13 files changed, 634 insertions, 229 deletions
diff --git a/src/main/res/values-de/strings.xml b/src/main/res/values-de/strings.xml
index 93414f04..08993950 100644
--- a/src/main/res/values-de/strings.xml
+++ b/src/main/res/values-de/strings.xml
@@ -98,7 +98,7 @@
   <string name="no_pgp_key">Kein OpenPGP-Schlüssel gefunden</string>
   <string name="contact_has_no_pgp_key">Conversations ist nicht in der Lage, deine Nachrichten zu verschlüsseln, weil dein Kontakt seinen oder ihren Schlüssel nicht preisgibt.\n\n<small>Bitte sag deinem Kontakt, er oder sie möge OpenPGP einrichten.</small></string>
   <string name="no_pgp_keys">Keine OpenPGP-Schlüssel gefunden</string>
-  <string name="contacts_have_no_pgp_keys">Conversations ist nicht in der Lage, deine Nachrichten zu verschlüsseln, weil deine Kontakte ihre Schlüssel nicht preisgeben.\n\n<small>Bitte sage deinen Kontakten, sie mögen OpenPGP einrichten.</small></string>
+  <string name="contacts_have_no_pgp_keys">Conversations ist nicht in der Lage, deine Nachrichten zu verschlüsseln, weil deine Kontakte ihren öffentlichen Schlüssel nicht preisgeben.\n\n<small>Bitte sage deinen Kontakten, sie mögen OpenPGP einrichten.</small></string>
   <string name="pref_general">Allgemeines</string>
   <string name="pref_xmpp_resource">XMPP-Ressource</string>
   <string name="pref_xmpp_resource_summary">Der Name, mit dem sich der Client selbst identifiziert</string>
@@ -565,7 +565,7 @@
   <string name="shared_text_with_x">Text mit %s geteilt</string>
   <string name="no_storage_permission">Conversations benötigt Zugriff auf externen Speicher</string>
   <string name="sync_with_contacts">Mit Kontakten synchronisieren</string>
-  <string name="sync_with_contacts_long">Conversations möchte deine XMPP-Kontaktliste mit deinen Kontakten abgleichen, um deren vollständige Namen und Avatare anzuzeigen.\n\nConversations wird deine Kontakte nur lokal lesen und abgleichen und überträgt diese nicht auf den Server.\n\nDu wirst nun gefragt, ob du den Zugriff auf deine Kontakte erlauben möchtest.</string>
+  <string name="sync_with_contacts_long">Conversations möchte deine XMPP-Kontaktliste mit deinen Kontakten abgleichen, um deren vollständige Namen und Avatare anzuzeigen.\n\nConversations wird deine Kontakte nur lokal lesen, abgleichen und überträgt diese nicht auf den Server.\n\nDu wirst nun gefragt, ob du den Zugriff auf deine Kontakte erlauben möchtest.</string>
   <string name="certificate_information">Zertifikatinformationen</string>
   <string name="certificate_subject">Betreff</string>
   <string name="certificate_issuer">Aussteller</string>
diff --git a/src/main/res/values-es/strings.xml b/src/main/res/values-es/strings.xml
index 6cd291aa..0cd14367 100644
--- a/src/main/res/values-es/strings.xml
+++ b/src/main/res/values-es/strings.xml
@@ -678,7 +678,7 @@
   <string name="share_as_uri">Compartir como XMPP URI</string>
   <string name="share_as_http">Compartir como link HTTP</string>
   <string name="pref_blind_trust_before_verification">Confianza ciega antes de verificación</string>
-  <string name="pref_blind_trust_before_verification_summary">Automáticamente confiar en los nuevos dispositivos de tus contactos que no han sido verificados antes y solicita confirmación manual cada vez que un contacto verificado añade un dispositivo nuevo.</string>
+  <string name="pref_blind_trust_before_verification_summary">Automáticamente confiar en los nuevos dispositivos de tus contactos que no han sido verificados todavía, y solicitar confirmación manual cada vez que un contacto verificado añade un dispositivo nuevo.</string>
   <string name="blindly_trusted_omemo_keys">Huellas digitales OMEMO de confianza ciega</string>
   <string name="not_trusted">No confiables</string>
   <string name="invalid_barcode">Código QR inválido</string>
diff --git a/src/main/res/values-eu/strings.xml b/src/main/res/values-eu/strings.xml
index be7a915e..8e5ef28e 100644
--- a/src/main/res/values-eu/strings.xml
+++ b/src/main/res/values-eu/strings.xml
@@ -122,12 +122,14 @@
   <string name="pref_never_send_crash">Gelditze txostenik ez bidali inoiz</string>
   <string name="pref_never_send_crash_summary">Akats harraskak bidaliz Conversationsen garapenean laguntzen duzu</string>
   <string name="pref_confirm_messages">Mezuak egiaztatu</string>
+  <string name="pref_confirm_messages_summary">Zure kontaktuak haien mezuak noiz jaso eta irakurri dituzun jakin dezaten baimendu</string>
   <string name="pref_ui_options">Erabiltzaile-interfazea</string>
   <string name="openpgp_error">OpenKeychainek akats baten berri eman du</string>
   <string name="error_decrypting_file">Sarrera/Irteera akatsa fitxategia desenkriptatzerakoan</string>
   <string name="accept">Onartu</string>
   <string name="error">Akats bat gertatu da</string>
   <string name="pref_grant_presence_updates">Presentzia eguneraketak eman</string>
+  <string name="pref_grant_presence_updates_summary">Prebentiboki presentzia eguneraketak eman eta eskatu sortu dituzun kontaktuetarako</string>
   <string name="subscriptions">Harpidetzak</string>
   <string name="your_account">Zure kontua</string>
   <string name="keys">Gakoak</string>
@@ -337,6 +339,8 @@
   <string name="url_copied_to_clipboard">URLa arbelera kopiatu da</string>
   <string name="message_copied_to_clipboard">Mezua arbelera kopiatu da</string>
   <string name="image_transmission_failed">Irudiaren transmisioak huts egin du</string>
+  <string name="scan_qr_code">2D barra kodea eskaneatu</string>
+  <string name="show_qr_code">2D barra kodea erakutsi</string>
   <string name="show_block_list">Blokeatutakoen zerrenda ikusi</string>
   <string name="account_details">Kontuaren xehetasunak</string>
   <string name="verify_otr">OTR egiaztatu</string>
@@ -376,6 +380,7 @@
   <string name="no_application_found_to_open_file">Fitxategia ireki dezakeen aplikaziorik ez da aurkitu</string>
   <string name="could_not_verify_fingerprint">Hatz-marka ezin izan da egiaztatu</string>
   <string name="manually_verify">Eskuz egiaztatu</string>
+  <string name="are_you_sure_verify_fingerprint">Ziur al zaude zure kontaktuaren OTR hatz-marka egiaztatu nahi duzulaz?</string>
   <string name="pref_show_dynamic_tags">Etiketa dinamikoak erakutsi</string>
   <string name="pref_show_dynamic_tags_summary">Irakurtzeko soilik diren etiketak erakutsi kontaktuen azpian</string>
   <string name="enable_notifications">Jakinarazpenak gaitu</string>
@@ -468,6 +473,7 @@
   <string name="contact_is_typing">%s idazten ari da...</string>
   <string name="contact_has_stopped_typing">%s(e)k idazteari utzi dio</string>
   <string name="pref_chat_states">Idazketa jakinarazpenak</string>
+  <string name="pref_chat_states_summary">Zure kontaktuak mezu berri bat noiz idazten ari zaren jakin dezaten baimendu</string>
   <string name="send_location">Kokapena partekatu</string>
   <string name="show_location">Kokapena erakutsi</string>
   <string name="no_application_found_to_display_location">Kokapena erakutsi dezakeen aplikaziorik ez da aurkitu</string>
@@ -660,4 +666,20 @@
   <string name="data_saver_enabled">Datuen aurreztailea gaituta</string>
   <string name="data_saver_enabled_explained">Zure sistema eragileak Conversations atzeko planoan dagoenean Internetera konekta dadin mugatzen ari da. Mezu berrien jakinarazpenak jasotzeko Conversationsi mugagabeko sarrera eman beharko zenioke Datuen aurreztailea piztuta dagoenean.\nConversationsek datuak aurrezteko esfortzua egiten jarraituko du ahal duenean.</string>
   <string name="device_does_not_support_data_saver">Zure gailuak ez du Datuen aurreztailea ezgaitzea baimentzen Conversationserako</string>
+  <string name="error_unable_to_create_temporary_file">Ezin izan da aldi baterako fitxategia sortu</string>
+  <string name="this_device_has_been_verified">Gailu hau egiaztatu da</string>
+  <string name="copy_fingerprint">Hatz-marka kopiatu</string>
+  <string name="all_omemo_keys_have_been_verified">OMEMO gako guztiak egiaztatu dira</string>
+  <string name="barcode_does_not_contain_fingerprints_for_this_conversation">Barra kodeak ez du hatz-markarik elkarrizketa honetarako.</string>
+  <string name="verified_fingerprints">Egiaztatutako hatz-markak</string>
+  <string name="use_camera_icon_to_scan_barcode">Kamera erabili kontaktuaren barra kodea eskaneatzeko</string>
+  <string name="please_wait_for_keys_to_be_fetched">Mesedez itxaron gakoak ekarri arte</string>
+  <string name="share_as_barcode">Barra kode bezala partekatu</string>
+  <string name="share_as_uri">XMPP URI bezala partekatu</string>
+  <string name="share_as_http">HTTP link bezala partekatu</string>
+  <string name="pref_blind_trust_before_verification">Egiaztatu aurreko fidagarritasun itsua</string>
+  <string name="pref_blind_trust_before_verification_summary">Aurretik egiaztatu ez diren kontaktuen gailu berri guztietaz automatikoki fidatu, eta eskuzko baieztapen bila galdetu egiaztatutako kontaktuek gailu berri bat gehitzen duten bakoitzean.</string>
+  <string name="blindly_trusted_omemo_keys">Itsuki fidatutako OMEMO gakoak</string>
+  <string name="not_trusted">Ez fidagarria</string>
+  <string name="invalid_barcode">2D barra kodea baliogabea</string>
 </resources>
diff --git a/src/main/res/values-fr/strings.xml b/src/main/res/values-fr/strings.xml
index 290125dc..aae588b3 100644
--- a/src/main/res/values-fr/strings.xml
+++ b/src/main/res/values-fr/strings.xml
@@ -117,19 +117,19 @@
   <string name="pref_sound">Sonnerie</string>
   <string name="pref_sound_summary">Jouer un son lors de la réception d\'un message</string>
   <string name="pref_notification_grace_period">Période sans notification</string>
-  <string name="pref_notification_grace_period_summary">Durée d\'inactivité de Conversations après avoir repéré un changement sur un autre périphérique</string>
+  <string name="pref_notification_grace_period_summary">Durée d\'inactivité de Conversations après avoir repéré un changement sur un autre appareil</string>
   <string name="pref_advanced_options">Avancé</string>
   <string name="pref_never_send_crash">Ne pas envoyer de rapports d\'erreurs</string>
   <string name="pref_never_send_crash_summary">En envoyant des logs vous aidez le développement de Conversations.</string>
   <string name="pref_confirm_messages">Confirmation de lecture</string>
-  <string name="pref_confirm_messages_summary">Faites savoir à vos contacts quand vous avez reçu et lu leurs messages</string>
+  <string name="pref_confirm_messages_summary">Informer vos contacts quand vous avez reçu et lu leurs messages</string>
   <string name="pref_ui_options">Interface</string>
   <string name="openpgp_error">OpenKeychain a signalé une erreur</string>
   <string name="error_decrypting_file">Erreur d\'E/S lors du déchiffrement du fichier</string>
   <string name="accept">Accepter</string>
   <string name="error">Une erreur s\'est produite</string>
   <string name="pref_grant_presence_updates">Autoriser les màj de disponibilité</string>
-  <string name="pref_grant_presence_updates_summary">Accordez et demandez par avance les abonnements de présence aux contacts que vous avez ajoutés</string>
+  <string name="pref_grant_presence_updates_summary">Accorder et demander par avance les mises à jour de présence aux contacts que vous avez ajoutés</string>
   <string name="subscriptions">Publications</string>
   <string name="your_account">Votre compte</string>
   <string name="keys">Clefs</string>
@@ -169,8 +169,8 @@
   <string name="mgmt_account_disable">Désactiver temporairement</string>
   <string name="mgmt_account_publish_avatar">Publier un avatar</string>
   <string name="mgmt_account_publish_pgp">Publier la clef publique OpenPGP</string>
-  <string name="openpgp_has_been_published">La clef public OpenPGP a été publiée</string>
-  <string name="republish_pgp_keys">N\'oubliez pas de republier votre clef public OpenPGP !</string>
+  <string name="openpgp_has_been_published">La clef publique OpenPGP a été publiée</string>
+  <string name="republish_pgp_keys">N\'oubliez pas de republier votre clef publique OpenPGP !</string>
   <string name="mgmt_account_enable">Activer</string>
   <string name="mgmt_account_are_you_sure">Êtes-vous sûr ?</string>
   <string name="mgmt_account_delete_confirm_text">Si vous supprimez votre compte, votre historique de conversations sera perdu !</string>
@@ -247,7 +247,7 @@
   <string name="contact_already_exists">Le contact existe déjà.</string>
   <string name="join">Rejoindre</string>
   <string name="conference_address">Adresse de la conférence</string>
-  <string name="conference_address_example">room@conference.example.com/nick</string>
+  <string name="conference_address_example">salle@conference.exemple.com/pseudo</string>
   <string name="save_as_bookmark">Enregistrer comme favori</string>
   <string name="delete_bookmark">Supprimer le favori</string>
   <string name="bookmark_already_exists">Le favori existe déjà</string>
@@ -339,8 +339,8 @@
   <string name="url_copied_to_clipboard">URL copiée dans le presse-papier</string>
   <string name="message_copied_to_clipboard">Message copié dans le presse-papier</string>
   <string name="image_transmission_failed">Échec lors de l\'envoi de l\'image</string>
-  <string name="scan_qr_code">Scanner le Code-barres 2D</string>
-  <string name="show_qr_code">Montrer le Code-barres 2D</string>
+  <string name="scan_qr_code">Scanner le code-barres 2D</string>
+  <string name="show_qr_code">Montrer le code-barres 2D</string>
   <string name="show_block_list">Afficher la liste des contacts bloqués</string>
   <string name="account_details">Détails du compte</string>
   <string name="verify_otr">Vérifier l\'OTR</string>
@@ -473,7 +473,7 @@
   <string name="contact_is_typing">%s est en train d\'écrire</string>
   <string name="contact_has_stopped_typing">%s a arrêté d\'écrire</string>
   <string name="pref_chat_states">Notifications d\'écriture</string>
-  <string name="pref_chat_states_summary">Faites savoir à vos contacts quand vous leur écrivez des message</string>
+  <string name="pref_chat_states_summary">Informer vos contacts quand vous leur écrivez des messages</string>
   <string name="send_location">Envoyer la position</string>
   <string name="show_location">Afficher la position</string>
   <string name="no_application_found_to_display_location">Aucune application trouvée pour afficher la position</string>
@@ -617,7 +617,7 @@
   <string name="device_does_not_support_battery_op">Les optimisations de batterie ne peuvent pas être désactivées sur votre appareil</string>
   <string name="show_password">Afficher le mot de passe</string>
   <string name="registration_please_wait">L\'enregistrement a échoué : Réessayer plus tard</string>
-  <string name="registration_password_too_weak">L\'enregistrement a échoué : Le mot de passe est trop faible</string>
+  <string name="registration_password_too_weak">Échec de l\'enregistrement : le mot de passe n\'est pas assez fort</string>
   <string name="create_conference">Créer une conférence</string>
   <string name="join_or_create_conference">Rejoindre ou créer une conférence</string>
   <string name="conference_subject">Objet</string>
@@ -631,55 +631,55 @@
   <string name="pref_broadcast_last_activity_summary">Informer tous vos contacts lorsque vous utitlisez Conversations</string>
   <string name="pref_privacy">Confidentialité</string>
   <string name="pref_theme_options">Thème</string>
-  <string name="pref_theme_options_summary">Choisir la palette de couleur </string>
+  <string name="pref_theme_options_summary">Choisir la palette de couleurs</string>
   <string name="pref_theme_light">Thème Clair</string>
   <string name="pref_theme_dark">Thème Sombre</string>
   <string name="pref_use_green_background">Fond Vert</string>
   <string name="pref_use_green_background_summary">Utiliser un fond vert pour les messages reçus</string>
   <string name="unable_to_connect_to_keychain">Connection à OpenKeychain impossible</string>
-  <string name="this_device_is_no_longer_in_use">Ce périphérique n\'est plus utilisé</string>
+  <string name="this_device_is_no_longer_in_use">Cet appareil n\'est plus utilisé</string>
   <string name="type_pc">Ordinateur</string>
   <string name="type_phone">Smartphone</string>
   <string name="type_tablet">Tablette</string>
   <string name="type_web">Navigateur Internet</string>
   <string name="type_console">Console</string>
-  <string name="payment_required">Paiement Obligatoire</string>
-  <string name="missing_internet_permission">Permission Internet Manquante</string>
+  <string name="payment_required">Paiement requis</string>
+  <string name="missing_internet_permission">Permission Internet manquante</string>
   <string name="me">Moi</string>
   <string name="contact_asks_for_presence_subscription">Le contact demande la notification de présence</string>
   <string name="allow">Autoriser</string>
-  <string name="no_permission_to_access_x">Permission d\'accès refusée à %s</string>
+  <string name="no_permission_to_access_x">Permission d\'accéder à %s refusée</string>
   <string name="remote_server_not_found">Serveur distant non trouvé</string>
   <string name="unable_to_update_account">Mise à jour du compte impossible</string>
-  <string name="missing_presence_subscription_with_x">La notification de présence est manquante avec %s</string>
-  <string name="missing_keys_from_x">La clef OMEMO de %s est manquante</string>
+  <string name="missing_presence_subscription_with_x">La notification de présence pour %s est manquante.</string>
+  <string name="missing_keys_from_x">La clef OMEMO de %s est manquante.</string>
   <string name="missing_omemo_keys">Clefs OMEMO manquantes</string>
-  <string name="wrong_conference_configuration">La conférence n\'est ni privée, ni anonyme</string>
-  <string name="this_conference_has_no_members">Aucun membre dans cette conférence</string>
-  <string name="report_jid_as_spammer">Signaler ce JID comme envoyant des messages non sollicités</string>
+  <string name="wrong_conference_configuration">Cette conférence n\'est ni privée, ni anonyme.</string>
+  <string name="this_conference_has_no_members">Aucun membre dans cette conférence.</string>
+  <string name="report_jid_as_spammer">Signaler ce JID comme envoyant des messages non sollicités.</string>
   <string name="pref_delete_omemo_identities">Effacer les identités OMEMO</string>
-  <string name="pref_delete_omemo_identities_summary">Régénérer vos clef OMEMO. Tous vos contacts devront les vérifier à nouveau. A n\'utiliser qu\'en dernier recours.</string>
+  <string name="pref_delete_omemo_identities_summary">Régénérer vos clef OMEMO. Tous vos contacts devront vous vérifier à nouveau. À n\'utiliser qu\'en dernier recours.</string>
   <string name="delete_selected_keys">Supprimer les clefs sélectionnées</string>
-  <string name="error_publish_avatar_offline">Vous devez être connecté pour publier votre avatar</string>
+  <string name="error_publish_avatar_offline">Vous devez être connecté pour publier votre avatar.</string>
   <string name="show_error_message">Afficher le message d\'erreur</string>
   <string name="error_message">Message d\'erreur</string>
-  <string name="data_saver_enabled">Économie de données activée</string>
-  <string name="data_saver_enabled_explained">Votre système d\'exploitation empêche Conversations d’accéder à Internet en arrière plan. Pour recevoir les notifications de nouveaux messages, vous devez autoriser, quand le mode d\'économie de données est actif, à ce que Conversations ai un plein accès au réseau.\n Conversations essaiera autant que possible d\'économiser la data.</string>
-  <string name="device_does_not_support_data_saver">Votre appareil ne prend pas en charge la désactivation de l\'économiseur de données pour Conversations.</string>
+  <string name="data_saver_enabled">Économiseur de données activé</string>
+  <string name="data_saver_enabled_explained">Votre système d\'exploitation empêche Conversations d’accéder à Internet lorsque l\'application est en arrière plan. Pour recevoir les notifications de nouveaux messages, vous devez autoriser Conversations à accéder au réseau sans restriction quand l\'Économiseur de données est activé.\n Conversations tentera de consommer le moins de données possible.</string>
+  <string name="device_does_not_support_data_saver">Votre appareil ne prend pas en charge la désactivation de l\'Économiseur de données pour Conversations.</string>
   <string name="error_unable_to_create_temporary_file">Impossible de créer un fichier temporaire</string>
   <string name="this_device_has_been_verified">Cet appareil a été vérifié</string>
   <string name="copy_fingerprint">Copier l\'empreinte</string>
-  <string name="all_omemo_keys_have_been_verified">Toutes les clés OMEMO ont étés vérifiées</string>
-  <string name="barcode_does_not_contain_fingerprints_for_this_conversation">Le Code-barres ne contient pas d\'empreintes pour cette conversation.</string>
+  <string name="all_omemo_keys_have_been_verified">Toutes les clefs OMEMO ont étés vérifiées</string>
+  <string name="barcode_does_not_contain_fingerprints_for_this_conversation">Le code-barres ne contient pas d\'empreintes pour cette conversation.</string>
   <string name="verified_fingerprints">Empreintes vérifiées</string>
   <string name="use_camera_icon_to_scan_barcode">Utilisez l\'appareil photo pour scanner le code-barres d\'un contact</string>
-  <string name="please_wait_for_keys_to_be_fetched">Veuillez attendre que les clés soient récupérées</string>
-  <string name="share_as_barcode">Partager par Code-barres</string>
+  <string name="please_wait_for_keys_to_be_fetched">Veuillez attendre que les clefs soient récupérées</string>
+  <string name="share_as_barcode">Partager par code-barres</string>
   <string name="share_as_uri">Partager par URI XMPP</string>
   <string name="share_as_http">Partager par lien HTTP</string>
-  <string name="pref_blind_trust_before_verification">Faire Aveuglement Confiance Avant La Vérification</string>
-  <string name="pref_blind_trust_before_verification_summary">Faire automatiquement confiance à tous les nouveaux appareils des contacts qui n\'ont pas étés vérifiés avant et demandez une confirmation manuelle à chaque fois qu\'un contact vérifié ajoute un nouveau appareil.</string>
-  <string name="blindly_trusted_omemo_keys">Faire aveuglement confiance aux clés OMEMO</string>
+  <string name="pref_blind_trust_before_verification">Faire aveuglément confiance avant vérification</string>
+  <string name="pref_blind_trust_before_verification_summary">Faire automatiquement confiance aux nouveaux appareils des contacts qui n\'ont pas été vérifiés auparavant, et requérir une confirmation manuelle à chaque fois qu\'un contact vérifié auparavant utilise un nouvel appareil.</string>
+  <string name="blindly_trusted_omemo_keys">Faire aveuglément confiance aux clefs OMEMO</string>
   <string name="not_trusted">Non approuvée</string>
   <string name="invalid_barcode">Code-barres 2D invalide</string>
 </resources>
diff --git a/src/main/res/values-hu/strings.xml b/src/main/res/values-hu/strings.xml
new file mode 100644
index 00000000..9857ade8
--- /dev/null
+++ b/src/main/res/values-hu/strings.xml
@@ -0,0 +1,302 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<resources>
+  <string name="action_settings">Beállítások</string>
+  <string name="action_add">Új beszélgetés</string>
+  <string name="action_accounts">Fiókok kezelése</string>
+  <string name="action_end_conversation">Beszélgetés befejezése</string>
+  <string name="action_contact_details">Kapcsolat részletek</string>
+  <string name="action_muc_details">Konferencia részletek</string>
+  <string name="action_secure">Biztonságos neszélgetés</string>
+  <string name="action_add_account">Fiók hozzáadása</string>
+  <string name="action_edit_contact">Név szerkesztése</string>
+  <string name="action_add_phone_book">Címjegyzékhez hozzáad</string>
+  <string name="action_delete_contact">Névsorból törlés</string>
+  <string name="action_block_contact">Ismerős tiltása</string>
+  <string name="action_unblock_contact">Tiltás feloldása</string>
+  <string name="action_block_domain">Tartomány tiltása</string>
+  <string name="action_unblock_domain">Tartomány feloldása</string>
+  <string name="title_activity_manage_accounts">Fiókok kezelése</string>
+  <string name="title_activity_settings">Beállítások</string>
+  <string name="title_activity_conference_details">Konferencia részletek</string>
+  <string name="title_activity_contact_details">Kapcsolat részletek</string>
+  <string name="title_activity_sharewith">Megosztás Conversation-nel</string>
+  <string name="title_activity_start_conversation">Beszélgetés kezdeményezése</string>
+  <string name="title_activity_choose_contact">Névjegy kiválasztása</string>
+  <string name="title_activity_block_list">Tiltólista</string>
+  <string name="just_now">Éppen most</string>
+  <string name="minute_ago">1 perce</string>
+  <string name="minutes_ago">%d perce</string>
+  <string name="unread_conversations">Olvasatlan beszélgetések</string>
+  <string name="sending">küldés...</string>
+  <string name="message_decrypting">Üzenet dekódolása. Kérem várjon...</string>
+  <string name="pgp_message">OpenPGP kódolású üzenet</string>
+  <string name="nick_in_use">A becenév már foglalt</string>
+  <string name="admin">Adminisztrátor</string>
+  <string name="owner">Tulajdonos</string>
+  <string name="moderator">Moderátor</string>
+  <string name="participant">Résztvevő</string>
+  <string name="visitor">Látogató</string>
+  <string name="remove_contact_text">Szeretnéd eltávolítani %s nevű ismerősöd a listádról? A beszélgetésetek nem fog törlődni.</string>
+  <string name="block_contact_text">Szeretnéd tiltani %s nevű ismerősödet, hogy ne tudjon neked küldeni üzenetet?</string>
+  <string name="unblock_contact_text">Szeretnéd %s nevű ismerősöd tiltását feloldani és megengedni az üzenetváltást vele?</string>
+  <string name="block_domain_text">%s minden névjegyét tiltja?</string>
+  <string name="unblock_domain_text">%s minden tiltását feloldja</string>
+  <string name="contact_blocked">Ismerős letiltva</string>
+  <string name="remove_bookmark_text">Szeretnéd eltávolítani %s nevű névjegyet a könyvjelzőkből? A beszélgetésetek nem fog törlődni.</string>
+  <string name="register_account">Új fiók létrehozása a szerveren</string>
+  <string name="change_password_on_server">Jelszó megváltoztatása a szerveren</string>
+  <string name="share_with">Megosztás...</string>
+  <string name="start_conversation">Beszélgetés kezdeményezése</string>
+  <string name="invite_contact">Ismerős meghívása</string>
+  <string name="contacts">Névjegyek</string>
+  <string name="cancel">Mégse</string>
+  <string name="set">Beállít</string>
+  <string name="add">Hozzáad</string>
+  <string name="edit">Szerkeszt</string>
+  <string name="delete">Töröl</string>
+  <string name="block">Tilt</string>
+  <string name="unblock">Tiltás vége</string>
+  <string name="save">Mentés</string>
+  <string name="ok">Rendben</string>
+  <string name="crash_report_title">Conversations összeomlott</string>
+  <string name="send_now">Elküldi most</string>
+  <string name="send_never">Ne kérdezze többször</string>
+  <string name="problem_connecting_to_account">Nem sikerül a fiókhoz csatlakozni</string>
+  <string name="problem_connecting_to_accounts">Nem sikerül fiókokhoz csatlakozni</string>
+  <string name="touch_to_fix">Érintsd meg itt fiókjaid beállításaihoz </string>
+  <string name="attach_file">Fájl csatolása</string>
+  <string name="not_in_roster">Az ismerős nincs a névsorodban. Hozzáadod?</string>
+  <string name="add_contact">Ismerős hozzáadása</string>
+  <string name="send_failed">Kézbesítés meghiúsult</string>
+  <string name="send_rejected">elutasítva</string>
+  <string name="preparing_image">A kép átvitelének előkészítése</string>
+  <string name="preparing_images">Képek előkészítése az átvitelhez.</string>
+  <string name="sharing_files_please_wait">Fájlok megosztása. Kérlek várj...</string>
+  <string name="action_clear_history">Előzmények törlése</string>
+  <string name="clear_conversation_history">Beszélgetés előzményének törlése</string>
+  <string name="delete_messages">Üzenetek törlése</string>
+  <string name="also_end_conversation">A beszélgetést is fejezze be</string>
+  <string name="choose_presence">Válassz eszközt</string>
+  <string name="send_unencrypted_message">Kódolatlan üzenet küldése</string>
+  <string name="send_message_to_x">Üzenet elküldése %s számára</string>
+  <string name="send_otr_message">OTR titkosított üzenet küldése</string>
+  <string name="send_omemo_message">OMEMO titkosított üzenetet küldése</string>
+  <string name="send_omemo_x509_message">OMEMO v\\kódolt üzenet küldése</string>
+  <string name="send_pgp_message">OpenPGP titkosított üzenet küldése</string>
+  <string name="your_nick_has_been_changed">Beceneved megváltozott</string>
+  <string name="send_unencrypted">Küldés titkosítás nélkül</string>
+  <string name="decryption_failed">Dekódolás nem sikerült. Lehet, hogy nincs megfelelő személyes kulcsod?</string>
+  <string name="openkeychain_required">OpenKeychain</string>
+  <string name="restart">Újrakezd</string>
+  <string name="install">Telepít</string>
+  <string name="openkeychain_not_installed">Kérlek telepítsd az OpenKeychain-t</string>
+  <string name="offering">megkisérli...</string>
+  <string name="waiting">várakozik...</string>
+  <string name="no_pgp_key">Nem talált OpenPGP kulcsot</string>
+  <string name="no_pgp_keys">Nem talált OpenPGP kulcsokat</string>
+  <string name="pref_general">Általános</string>
+  <string name="pref_xmpp_resource">XMPP erőforrás</string>
+  <string name="pref_xmpp_resource_summary">A név amivel ez a kliens azonosítja magát</string>
+  <string name="pref_accept_files">Fájlok fogadása</string>
+  <string name="pref_accept_files_summary">Automatikusan fogadjon ennél kisebb fájlokat...</string>
+  <string name="pref_attachments">Csatolmányok</string>
+  <string name="pref_return_to_previous">Gyors megosztás</string>
+  <string name="pref_notification_settings">Értesítés</string>
+  <string name="pref_notifications">Értesítések</string>
+  <string name="pref_notifications_summary">Értesítsen új üzenet érkezésekor</string>
+  <string name="pref_vibrate">Rezegjen</string>
+  <string name="pref_vibrate_summary">Rezegjen új üzenet érkezésekor</string>
+  <string name="pref_led">LED értesítés</string>
+  <string name="pref_led_summary">Villogjon a LED új üzenet érkezésekor</string>
+  <string name="pref_sound">Csengőhang</string>
+  <string name="pref_sound_summary">Hangeffekt lejátszása új üzenet érkezésekor</string>
+  <string name="pref_notification_grace_period">Ne zavarjanak időszak</string>
+  <string name="pref_notification_grace_period_summary">A szoftver csendben marad ennyi ideig, miután aktivitást észlelt másik eszközön</string>
+  <string name="pref_advanced_options">Haladó beállítások</string>
+  <string name="pref_never_send_crash">Ne küldjön programhiba jelentéseket</string>
+  <string name="pref_confirm_messages">Üzenetek megerősítése</string>
+  <string name="pref_confirm_messages_summary">Tudatod az ismerőseiddel, hogy megkaptad és elolvastad az üzeneteiket</string>
+  <string name="pref_ui_options">UI</string>
+  <string name="openpgp_error">Az OpenKeychain hibát jelzett</string>
+  <string name="error_decrypting_file">I/O hiba a fájl dekódolása közben</string>
+  <string name="accept">Elfogad</string>
+  <string name="error">Hiba történt</string>
+  <string name="pref_grant_presence_updates">Állapotfrissítések megadása</string>
+  <string name="subscriptions">Felíratkozások</string>
+  <string name="your_account">Fiókod</string>
+  <string name="keys">Kulcsok</string>
+  <string name="send_presence_updates">Állapotfrissítések küldése</string>
+  <string name="receive_presence_updates">Állapotfrissítések fogadása</string>
+  <string name="ask_for_presence_updates">Állapotfrissítések kérése</string>
+  <string name="attach_choose_picture">Válassz képet</string>
+  <string name="attach_take_picture">Készíts képet</string>
+  <string name="preemptively_grant">Megadja a feliratkozás kérelmekre az engedélyt</string>
+  <string name="error_not_an_image_file">A kiválasztott fájl nem képfájl</string>
+  <string name="error_compressing_image">Hiba történt a kép konvertálása közben</string>
+  <string name="error_file_not_found">Nem található fájl</string>
+  <string name="error_io_exception">Általános íráshiba. Talán elfogyott a hely?</string>
+  <string name="account_status_unknown">Nem ismert</string>
+  <string name="account_status_disabled">Átmenetileg letiltva</string>
+  <string name="account_status_online">Elérhető</string>
+  <string name="account_status_connecting">Kapcsolódás\u2026</string>
+  <string name="account_status_offline">Nem elérhető</string>
+  <string name="account_status_unauthorized">Nem engedélyezett</string>
+  <string name="account_status_not_found">Szerver nem elérhető</string>
+  <string name="account_status_no_internet">Nincs kapcsolat</string>
+  <string name="account_status_regis_fail">Regisztráció nem sikerült</string>
+  <string name="account_status_regis_conflict">Felhasználónév már foglalt</string>
+  <string name="account_status_regis_success">Sikeres regisztráció</string>
+  <string name="account_status_regis_not_sup">A szerver nem támogatja a regisztrációt</string>
+  <string name="account_status_security_error">Biztonsági hiba</string>
+  <string name="account_status_policy_violation">Irányelv megsértése</string>
+  <string name="account_status_incompatible_server">Nem kompatibilis szerver</string>
+  <string name="account_status_stream_error">Adatfolyam hiba</string>
+  <string name="encryption_choice_unencrypted">Titkosítatlan</string>
+  <string name="encryption_choice_otr">OTR</string>
+  <string name="encryption_choice_pgp">OpenPGP</string>
+  <string name="encryption_choice_omemo">OMEMO</string>
+  <string name="mgmt_account_edit">Fiók szerkesztése</string>
+  <string name="mgmt_account_delete">Fiók törlése</string>
+  <string name="mgmt_account_disable">Letiltja átmenetileg</string>
+  <string name="mgmt_account_publish_avatar">Önarckép megadása</string>
+  <string name="mgmt_account_publish_pgp">OpenPGP publikus kulcs megadása</string>
+  <string name="openpgp_has_been_published">OpenPGP publikus kulcs meg lett adva.</string>
+  <string name="republish_pgp_keys">Ne felejtsd el újra publikálni az OpenPGP kulcsaidat!</string>
+  <string name="mgmt_account_enable">Fiók bekapcsolása</string>
+  <string name="mgmt_account_are_you_sure">Biztos vagy ebben?</string>
+  <string name="mgmt_account_delete_confirm_text">Ha törlöd a fiókodat, a korábbi beszélgetéseid mind elvesznek</string>
+  <string name="attach_record_voice">Hang felvétele</string>
+  <string name="account_settings_jabber_id">Jabber ID</string>
+  <string name="account_settings_password">Jelszó</string>
+  <string name="account_settings_example_jabber_id">username@example.com</string>
+  <string name="account_settings_confirm_password">Erősítsd meg a jelszót</string>
+  <string name="password">Jelszó</string>
+  <string name="confirm_password">Erősítsd meg a jelszót</string>
+  <string name="passwords_do_not_match">Jelszók nem egyeznek</string>
+  <string name="invalid_jid">Nem érvényes Jabber ID</string>
+  <string name="error_out_of_memory">Nincs elég memória. Képfájl túl nagy</string>
+  <string name="add_phone_book_text">Szeretnéd %s nevű személyt hozzáadni a névjegyzékhez?</string>
+  <string name="contact_status_online">Elérhető</string>
+  <string name="contact_status_free_to_chat">Csevegésre kész</string>
+  <string name="contact_status_away">tétlen</string>
+  <string name="contact_status_extended_away">régóta tétlen</string>
+  <string name="contact_status_do_not_disturb">ne zavarjanak</string>
+  <string name="contact_status_offline">nem elérhető</string>
+  <string name="muc_details_conference">Konferencia</string>
+  <string name="muc_details_other_members">További tagok</string>
+  <string name="server_info_show_more">Szerver részletek</string>
+  <string name="server_info_mam">XEP-0313: MAM</string>
+  <string name="server_info_carbon_messages">XEP-0280: Message Carbons</string>
+  <string name="server_info_csi">XEP-0352: Client State Indication</string>
+  <string name="server_info_blocking">XEP-0191: Blocking Command</string>
+  <string name="server_info_roster_version">XEP-0237: Roster Versioning</string>
+  <string name="server_info_stream_management">XEP-0198: Stream Management</string>
+  <string name="server_info_pep">XEP-0163: PEP (Avatars / OMEMO)</string>
+  <string name="server_info_http_upload">XEP-0363: HTTP File Upload</string>
+  <string name="server_info_push">XEP-0357: Push</string>
+  <string name="server_info_available">elérhető</string>
+  <string name="server_info_unavailable">nem elérhető</string>
+  <string name="missing_public_keys">Hiányzó nyilvános kulcs megadások</string>
+  <string name="last_seen_now">éppen most volt aktív</string>
+  <string name="last_seen_min">1 perce volt aktív</string>
+  <string name="last_seen_mins">%d perce volt aktív</string>
+  <string name="last_seen_hour">1 órája volt aktív</string>
+  <string name="last_seen_hours">%d órája volt aktív</string>
+  <string name="last_seen_day">1 napja volt aktív</string>
+  <string name="last_seen_days">%d napja volt aktív</string>
+  <string name="never_seen">Még nem láttuk itt</string>
+  <string name="install_openkeychain">Titkosított üzenet. Kérlek telepítsd az OpenKeychain-t a dekódoláshoz.</string>
+  <string name="unknown_otr_fingerprint">Ismeretlen OTR ujjlenyomat</string>
+  <string name="openpgp_messages_found">OpenPGP kódolású üzeneteket találtunk</string>
+  <string name="reception_failed">A fogadása meghiúsult</string>
+  <string name="your_fingerprint">A Te ujjlenyomatod</string>
+  <string name="otr_fingerprint">OTR ujjlenyomat</string>
+  <string name="otr_fingerprint_selected_message">Az üzenet OTR ujjlenyomata</string>
+  <string name="openpgp_key_id">OpenPGP Kulcs Azonosító</string>
+  <string name="omemo_fingerprint">OMEMO ujjlenyomat</string>
+  <string name="omemo_fingerprint_x509">v\\OMEMO ujjlenyomat</string>
+  <string name="omemo_fingerprint_selected_message">Az üzenet OMEMO ujjlenyomata</string>
+  <string name="omemo_fingerprint_x509_selected_message">v\\OMEMO ujjlenyomata az üzenetnek</string>
+  <string name="this_device_omemo_fingerprint">Saját OMEMO ujjlenyomat</string>
+  <string name="other_devices">Más eszközök</string>
+  <string name="trust_omemo_fingerprints">OMEMO ujjlenyomatokban megbízik</string>
+  <string name="fetching_keys">Kulcsok beszerzése...</string>
+  <string name="done">Kész</string>
+  <string name="verify">Ellenőriz</string>
+  <string name="decrypt">Dekódol</string>
+  <string name="conferences">Konferenciák</string>
+  <string name="search">Keresés</string>
+  <string name="create_contact">Névjegy létrehozása</string>
+  <string name="enter_contact">Névjegy megadása</string>
+  <string name="join_conference">Konferenciához csatlakozás</string>
+  <string name="delete_contact">Ismerős törlése</string>
+  <string name="view_contact_details">Ismerős névjegyének részletei</string>
+  <string name="block_contact">Ismerős tiltása</string>
+  <string name="unblock_contact">Tiltás feloldása</string>
+  <string name="create">Létrehoz</string>
+  <string name="select">Kiválaszt</string>
+  <string name="contact_already_exists">A névjegy már létezik</string>
+  <string name="join">Csatlakozik</string>
+  <string name="conference_address">Konferencia cím</string>
+  <string name="conference_address_example">room@conference.example.com/nick</string>
+  <string name="save_as_bookmark">Könyvjelzőkhöz hozzáadás</string>
+  <string name="delete_bookmark">Könyvjelző törlése</string>
+  <string name="bookmark_already_exists">A könyvjelző már létezik</string>
+  <string name="you">Te</string>
+  <string name="action_edit_subject">Konferencia témájának beállítása</string>
+  <string name="edit_subject_hint">A konferencia témája</string>
+  <string name="joining_conference">Konferenciához csatlakozás...</string>
+  <string name="leave">Távozás</string>
+  <string name="contact_added_you">Felhasználó hozzáadott a névjegyzékéhez</string>
+  <string name="add_back">Te is hozzáadod</string>
+  <string name="contact_has_read_up_to_this_point">%s eddig olvasta el</string>
+  <string name="publish">Közzétesz</string>
+  <string name="touch_to_choose_picture">Érintsd meg a piktogramot kép kiválasztásához </string>
+  <string name="publish_avatar_explanation">Vedd figyelembe: mindenki láthatja a képedet, aki fel van iratkozva rád.</string>
+  <string name="publishing">Közzétesz...</string>
+  <string name="error_publish_avatar_server_reject">A szerver elutasította a kérésedet</string>
+  <string name="error_publish_avatar_converting">Valami hiba történt a képed átalakítása közben</string>
+  <string name="error_saving_avatar">Nem tudja menteni a képedet a tárhelyre</string>
+  <string name="or_long_press_for_default">(Vagy nyomd hosszan az alapbeállításért)</string>
+  <string name="error_publish_avatar_no_server_support">A szerver nem támogatja a profilkép közzétételét</string>
+  <string name="private_message">elsuttogott</string>
+  <string name="private_message_to">%s részére</string>
+  <string name="send_private_message_to">Privát üzenet küldése %s részére</string>
+  <string name="connect">Kapcsolódás</string>
+  <string name="account_already_exists">A fiók már létezik</string>
+  <string name="next">Következő</string>
+  <string name="server_info_session_established">Munkafolyamat létrehozva</string>
+  <string name="additional_information">További információ</string>
+  <string name="skip">Kihagyás</string>
+  <string name="disable_notifications">Értesítések letiltása</string>
+  <string name="disable_notifications_for_this_conversation">Értesítések letiltása erre a beszélgetésre</string>
+  <string name="enable">Engedélyez</string>
+  <string name="conference_requires_password">A konferenciához jelszó szükséges</string>
+  <string name="enter_password">Írd be a jelszót</string>
+  <string name="missing_presence_updates">Állapotjelentések hiányoznak az ismerőstől</string>
+  <string name="missing_presence_subscription">Hiányzik az állapotra való feliratkozás</string>
+  <string name="request_presence_updates">Kérlek, kérd először az állapot frissítéseket az ismerősödtől.\n\n<small>Ez segíteni fog abban, hogy kiderítsük, milyen klienst használ.</small></string>
+  <string name="request_now">Lekérés folyamatban</string>
+  <string name="delete_fingerprint">Ujjlenyomat törlése</string>
+  <string name="sure_delete_fingerprint">Biztosan törölni szeretnéd ezt az ujjlenyomatot?</string>
+  <string name="ignore">Mellőz</string>
+  <string name="pref_security_settings">Biztonság</string>
+  <string name="pref_force_encryption">Végpontok közötti titkosítás kényszerítése</string>
+  <string name="pref_force_encryption_summary">Mindig titkosítva küldje az üzeneteket(kivéve konferenciák)</string>
+  <string name="pref_allow_message_correction">Üzenetek kijavításának engedélyezése</string>
+  <string name="pref_allow_message_correction_summary">Visszamenőlegesen is megengedi az üzenetek szerkesztését</string>
+  <string name="pref_dont_save_encrypted">Ne mentse el a titkosított üzeneteket</string>
+  <string name="pref_dont_save_encrypted_summary">Figyelem: Ez üzenetek elvesztéséhez vezethet</string>
+  <string name="pref_expert_options">Haladó beállítások</string>
+  <string name="pref_expert_options_summary">Kérlek légy óvatos ezekkel</string>
+  <string name="title_activity_about">A Conversations-ről</string>
+  <string name="pref_about_conversations_summary">Verzió és licenc információk</string>
+  <string name="title_pref_quiet_hours">Csöndes órák</string>
+  <string name="title_pref_quiet_hours_start_time">Kezdése</string>
+  <string name="title_pref_quiet_hours_end_time">Befejezése</string>
+  <string name="title_pref_enable_quiet_hours">Csöndes órák engedélyezése</string>
+  <string name="pref_quiet_hours_summary">Értesítések el lesznek némítva a csöndes órákban</string>
+  <string name="pref_use_larger_font">Betűméret növelése</string>
+  <string name="pref_use_larger_font_summary">Az egész programban használjon nagyobb betűméretet</string>
+  <string name="pref_use_send_button_to_indicate_status">A küldés gomb jelzi az állapotot</string>
+</resources>
diff --git a/src/main/res/values-it/strings.xml b/src/main/res/values-it/strings.xml
index e462e92a..f0a7d7b9 100644
--- a/src/main/res/values-it/strings.xml
+++ b/src/main/res/values-it/strings.xml
@@ -122,12 +122,14 @@
   <string name="pref_never_send_crash">Non inviare mai segnalazioni di errore</string>
   <string name="pref_never_send_crash_summary">Se scegli di inviare una segnalazione dell’errore aiuterai lo sviluppo di Conversations</string>
   <string name="pref_confirm_messages">Conferma Messaggi</string>
+  <string name="pref_confirm_messages_summary">Fai sapere ai tuoi contatti quando hai ricevuto e letto i loro messaggi</string>
   <string name="pref_ui_options">Interfaccia Utente</string>
   <string name="openpgp_error">OpenKeychain ha riportato un errore</string>
   <string name="error_decrypting_file">Errore di I/O nel decifrare il file</string>
   <string name="accept">Accetta</string>
   <string name="error">Si è verificato un errore</string>
   <string name="pref_grant_presence_updates">Concedi aggiornamenti della presenza</string>
+  <string name="pref_grant_presence_updates_summary">Concedi e richiedi preventivamente le sottoscrizioni sulla presenza ai contatti che hai creato</string>
   <string name="subscriptions">Sottoscrizioni</string>
   <string name="your_account">Il tuo utente</string>
   <string name="keys">Chiavi</string>
@@ -337,6 +339,8 @@
   <string name="url_copied_to_clipboard">URL copiato</string>
   <string name="message_copied_to_clipboard">Messaggio copiato</string>
   <string name="image_transmission_failed">Trasmissione dell’immagine fallita</string>
+  <string name="scan_qr_code">Scansiona codice a barre 2D</string>
+  <string name="show_qr_code">Mostra codice a barre 2D</string>
   <string name="show_block_list">Mostra la black list</string>
   <string name="account_details">Dettagli utente</string>
   <string name="verify_otr">Verifica OTR</string>
@@ -376,6 +380,7 @@
   <string name="no_application_found_to_open_file">Nessuna applicazione trovata per aprire il file</string>
   <string name="could_not_verify_fingerprint">Impronta non verificata</string>
   <string name="manually_verify">Verifica manuale</string>
+  <string name="are_you_sure_verify_fingerprint">Sei sicuro di voler verificare l\'impronta OTR del tuo contatto?</string>
   <string name="pref_show_dynamic_tags">Mostra tag dinamici</string>
   <string name="pref_show_dynamic_tags_summary">Mostra tag in sola lettura sotto i contatti</string>
   <string name="enable_notifications">Abilita le notifiche</string>
@@ -468,6 +473,7 @@
   <string name="contact_is_typing">%s sta digitando...</string>
   <string name="contact_has_stopped_typing">%s ha smesso di digitare</string>
   <string name="pref_chat_states">Notifiche di composizione</string>
+  <string name="pref_chat_states_summary">Fai sapere ai tuoi contatti quando stai scrivendo loro un messaggio</string>
   <string name="send_location">Invia la posizione</string>
   <string name="show_location">Mostra la posizione</string>
   <string name="no_application_found_to_display_location">Non è stata trovata alcuna applicazione per mostrare la posizione</string>
@@ -660,4 +666,20 @@
   <string name="data_saver_enabled">Risparmio dati attivato</string>
   <string name="data_saver_enabled_explained">Il tuo sistema operativo sta limitando l\'accesso internet a Conversations quando è in background. Per ricevere le notifiche di nuovi messaggi dovresti consentire l\'accesso senza limiti a Conversations quando il Risparmio dati è attivo.\nConversations cercherà comunque di risparmiare dati quando possibile.</string>
   <string name="device_does_not_support_data_saver">Il tuo dispositivo non supporta la disattivazione del Risparmio dati per Conversations.</string>
+  <string name="error_unable_to_create_temporary_file">Impossibile creare file temporaneo</string>
+  <string name="this_device_has_been_verified">Questo dispositivo è stato verificato</string>
+  <string name="copy_fingerprint">Copia impronta</string>
+  <string name="all_omemo_keys_have_been_verified">Tutte le chiavi OMEMO sono state verificate</string>
+  <string name="barcode_does_not_contain_fingerprints_for_this_conversation">Il codice a barre non contiene impronte per questa conversazione.</string>
+  <string name="verified_fingerprints">Impronte verificate</string>
+  <string name="use_camera_icon_to_scan_barcode">Usa la fotocamera per scansionare il codice a barre di un contatto</string>
+  <string name="please_wait_for_keys_to_be_fetched">Attendi la ricezione delle chiavi</string>
+  <string name="share_as_barcode">Condividi come codice a barre</string>
+  <string name="share_as_uri">Condividi come URI XMPP</string>
+  <string name="share_as_http">Condividi come link HTTP</string>
+  <string name="pref_blind_trust_before_verification">Fiducia cieca prima della verifica</string>
+  <string name="pref_blind_trust_before_verification_summary">Fidati automaticamente di tutti i nuovi dispositivi di contatti che non sono stati verificati e chiedi una conferma manuale ogni volta che un contatto verificato aggiunge un dispositivo.</string>
+  <string name="blindly_trusted_omemo_keys">Chiavi OMEMO fidate ciecamente</string>
+  <string name="not_trusted">Non fidato</string>
+  <string name="invalid_barcode">Codice a barre 2D non valido</string>
 </resources>
diff --git a/src/main/res/values-nl/strings.xml b/src/main/res/values-nl/strings.xml
index 2088d45e..e87a430f 100644
--- a/src/main/res/values-nl/strings.xml
+++ b/src/main/res/values-nl/strings.xml
@@ -19,11 +19,11 @@
   <string name="title_activity_settings">Instellingen</string>
   <string name="title_activity_conference_details">Groepsgespreksgegevens</string>
   <string name="title_activity_contact_details">Contactgegevens</string>
-  <string name="title_activity_sharewith">Delen met gesprek</string>
+  <string name="title_activity_sharewith">Delen in gesprek</string>
   <string name="title_activity_start_conversation">Gesprek starten</string>
   <string name="title_activity_choose_contact">Kies contact</string>
   <string name="title_activity_block_list">Geblokkeerde contacten</string>
-  <string name="just_now">net</string>
+  <string name="just_now">zojuist</string>
   <string name="minute_ago">1 min. geleden</string>
   <string name="minutes_ago">%d min. geleden</string>
   <string name="unread_conversations">ongelezen gesprekken</string>
@@ -62,11 +62,11 @@
   <string name="crash_report_message">Door het versturen van crashrapportages help je de ontwikkeling van Conversations.\n\n<b>Waarschuwing:</b> Deze app zal je XMPP-account gebruiken om de crashrapportages te versturen naar de ontwikkelaars.</string>
   <string name="send_now">Nu versturen</string>
   <string name="send_never">Niet opnieuw vragen</string>
-  <string name="problem_connecting_to_account">Account verbinden mislukt</string>
+  <string name="problem_connecting_to_account">Verbinding maken met account mislukt</string>
   <string name="problem_connecting_to_accounts">Verbinden met meerdere accounts mislukt</string>
-  <string name="touch_to_fix">Raak hier aan om accounts te beheren</string>
+  <string name="touch_to_fix">Tik hier op om accounts te beheren</string>
   <string name="attach_file">Bestand bijvoegen</string>
-  <string name="not_in_roster">Het contact is geen onderdeel van je lijst. Wil je hem/haar toevoegen?</string>
+  <string name="not_in_roster">Het contact staat niet in je contactenlijst. Wil je hem/haar toevoegen?</string>
   <string name="add_contact">Contact toevoegen</string>
   <string name="send_failed">afleveren mislukt</string>
   <string name="send_rejected">geweigerd</string>
@@ -172,8 +172,8 @@
   <string name="openpgp_has_been_published">OpenPGP-publieke sleutel is gepubliceerd.</string>
   <string name="republish_pgp_keys">Vergeet niet je OpenPGP-publieke sleutels opnieuw te publiceren!</string>
   <string name="mgmt_account_enable">Account inschakelen</string>
-  <string name="mgmt_account_are_you_sure">Ben je zeker?</string>
-  <string name="mgmt_account_delete_confirm_text">Als je je account verwijdert wordt je volledige gespreksgeschiedenis gewist</string>
+  <string name="mgmt_account_are_you_sure">Weet je het zeker?</string>
+  <string name="mgmt_account_delete_confirm_text">Als je je account verwijdert, wordt je volledige gespreksgeschiedenis gewist</string>
   <string name="attach_record_voice">Stem opnemen</string>
   <string name="account_settings_jabber_id">Jabber-ID:</string>
   <string name="account_settings_password">Wachtwoord:</string>
@@ -181,14 +181,14 @@
   <string name="account_settings_confirm_password">Wachtwoord bevestigen</string>
   <string name="password">Wachtwoord</string>
   <string name="confirm_password">Wachtwoord bevestigen</string>
-  <string name="passwords_do_not_match">Wachtwoorden komen niet overeen</string>
+  <string name="passwords_do_not_match">Wachtwoorden komen niet met elkaar overeen</string>
   <string name="invalid_jid">Dit is geen geldige Jabber-ID</string>
   <string name="error_out_of_memory">Geen geheugen beschikbaar. Afbeelding is te groot</string>
   <string name="add_phone_book_text">Wil je %s toevoegen aan je adresboek?</string>
   <string name="contact_status_online">online</string>
   <string name="contact_status_free_to_chat">beschikbaar</string>
-  <string name="contact_status_away">weg</string>
-  <string name="contact_status_extended_away">langdurig weg</string>
+  <string name="contact_status_away">afwezig</string>
+  <string name="contact_status_extended_away">langdurig afwezig</string>
   <string name="contact_status_do_not_disturb">niet storen</string>
   <string name="contact_status_offline">offline</string>
   <string name="muc_details_conference">Groepsgesprek</string>
@@ -206,7 +206,7 @@
   <string name="server_info_available">beschikbaar</string>
   <string name="server_info_unavailable">niet beschikbaar</string>
   <string name="missing_public_keys">Ontbrekende publieke sleutel-aankondigingen</string>
-  <string name="last_seen_now">zonet voor het laatst gezien</string>
+  <string name="last_seen_now">zojuist voor het laatst gezien</string>
   <string name="last_seen_min">1 minuut geleden voor het laatst gezien</string>
   <string name="last_seen_mins">%d minuten geleden voor het laatst gezien</string>
   <string name="last_seen_hour">1 uur geleden voor het laatst gezien</string>
@@ -231,7 +231,7 @@
   <string name="trust_omemo_fingerprints">Vertrouw OMEMO-vingerafdrukken</string>
   <string name="fetching_keys">Sleutels ophalen…</string>
   <string name="done">Klaar</string>
-  <string name="verify">Bevestigen</string>
+  <string name="verify">Verifiëren</string>
   <string name="decrypt">Ontsleutelen</string>
   <string name="conferences">Groepsgesprekken</string>
   <string name="search">Zoeken</string>
@@ -257,10 +257,10 @@
   <string name="joining_conference">Deelnemen aan groepsgesprek…</string>
   <string name="leave">Verlaten</string>
   <string name="contact_added_you">Contact heeft je toegevoegd aan zijn/haar contacten</string>
-  <string name="add_back">Contact toevoegen aan eigen contacten</string>
+  <string name="add_back">Ook toevoegen</string>
   <string name="contact_has_read_up_to_this_point">%s heeft tot hier gelezen</string>
-  <string name="publish">Publiceren</string>
-  <string name="touch_to_choose_picture">Raak avatar aan om een foto uit de galerij te kiezen</string>
+  <string name="publish">Publiceer</string>
+  <string name="touch_to_choose_picture">Tik op avatar om een foto uit de galerij te kiezen</string>
   <string name="publish_avatar_explanation">Let op: iedereen die je aanwezigheidsupdates ontvangt zal deze foto kunnen zien.</string>
   <string name="publishing">Publiceren…</string>
   <string name="error_publish_avatar_server_reject">De server weigerde de publicatie van je afbeelding</string>
@@ -271,11 +271,11 @@
   <string name="private_message">gefluisterd</string>
   <string name="private_message_to">naar %s</string>
   <string name="send_private_message_to">Privébericht sturen naar %s</string>
-  <string name="connect">Verbinden</string>
+  <string name="connect">Verbind</string>
   <string name="account_already_exists">Deze account bestaat al</string>
   <string name="next">Volgende</string>
-  <string name="server_info_session_established">Huidige sessie gevestigd</string>
-  <string name="additional_information">Bijkomstige informatie</string>
+  <string name="server_info_session_established">Huidige sessie is tot stand gekomen</string>
+  <string name="additional_information">Overige informatie</string>
   <string name="skip">Overslaan</string>
   <string name="disable_notifications">Meldingen uitschakelen</string>
   <string name="disable_notifications_for_this_conversation">Meldingen uitschakelen voor dit gesprek</string>
@@ -293,7 +293,7 @@
   <string name="pref_security_settings">Beveiliging</string>
   <string name="pref_force_encryption">Verplicht end-to-end-versleuteling</string>
   <string name="pref_force_encryption_summary">Stuur berichten altijd versleuteld (behalve in groepsgesprekken)</string>
-  <string name="pref_allow_message_correction">Berichtverbetering toestaan</string>
+  <string name="pref_allow_message_correction">Berichtcorrectie toestaan</string>
   <string name="pref_allow_message_correction_summary">Sta je contacten toe hun berichten na het versturen te verbeteren</string>
   <string name="pref_dont_save_encrypted">Sla versleutelde berichten niet op</string>
   <string name="pref_dont_save_encrypted_summary">Waarschuwing: dit kan leiden tot verlies van berichten</string>
@@ -321,7 +321,7 @@
   <string name="toast_message_omemo_fingerprint">OMEMO-vingerafdruk gekopieerd naar klembord!</string>
   <string name="conference_banned">Je bent verbannen uit dit groepsgesprek</string>
   <string name="conference_members_only">Dit groepsgesprek is enkel voor leden</string>
-  <string name="conference_kicked">Je bent uit dit groepsgesprek geschopt</string>
+  <string name="conference_kicked">Je bent uit dit groepsgesprek verwijderd</string>
   <string name="conference_shutdown">Het groepsgesprek is uitgeschakeld</string>
   <string name="conference_unknown_error">Je neemt niet langer deel aan dit groepsgesprek</string>
   <string name="using_account">met account %s</string>
@@ -339,11 +339,11 @@
   <string name="url_copied_to_clipboard">URL gekopieerd naar klembord</string>
   <string name="message_copied_to_clipboard">Bericht gekopieerd naar klembord</string>
   <string name="image_transmission_failed">Versturen van afbeelding mislukt</string>
-  <string name="scan_qr_code">2D-barcode scannen</string>
-  <string name="show_qr_code">2D-barcode tonen</string>
+  <string name="scan_qr_code">2D-streepjescode scannen</string>
+  <string name="show_qr_code">2D-streepjescode tonen</string>
   <string name="show_block_list">Geblokkeerde contacten weergeven</string>
   <string name="account_details">Accountgegevens</string>
-  <string name="verify_otr">OTR bevestigen</string>
+  <string name="verify_otr">OTR verifiëren</string>
   <string name="remote_fingerprint">Externe vingerafdruk</string>
   <string name="scan">scan</string>
   <string name="smp">Socialist Millionaire Protocol</string>
@@ -356,12 +356,12 @@
   <string name="secrets_do_not_match">Geheimen komen niet overeen</string>
   <string name="try_again">Opnieuw proberen</string>
   <string name="finish">Afsluiten</string>
-  <string name="verified">Bevestigd!</string>
+  <string name="verified">Geverifieerd!</string>
   <string name="smp_requested">Contact vraagt SMP-bevestiging</string>
   <string name="no_otr_session_found">Geen geldige OTR-sessie gevonden!</string>
   <string name="conversations_foreground_service">Conversations</string>
   <string name="pref_keep_foreground_service">Dienst in voorgrond houden</string>
-  <string name="pref_keep_foreground_service_summary">Belet het besturingssysteem van je verbinding te onderbreken</string>
+  <string name="pref_keep_foreground_service_summary">Belet het besturingssysteem je verbinding te onderbreken</string>
   <string name="pref_export_logs">Geschiedenis exporteren</string>
   <string name="pref_export_logs_summary">Gespreksgeschiedenis schrijven naar SD-kaart</string>
   <string name="notification_export_logs_title">Logs schrijven naar SD-kaart</string>
@@ -372,14 +372,15 @@
   <string name="file">bestand</string>
   <string name="open_x_file">%s openen</string>
   <string name="sending_file">versturen (%1$d%% voltooid)</string>
-  <string name="preparing_file">Bestand klaarmaken voor versturen</string>
+  <string name="preparing_file">Bestand gereedmaken voor verzending</string>
   <string name="x_file_offered_for_download">%s aangeboden om te downloaden</string>
   <string name="cancel_transmission">Bestandsoverdracht annuleren</string>
   <string name="file_transmission_failed">bestandsoverdracht mislukt</string>
   <string name="file_deleted">Het bestand is verwijderd</string>
   <string name="no_application_found_to_open_file">Geen applicatie om bestand te openen</string>
-  <string name="could_not_verify_fingerprint">Kon vingerafdruk niet bevestigen</string>
-  <string name="manually_verify">Handmatig bevestigen</string>
+  <string name="could_not_verify_fingerprint">Kon vingerafdruk niet verifiëren</string>
+  <string name="manually_verify">Handmatig verifiëren</string>
+  <string name="are_you_sure_verify_fingerprint">Weet je zeker dat je de OTR-vingerafdruk van je contactpersoon wilt verifiëren?</string>
   <string name="pref_show_dynamic_tags">Toon dynamische tags</string>
   <string name="pref_show_dynamic_tags_summary">Toon enkel-lezen tags onder contacten</string>
   <string name="enable_notifications">Meldingen inschakelen</string>
@@ -394,10 +395,10 @@
   <string name="regenerate_omemo_key">OMEMO-sleutel opnieuw aanmaken</string>
   <string name="wipe_omemo_pep">Andere apparaten van PEP verwijderen</string>
   <string name="clear_other_devices">Apparaten wissen</string>
-  <string name="clear_other_devices_desc">Ben je zeker dat je alle andere apparaten van de OMEMO-aankondiging wil wissen? De volgende keer dat je apparaten verbinding maken zullen ze zich opnieuw aankondigen, maar zullen ze misschien niet de berichten ontvangen die intussen zijn verzonden.</string>
+  <string name="clear_other_devices_desc">Weet je zeker dat je alle andere apparaten uit de OMEMO-aankondiging wilt weglaten? De volgende keer dat je apparaten verbinding maken zullen ze zich opnieuw aankondigen, maar zullen ze misschien niet de berichten ontvangen die in de tussentijd zijn verzonden.</string>
   <string name="purge_key">Sleutel verwijderen</string>
-  <string name="purge_key_desc_part1">Ben je zeker dat je deze sleutel wil verwijderen?</string>
-  <string name="purge_key_desc_part2">Ze zal onherroepelijk beschouwd worden als gecompromitteerd en je zal er nooit meer een nieuwe sessie mee kunnen bouwen.</string>
+  <string name="purge_key_desc_part1">Weet je zeker dat je deze sleutel wilt verwijderen?</string>
+  <string name="purge_key_desc_part2">Ze zal onherroepelijk beschouwd worden als gecompromitteerd en je zal er nooit meer een nieuwe sessie mee kunnen opzetten.</string>
   <string name="error_no_keys_to_trust_server_error">Er zijn geen bruikbare sleutels beschikbaar voor dit contact.\nHet ophalen van nieuwe sleutels van de server is mislukt. Misschien is er iets mis met de server van je contact.</string>
   <string name="error_no_keys_to_trust">Er zijn geen bruikbare sleutels beschikbaar voor dit contact. Als je zijn/haar sleutels hebt verwijderd dient hij/zij nieuwe aan te maken.</string>
   <string name="error_trustkeys_title">Fout</string>
@@ -408,11 +409,11 @@
   <string name="could_not_change_password">Kon wachtwoord niet wijzigen</string>
   <string name="otr_session_not_started">Verstuur een bericht om een versleuteld gesprek te starten</string>
   <string name="ask_question">Stel een vraag</string>
-  <string name="smp_explain_question">Als jij en je contact een gemeenschappelijk geheim hebben dat niemand anders weet (zoals een privé-grap of gewoonweg wat jullie gegeten hebben de laatste keer dat jullie elkaar zagen) kunnen jullie dat geheim gebruiken om elkaars vingerafdrukken te bevestigen.\n\nJe geeft een hint of een vraag voor je contact, en hij/zij moet hier op antwoorden met een hoofdlettergevoelig antwoord.</string>
-  <string name="smp_explain_answer">Je contact wil je vingerafdruk bevestigen door je uit te dagen met een gedeeld geheim. Je contact heeft daarvoor volgende hint of vraag opgegeven.</string>
+  <string name="smp_explain_question">Als jij en je contact een gemeenschappelijk geheim hebben dat niemand anders weet (zoals een privé-grap of gewoonweg wat jullie gegeten hebben de laatste keer dat jullie elkaar zagen) kunnen jullie dat geheim gebruiken om elkaars vingerafdrukken te verifiëren.\n\nJe geeft een hint of een vraag voor je contact, en hij/zij moet hier een  hoofdlettergevoelig antwoord op geven.</string>
+  <string name="smp_explain_answer">Je contact wil je vingerafdruk verifiëren door je uit te dagen met een gedeeld geheim. Je contact heeft daarvoor volgende hint of vraag opgegeven.</string>
   <string name="shared_secret_hint_should_not_be_empty">Je hint zou niet leeg mogen zijn</string>
   <string name="shared_secret_can_not_be_empty">Je gedeeld geheim can niet leeg zijn</string>
-  <string name="manual_verification_explanation">Vergelijk voorzichtig de vingerafdruk hieronder met de vingerafdruk van je contact.\nJe kan hiervoor eender welke betrouwbare vorm van communicatie gebruiken, zoals een versleutelde e-mail of een telefoongesprek.</string>
+  <string name="manual_verification_explanation">Vergelijk met zorg de vingerafdruk hieronder met de vingerafdruk van je contact.\nJe kan hiervoor een andere betrouwbare vorm van communicatie gebruiken, zoals een versleutelde e-mail of een telefoongesprek.</string>
   <string name="change_password">Wachtwoord wijzigen</string>
   <string name="current_password">Huidig wachtwoord</string>
   <string name="new_password">Nieuw wachtwoord</string>
@@ -426,9 +427,9 @@
   <string name="member">Lid</string>
   <string name="advanced_mode">Geavanceerde modus</string>
   <string name="grant_membership">Lidmaatschap verlenen</string>
-  <string name="remove_membership">Lidmaatschap verwijderen</string>
-  <string name="grant_admin_privileges">Administratorprivileges verlenen</string>
-  <string name="remove_admin_privileges">Administratorprivileges verwijderen</string>
+  <string name="remove_membership">Lidmaatschap ontzeggen</string>
+  <string name="grant_admin_privileges">Beheerdersprivileges verlenen</string>
+  <string name="remove_admin_privileges">Beheerdersprivileges ontzeggen</string>
   <string name="remove_from_room">Verwijderen uit groepsgesprek</string>
   <string name="could_not_change_affiliation">Kon aansluiting niet wijzigen</string>
   <string name="ban_from_conference">Verbannen uit groepsgesprek</string>
@@ -463,7 +464,7 @@
   <string name="vcard">Contact</string>
   <string name="received_x_file">%s ontvangen</string>
   <string name="disable_foreground_service">Voorgronddienst uitschakelen</string>
-  <string name="touch_to_open_conversations">Raak aan om Conversations te openen</string>
+  <string name="touch_to_open_conversations">Tik om Conversations te openen</string>
   <string name="avatar_has_been_published">Avatar is gepubliceerd!</string>
   <string name="sending_x_file">Bezig met versturen van %s</string>
   <string name="offering_x_file">Bezig met aanbieden van %s</string>
@@ -471,7 +472,8 @@
   <string name="disable_account">Account uitschakelen</string>
   <string name="contact_is_typing">%s is aan het typen…</string>
   <string name="contact_has_stopped_typing">%s is gestopt met typen</string>
-  <string name="pref_chat_states">\'Aan het typen\' meldingen</string>
+  <string name="pref_chat_states">Aan-het-typen-meldingen</string>
+  <string name="pref_chat_states_summary">Laat je contacten weten wanneer je ze een nieuw bericht schrijft</string>
   <string name="send_location">Locatie versturen</string>
   <string name="show_location">Locatie weergeven</string>
   <string name="no_application_found_to_display_location">Geen applicatie om locatie weer te geven</string>
@@ -563,7 +565,7 @@
   <string name="shared_text_with_x">Tekst gedeeld met %s</string>
   <string name="no_storage_permission">Conversations heeft toegang nodig tot de externe opslag</string>
   <string name="sync_with_contacts">Synchroniseer met contacten</string>
-  <string name="sync_with_contacts_long">Conversations wil je XMPP-rooster met je contacten vergelijken om hun volledige namen en avatars te tonen.\n\nConversations zal je contacten enkel lokaal lezen en vergelijken zonder ze te uploaden naar je server.\n\nJe zal nu gevraagd worden Conversations toegang te verlenen tot je contacten.</string>
+  <string name="sync_with_contacts_long">Conversations wil je XMPP-contacten met je systeemcontacten vergelijken om hun volledige namen en avatars te tonen.\n\nConversations zal je contacten enkel lokaal lezen en vergelijken zonder ze te uploaden naar je server.\n\nJe zal nu gevraagd worden Conversations toegang te verlenen tot je contacten.</string>
   <string name="certificate_information">Certificaatinformatie</string>
   <string name="certificate_subject">Onderwerp</string>
   <string name="certificate_issuer">Uitgever</string>
@@ -573,7 +575,7 @@
   <string name="certicate_info_not_available">(Niet beschikbaar)</string>
   <string name="certificate_not_found">Geen certificaat gevonden</string>
   <string name="notify_on_all_messages">Melding bij alle berichten</string>
-  <string name="notify_only_when_highlighted">Melding enkel wanneer vermeld</string>
+  <string name="notify_only_when_highlighted">Melding enkel wanneer je aangesproken wordt</string>
   <string name="notify_never">Meldingen uitgeschakeld</string>
   <string name="notify_paused">Meldingen gepauzeerd</string>
   <string name="pref_picture_compression">Afbeeldingen comprimeren</string>
@@ -587,15 +589,15 @@
   <string name="selection_too_large">Het gekozen vlak is te groot</string>
   <string name="no_accounts">(Geen actieve accounts)</string>
   <string name="this_field_is_required">Dit veld is vereist</string>
-  <string name="correct_message">Bericht verbeteren</string>
-  <string name="send_corrected_message">Verbeterd bericht sturen</string>
+  <string name="correct_message">Bericht corrigeren</string>
+  <string name="send_corrected_message">Gecorrigeerd bericht versturen</string>
   <string name="no_keys_just_confirm">Je vertrouwt dit contact al. Door \'klaar\' te kiezen bevestig je enkel dat %s deel uitmaakt van dit groepsgesprek.</string>
   <string name="select_image_and_crop">Afbeelding kiezen en bijsnijden</string>
   <string name="this_account_is_disabled">Je hebt deze account uitgeschakeld</string>
   <string name="security_error_invalid_file_access">Beveiligingsfout: Ongeldige bestandstoegang</string>
   <string name="no_application_to_share_uri">Geen applicatie om URI te delen</string>
   <string name="share_uri_with">URI delen met…</string>
-  <string name="welcome_text">XMPP is een protocol onafhankelijk van de providers. Je kan deze cliënt gebruiken met eender welke XMPP-server.\nOm het eenvoudig te houden hebben we het makkelijk gemaakt een account aan te maken op conversations.im¹; een provider speciaal geschikt voor Conversations.</string>
+  <string name="welcome_text">XMPP is een provider-onafhankelijk protocol. Je kan deze cliënt gebruiken met elke willekeurige XMPP-server.\nOm het je gemakkelijker te maken kun je simpelweg een account aanmaken conversations.im¹; een provider speciaal geschikt voor Conversations.</string>
   <string name="magic_create_text">We zullen je helpen een account op conversations.im¹ aan te maken.\nWanneer je conversations.im als je provider kiest kan je met gebruikers van andere providers communiceren door hen je volledige Jabber-ID te geven.</string>
   <string name="your_full_jid_will_be">Je volledige Jabber-ID zal %s zijn</string>
   <string name="create_account">Account aanmaken</string>
@@ -606,7 +608,7 @@
   <string name="change_presence">Aanwezigheid instellen</string>
   <string name="status_message">Statusbericht</string>
   <string name="all_accounts_on_this_device">Instellen voor alle accounts op dit apparaat</string>
-  <string name="presence_chat">Beschikbaar</string>
+  <string name="presence_chat">Beschikbaar voor gesprek</string>
   <string name="presence_online">Online</string>
   <string name="presence_away">Afwezig</string>
   <string name="presence_xa">Niet beschikbaar</string>
@@ -637,7 +639,7 @@
   <string name="unable_to_connect_to_keychain">Verbinden met OpenKeychain mislukt</string>
   <string name="this_device_is_no_longer_in_use">Dit apparaat wordt niet meer gebruikt</string>
   <string name="type_pc">Computer</string>
-  <string name="type_phone">GSM</string>
+  <string name="type_phone">Mobiele telefoon</string>
   <string name="type_tablet">Tablet</string>
   <string name="type_web">Webbrowser</string>
   <string name="type_console">Console</string>
@@ -668,5 +670,16 @@
   <string name="this_device_has_been_verified">Dit apparaat is geverifieerd</string>
   <string name="copy_fingerprint">Vingerafdruk kopiëren</string>
   <string name="all_omemo_keys_have_been_verified">Alle OMEMO-sleutels zijn geverifieerd</string>
+  <string name="barcode_does_not_contain_fingerprints_for_this_conversation">Streepjescode bevat geen vingerafdruk voor dit gesprek.</string>
   <string name="verified_fingerprints">Geverifieerde vingerafdrukken</string>
+  <string name="use_camera_icon_to_scan_barcode">Gebruik de camera om de streepjescode van een contact te scannen</string>
+  <string name="please_wait_for_keys_to_be_fetched">De sleutels worden opgehaald. Even geduld.</string>
+  <string name="share_as_barcode">Delen als streepjescode</string>
+  <string name="share_as_uri">Delen als XMPP-URI</string>
+  <string name="share_as_http">Delen als HTTP-link</string>
+  <string name="pref_blind_trust_before_verification">Blindelings vertrouwen vóór verificatie</string>
+  <string name="pref_blind_trust_before_verification_summary">Automatisch alle nieuwe ongeverifieerde apparaten van contacten vertrouwen en in het vervolg elke keer dat een contact een nieuw apparaat toevoegt vragen om bevestiging.</string>
+  <string name="blindly_trusted_omemo_keys">Blindelings vertrouwde OMEMO-sleutels</string>
+  <string name="not_trusted">Onvertrouwd</string>
+  <string name="invalid_barcode">Ongeldige 2D-streepjescode</string>
 </resources>
diff --git a/src/main/res/values-pt-rBR/strings.xml b/src/main/res/values-pt-rBR/strings.xml
index dd818d0a..e85b40c7 100644
--- a/src/main/res/values-pt-rBR/strings.xml
+++ b/src/main/res/values-pt-rBR/strings.xml
@@ -673,8 +673,10 @@
   <string name="barcode_does_not_contain_fingerprints_for_this_conversation">O código de barras não contém impressões digitais para esta conversa.</string>
   <string name="verified_fingerprints">Impressões digitais verificadas</string>
   <string name="use_camera_icon_to_scan_barcode">Use a câmera para capturar o código de barras de um contato</string>
+  <string name="please_wait_for_keys_to_be_fetched">Por favor, aguarde a obtenção das chaves</string>
   <string name="share_as_barcode">Compartilhar como código de barras</string>
   <string name="share_as_uri">Compartilhar como uma URI XMPP</string>
   <string name="share_as_http">Compartilhar como um link HTTP</string>
   <string name="not_trusted">Não confiável</string>
+  <string name="invalid_barcode">Código de barras 2D inválido</string>
 </resources>
diff --git a/src/main/res/values-ro-rRO/strings.xml b/src/main/res/values-ro-rRO/strings.xml
index 5590cd29..b26a4935 100644
--- a/src/main/res/values-ro-rRO/strings.xml
+++ b/src/main/res/values-ro-rRO/strings.xml
@@ -1,34 +1,34 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <resources>
-  <string name="action_settings">Setari</string>
-  <string name="action_add">Conversatie noua</string>
-  <string name="action_accounts">Configureaza conturi</string>
-  <string name="action_end_conversation">Inchide conversatia</string>
+  <string name="action_settings">Setări</string>
+  <string name="action_add">Conversație nouă</string>
+  <string name="action_accounts">Configurează conturi</string>
+  <string name="action_end_conversation">Închide conversația</string>
   <string name="action_contact_details">Detalii contact</string>
-  <string name="action_muc_details">Detalii conferinta</string>
-  <string name="action_secure">Securizeaza conferinta</string>
-  <string name="action_add_account">Adauga cont</string>
-  <string name="action_edit_contact">Editeaza nume</string>
-  <string name="action_add_phone_book">Adauga la lista de contacte</string>
-  <string name="action_delete_contact">Sterge din lista</string>
-  <string name="action_block_contact">Blocheaza contact</string>
-  <string name="action_unblock_contact">Deblocheaza contact</string>
-  <string name="action_block_domain">Blocheaza domeniu</string>
-  <string name="action_unblock_domain">Deblocheaza domeniu</string>
-  <string name="title_activity_manage_accounts">Configureaza conturi</string>
-  <string name="title_activity_settings">Configuratie</string>
-  <string name="title_activity_conference_details">Detalii conferinta</string>
+  <string name="action_muc_details">Detalii conferință</string>
+  <string name="action_secure">Securizează conferința</string>
+  <string name="action_add_account">Adaugă cont</string>
+  <string name="action_edit_contact">Editează nume</string>
+  <string name="action_add_phone_book">Adaugă la lista de contacte</string>
+  <string name="action_delete_contact">Șterge din listă</string>
+  <string name="action_block_contact">Blochează contact</string>
+  <string name="action_unblock_contact">Deblochează contact</string>
+  <string name="action_block_domain">Blochează domeniu</string>
+  <string name="action_unblock_domain">Deblochează domeniu</string>
+  <string name="title_activity_manage_accounts">Configurează conturi</string>
+  <string name="title_activity_settings">Setări</string>
+  <string name="title_activity_conference_details">Detalii conferință</string>
   <string name="title_activity_contact_details">Detalii contact</string>
-  <string name="title_activity_sharewith">Distribuie catre Conversations</string>
-  <string name="title_activity_start_conversation">Porneste o conversatie</string>
+  <string name="title_activity_sharewith">Distribuie către Conversations</string>
+  <string name="title_activity_start_conversation">Pornește o conversație</string>
   <string name="title_activity_choose_contact">Alege contact</string>
-  <string name="title_activity_block_list">Blocheaza lista</string>
-  <string name="just_now">in acest moment</string>
+  <string name="title_activity_block_list">Blochează lista</string>
+  <string name="just_now">în acest moment</string>
   <string name="minute_ago">acum un minut</string>
   <string name="minutes_ago">acum %d minute</string>
-  <string name="unread_conversations">conversatii necitite</string>
+  <string name="unread_conversations">conversații necitite</string>
   <string name="sending">trimitere...</string>
-  <string name="message_decrypting">Decriptez mesaj. Te rog asteapta...</string>
+  <string name="message_decrypting">Decriptez mesaj. Te rog așteaptă...</string>
   <string name="pgp_message">Mesaj criptat cu OpenPGP</string>
   <string name="nick_in_use">Nume utilizator este deja folosit.</string>
   <string name="admin">Administrator</string>
@@ -36,128 +36,128 @@
   <string name="moderator">Moderator</string>
   <string name="participant">Participant</string>
   <string name="visitor">Vizitator</string>
-  <string name="remove_contact_text">Ai dori sa stergi %s din lista? Conversatia asociata cu acest contact nu va fi stearsa.</string>
-  <string name="block_contact_text">Ai dori sa blochezi pe %s din a-ti trimite mesaje?</string>
-  <string name="unblock_contact_text">Ai dori sa deblochezi pe %s si sa ii permiti sa iti trimite mesaje?</string>
-  <string name="block_domain_text">Blocheaza toate contactele de la %s?</string>
-  <string name="unblock_domain_text">Deblocheaza toate contactele de la %s?</string>
+  <string name="remove_contact_text">Ai dori să ștergi %s din listă? Conversația asociată cu acest contact nu va fi ștearsă.</string>
+  <string name="block_contact_text">Ai dori să blochezi pe %s din a-ți trimite mesaje?</string>
+  <string name="unblock_contact_text">Ai dori să deblochezi pe %s și să îi permiți să îți trimită mesaje?</string>
+  <string name="block_domain_text">Blochează toate contactele de la %s?</string>
+  <string name="unblock_domain_text">Deblochează toate contactele de la %s?</string>
   <string name="contact_blocked">Contact blocat</string>
-  <string name="remove_bookmark_text">Ai dori sa stergi pe %s din semne de carte? Conversatia asociata cu acest semn de carte nu va fi stearsa.</string>
-  <string name="register_account">Inregistreaza un cont nou pe server</string>
-  <string name="change_password_on_server">Schimba parola pe server</string>
-  <string name="share_with">Partajeaza cu...</string>
-  <string name="start_conversation">Porneste o conversatie</string>
-  <string name="invite_contact">Invita contact</string>
+  <string name="remove_bookmark_text">Ai dori să ștergi pe %s din semne de carte? Conversația asociată cu acest semn de carte nu va fi ștearsă.</string>
+  <string name="register_account">Înregistrează un cont nou pe server</string>
+  <string name="change_password_on_server">Schimbă parola pe server</string>
+  <string name="share_with">Partajează cu...</string>
+  <string name="start_conversation">Pornește o conversație</string>
+  <string name="invite_contact">Invită contact</string>
   <string name="contacts">Contacte</string>
-  <string name="cancel">Anuleaza</string>
-  <string name="set">Seteaza</string>
-  <string name="add">Adauga</string>
-  <string name="edit">Editeaza</string>
-  <string name="delete">Sterge</string>
-  <string name="block">Blocheaza</string>
-  <string name="unblock">Deblocheaza</string>
-  <string name="save">Salveaza</string>
+  <string name="cancel">Anulează</string>
+  <string name="set">Setează</string>
+  <string name="add">Adaugă</string>
+  <string name="edit">Editează</string>
+  <string name="delete">Șterge</string>
+  <string name="block">Blochează</string>
+  <string name="unblock">Deblochează</string>
+  <string name="save">Salvează</string>
   <string name="ok">DA</string>
-  <string name="crash_report_title">Conversations s-a oprit neasteptat</string>
-  <string name="crash_report_message">Trimitand jurnalele de eroare ajuti la buna dezvoltarea a aplicatiei Conversations\n<b>Atentie:</b> Se va utiliza contul XMPP pentru a trimite informatiile din jurnal catre programatori.</string>
+  <string name="crash_report_title">Conversations s-a oprit neașteptat</string>
+  <string name="crash_report_message">Trimițând jurnalele de eroare ajuți la buna dezvoltarea a aplicației Conversations\n<b>Atenție:</b> Se va utiliza contul XMPP pentru a trimite informațiile din jurnal către programatori.</string>
   <string name="send_now">Trimite acum</string>
-  <string name="send_never">Nu ma mai intreba</string>
-  <string name="problem_connecting_to_account">Nu ma pot conecta la cont</string>
-  <string name="problem_connecting_to_accounts">Nu ma pot conecta la conturi multiple</string>
-  <string name="touch_to_fix">Apasa aici pentru a configura conturile tale</string>
-  <string name="attach_file">Ataseaza fisier</string>
-  <string name="not_in_roster">Contactul nu este in lista ta. Ai vrea sa il adaugi?</string>
-  <string name="add_contact">Adauga contact</string>
-  <string name="send_failed">trimitere esuata</string>
+  <string name="send_never">Nu mă mai întreba</string>
+  <string name="problem_connecting_to_account">Nu mă pot conecta la cont</string>
+  <string name="problem_connecting_to_accounts">Nu mă pot conecta la conturi multiple</string>
+  <string name="touch_to_fix">Apasă aici pentru a configura conturile tale</string>
+  <string name="attach_file">Atașează fisier</string>
+  <string name="not_in_roster">Contactul nu este în lista ta. Ai vrea să-l adaugi?</string>
+  <string name="add_contact">Adaugă contact</string>
+  <string name="send_failed">trimitere eșuată</string>
   <string name="send_rejected">respins</string>
-  <string name="preparing_image">Pregatesc imaginea pentru transmisie</string>
-  <string name="preparing_images">Pregatesc imaginile pentru transmisie</string>
-  <string name="sharing_files_please_wait">Trimitere fisiere. Te rog asteapta...</string>
-  <string name="action_clear_history">Sterge istoric</string>
-  <string name="clear_conversation_history">Sterge istoricul conversatiei</string>
-  <string name="clear_histor_msg">Doresti sa stergi toate mesajele din aceasta conversatie?\n\n<b>Atentie:</b> Aceasta actiune nu va influenta mesajele aflate pe alte telefoane/tabelete/servere.</string>
-  <string name="delete_messages">Sterge mesajele</string>
-  <string name="also_end_conversation">Dupa, incheie conversatia</string>
+  <string name="preparing_image">Pregătesc imaginea pentru transmisie</string>
+  <string name="preparing_images">Pregătesc imaginile pentru transmisie</string>
+  <string name="sharing_files_please_wait">Trimitere fișiere. Te rog asteaptă...</string>
+  <string name="action_clear_history">Șterge istoric</string>
+  <string name="clear_conversation_history">Șterge istoricul conversației</string>
+  <string name="clear_histor_msg">Dorești să ștergi toate mesajele din această conversație?\n\n<b>Atenție:</b> Această acțiune nu va influența mesajele aflate pe alte telefoane/tabelete/servere.</string>
+  <string name="delete_messages">Șterge mesajele</string>
+  <string name="also_end_conversation">După, încheie conversația</string>
   <string name="choose_presence">Alege dispozitiv</string>
   <string name="send_unencrypted_message">Trimite mesaje necriptate</string>
-  <string name="send_message_to_x">Trimite mesaj catre %s</string>
+  <string name="send_message_to_x">Trimite mesaj către %s</string>
   <string name="send_otr_message">Trimite mesaj criptat cu OTR</string>
   <string name="send_omemo_message">Trimite mesaj criptat cu OMEMO</string>
   <string name="send_omemo_x509_message">Trimite mesaj criptat cu v\\OMEMO</string>
   <string name="send_pgp_message">Trimite mesaj criptat cu OpenPGP</string>
-  <string name="your_nick_has_been_changed">Numele tau a fost schimbat</string>
+  <string name="your_nick_has_been_changed">Numele tău a fost schimbat</string>
   <string name="send_unencrypted">Trimite necriptat</string>
-  <string name="decryption_failed">Decriptia a esuat. Poate nu ai cheia privata corecta.</string>
+  <string name="decryption_failed">Decriptarea a eșuat. Poate nu ai cheia privată corectă.</string>
   <string name="openkeychain_required">OpenKeychain</string>
-  <string name="openkeychain_required_long">Conversations utilizeaza o aplicatia externa <b>OpenKeychain</b> pentru a cripta si decripta mesaje si a administra cheile publice.\n\nOpenKeychain este licentiat sub GPLv3 si se gaseste pentru copiere pe F-Droid si Google Play.\n\n<small>(Te rog sa repornesti Conversations dupa)</small></string>
-  <string name="restart">Reporneste</string>
-  <string name="install">Instaleaza</string>
-  <string name="openkeychain_not_installed">Te rog instaleaza OpenKeychain</string>
+  <string name="openkeychain_required_long">Conversations utilizează o aplicație externă <b>OpenKeychain</b> pentru a cripta și decripta mesaje și a administra cheile publice.\n\nOpenKeychain este licențiat sub GPLv3 și se găsește pentru copiere pe F-Droid și Google Play.\n\n<small>(Te rog să repornești Conversations după)</small></string>
+  <string name="restart">Repornește</string>
+  <string name="install">Instalează</string>
+  <string name="openkeychain_not_installed">Te rog instalează OpenKeychain</string>
   <string name="offering">transmit...</string>
-  <string name="waiting">in asteptare...</string>
-  <string name="no_pgp_key">Nu am gasit cheie OpenPGP</string>
-  <string name="contact_has_no_pgp_key">Conversations nu a putut sa cripteze mesajele tale din cauza contactului care nu isi anunta cheia publica.\n\n<small>Roaga contactul sa isi configureze OpenPGP.</small></string>
-  <string name="no_pgp_keys">Nu am gasit chei OpenPGP</string>
-  <string name="contacts_have_no_pgp_keys">Conversations nu poate cripta mesajele tale pentru contactele tale care nu isi anunta cheia publica.\n\n<small>Te rog cere contactelor sa configureze OpenPGP.</small></string>
+  <string name="waiting">în așteptare...</string>
+  <string name="no_pgp_key">Nu am găsit cheia OpenPGP</string>
+  <string name="contact_has_no_pgp_key">Conversations nu a putut să cripteze mesajele tale din cauza contactului care nu își anunță cheia publică.\n\n<small>Roagă contactul să își configureze OpenPGP.</small></string>
+  <string name="no_pgp_keys">Nu am găsit chei OpenPGP</string>
+  <string name="contacts_have_no_pgp_keys">Conversations nu poate cripta mesajele tale pentru contactele tale care nu își anunță cheia publică.\n\n<small>Te rog cere contactelor să configureze OpenPGP.</small></string>
   <string name="pref_general">General</string>
   <string name="pref_xmpp_resource">Nume client XMPP</string>
   <string name="pref_xmpp_resource_summary">Identificatorul acestui client</string>
-  <string name="pref_accept_files">Accepta fisiere</string>
-  <string name="pref_accept_files_summary">Mai mici decat...</string>
-  <string name="pref_attachments">Atasamente</string>
-  <string name="pref_return_to_previous">Partajare rapida</string>
-  <string name="pref_return_to_previous_summary">Dupa ce ai partajat ceva, intoarce-te la activitatea precedenta in loc sa deschizi conversatia</string>
+  <string name="pref_accept_files">Acceptă fișiere</string>
+  <string name="pref_accept_files_summary">Mai mici decât...</string>
+  <string name="pref_attachments">Atașamente</string>
+  <string name="pref_return_to_previous">Partajare rapidă</string>
+  <string name="pref_return_to_previous_summary">Dupa ce ai partajat ceva, întoarce-te la activitatea precedentă în loc să deschizi conversația</string>
   <string name="pref_notification_settings">Notificare</string>
-  <string name="pref_notifications">Notificari</string>
-  <string name="pref_notifications_summary">Atunci cand un nou mesaj este primit</string>
-  <string name="pref_vibrate">Vibreaza</string>
-  <string name="pref_vibrate_summary">Atunci cand un nou mesaj este primit</string>
+  <string name="pref_notifications">Notificări</string>
+  <string name="pref_notifications_summary">Notifică atunci când este primit un mesaj nou</string>
+  <string name="pref_vibrate">Vibrează</string>
+  <string name="pref_vibrate_summary">Vibrează când este primit un mesaj nou</string>
   <string name="pref_led">Notificare LED</string>
-  <string name="pref_led_summary">Clipeste lumina de notificare atunci cand un nou mesaj este primit</string>
+  <string name="pref_led_summary">Clipește lumina de notificare atunci când este primit un mesaj nou</string>
   <string name="pref_sound">Ton de apel</string>
-  <string name="pref_sound_summary">Notificare sonora atunci cand un nou mesaj este primit</string>
-  <string name="pref_notification_grace_period">Perioada de gratie</string>
-  <string name="pref_notification_grace_period_summary">Durata de timp cat Conversations pastreaza linistea dupa ce a observat activitate pe un alt dispozitiv</string>
-  <string name="pref_advanced_options">Optiuni avansate</string>
+  <string name="pref_sound_summary">Notificare sonoră atunci când este primit un mesaj nou</string>
+  <string name="pref_notification_grace_period">Perioada de grație</string>
+  <string name="pref_notification_grace_period_summary">Durata de timp cât Conversations păstrează liniștea după ce a observat activitate pe un alt dispozitiv</string>
+  <string name="pref_advanced_options">Opțiuni avansate</string>
   <string name="pref_never_send_crash">Nu trimite rapoarte de erori</string>
-  <string name="pref_never_send_crash_summary">Trimitand date ajuti la dezvoltarea aplicatiei Conversations\n<b>Atentie:</b> Se va utiliza contul XMPP pentru a trimite informatii catre programatori.</string>
-  <string name="pref_confirm_messages">Confirma mesaje</string>
-  <string name="pref_confirm_messages_summary">Contactul este notificat atunci cand ai primit un mesaj si l-ai citit</string>
-  <string name="pref_ui_options">Optiuni interfata</string>
+  <string name="pref_never_send_crash_summary">Trimițând date ajuți la dezvoltarea aplicației Conversations\n<b>Atenție:</b> Se va utiliza contul XMPP pentru a trimite informații către programatori.</string>
+  <string name="pref_confirm_messages">Confirmă mesajele</string>
+  <string name="pref_confirm_messages_summary">Contactul este notificat atunci când ai primit un mesaj și l-ai citit</string>
+  <string name="pref_ui_options">Opțiuni interfață</string>
   <string name="openpgp_error">OpenKeychain a raportat o eroare</string>
-  <string name="error_decrypting_file">Eroare I/O la decriptarea fisierului</string>
-  <string name="accept">Accepta</string>
-  <string name="error">A aparut o eroare</string>
-  <string name="pref_grant_presence_updates">Trimite actualizari de prezenta</string>
-  <string name="pref_grant_presence_updates_summary">Acorda si cere anticipat abonarea la actualizarile de prezenta pentru contactele create de tine</string>
-  <string name="subscriptions">Abonari</string>
-  <string name="your_account">Contul tau</string>
+  <string name="error_decrypting_file">Eroare I/O la decriptarea fișierului</string>
+  <string name="accept">Acceptă</string>
+  <string name="error">A apărut o eroare</string>
+  <string name="pref_grant_presence_updates">Trimite actualizări de prezență</string>
+  <string name="pref_grant_presence_updates_summary">Acordă și cere anticipat abonarea la actualizările de prezență pentru contactele create de tine</string>
+  <string name="subscriptions">Abonări</string>
+  <string name="your_account">Contul tău</string>
   <string name="keys">Chei</string>
-  <string name="send_presence_updates">Trimite actualizari de prezenta</string>
-  <string name="receive_presence_updates">Primeste actualizari de prezenta</string>
-  <string name="ask_for_presence_updates">Cere actualizari de prezenta</string>
+  <string name="send_presence_updates">Trimite actualizari de prezență</string>
+  <string name="receive_presence_updates">Primește actualizări de prezență</string>
+  <string name="ask_for_presence_updates">Cere actualizări de prezență</string>
   <string name="attach_choose_picture">Alege imagine</string>
-  <string name="attach_take_picture">Fa o poza</string>
+  <string name="attach_take_picture">Fă o poză</string>
   <string name="preemptively_grant">Acorda anticipat cererea de abonare</string>
-  <string name="error_not_an_image_file">Fisierul selectat nu este o imagine</string>
-  <string name="error_compressing_image">Eroare la conversia fisierului de imagine</string>
-  <string name="error_file_not_found">Fisierul nu a fost gasit</string>
-  <string name="error_io_exception">Eroare I/O gemerala. Poate ai ramas fara spatiu liber?</string>
-  <string name="error_security_exception_during_image_copy">Aplicatia folosita pentru selectia acestei imagini nu a oferit destule permisiuni pentru a putea citi fisierul.\n\n<small>Foloseste un alt manager de fisiere pentru a alege o imagine</small></string>
+  <string name="error_not_an_image_file">Fișierul selectat nu este o imagine</string>
+  <string name="error_compressing_image">Eroare la conversia fișierului de imagine</string>
+  <string name="error_file_not_found">Fișierul nu a fost gasit</string>
+  <string name="error_io_exception">Eroare I/O generala. Poate ai rămas fără spațiu liber?</string>
+  <string name="error_security_exception_during_image_copy">Aplicația folosită pentru selecția acestei imagini nu a oferit destule permisiuni pentru a putea citi fișierul.\n\n<small>Folosește un alt manager de fișiere pentru a alege o imagine</small></string>
   <string name="account_status_unknown">Necunoscut</string>
   <string name="account_status_disabled">Dezactivat temporar</string>
   <string name="account_status_online">Conectat</string>
-  <string name="account_status_connecting">In curs de conectare\u2026</string>
+  <string name="account_status_connecting">În curs de conectare\u2026</string>
   <string name="account_status_offline">Deconectat</string>
   <string name="account_status_unauthorized">Neautorizat</string>
-  <string name="account_status_not_found">Serverul nu a fost gasit</string>
-  <string name="account_status_no_internet">Fara conexiune</string>
-  <string name="account_status_regis_fail">Inregistrare esuata</string>
+  <string name="account_status_not_found">Serverul nu a fost găsit</string>
+  <string name="account_status_no_internet">Fără conexiune</string>
+  <string name="account_status_regis_fail">Înregistrare eșuată</string>
   <string name="account_status_regis_conflict">Nume de utilizator deja alocat</string>
-  <string name="account_status_regis_success">Inregistrare completa</string>
-  <string name="account_status_regis_not_sup">Acest server nu permite inregistrarea</string>
+  <string name="account_status_regis_success">Înregistrare completă</string>
+  <string name="account_status_regis_not_sup">Acest server nu permite înregistrarea</string>
   <string name="account_status_security_error">Eroare de securitate</string>
-  <string name="account_status_policy_violation">Incalcare conditii serviciu</string>
+  <string name="account_status_policy_violation">Incălcare condiții serviciu</string>
   <string name="account_status_incompatible_server">Server incompatibil</string>
   <string name="account_status_stream_error">Eroare de date</string>
   <string name="encryption_choice_unencrypted">Necriptat</string>
@@ -165,47 +165,47 @@
   <string name="encryption_choice_pgp">OpenGPG</string>
   <string name="encryption_choice_omemo">OMEMO</string>
   <string name="mgmt_account_edit">Editare cont</string>
-  <string name="mgmt_account_delete">Sterge cont</string>
-  <string name="mgmt_account_disable">Dezactivare temporara</string>
-  <string name="mgmt_account_publish_avatar">Publica avatar</string>
-  <string name="mgmt_account_publish_pgp">Publica cheia publica OpenPGP</string>
-  <string name="openpgp_has_been_published">Cheia publica OpenPGP a fost publicata.</string>
-  <string name="republish_pgp_keys">Amintiti-va sa va republicati cheile publice OpenPGP!</string>
-  <string name="mgmt_account_enable">Activeaza cont</string>
-  <string name="mgmt_account_are_you_sure">Esti sigur?</string>
-  <string name="mgmt_account_delete_confirm_text">Daca iti stergi contul intregul istoric de conversatii va fi pierdut</string>
-  <string name="attach_record_voice">Inregistrare voce</string>
+  <string name="mgmt_account_delete">Șterge cont</string>
+  <string name="mgmt_account_disable">Dezactivare temporară</string>
+  <string name="mgmt_account_publish_avatar">Publică avatar</string>
+  <string name="mgmt_account_publish_pgp">Publică cheia publică OpenPGP</string>
+  <string name="openpgp_has_been_published">Cheia publică OpenPGP a fost publicată.</string>
+  <string name="republish_pgp_keys">Amintiți-vă să vă republicați cheile publice OpenPGP!</string>
+  <string name="mgmt_account_enable">Activează cont</string>
+  <string name="mgmt_account_are_you_sure">Ești sigur?</string>
+  <string name="mgmt_account_delete_confirm_text">Dacă iți ștergi contul întregul istoric de conversații va fi pierdut</string>
+  <string name="attach_record_voice">Înregistrare voce</string>
   <string name="account_settings_jabber_id">ID-ul Jabber</string>
   <string name="account_settings_password">Parola</string>
   <string name="account_settings_example_jabber_id">username@example.com</string>
-  <string name="account_settings_confirm_password">Confirma parola</string>
+  <string name="account_settings_confirm_password">Confirmă parola</string>
   <string name="password">Parola</string>
-  <string name="confirm_password">Confirma parola</string>
+  <string name="confirm_password">Confirmă parola</string>
   <string name="passwords_do_not_match">Parolele nu sunt identice</string>
   <string name="invalid_jid">Acesta nu este un ID Jabber valabil</string>
-  <string name="error_out_of_memory">Memorie epuizata. Imaginea este prea mare.</string>
-  <string name="add_phone_book_text">Vrei sa adaugi pe %s in lista de contacte?</string>
+  <string name="error_out_of_memory">Memorie epuizată. Imaginea este prea mare.</string>
+  <string name="add_phone_book_text">Vrei să adaugi pe %s în lista de contacte?</string>
   <string name="contact_status_online">conectat</string>
-  <string name="contact_status_free_to_chat">disponibil pentru conversatie</string>
+  <string name="contact_status_free_to_chat">disponibil pentru conversație</string>
   <string name="contact_status_away">plecat</string>
   <string name="contact_status_extended_away">plecat departe</string>
   <string name="contact_status_do_not_disturb">nu deranja</string>
   <string name="contact_status_offline">deconectat</string>
-  <string name="muc_details_conference">Conferinta</string>
-  <string name="muc_details_other_members">Alti membri</string>
-  <string name="server_info_show_more">Informatii server</string>
+  <string name="muc_details_conference">Conferință</string>
+  <string name="muc_details_other_members">Alți membri</string>
+  <string name="server_info_show_more">Informații server</string>
   <string name="server_info_mam">XEP-0313: MAM</string>
   <string name="server_info_carbon_messages">XEP-0280: Copii indigo mesaje</string>
   <string name="server_info_csi">XEP-0352: Indicator stare client</string>
-  <string name="server_info_blocking">XEP-0191: Comanda blocare</string>
-  <string name="server_info_roster_version">XEP-0237: Creare de versiuni lista</string>
+  <string name="server_info_blocking">XEP-0191: Comandă blocare</string>
+  <string name="server_info_roster_version">XEP-0237: Creare de versiuni listă</string>
   <string name="server_info_stream_management">XEP-0198: Management flux</string>
   <string name="server_info_pep">XEP-0163: PEP (Avatare / OMEMO)</string>
-  <string name="server_info_http_upload">XEP-0363: Incarcare fisiere prin HTTP</string>
+  <string name="server_info_http_upload">XEP-0363: Încărcare fișiere prin HTTP</string>
   <string name="server_info_push">XEP-0357: Push</string>
   <string name="server_info_available">disponibil</string>
   <string name="server_info_unavailable">indisponibil</string>
-  <string name="missing_public_keys">Cheile publice ce nu au fost anuntate</string>
+  <string name="missing_public_keys">Cheile publice ce nu au fost anunțate</string>
   <string name="last_seen_now">vazut ultima data adineauri</string>
   <string name="last_seen_min">vazut ultima data acum un minut</string>
   <string name="last_seen_mins">vazut ultima data acum %d minute</string>
@@ -259,17 +259,17 @@
   <string name="contact_added_you">Contactul a fost adaugat in lista </string>
   <string name="add_back">Adauga inapoi</string>
   <string name="contact_has_read_up_to_this_point">%s a citit pana in acest loc</string>
-  <string name="publish">Publica</string>
+  <string name="publish">Publică</string>
   <string name="touch_to_choose_picture">Atinge avatarul pentru a selecta o poza din galerie</string>
   <string name="publish_avatar_explanation">Tine minte: Toti cei abonati la actualizarile tale de prezenta vor putea sa vada aceasta poza</string>
-  <string name="publishing">Se publica...</string>
+  <string name="publishing">Se publică...</string>
   <string name="error_publish_avatar_server_reject">Acest server v-a refuzat publicarea</string>
   <string name="error_publish_avatar_converting">Ceva nu a mers bine in timpul conversiei imaginii</string>
   <string name="error_saving_avatar">Nu s-a putut salva avatarul pe disc</string>
   <string name="or_long_press_for_default">(Sau apasa indelung pentru a reseta la implicit)</string>
   <string name="error_publish_avatar_no_server_support">Acest server nu permite publicarea de avatare</string>
-  <string name="private_message">sopteste</string>
-  <string name="private_message_to">catre %s</string>
+  <string name="private_message">șoptește</string>
+  <string name="private_message_to">către %s</string>
   <string name="send_private_message_to">Trimite mesaj privat catre %s</string>
   <string name="connect">Conectare</string>
   <string name="account_already_exists">Acest cont exista deja</string>
diff --git a/src/main/res/values-ru/strings.xml b/src/main/res/values-ru/strings.xml
index 3a88a444..f21009f4 100644
--- a/src/main/res/values-ru/strings.xml
+++ b/src/main/res/values-ru/strings.xml
@@ -62,8 +62,8 @@
   <string name="crash_report_message">Отправляя отчёты об ошибках, вы помогаете исправить и улучшить Conversations\n<b>Предупреждение:</b> Отчёт будет отправлен разработчику с вашего XMPP аккаунта. </string>
   <string name="send_now">Отправить сейчас</string>
   <string name="send_never">Больше не спрашивать</string>
-  <string name="problem_connecting_to_account">Не удаётся подключиться к аккаунту</string>
-  <string name="problem_connecting_to_accounts">Не удаётся подключиться к аккаунтам</string>
+  <string name="problem_connecting_to_account">Не удалось подключиться к аккаунту</string>
+  <string name="problem_connecting_to_accounts">Не удалось подключиться к аккаунтам</string>
   <string name="touch_to_fix">Нажмите здесь, чтобы настроить свои аккаунты</string>
   <string name="attach_file">Прикрепить файл</string>
   <string name="not_in_roster">Контакт не находится в вашем списке. Хотите добавить его?</string>
@@ -122,12 +122,14 @@
   <string name="pref_never_send_crash">Не отправлять отчёты об ошибках</string>
   <string name="pref_never_send_crash_summary">Отправляя отчёты об ошибках, вы помогаете исправить и улучшить Conversations</string>
   <string name="pref_confirm_messages">Отчёты о получении</string>
+  <string name="pref_confirm_messages_summary">Позволяет вашим контактам видеть когда вы получили и прочитали их сообщения</string>
   <string name="pref_ui_options">Интерфейс</string>
   <string name="openpgp_error">Возникла ошибка в OpenKeychain</string>
   <string name="error_decrypting_file">Ошибка расшифровки файла</string>
   <string name="accept">Принять</string>
   <string name="error">Произошла ошибка</string>
   <string name="pref_grant_presence_updates">Предоставлять обновления</string>
+  <string name="pref_grant_presence_updates_summary">Разрешить и запрашивать статус присутствия для созданных вами контактов</string>
   <string name="subscriptions">Подписки</string>
   <string name="your_account">Ваш аккаунт</string>
   <string name="keys">Ключи</string>
@@ -330,7 +332,6 @@
   <string name="message_options">Опции сообщения</string>
   <string name="copy_text">Копировать текст</string>
   <string name="select_text">Выбрать текст</string>
-  <string name="quote">Цитировать</string>
   <string name="copy_original_url">Копировать адрес ссылки</string>
   <string name="send_again">Отправить ещё раз</string>
   <string name="file_url">URL файла</string>
@@ -338,6 +339,8 @@
   <string name="url_copied_to_clipboard">Ссылка скопирована в буфер обмена</string>
   <string name="message_copied_to_clipboard">Сообщение скопировано в буфер обмена</string>
   <string name="image_transmission_failed">Передача изображения не удалась</string>
+  <string name="scan_qr_code">Сканировать 2D штрихкод</string>
+  <string name="show_qr_code">Показать 2D штрихкод</string>
   <string name="show_block_list">Показать чёрный список</string>
   <string name="account_details">Сведения об учётной записи</string>
   <string name="verify_otr">Подтвердить OTR</string>
@@ -377,6 +380,7 @@
   <string name="no_application_found_to_open_file">Не найдено приложения для открытия файла</string>
   <string name="could_not_verify_fingerprint">Не удалось подтвердить отпечаток</string>
   <string name="manually_verify">Ручная проверка</string>
+  <string name="are_you_sure_verify_fingerprint">Вы точно хотите подтвердить OTR-отпечатки ваших контактов?</string>
   <string name="pref_show_dynamic_tags">Показывать динамические тэги</string>
   <string name="pref_show_dynamic_tags_summary">Отображать теги только для чтения под контактами</string>
   <string name="enable_notifications">Включить уведомления</string>
@@ -469,6 +473,7 @@
   <string name="contact_is_typing">%s печатает…</string>
   <string name="contact_has_stopped_typing">%s прекратил набор</string>
   <string name="pref_chat_states">Оповещения о наборе</string>
+  <string name="pref_chat_states_summary">Позволяет вашим контактам видеть когда вы пишете им новое сообщение</string>
   <string name="send_location">Отправить местоположение</string>
   <string name="show_location">Показать местоположение</string>
   <string name="no_application_found_to_display_location">Не найдено приложений для отображения местоположения</string>
@@ -637,7 +642,7 @@
   <string name="pref_theme_dark">Тёмная тема</string>
   <string name="pref_use_green_background">Зелёный фон</string>
   <string name="pref_use_green_background_summary">Использовать зелёный фон для полученных сообщений</string>
-  <string name="unable_to_connect_to_keychain">Не удаётся подключиться к OpenKeychain</string>
+  <string name="unable_to_connect_to_keychain">Не удалось подключиться к OpenKeychain</string>
   <string name="this_device_is_no_longer_in_use">Данное устройство больше не используется</string>
   <string name="type_pc">Компьютер</string>
   <string name="type_phone">Телефон</string>
@@ -664,7 +669,20 @@
   <string name="error_publish_avatar_offline">Вы должны подключиться для публикации аватара.</string>
   <string name="show_error_message">Текст ошибки</string>
   <string name="error_message">Текст ошибки</string>
+  <string name="error_unable_to_create_temporary_file">Не удалось создать временный файл</string>
   <string name="this_device_has_been_verified">Это устройство было подтверждено</string>
   <string name="copy_fingerprint">Копировать отпечаток</string>
   <string name="all_omemo_keys_have_been_verified">Все OMEMO-ключи были подтверждены</string>
+  <string name="barcode_does_not_contain_fingerprints_for_this_conversation">Штрихкод не содержит отпечатков для данной беседы</string>
+  <string name="verified_fingerprints">Подтверждённые отпечатки</string>
+  <string name="use_camera_icon_to_scan_barcode">Используйте камеру для сканирования штрихкода контакта</string>
+  <string name="please_wait_for_keys_to_be_fetched">Подождите получения ключей</string>
+  <string name="share_as_barcode">Отправить штрихкод</string>
+  <string name="share_as_uri">Отправить XMPP URI</string>
+  <string name="share_as_http">Отправить HTTP ссылку</string>
+  <string name="pref_blind_trust_before_verification">Слепое доверие перед подтверждением</string>
+  <string name="pref_blind_trust_before_verification_summary">Автоматически доверять всем новым устройствам контактов, которые не были подтверждены ранее, и запрашивать ручное подтверждение каждый раз когда подтверждённый контакт добавляет новое устройство</string>
+  <string name="blindly_trusted_omemo_keys">Слепо доверенные OMEMO ключи</string>
+  <string name="not_trusted">Недоверенный</string>
+  <string name="invalid_barcode">Некорректный 2D штрихкод</string>
 </resources>
diff --git a/src/main/res/values-sr/strings.xml b/src/main/res/values-sr/strings.xml
index f8cb5622..2be517be 100644
--- a/src/main/res/values-sr/strings.xml
+++ b/src/main/res/values-sr/strings.xml
@@ -122,12 +122,14 @@
   <string name="pref_never_send_crash">Никад не шаљи извештаје о паду</string>
   <string name="pref_never_send_crash_summary">Слањем контратрага помажете текући развој Конверзације</string>
   <string name="pref_confirm_messages">Потврди поруке</string>
+  <string name="pref_confirm_messages_summary">Обзнаните контактима када примите и прочитате њихове поруке</string>
   <string name="pref_ui_options">Сучеље</string>
   <string name="openpgp_error">Отворени кључарник је пријавио грешку</string>
   <string name="error_decrypting_file">У/И грешка дешифровања фајла</string>
   <string name="accept">Прихвати</string>
   <string name="error">Десила се грешка</string>
   <string name="pref_grant_presence_updates">Дозволи ажурирања присутности</string>
+  <string name="pref_grant_presence_updates_summary">Унапред дозволи и питај за претплату на присутност за контакте које направите</string>
   <string name="subscriptions">Претплате</string>
   <string name="your_account">Ваш налог</string>
   <string name="keys">Кључеви</string>
@@ -378,6 +380,7 @@
   <string name="no_application_found_to_open_file">Нема апликације која може да отвори фајл</string>
   <string name="could_not_verify_fingerprint">Не могох да оверим отисак</string>
   <string name="manually_verify">Овери ручно</string>
+  <string name="are_you_sure_verify_fingerprint">Желите ли заиста да оверите ОТР отисак вашег контакта?</string>
   <string name="pref_show_dynamic_tags">Прикажи динамичке ознаке</string>
   <string name="pref_show_dynamic_tags_summary">Приказ ознака испод контаката</string>
   <string name="enable_notifications">Укључи обавештења</string>
@@ -470,6 +473,7 @@
   <string name="contact_is_typing">%s куца…</string>
   <string name="contact_has_stopped_typing">%s престаде да куца</string>
   <string name="pref_chat_states">Обавештења о куцању</string>
+  <string name="pref_chat_states_summary">Обзнаните контактима када им куцате поруке</string>
   <string name="send_location">Пошаљи локацију</string>
   <string name="show_location">Прикажи локацију</string>
   <string name="no_application_found_to_display_location">Нема апликације за приказ локације</string>
@@ -666,7 +670,12 @@
   <string name="this_device_has_been_verified">Овај уређај је оверен.</string>
   <string name="copy_fingerprint">Копирај отисак</string>
   <string name="all_omemo_keys_have_been_verified">Сви ОМЕМО кључеви су оверени</string>
+  <string name="barcode_does_not_contain_fingerprints_for_this_conversation">Бар-кôд не садржи отиске за ову преписку.</string>
+  <string name="verified_fingerprints">Оверени отисци</string>
+  <string name="use_camera_icon_to_scan_barcode">Користи камеру за очитавање контактова бар-кôда</string>
+  <string name="please_wait_for_keys_to_be_fetched">Сачекајте на добављање кључева</string>
   <string name="share_as_barcode">Подели као бар-кôд</string>
   <string name="share_as_uri">Подели као ИксМПП УРИ</string>
   <string name="share_as_http">Подели као ХТТП везу</string>
+  <string name="invalid_barcode">Неисправан 2Д бар-кôд</string>
 </resources>
diff --git a/src/main/res/values-tr-rTR/strings.xml b/src/main/res/values-tr-rTR/strings.xml
index 364b2c0e..dc6f310a 100644
--- a/src/main/res/values-tr-rTR/strings.xml
+++ b/src/main/res/values-tr-rTR/strings.xml
@@ -232,7 +232,7 @@
   <string name="fetching_keys">Anahtarları alıyor…</string>
   <string name="done">Tamam</string>
   <string name="verify">Doğrula</string>
-  <string name="decrypt">Deşifre et</string>
+  <string name="decrypt">Şifreyi çöz</string>
   <string name="conferences">Toplantılar</string>
   <string name="search">Ara</string>
   <string name="create_contact">Kişi Oluştur</string>
@@ -278,7 +278,7 @@
   <string name="additional_information">Ek bilgi</string>
   <string name="skip">Atla</string>
   <string name="disable_notifications">Bildirimleri kapat</string>
-  <string name="disable_notifications_for_this_conversation">Bu sohbet için bildirimleri kapat</string>
+  <string name="disable_notifications_for_this_conversation">Bu konuşma için bildirimleri kapat</string>
   <string name="enable">Etkinleştir</string>
   <string name="conference_requires_password">Toplantı için parola gerekiyor</string>
   <string name="enter_password">Parolayı gir</string>
@@ -479,7 +479,7 @@
   <string name="no_application_found_to_display_location">Yer bildirimi için bir uygulama bulunamadı</string>
   <string name="location">Yer</string>
   <string name="received_location">Bildirilen yer</string>
-  <string name="title_undo_swipe_out_conversation">Sohbet sonlandı</string>
+  <string name="title_undo_swipe_out_conversation">Konuşma sonlandı</string>
   <string name="title_undo_swipe_out_muc">Toplantıdan ayrıldı</string>
   <string name="pref_dont_trust_system_cas_title">Sistem sertifikalarına güvenmeyin</string>
   <string name="pref_dont_trust_system_cas_summary">Tüm sertifikalar bizzat onaylanmalıdır</string>
@@ -562,7 +562,7 @@
   <string name="shared_text_with_x">%s ile paylaşılan metin</string>
   <string name="no_storage_permission">Conversations’ın harici depolama alanına erişmesi gerek </string>
   <string name="sync_with_contacts">Kişilerle senkronize et</string>
-  <string name="sync_with_contacts_long">Conversations XMPP listenizi telefon rehberinizle eşleştirerek kişilerin tam isimlerini ve avatarlarını göstermek istiyor.\n\nConversations telefon rehberinizi yalnızca okuyacak ve onları sunucunuza yüklemeden eşleştirecek.\n\nŞimdi telefon rehberinize erişilmesine izin vermeniz istenecek.</string>
+  <string name="sync_with_contacts_long">Conversations XMPP listenizi telefon rehberinizle eşleştirerek kişilerin tam adlarını ve avatarlarını göstermek istiyor.\n\nConversations telefon rehberinizi yalnızca okuyacak ve onları sunucunuza yüklemeden eşleştirecek.\n\nŞimdi telefon rehberinize erişilmesine izin vermeniz istenecek.</string>
   <string name="certificate_information">Sertifika Bilgisi</string>
   <string name="certificate_subject">Konu</string>
   <string name="certificate_issuer">Veren</string>
@@ -605,7 +605,7 @@
   <string name="change_presence">Durum Değiştir</string>
   <string name="status_message">Durum iletisi</string>
   <string name="all_accounts_on_this_device">Bu aygıttaki tüm hesaplara uygula</string>
-  <string name="presence_chat">Sohbet için uygun</string>
+  <string name="presence_chat">Konuşmak için uygun</string>
   <string name="presence_online">Çevrim içi</string>
   <string name="presence_away">Uzakta</string>
   <string name="presence_xa">Mevcut Değil</string>
diff --git a/src/main/res/values-zh-rCN/strings.xml b/src/main/res/values-zh-rCN/strings.xml
index e0705cb0..9aae5d25 100644
--- a/src/main/res/values-zh-rCN/strings.xml
+++ b/src/main/res/values-zh-rCN/strings.xml
@@ -122,6 +122,7 @@
   <string name="pref_never_send_crash">总不发送崩溃报告</string>
   <string name="pref_never_send_crash_summary">发送堆栈跟踪帮助 Conversations 开发人员</string>
   <string name="pref_confirm_messages">确认消息</string>
+  <string name="pref_confirm_messages_summary">让对方知道你收到并阅读了他们的消息</string>
   <string name="pref_ui_options">UI</string>
   <string name="openpgp_error">OpenKeychain 报告了一个错误</string>
   <string name="error_decrypting_file">解密文件时出现 I/O 错误</string>
@@ -337,6 +338,8 @@
   <string name="url_copied_to_clipboard">已经拷贝 URL 到剪贴板</string>
   <string name="message_copied_to_clipboard">消息已经拷贝到剪贴板</string>
   <string name="image_transmission_failed">图片传送失败</string>
+  <string name="scan_qr_code">扫描二维码</string>
+  <string name="show_qr_code">显示二维码</string>
   <string name="show_block_list">显示屏蔽列表</string>
   <string name="account_details">账户详情</string>
   <string name="verify_otr">验证 OTR</string>
@@ -376,6 +379,7 @@
   <string name="no_application_found_to_open_file">没有可以打开此文件的应用</string>
   <string name="could_not_verify_fingerprint">不能验证指纹</string>
   <string name="manually_verify">手工验证</string>
+  <string name="are_you_sure_verify_fingerprint">是否确定要验证你的联系人的 OTR 指纹？</string>
   <string name="pref_show_dynamic_tags">显示动态标签</string>
   <string name="pref_show_dynamic_tags_summary">在联系人下方显示只读标签</string>
   <string name="enable_notifications">启用通知</string>
@@ -468,6 +472,7 @@
   <string name="contact_is_typing">%s 正在输入</string>
   <string name="contact_has_stopped_typing">%s 已停止输入</string>
   <string name="pref_chat_states">键盘输入通知</string>
+  <string name="pref_chat_states_summary">让对方知道你正在向他们写消息</string>
   <string name="send_location">发送位置</string>
   <string name="show_location">显示位置</string>
   <string name="no_application_found_to_display_location">无法找到显示位置的应用</string>
@@ -659,4 +664,16 @@
   <string name="data_saver_enabled">省流量模式已激活</string>
   <string name="data_saver_enabled_explained">您的操作系统禁止本程序在后台运行时访问互联网。为了收到新消息提示，您需要在省流量模式下允许本程序不受限制地访问互联网。\n本程序仍会尽可能节省流量。</string>
   <string name="device_does_not_support_data_saver">该设备不支持禁用省流量模式</string>
+  <string name="error_unable_to_create_temporary_file">无法创建临时文件</string>
+  <string name="this_device_has_been_verified">此设备已经验证</string>
+  <string name="copy_fingerprint">复制指纹</string>
+  <string name="all_omemo_keys_have_been_verified">所有的 OMEMO 密钥已经验证</string>
+  <string name="barcode_does_not_contain_fingerprints_for_this_conversation">条码不包含用于这个会话的指纹。</string>
+  <string name="verified_fingerprints">已验证的指纹</string>
+  <string name="use_camera_icon_to_scan_barcode">使用相机扫描一个联系人的条码</string>
+  <string name="please_wait_for_keys_to_be_fetched">请等待密钥被获取</string>
+  <string name="share_as_barcode">以条码的形式分享</string>
+  <string name="share_as_uri">以 XMPP URI 的形式分享</string>
+  <string name="share_as_http">以 HTTP 链接的形式分享</string>
+  <string name="invalid_barcode">非法的二维码</string>
 </resources>