From e94e06246b007b5991c1f03e30f5b2ab8604d712 Mon Sep 17 00:00:00 2001
From: Daniel Gultsch <daniel@gultsch.de>
Date: Mon, 4 Apr 2016 20:21:00 +0200
Subject: [PATCH] pulled translations from transifex

---
 src/main/res/values-bg/strings.xml     |  4 ++++
 src/main/res/values-de/strings.xml     |  8 +++++--
 src/main/res/values-es/strings.xml     |  4 ++++
 src/main/res/values-eu/strings.xml     |  4 ++++
 src/main/res/values-fr/strings.xml     | 32 +++++++++++++-------------
 src/main/res/values-it/strings.xml     |  5 ++++
 src/main/res/values-ja/strings.xml     |  4 ++++
 src/main/res/values-nl/strings.xml     |  4 ++++
 src/main/res/values-pt/strings.xml     | 20 +++++++++-------
 src/main/res/values-ro-rRO/strings.xml |  4 ++++
 src/main/res/values-sr/strings.xml     |  4 ++++
 src/main/res/values-sv/strings.xml     |  4 ++++
 12 files changed, 71 insertions(+), 26 deletions(-)

diff --git a/src/main/res/values-bg/strings.xml b/src/main/res/values-bg/strings.xml
index b75892445..daa07b085 100644
--- a/src/main/res/values-bg/strings.xml
+++ b/src/main/res/values-bg/strings.xml
@@ -71,6 +71,8 @@
   <string name="send_failed">доставянето се провали</string>
   <string name="send_rejected">отказано</string>
   <string name="preparing_image">Подготовка на изображението за изпращане</string>
+  <string name="preparing_images">Подготовка на изображенията за изпращане</string>
+  <string name="sharing_files_please_wait">Споделяне на файлове. Моля, изчакайте…</string>
   <string name="action_clear_history">Изчистване на историята</string>
   <string name="clear_conversation_history">Изчистване на историята на разговорите</string>
   <string name="clear_histor_msg">Искате ли да изтриете всички съобщения от този разговор?\n\n<b>Внимание:</b> Това няма да изтрие съобщенията, съхранявани на други устройства или на сървърите.</string>
@@ -351,6 +353,7 @@
   <string name="choose_file">Изберете файл</string>
   <string name="receiving_x_file">Получаване на %1$s (%2$d%% завършено)</string>
   <string name="download_x_file">Сваляне на %s</string>
+  <string name="delete_x_file">Изтриване на %s</string>
   <string name="file">файл</string>
   <string name="open_x_file">Отваряне на %s</string>
   <string name="sending_file">изпращане (%1$d%% завършено)</string>
@@ -542,6 +545,7 @@
   <string name="load_more_messages">Зареждане на още съобщения</string>
   <string name="shared_file_with_x">Файлът е споделен с %s</string>
   <string name="shared_image_with_x">Изображението е споделено с %s</string>
+  <string name="shared_images_with_x">Изображения, споделени с %s</string>
   <string name="no_storage_permission">Conversations се нуждае от достъп до външно място за съхранение</string>
   <string name="sync_with_contacts">Синхронизиране с контактите</string>
   <string name="sync_with_contacts_long">Conversations иска да съчетае Вашия списък в XMPP с контактите Ви, за да показва пълните им имена и снимки..\n\nConversations единствено ще чете контактите Ви и ще ги използва вътрешно, без да ги качва на сървъра Ви.\n\nЩе бъдете помолен/а за позволение за достъп до контактите Ви.</string>
diff --git a/src/main/res/values-de/strings.xml b/src/main/res/values-de/strings.xml
index 9de60995d..68325e00d 100644
--- a/src/main/res/values-de/strings.xml
+++ b/src/main/res/values-de/strings.xml
@@ -71,6 +71,8 @@
   <string name="send_failed">Zustellung fehlgeschlagen</string>
   <string name="send_rejected">abgelehnt</string>
   <string name="preparing_image">Bild wird für Übertragung vorbereitet</string>
+  <string name="preparing_images">Bilder werden für Übertragung vorbereitet</string>
+  <string name="sharing_files_please_wait">Teile Dateien. Bitte warten…</string>
   <string name="action_clear_history">Verlauf löschen</string>
   <string name="clear_conversation_history">Verlauf löschen</string>
   <string name="clear_histor_msg">Möchtest du alle Nachrichten in dieser Unterhaltung löschen?\n\n<b>Achtung:</b> Dies beeinflusst nicht Nachrichten, die auf anderen Geräten oder Servern gespeichert sind.</string>
@@ -159,7 +161,7 @@
   <string name="mgmt_account_disable">Vorübergehend abschalten</string>
   <string name="mgmt_account_publish_avatar">Avatar veröffentlichen</string>
   <string name="mgmt_account_publish_pgp">Öffentlichen OpenPGP-Schlüssel veröffentlichen</string>
-  <string name="mgmt_account_enable">Aktivieren </string>
+  <string name="mgmt_account_enable">Konto aktivieren </string>
   <string name="mgmt_account_are_you_sure">Bist du dir sicher?</string>
   <string name="mgmt_account_delete_confirm_text">Wenn du dein Konto löschst, gehen alle Gesprächsverläufe verloren</string>
   <string name="attach_record_voice">Sprache aufzeichnen</string>
@@ -351,6 +353,7 @@
   <string name="choose_file">Datei auswählen</string>
   <string name="receiving_x_file">Empfange %1$s (%2$d%% abgeschlossen)</string>
   <string name="download_x_file">%s herunterladen</string>
+  <string name="delete_x_file">%s löschen</string>
   <string name="file">Datei</string>
   <string name="open_x_file">%s öffnen</string>
   <string name="sending_file">Senden (%1$d%% abgeschlossen)</string>
@@ -542,6 +545,7 @@
   <string name="load_more_messages">Weitere Nachrichten laden</string>
   <string name="shared_file_with_x">Datei mit %s geteilt</string>
   <string name="shared_image_with_x">Bild mit %s geteilt</string>
+  <string name="shared_images_with_x">Bilder 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>
@@ -572,5 +576,5 @@
   <string name="send_corrected_message">Korrigierte Nachricht senden</string>
   <string name="no_keys_just_confirm">Du vertraust diesem Kontakt bereits. Durch Auswählen von \"Fertig\" bestätigst du, dass %s Teil dieser Konferenz ist.</string>
   <string name="select_image_and_crop">Bild auswählen und zuschneiden</string>
-  <string name="this_account_is_disabled">Du hast diesen Account deaktiviert</string>
+  <string name="this_account_is_disabled">Du hast dieses Konto deaktiviert</string>
 </resources>
diff --git a/src/main/res/values-es/strings.xml b/src/main/res/values-es/strings.xml
index f630f7cac..5af941b33 100644
--- a/src/main/res/values-es/strings.xml
+++ b/src/main/res/values-es/strings.xml
@@ -71,6 +71,8 @@
   <string name="send_failed">Error al enviar</string>
   <string name="send_rejected">rechazado</string>
   <string name="preparing_image">Preparando imagen para enviar</string>
+  <string name="preparing_images">Preparando imágenes para enviar</string>
+  <string name="sharing_files_please_wait">Compartiendo ficheros. Por favor, espera...</string>
   <string name="action_clear_history">Limpiar historial</string>
   <string name="clear_conversation_history">Limpiar historial de conversación</string>
   <string name="clear_histor_msg">¿Quieres borrar todos los mensajes de esta conversación?\n\n<b>Aviso:</b> Esto no afectará a los mensajes guardados en otros dispositivos o servidores.</string>
@@ -351,6 +353,7 @@
   <string name="choose_file">Seleccionar archivo</string>
   <string name="receiving_x_file">Recibiendo %1$s (%2$d%% completado)</string>
   <string name="download_x_file">Descargar %s</string>
+  <string name="delete_x_file">Eliminar %s</string>
   <string name="file">archivo</string>
   <string name="open_x_file">Abrir %s</string>
   <string name="sending_file">Enviando (%1$d%% completado)</string>
@@ -542,6 +545,7 @@
   <string name="load_more_messages">Cargar más mensajes</string>
   <string name="shared_file_with_x">Archivo compartido con %s</string>
   <string name="shared_image_with_x">Imagen compartida con %s</string>
+  <string name="shared_images_with_x">Imágenes compartidas con %s</string>
   <string name="no_storage_permission">Conversations necesita acceder al almacenamiento externo</string>
   <string name="sync_with_contacts">Sincronizar contactos</string>
   <string name="sync_with_contacts_long">Conversations quiere cruzar tu lista de contactos de XMPP con tus contactos del móvil para mostrar sus nombres completos y sus fotos de perfil.\n\nConversations solo leerá tus contactos y los cruzará localmente sin subirlos a tu servidor.\n\nEl sistema te preguntará ahora para conceder los permisos de acceso a tus contactos del móvil.</string>
diff --git a/src/main/res/values-eu/strings.xml b/src/main/res/values-eu/strings.xml
index e26be0040..ed9fbeb5c 100644
--- a/src/main/res/values-eu/strings.xml
+++ b/src/main/res/values-eu/strings.xml
@@ -71,6 +71,8 @@
   <string name="send_failed">huts bidaltzerakoan</string>
   <string name="send_rejected">ukatua</string>
   <string name="preparing_image">Irudia transmisiorako prestatzen. Mesedez itxaron…</string>
+  <string name="preparing_images">Irudiak transmisiorako prestatzen</string>
+  <string name="sharing_files_please_wait">Fitxategiak partekatzen. Mesedez itxaron...</string>
   <string name="action_clear_history">Historia garbitu</string>
   <string name="clear_conversation_history">Elkarrizketa historia garbitu</string>
   <string name="clear_histor_msg">Elkarrizketa honetako mezu guztiak ezabatu nahi al dituzu?\n\n<b>Abisua:</b> Honek ez du beste gailu edo zerbitzarietan gordetako mezuetan eraginik izango.</string>
@@ -351,6 +353,7 @@
   <string name="choose_file">Fitxategia aukeratu</string>
   <string name="receiving_x_file">%1$s jasotzen (%2$d%% osatua)</string>
   <string name="download_x_file">%s deskargatu</string>
+  <string name="delete_x_file">Ezabatu %s</string>
   <string name="file">fitxategia</string>
   <string name="open_x_file">%s ireki</string>
   <string name="sending_file">bidaltzen (%1$d%% osatua)</string>
@@ -542,6 +545,7 @@
   <string name="load_more_messages">Mezu gehiago kargatu</string>
   <string name="shared_file_with_x">Fitxategia %s(r)ekin partekatu da</string>
   <string name="shared_image_with_x">Irudia %s(r)ekin partekatu da</string>
+  <string name="shared_images_with_x">Irudiak %s(r)ekin partekatu dira</string>
   <string name="no_storage_permission">Conversationsek kanpoko biltegirako sarbidea behar du</string>
   <string name="sync_with_contacts">Kontaktuekin sinkronizatu</string>
   <string name="sync_with_contacts_long">Conversationsek zure XMPP zerrenda eta zure kontaktuak uztartu nahi ditu haien izenak eta argazkiak erakusteko.\n\nConversationsek zure kontaktuak modu lokalean soilik irakurri eta uztartuko ditu, zure zerbitzarira kargatu gabe.\n\nJarraian baimenak eskatuko zaizkizu zure kontaktuetara sartu ahal izateko.</string>
diff --git a/src/main/res/values-fr/strings.xml b/src/main/res/values-fr/strings.xml
index 488a4b582..889f50922 100644
--- a/src/main/res/values-fr/strings.xml
+++ b/src/main/res/values-fr/strings.xml
@@ -76,7 +76,7 @@
   <string name="clear_histor_msg">Voulez-vous supprimer tous les messages de cette conversation ?\n\n<b>Attention :</b> Les messages seront supprimés uniquement sur cet appareil.</string>
   <string name="delete_messages">Supprimer les messages</string>
   <string name="also_end_conversation">Fermer cette conversation ensuite</string>
-  <string name="choose_presence">Choisir le status de présence</string>
+  <string name="choose_presence">Choisir le statut de présence</string>
   <string name="send_unencrypted_message">Envoyer un message non chiffré</string>
   <string name="send_otr_message">Envoyer un message chiffré avec OTR</string>
   <string name="send_omemo_message">Envoyer un message chiffré avec OMEMO</string>
@@ -86,7 +86,7 @@
   <string name="send_unencrypted">Envoyer en clair</string>
   <string name="decryption_failed">Echec du déchiffrement. Avez-vous la bonne clef privée ?</string>
   <string name="openkeychain_required">OpenKeychain</string>
-  <string name="openkeychain_required_long">Conversations requiert une application tierce nommée <b>OpenKeychain</b> pour chiffrer et déchiffrer les messages.\n\nOpenKeychain est sous licence GPLv3 et est disponible sur F-Droid et Google Play.\n\n<small>(Veuillez redémarrer Conversations apres l\'installation de l\'app)</small></string>
+  <string name="openkeychain_required_long">Conversations requiert une application tierce nommée <b>OpenKeychain</b> pour chiffrer et déchiffrer les messages.\n\nOpenKeychain est sous licence GPLv3 et est disponible sur F-Droid et Google Play.\n\n<small>(Veuillez redémarrer Conversations après l\'installation de l\'app)</small></string>
   <string name="restart">Redémarrer</string>
   <string name="install">Installer</string>
   <string name="openkeychain_not_installed">Veuillez installer OpenKeychain</string>
@@ -184,9 +184,9 @@
   <string name="server_info_show_more">Infos sur le serveur</string>
   <string name="server_info_mam">XEP-0313 : MAM</string>
   <string name="server_info_carbon_messages">XEP-0280 : Copies carbone</string>
-  <string name="server_info_csi">XEP-0352 : Indication status client</string>
+  <string name="server_info_csi">XEP-0352 : Indication statut client</string>
   <string name="server_info_blocking">XEP-0191 : Commande de bloquage</string>
-  <string name="server_info_roster_version">XEP-0237 : Versionnement contacts</string>
+  <string name="server_info_roster_version">XEP-0237 : Révision contacts</string>
   <string name="server_info_stream_management">XEP-0198 : Gestion des flux</string>
   <string name="server_info_pep">XEP-0163 : PEP (Avatars / OMEMO)</string>
   <string name="server_info_http_upload">XEP-0363 : Envoi de fichiers via HTTP</string>
@@ -271,7 +271,7 @@
   <string name="request_presence_updates">Veuillez demander à votre contact de partager ses mises à jour de présence.\n\n<small>Elles seront utilisées pour déterminer son client.</small></string>
   <string name="request_now">Demander maintenant</string>
   <string name="delete_fingerprint">Supprimer l\'empreinte</string>
-  <string name="sure_delete_fingerprint">Etes-vous sûr de vouloir supprimer l\'empreinte ?</string>
+  <string name="sure_delete_fingerprint">Êtes-vous sûr de vouloir supprimer l\'empreinte ?</string>
   <string name="ignore">Ignorer</string>
   <string name="without_mutual_presence_updates"><b>Attention :</b> peut poser problème si l\'un des deux correspondants n\'a pas activé les mises à jour de présence.\n\n<small>Vérifiez dans les détails du contact que vous y avez bien souscrit.</small></string>
   <string name="pref_security_settings">Sécurité</string>
@@ -284,7 +284,7 @@
   <string name="pref_expert_options">Paramètres avancés</string>
   <string name="pref_expert_options_summary">À utiliser avec précaution.</string>
   <string name="title_activity_about">À propos</string>
-  <string name="pref_about_conversations_summary">Informations sur la version et les licenses</string>
+  <string name="pref_about_conversations_summary">Informations sur la version et les licences</string>
   <string name="title_pref_quiet_hours">Heures tranquilles</string>
   <string name="title_pref_quiet_hours_start_time">Heure de début</string>
   <string name="title_pref_quiet_hours_end_time">Heure de fin</string>
@@ -297,7 +297,7 @@
   <string name="pref_use_indicate_received_summary">Les messages reçus seront marqués d\'une coche verte (si supporté).</string>
   <string name="pref_use_send_button_to_indicate_status_summary">Le bouton Envoyer change de couleur pour indiquer le statut du contact.</string>
   <string name="pref_expert_options_other">Autres</string>
-  <string name="pref_conference_name">Nom de la conférence </string>
+  <string name="pref_conference_name">Nom de la conférence</string>
   <string name="pref_conference_name_summary">Identifier les conférences par leur sujet plutôt que leur JID.</string>
   <string name="pref_autojoin">Rejoindre automatiquement les conférences</string>
   <string name="pref_autojoin_summary">Respecter le paramètre de connexion automatique des favoris de conférence</string>
@@ -322,7 +322,7 @@
   <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 un QR code</string>
+  <string name="scan_qr_code">Scanner un code QR</string>
   <string name="show_qr_code">Afficher le code QR</string>
   <string name="show_block_list">Afficher la liste des contacts bloqués</string>
   <string name="account_details">Détails du compte</string>
@@ -392,7 +392,7 @@
   <string name="could_not_change_password">Impossible de changer le mot de passe</string>
   <string name="otr_session_not_started">Envoyez un message pour commencer la conversation chiffrée</string>
   <string name="ask_question">Poser une question</string>
-  <string name="smp_explain_question">Si vous et votre contact avez en commun un secret que personne d\'autre ne connait (comme une blague ou ce que vous avez mangé lors de votre dernière rencontre), vous pouvez utiliser ce secret pour vérifier vos empreintes respectives.\n\nVous donnez un indice ou posez votre question à votre contact, qui répondra en faisant attention à la casse.</string>
+  <string name="smp_explain_question">Si vous et votre contact avez en commun un secret que personne d\'autre ne connaît (comme une blague ou ce que vous avez mangé lors de votre dernière rencontre), vous pouvez utiliser ce secret pour vérifier vos empreintes respectives.\n\nVous donnez un indice ou posez votre question à votre contact, qui répondra en faisant attention à la casse.</string>
   <string name="smp_explain_answer">Votre contact souhaite confirmer votre identité grâce à un secret partagé. Il vous a envoyé le message/indice suivant concernant ce secret.</string>
   <string name="shared_secret_hint_should_not_be_empty">Votre indice ne doit pas être vide</string>
   <string name="shared_secret_can_not_be_empty">Votre secret partagé ne doit pas être vide</string>
@@ -438,7 +438,7 @@
   <string name="pref_enter_is_send">Touche Entrée pour envoyer</string>
   <string name="pref_enter_is_send_summary">Utiliser la touche Entrée pour envoyer un message.</string>
   <string name="pref_display_enter_key">Afficher la touche Entrée</string>
-  <string name="pref_display_enter_key_summary">Remplacer le bouton des Émoticônes par un bouton Entrée.</string>
+  <string name="pref_display_enter_key_summary">Remplacer la touche Émoticônes par une touche Entrée.</string>
   <string name="audio">audio</string>
   <string name="video">vidéo</string>
   <string name="image">image</string>
@@ -451,7 +451,7 @@
   <string name="avatar_has_been_published">L\'avatar a été publié !</string>
   <string name="sending_x_file">%s en cours d\'envoi</string>
   <string name="offering_x_file">En train de proposer un(e) %s</string>
-  <string name="hide_offline">Se cacher hors-ligne</string>
+  <string name="hide_offline">Cacher contacts hors-ligne</string>
   <string name="disable_account">Désactiver le compte</string>
   <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>
@@ -477,7 +477,7 @@
     <item quantity="other">%d certificats supprimés</item>
   </plurals>
   <plurals name="select_contact">
-    <item quantity="one">%d contact séléctionné</item>
+    <item quantity="one">%d contact sélectionné</item>
     <item quantity="other">%d contacts sélectionnés</item>
   </plurals>
   <string name="pref_quick_action_summary">Remplacer le bouton Envoyer par une action rapide.</string>
@@ -491,7 +491,7 @@
   <string name="username">Identifiant</string>
   <string name="username_hint">Identifiant</string>
   <string name="invalid_username">Cet identifiant n\'est pas valide</string>
-  <string name="conference_name">Nom de la conférence </string>
+  <string name="conference_name">Nom de la conférence</string>
   <string name="invalid_conference_name">Ce nom de conférence n\'est pas valide</string>
   <string name="download_failed_server_not_found">Échec du téléchargement : impossible de trouver le serveur</string>
   <string name="download_failed_file_not_found">Échec du téléchargement : impossible de trouver le fichier</string>
@@ -507,7 +507,7 @@
   <string name="pref_xa_on_silent_mode_summary">Marque cette ressource comme indisponible quand l\'appareil est en mode silencieux</string>
   <string name="pref_treat_vibrate_as_silent">Indisponible en mode vibreur</string>
   <string name="pref_treat_vibrate_as_silent_summary">Marque cette ressource comme indisponible quand l\'appareil est en mode vibreur</string>
-  <string name="pref_show_connection_options">Paramètres de connexioin avancés</string>
+  <string name="pref_show_connection_options">Paramètres de connexion avancés</string>
   <string name="pref_show_connection_options_summary">Montrer le nom d\'hôte et le port lors du paramétrage d\'un compte</string>
   <string name="hostname_example">xmpp.example.com</string>
   <string name="action_add_account_with_certificate">Ajouter un compte avec un certificat</string>
@@ -527,7 +527,7 @@
   <string name="verified_omemo_key_with_certificate">Clef OMEMO vérifiée avec un certificat !</string>
   <string name="device_does_not_support_certificates">Votre appareil ne supporte pas la sélection de certificats client !</string>
   <string name="pref_connection_options">Connexion</string>
-  <string name="pref_use_tor">Connection via Tor</string>
+  <string name="pref_use_tor">Connexion via Tor</string>
   <string name="pref_use_tor_summary">Rediriger toutes les connexions via le réseau Tor. Nécessite Orbot.</string>
   <string name="account_settings_hostname">Nom d\'hôte</string>
   <string name="account_settings_port">Port</string>
@@ -544,7 +544,7 @@
   <string name="shared_image_with_x">Image partagée avec %s</string>
   <string name="no_storage_permission">Conversations a besoin d\'accéder au stockage externe</string>
   <string name="sync_with_contacts">Synchroniser avec contacts</string>
-  <string name="sync_with_contacts_long">Conversations souhaite associer vos contacts XMPP avec les contacts de votre appareil, pour utiliser leur nom complet et leur avatar.\n\nConversations va uniquement lire vos contacts et les associer localement, sans les uploader sur le serveur XMPP.\n\nVotre appareil va maintenant vous demander la permission d\'accéder à vos contacts.</string>
+  <string name="sync_with_contacts_long">Conversations souhaite associer vos contacts XMPP avec les contacts de votre appareil, pour utiliser leur nom complet et leur avatar.\n\nConversations va uniquement lire vos contacts et les associer localement, sans les envoyer sur le serveur XMPP.\n\nVotre appareil va maintenant vous demander la permission d\'accéder à vos contacts.</string>
   <string name="certificate_information">Informations du certificat</string>
   <string name="certificate_subject">Sujet</string>
   <string name="certificate_issuer">Émetteur</string>
diff --git a/src/main/res/values-it/strings.xml b/src/main/res/values-it/strings.xml
index a512575b1..83bcbda01 100644
--- a/src/main/res/values-it/strings.xml
+++ b/src/main/res/values-it/strings.xml
@@ -504,6 +504,8 @@
   <string name="pref_away_when_screen_off_summary">Imposta la tua risorsa come non disponibile quando lo schermo è spento</string>
   <string name="pref_xa_on_silent_mode">Non disponibile in modalità silenzioso</string>
   <string name="pref_xa_on_silent_mode_summary">Imposta la tua risorsa come non disponibile quando il dispositivo è in modalità silenziosa</string>
+  <string name="pref_treat_vibrate_as_silent">Tratta vibrazione come modalità silenziosa</string>
+  <string name="pref_treat_vibrate_as_silent_summary">Segna la tua risorsa come non disponibile quando il dispositivo ha solo la vibrazione</string>
   <string name="pref_show_connection_options">Impostazioni estese di connessione</string>
   <string name="pref_show_connection_options_summary">Mostra nome host e impostazioni della porta quando configuri un account</string>
   <string name="hostname_example">xmpp.esempio.it</string>
@@ -567,4 +569,7 @@
   <string name="this_field_is_required">Questo campo è obbligatorio</string>
   <string name="correct_message">Correggi messaggio</string>
   <string name="send_corrected_message">Invia messaggio corretto</string>
+  <string name="no_keys_just_confirm">Ti fidi già di questo contatto. Selezionando \'fatto\' stai solo confermando che %s fa parte di questa conferenza.</string>
+  <string name="select_image_and_crop">Seleziona immagine e ritagliala</string>
+  <string name="this_account_is_disabled">Hai disabilitato questo account</string>
 </resources>
diff --git a/src/main/res/values-ja/strings.xml b/src/main/res/values-ja/strings.xml
index 41ac0361c..2268ca966 100644
--- a/src/main/res/values-ja/strings.xml
+++ b/src/main/res/values-ja/strings.xml
@@ -71,6 +71,8 @@
   <string name="send_failed">配信に失敗しました</string>
   <string name="send_rejected">拒否されました</string>
   <string name="preparing_image">転送用画像の準備中</string>
+  <string name="preparing_images">転送用画像の準備中</string>
+  <string name="sharing_files_please_wait">フィルを共有しています。しばらくお待ちください…</string>
   <string name="action_clear_history">履歴をクリア</string>
   <string name="clear_conversation_history">会話履歴をクリア</string>
   <string name="clear_histor_msg">この会話のすべてのメッセージを削除しますか?\n\n<b>警告:</b> これは、他のデバイスやサーバーに保存されているメッセージには影響しません。</string>
@@ -351,6 +353,7 @@
   <string name="choose_file">ファイルの選択</string>
   <string name="receiving_x_file">%1$s 受信中 (%2$d%% 完了)</string>
   <string name="download_x_file">%s のダウンロード</string>
+  <string name="delete_x_file">%s を削除</string>
   <string name="file">ファイル</string>
   <string name="open_x_file">%s を開く</string>
   <string name="sending_file">送信中 (%1$d%% 完了)</string>
@@ -539,6 +542,7 @@
   <string name="load_more_messages">さらにメッセージをロード</string>
   <string name="shared_file_with_x">%s でファイルを共有</string>
   <string name="shared_image_with_x">%s で画像を共有</string>
+  <string name="shared_images_with_x">%s で画像を共有</string>
   <string name="no_storage_permission">Conversations は外部ストレージにアクセスが必要です</string>
   <string name="sync_with_contacts">連絡先と同期</string>
   <string name="sync_with_contacts_long">Conversations はフルネームやアバターを表示するために、連絡先と XMPP 名簿と一致するようにしたいです。\n\nConversations は、サーバーにアップロードすることはなく、ローカルで連絡先を読んで一致させるだけです。\n\n今、連絡先へのアクセス許可を付与するように求められます。</string>
diff --git a/src/main/res/values-nl/strings.xml b/src/main/res/values-nl/strings.xml
index 9431e8cf6..44e5dab65 100644
--- a/src/main/res/values-nl/strings.xml
+++ b/src/main/res/values-nl/strings.xml
@@ -71,6 +71,8 @@
   <string name="send_failed">afleveren mislukt</string>
   <string name="send_rejected">geweigerd</string>
   <string name="preparing_image">Bezig met voorbereiden van versturen van afbeelding</string>
+  <string name="preparing_images">Bezig met voorbereiden van versturen van afbeeldingen</string>
+  <string name="sharing_files_please_wait">Bestanden delen. Even geduld…</string>
   <string name="action_clear_history">Geschiedenis wissen</string>
   <string name="clear_conversation_history">Gespreksgeschiedenis wissen</string>
   <string name="clear_histor_msg">Wil je alle berichten in dit gesprek verwijderen?\n\n<b>Waarschuwing:</b> Dit zal geen invloed hebben op de berichten opgeslagen op andere apparaten of servers.</string>
@@ -351,6 +353,7 @@
   <string name="choose_file">Bestand kiezen</string>
   <string name="receiving_x_file">Ontvangen van %1$s (%2$d%% voltooid)</string>
   <string name="download_x_file">%s downloaden</string>
+  <string name="delete_x_file">%s verwijderen</string>
   <string name="file">bestand</string>
   <string name="open_x_file">%s openen</string>
   <string name="sending_file">versturen (%1$d%% voltooid)</string>
@@ -542,6 +545,7 @@
   <string name="load_more_messages">Laad meer berichten</string>
   <string name="shared_file_with_x">Bestand gedeeld met %s</string>
   <string name="shared_image_with_x">Afbeelding gedeeld met %s</string>
+  <string name="shared_images_with_x">Afbeeldingen 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 profielfoto\'s 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>
diff --git a/src/main/res/values-pt/strings.xml b/src/main/res/values-pt/strings.xml
index b66ecd5e9..c779aa7ce 100644
--- a/src/main/res/values-pt/strings.xml
+++ b/src/main/res/values-pt/strings.xml
@@ -1,27 +1,27 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <resources>
-  <string name="action_settings">Configurações</string>
+  <string name="action_settings">Definições</string>
   <string name="action_add">Nova conversa</string>
   <string name="action_accounts">Gerir contas</string>
   <string name="action_end_conversation">Finalizar essa conversa</string>
-  <string name="action_contact_details">Detalhes do contato</string>
+  <string name="action_contact_details">Detalhes do contacto</string>
   <string name="action_muc_details">Detalhes da conferência</string>
   <string name="action_secure">Conversa segura</string>
   <string name="action_add_account">Adicionar conta</string>
   <string name="action_edit_contact">Editar nome</string>
   <string name="action_add_phone_book">Adicionar ao livro de endereços</string>
   <string name="action_delete_contact">Apagar da lista</string>
-  <string name="action_block_contact">Bloquear contato</string>
-  <string name="action_unblock_contact">Desbloquear contato</string>
+  <string name="action_block_contact">Bloquear contacto</string>
+  <string name="action_unblock_contact">Desbloquear contacto</string>
   <string name="action_block_domain">Bloquear domínio</string>
   <string name="action_unblock_domain">Desbloquear domínio</string>
   <string name="title_activity_manage_accounts">Gerir contas</string>
-  <string name="title_activity_settings">Configurações</string>
+  <string name="title_activity_settings">Definições</string>
   <string name="title_activity_conference_details">Detalhes da conferência</string>
-  <string name="title_activity_contact_details">Detalhes do contato</string>
+  <string name="title_activity_contact_details">Detalhes do contacto</string>
   <string name="title_activity_sharewith">Compartilhar conversa</string>
   <string name="title_activity_start_conversation">Iniciar conversa</string>
-  <string name="title_activity_choose_contact">Escolher contato</string>
+  <string name="title_activity_choose_contact">Escolher contacto</string>
   <string name="title_activity_block_list">Bloquear lista</string>
   <string name="just_now">agora há pouco</string>
   <string name="minute_ago">1 minuto atrás</string>
@@ -71,6 +71,8 @@
   <string name="send_failed">a entrega falhou</string>
   <string name="send_rejected">rejeitado</string>
   <string name="preparing_image">Preparando a imagem para transmissão</string>
+  <string name="preparing_images">Preparando as imagens para a transmissão</string>
+  <string name="sharing_files_please_wait">Partilhando os ficheiros. Por favor aguarde...</string>
   <string name="action_clear_history">Limpar histórico</string>
   <string name="clear_conversation_history">Limpar o histórico de conversas</string>
   <string name="clear_histor_msg">Deseja remover todas as mensagens nesta conversa?\n\n&lt;b&gt;Aviso:&lt;b&gt; Isto não irá influenciar mensagens guardadas noutros dispositivos ou servidores.</string>
@@ -267,7 +269,7 @@
   <string name="enable">Ativar</string>
   <string name="conference_requires_password">Esta conferência requer uma palavra-passe</string>
   <string name="enter_password">Inserir palavra-passe</string>
-  <string name="missing_presence_updates">Atualizações de presença inexistente para o contato</string>
+  <string name="missing_presence_updates">Atualizações de presença inexistente para o contacto</string>
   <string name="request_presence_updates">Por favor peça atualizações de presença ao seu contacto primeiro.\n\n<small>Isto irá ser utilizado para determinar que cliente(s) o seu contacto está a utilizar.</small></string>
   <string name="request_now">Solicitar agora</string>
   <string name="delete_fingerprint">Remover impressão digital</string>
@@ -351,6 +353,7 @@
   <string name="choose_file">Escolher ficheiro</string>
   <string name="receiving_x_file">A receber %1$s (%2$d%% concluído)</string>
   <string name="download_x_file">Transferir %s</string>
+  <string name="delete_x_file">Remover %s</string>
   <string name="file">ficheiro</string>
   <string name="open_x_file">Abrir %s</string>
   <string name="sending_file">a enviar (%1$d%% concluído)</string>
@@ -542,6 +545,7 @@
   <string name="load_more_messages">Carregar mais mensagens</string>
   <string name="shared_file_with_x">Ficheiro partilhado com %s</string>
   <string name="shared_image_with_x">Imagem partilhada com %s</string>
+  <string name="shared_images_with_x">Imagens partilhadas com %s</string>
   <string name="no_storage_permission">Conversations necessita de acesso ao armazenamento externo</string>
   <string name="sync_with_contacts">Sincronizar com contactos</string>
   <string name="sync_with_contacts_long">A aplicação Conversations deseja fazer a correspondência entre a sua lista de contactos XMPP e os seus contactos para mostrar os seus nomes completos e os seus avatares.\n\nA aplicação Conversations irá apenas ler os seus contactos e fazer a correspondência localmente sem enviar os dados para o seu servidor.\n\nIrá agora ser-lhe pedido para dar permissão para aceder aos seus contactos.</string>
diff --git a/src/main/res/values-ro-rRO/strings.xml b/src/main/res/values-ro-rRO/strings.xml
index 35a608721..090d234e3 100644
--- a/src/main/res/values-ro-rRO/strings.xml
+++ b/src/main/res/values-ro-rRO/strings.xml
@@ -71,6 +71,8 @@
   <string name="send_failed">trimitere esuata</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>
@@ -351,6 +353,7 @@
   <string name="choose_file">Alege un fisier</string>
   <string name="receiving_x_file">Primesc %1$s (%2$d%% complet)</string>
   <string name="download_x_file">Descarca %s</string>
+  <string name="delete_x_file">Sterge %s</string>
   <string name="file">fisier</string>
   <string name="open_x_file">Deschide %s</string>
   <string name="sending_file">trimit (%1$d%% complet)</string>
@@ -545,6 +548,7 @@
   <string name="load_more_messages">Incarca mai multe mesaje</string>
   <string name="shared_file_with_x">Partajeaza fisierul cu %s...</string>
   <string name="shared_image_with_x">Partajeaza imaginea cu %s.</string>
+  <string name="shared_images_with_x">Partajeaza imaginile cu %s.</string>
   <string name="no_storage_permission">Conversations are nevoie de acces la stocarea externa</string>
   <string name="sync_with_contacts">Sincronizeaza cu contactele</string>
   <string name="sync_with_contacts_long">Conversations doreste sa potriveasta lista de contacte XMPP cu cea din dispozitiv pentru a putea afisa numule lor complete si avatarele.\n\nConversations doar v-a citi si potrivi local fara sa le incarce catre vreun server.\n\nUrmeaza sa fii intrebat daca doresti sa permiti accesul la contacte.</string>
diff --git a/src/main/res/values-sr/strings.xml b/src/main/res/values-sr/strings.xml
index bf816ba20..5ad8362a5 100644
--- a/src/main/res/values-sr/strings.xml
+++ b/src/main/res/values-sr/strings.xml
@@ -71,6 +71,8 @@
   <string name="send_failed">испорука није успела</string>
   <string name="send_rejected">одбијено</string>
   <string name="preparing_image">Припремам слику за пренос</string>
+  <string name="preparing_images">Припремам слике за пренос</string>
+  <string name="sharing_files_please_wait">Делим фајлове, сачекајте…</string>
   <string name="action_clear_history">Очисти историјат</string>
   <string name="clear_conversation_history">Брисање историјата преписки</string>
   <string name="clear_histor_msg">Желите ли да обришете све поруке ове преписке?\n\n<b>Упозорење:</b> Ово неће утицати на поруке складиштене на осталим уређајима или серверима.</string>
@@ -351,6 +353,7 @@
   <string name="choose_file">Изабери фајл</string>
   <string name="receiving_x_file">Примам %1$s (%2$d%% завршено)</string>
   <string name="download_x_file">Преузми %s</string>
+  <string name="delete_x_file">Обриши %s</string>
   <string name="file">фајл</string>
   <string name="open_x_file">Отвори %s</string>
   <string name="sending_file">шаљем (%1$d%% завршено)</string>
@@ -545,6 +548,7 @@
   <string name="load_more_messages">Учитај још порука</string>
   <string name="shared_file_with_x">Подељен фајл са %s</string>
   <string name="shared_image_with_x">Подељена слика са %s</string>
+  <string name="shared_images_with_x">Подељене слике са %s</string>
   <string name="no_storage_permission">Конверзацији је потребан приступ спољашњем складишту</string>
   <string name="sync_with_contacts">Синхронизуј са контактима</string>
   <string name="sync_with_contacts_long">Конверзација жели да поклапи ваш ИксМПП именик са контактима на вашем уређају да би приказала њихова пуна имена и аватаре.\n\nКонверзација ће само да очита ваше контакте и упореди их локално без отпремања на сервер.\n\nСада ћете бити упитани за дозволу приступа вашим контактима.</string>
diff --git a/src/main/res/values-sv/strings.xml b/src/main/res/values-sv/strings.xml
index ee6a46ae0..370039c10 100644
--- a/src/main/res/values-sv/strings.xml
+++ b/src/main/res/values-sv/strings.xml
@@ -71,6 +71,8 @@
   <string name="send_failed">sändning misslyckades</string>
   <string name="send_rejected">avvisad</string>
   <string name="preparing_image">Förbereder bild för sändning</string>
+  <string name="preparing_images">Förbereder bilder för överföring</string>
+  <string name="sharing_files_please_wait">Delar filer. Vänta...</string>
   <string name="action_clear_history">Rensa historik</string>
   <string name="clear_conversation_history">Rensa konversationshistorik</string>
   <string name="clear_histor_msg">Vill du ta bort alla meddelanden i denna konversation?\n\n<b>Varning:</b> Detta kommer inte påverka meddelanden lagrade på andra enheter eller servrar.</string>
@@ -351,6 +353,7 @@
   <string name="choose_file">Välj fil</string>
   <string name="receiving_x_file">Tar emot %1$s (%2$d%% klart)</string>
   <string name="download_x_file">Ladda ner %s</string>
+  <string name="delete_x_file">Ta bort %s</string>
   <string name="file">fil</string>
   <string name="open_x_file">Öppna %s</string>
   <string name="sending_file">skickar (%1$d%% klart)</string>
@@ -542,6 +545,7 @@
   <string name="load_more_messages">Ladda fler meddelanden</string>
   <string name="shared_file_with_x">Delade fil med %s</string>
   <string name="shared_image_with_x">Delade bild med %s</string>
+  <string name="shared_images_with_x">Delade bilder med %s</string>
   <string name="no_storage_permission">Conversations behöver access till extern lagring</string>
   <string name="sync_with_contacts">Synkronisera med kontakter</string>
   <string name="sync_with_contacts_long">Conversations vill matcha din XMPP-kontaktlista med dina kontakter för att visa deras namn och profilbild.\n\nConversations läser endast dina kontakter för att matcha dem lokalt utan att ladda upp dem till din server.\n\nDu kommer nu få frågan om tillåtelse för att använda kontakterna.</string>