fetched translations from transifex

src/main/res/values-ca/strings.xml

@@ -1,6 +1,5 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <resources>
-
   <string name="action_settings">Preferències</string>
   <string name="action_add">Nova conversa</string>
   <string name="action_accounts">Gestionar comptes</string>
@@ -10,8 +9,8 @@
   <string name="action_secure">Conversa segura</string>
   <string name="action_add_account">Afegir compte</string>
   <string name="just_now">ara</string>
-    <string name="sending">enviant&#8230;</string>
-    <string name="encrypted_message">Desxifrant missatge. Espera si us plau&#8230;</string>
+  <string name="sending">enviant…</string>
+  <string name="encrypted_message">Desxifrant missatge. Espera si us plau…</string>
   <string name="nick_in_use">El sobrenom ja està en ús</string>
   <string name="moderator">Moderador</string>
   <string name="participant">Participant</string>
@@ -33,7 +32,6 @@
   <string name="add_contact">Afefgir contacte</string>
   <string name="send_failed">Error a l\'enviar</string>
   <string name="send_rejected">rebutjat</string>
-    <string name="receiving_image">Rebent arxiu d\'imatge. Espera si us plau&#8230;</string>
   <string name="preparing_image">Preparant imatge per enviar</string>
   <string name="action_clear_history">Netejar historial</string>
   <string name="clear_conversation_history">Netejar historial de conversa</string>
@@ -46,23 +44,20 @@
   <string name="send_pgp_message">Enviar missatge xifrat amb OpenPGP</string>
   <string name="your_nick_has_been_changed">El teu sobrenom s\'ha modificat</string>
   <string name="download_image">Descarregar imatge</string>
-    <string name="image_offered_for_download"><i>Fitxer d\'imatge ofert per a descàrrega</i></string>
   <string name="send_unencrypted">Enviar sense xifrar</string>
   <string name="decryption_failed">Ha fallat el desxiframent. Potser no tinguis la clau privada apropiada.</string>
   <string name="openkeychain_required">OpenKeychain</string>
   <string name="openkeychain_required_long">Conversations utilitza una aplicació de tercers anomenada <b>OpenKeychain</b> per xifrar i desxifrar missatges i gestionar les teves claus públiques..\n\nOpenKeychain està publicat sota llicència GPLv3 i disponible a la F-Droid i Google Play.\n\n<small>(Si us plau, reinicieu Conversations després.)</small></string>
   <string name="restart">Reiniciar</string>
   <string name="install">Instal·lar</string>
-    <string name="offering">oferint&#8230;</string>
+  <string name="offering">oferint…</string>
   <string name="no_pgp_key">Clau OpenPGP no trobada</string>
   <string name="contact_has_no_pgp_key">Conversations no ha pogut xifrar els teus missatges perquè el teu contacte no està anunciant la seva clau pública.\n\n<small>Si us plau, demana al teu contacte que configuri OpenPGP.</small></string>
   <string name="encrypted_message_received"><i>Missatge xifrat rebut. Prem per desxifrar i veure-ho.</i></string>
-    <string name="encrypted_image_received"><i>Imatge xifrada rebuda. Prem per desxifrar i veure-la.</i></string>
-    <string name="image_file"><i>Imatge rebuda. Prem per veure</i></string>
   <string name="pref_xmpp_resource">Recursos XMPP</string>
   <string name="pref_xmpp_resource_summary">El nom que identifica aquest client amb</string>
   <string name="pref_accept_files">Acceptar fitxers</string>
-    <string name="pref_accept_files_summary">Accepta fitxers automàticament amb una mida menor a&#8230;</string>
+  <string name="pref_accept_files_summary">Accepta fitxers automàticament amb una mida menor a…</string>
   <string name="pref_notification_settings">Ajustos de notificacions</string>
   <string name="pref_notifications">Notificacions</string>
   <string name="pref_notifications_summary">Notifica quan arriba un nou missatge</string>
@@ -78,5 +73,4 @@
   <string name="pref_never_send_crash">Mai enviïs informes d\'errors</string>
   <string name="pref_never_send_crash_summary">Enviant traces d\'execució ajudes al futur desenvolupament del Conversations.</string>
   <string name="pref_ui_options">Opcions de UI</string>
-
 </resources>

src/main/res/values-cs/strings.xml

@@ -1,6 +1,5 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <resources>
-
   <string name="action_settings">Nastavení</string>
   <string name="action_add">Nová konverzace</string>
   <string name="action_accounts">Nastavení účtů</string>
@@ -71,7 +70,6 @@
   <string name="add_contact">Přidat kontakt</string>
   <string name="send_failed">doručení selhalo</string>
   <string name="send_rejected">zamítnuto</string>
-    <string name="receiving_image">Přijímám obrázek (%1$d%%)</string>
   <string name="preparing_image">Připravuji obrázek na přenos</string>
   <string name="action_clear_history">Smazat historii</string>
   <string name="clear_conversation_history">Smaže historii konverzací</string>
@@ -84,7 +82,6 @@
   <string name="send_pgp_message">Poslat OpenPGP šifrovanou zprávu</string>
   <string name="your_nick_has_been_changed">Přezdívka byla změněna</string>
   <string name="download_image">Stáhnout obrázek</string>
-    <string name="image_offered_for_download"><i>Byl nabídnut obrázek ke stažení</i></string>
   <string name="send_unencrypted">Poslat nešifrované</string>
   <string name="decryption_failed">Zašifrování se nezdařilo. Možná nemáte správný privátní klíč.</string>
   <string name="openkeychain_required">OpenKeychain</string>
@@ -98,8 +95,6 @@
   <string name="no_pgp_keys">Nebyly nalezeny žádné OpenPGP klíče</string>
   <string name="contacts_have_no_pgp_keys">Není možné zašifrovat zprávy v aplikaci Konverzace, protože kontakty neoznamují svůj veřejný klíč.\n\n<small>Požádejte své kontakty ať si nastaví OpenPGP.</small></string>
   <string name="encrypted_message_received"><i>Byla přijata šifrovaná zpráva. Ťukni pro dešifrování a přečtení.</i></string>
-    <string name="encrypted_image_received"><i>Byl přijat šifrovaný obrázek. Ťukni pro dešifrování a prohlédnutí.</i></string>
-    <string name="image_file"><i>Byl přijat obrázek. Ťukni pro prohlédnutí</i></string>
   <string name="pref_general">Obecné</string>
   <string name="pref_xmpp_resource">XMPP zdroj</string>
   <string name="pref_xmpp_resource_summary">Jméno se kterým se tento klient identifikuje</string>
@@ -273,7 +268,6 @@
   <string name="pref_dont_save_encrypted">Neukládat šifrované zprávy</string>
   <string name="pref_dont_save_encrypted_summary">Varování: Toto může vést ke ztrátě zpráv</string>
   <string name="pref_enable_legacy_ssl">Povolit zastaralé SSL</string>
-    <string name="pref_enable_legacy_ssl_summary">Povolí SSLv3 podporu pro zastaralé servery. Varování: SSLv3 není již považováno za bezpečné.</string>
   <string name="pref_expert_options">Expertní nastavení</string>
   <string name="pref_expert_options_summary">S tímto zacházejte velmi opatrně</string>
   <string name="title_activity_about">O aplikaci Conversations</string>
@@ -332,7 +326,6 @@
   <string name="smp_requested">Kontakt zažádal o ověření SMP</string>
   <string name="no_otr_session_found">Nebylo nalezeno platné OTR sezení!</string>
   <string name="conversations_foreground_service">Conversations</string>
-    <string name="touch_to_disable">Ťukni pro vypnutí služby v popředí</string>
   <string name="pref_keep_foreground_service">Ponechat službu v popředí</string>
   <string name="pref_keep_foreground_service_summary">Zamezit operačnímu systému v ukončení připojení</string>
   <string name="choose_file">Vybrat soubor</string>
@@ -410,8 +403,6 @@
   <string name="pref_input_options">Nastavení zadávání</string>
   <string name="pref_enter_is_send">Enter odesílá</string>
   <string name="pref_enter_is_send_summary">Použít klávesu enter pro odesílání zpráv</string>
-	<string name="audio">zvukový soubor</string>
-	<string name="video">video soubor</string>
   <string name="pdf_document">dokument PDF</string>
   <string name="received_x_file">%s přijat</string>
 </resources>

src/main/res/values-de/strings.xml

@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <resources>
   <string name="action_settings">Einstellungen</string>
   <string name="action_add">Neue Unterhaltung</string>
@@ -28,8 +28,8 @@
   <string name="minute_ago">vor einer Minute</string>
   <string name="minutes_ago">vor %d Minuten</string>
   <string name="unread_conversations">ungelesene Unterhaltungen</string>
-    <string name="sending">Senden&#8230;</string>
-    <string name="encrypted_message">Entschlüssele Nachricht. Bitte warten&#8230;</string>
+  <string name="sending">Senden…</string>
+  <string name="encrypted_message">Entschlüssele Nachricht. Bitte warten…</string>
   <string name="nick_in_use">Nickname wird bereits verwendet</string>
   <string name="admin">Administrator</string>
   <string name="owner">Eigentümer</string>
@@ -45,7 +45,7 @@
   <string name="remove_bookmark_text">Möchtest du das Lesezeichen %s entfernen? Die Unterhaltung mit diesem Lesezeichen wird dabei nicht entfernt.</string>
   <string name="register_account">Neues Konto auf dem Server erstellen</string>
   <string name="change_password_on_server">Passwort ändern</string>
-    <string name="share_with">Teile mit&#8230;</string>
+  <string name="share_with">Teile mit…</string>
   <string name="start_conversation">Beginne Unterhaltung</string>
   <string name="invite_contact">Kontakt einladen</string>
   <string name="contacts">Kontakte</string>
@@ -70,7 +70,6 @@
   <string name="add_contact">Kontakt hinzufügen</string>
   <string name="send_failed">Zustellung nicht erfolgreich</string>
   <string name="send_rejected">abgelehnt</string>
-    <string name="receiving_image">Empfange Bild (%1$d%% heruntergeladen)</string>
   <string name="preparing_image">Bereite Bild für die Übertragung vor</string>
   <string name="action_clear_history">Verlauf löschen</string>
   <string name="clear_conversation_history">Unterhaltungsverlauf löschen</string>
@@ -83,27 +82,24 @@
   <string name="send_pgp_message">OpenPGP-verschlüsselt schreiben</string>
   <string name="your_nick_has_been_changed">Dein Nickname wurde geändert</string>
   <string name="download_image">Bild herunterladen</string>
-    <string name="image_offered_for_download"><i>Bilddatei zum Download angeboten</i></string>
   <string name="send_unencrypted">Unverschlüsselt verschicken</string>
   <string name="decryption_failed">Entschlüsselung fehlgeschlagen. Vielleicht hast du nicht den richtigen privaten Schlüssel.</string>
   <string name="openkeychain_required">OpenKeychain</string>
   <string name="openkeychain_required_long">Conversations benutzt eine Drittanwendung namens <b>OpenKeychain</b>, um Nachrichten zu ver- und entschlüsseln und um deine Schlüssel zu verwalten.\n\nOpenKeychain ist GPLv3-lizenziert und kann über F-Droid oder Google Play bezogen werden.\n\n<small>(Bitte starte Conversations danach neu.)</small></string>
   <string name="restart">Neustarten</string>
   <string name="install">Installieren</string>
-    <string name="offering">angeboten&#8230;</string>
-    <string name="waiting">warten&#8230;</string>
+  <string name="offering">angeboten…</string>
+  <string name="waiting">warten…</string>
   <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 sag deinen Kontakten, sie mögen OpenPGP einrichten.</small></string>
   <string name="encrypted_message_received"><i>Verschlüsselte Nachricht erhalten. Drücke hier, um sie anzuzeigen und zu entschlüsseln.</i></string>
-    <string name="encrypted_image_received"><i>Verschlüsseltes Bild erhalten. Drücke hier, um es anzuzeigen und zu entschlüsseln.</i></string>
-    <string name="image_file"><i>Bild erhalten. Drücke hier, um es anzuzeigen.</i></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>
   <string name="pref_accept_files">Dateiannahme</string>
-    <string name="pref_accept_files_summary">Dateien, die kleiner sind als &#8230;, automatisch annehmen</string>
+  <string name="pref_accept_files_summary">Dateien, die kleiner sind als …, automatisch annehmen</string>
   <string name="pref_notification_settings">Benachrichtigungen</string>
   <string name="pref_notifications">Benachrichtigungen</string>
   <string name="pref_notifications_summary">Benachrichtige mich, wenn eine neue Nachricht ankommt</string>
@@ -119,7 +115,7 @@
   <string name="pref_never_send_crash">Sende niemals Absturzberichte</string>
   <string name="pref_never_send_crash_summary">Wenn du Absturzberichte einschickst, hilfst du Conversations stetig zu verbessern</string>
   <string name="pref_confirm_messages">Lesebestätigung senden</string>
-    <string name="pref_confirm_messages_summary">Informiere deine Kontakte, wenn du eine Nachricht empfängst oder liest</string>
+  <string name="pref_confirm_messages_summary">Informiere deine Kontakte, wenn du eine Nachricht empfangen und gelesen hast</string>
   <string name="pref_ui_options">Benutzeroberfläche</string>
   <string name="openpgp_error">Fehler mit OpenKeychain</string>
   <string name="error_decrypting_file">Fehler beim Entschlüsseln der Datei</string>
@@ -238,7 +234,7 @@
   <string name="publish">Veröffentlichen</string>
   <string name="touch_to_choose_picture">Hier klicken, um einen Avatar auszuwählen</string>
   <string name="publish_avatar_explanation">Achtung: Jeder, der deinen Status sehen darf, sieht auch deinen Avatar.</string>
-    <string name="publishing">Veröffentliche&#8230;</string>
+  <string name="publishing">Veröffentliche…</string>
   <string name="error_publish_avatar_server_reject">Der Server hat die Veröffentlichung des Avatars abgelehnt.</string>
   <string name="error_publish_avatar_converting">Bei der Konvertierung des Avatars lief etwas schief.</string>
   <string name="error_saving_avatar">Kann Avatar nicht speichern.</string>
@@ -272,7 +268,6 @@
   <string name="pref_dont_save_encrypted">Verschlüsselte Nachrichten nicht speichern</string>
   <string name="pref_dont_save_encrypted_summary">Achtung: kann zu Nachrichtenverlust führen</string>
   <string name="pref_enable_legacy_ssl">Alte SSL-Version aktivieren</string>
-    <string name="pref_enable_legacy_ssl_summary">Aktiviert SSLv3-Unterstützung für alte Server. Achtung: SSLv3 ist unsicher.</string>
   <string name="pref_expert_options">Einstellungen für Experten</string>
   <string name="pref_expert_options_summary">Hier bitte vorsichtig sein</string>
   <string name="title_activity_about">Über Conversations</string>
@@ -285,9 +280,9 @@
   <string name="pref_use_larger_font">Schrift vergrößern</string>
   <string name="pref_use_larger_font_summary">Größere Schrift verwenden</string>
   <string name="pref_use_send_button_to_indicate_status">Absende-Knopf zeigt Online-Status an</string>
-    <string name="pref_use_send_button_to_indicate_status_summary">Absende-Knopf einfärben, um den Online-Status des Kontakts zu signalisieren</string>
   <string name="pref_use_indicate_received">Anfrage für Nachrichten Empfang</string>
   <string name="pref_use_indicate_received_summary">Empfangene Nachrichten werden mit einem grünen Häkchen markiert. Bitte beachte, dass dies nicht in allen Fällen funktioniert.</string>
+  <string name="pref_use_send_button_to_indicate_status_summary">Absende-Knopf einfärben, um den Online-Status des Kontakts zu signalisieren</string>
   <string name="pref_expert_options_other">Sonstiges</string>
   <string name="pref_conference_name">Konferenz-Name</string>
   <string name="pref_conference_name_summary">Konferenz-Thema statt Raum-JID als Namen verwenden</string>
@@ -302,7 +297,6 @@
   <string name="check_image_filesize">Bildgröße prüfen</string>
   <string name="message_options">Nachrichtenoptionen</string>
   <string name="copy_text">Text kopieren</string>
-    <string name="share_image">Bild teilen</string>
   <string name="copy_original_url">Original-URL kopieren</string>
   <string name="send_again">Erneut senden</string>
   <string name="image_url">Bild-URL</string>
@@ -332,16 +326,15 @@
   <string name="smp_requested">Kontakt fordert eine Überprüfung an</string>
   <string name="no_otr_session_found">Keine gültige OTR Sitzung gefunden!</string>
   <string name="conversations_foreground_service">Conversations</string>
-    <string name="touch_to_disable">Berühren, um den Vordergrund-Dient zu deaktiveren.</string>
   <string name="pref_keep_foreground_service">Den Dienst im Vordergrund ausführen.</string>
   <string name="pref_keep_foreground_service_summary">Verhindert, dass Android die Verbindung unterbricht</string>
   <string name="choose_file">Datei auswählen</string>
-    <string name="receiving_file">Empfange %1$s Datei (%2$d%% heruntergeladen)</string>
-    <string name="open_file">Öffne %s Datei</string>
+  <string name="receiving_x_file">Empfange  %1$s (%2$d%% abgeschlossen)</string>
+  <string name="download_x_file">Lade %s herunter</string>
+  <string name="open_x_file">Öffne %s</string>
   <string name="sending_file">Sende (%1$d%% gesendet)</string>
   <string name="preparing_file">Bereite Datei für die Übertragung vor</string>
-    <string name="file_offered_for_download">Datei zum Download angeboten</string>
-    <string name="file">%s Datei</string>
+  <string name="x_file_offered_for_download">%s zum Herunterladen angeboten</string>
   <string name="cancel_transmission">Datei-Übertragung abbrechen</string>
   <string name="file_transmission_failed">Datei-Übertragung fehlgeschlagen</string>
   <string name="file_deleted">Datei wurde gelöscht</string>
@@ -352,7 +345,7 @@
   <string name="pref_show_dynamic_tags">Dynamische Tags anzeigen</string>
   <string name="pref_show_dynamic_tags_summary">Zeige schreibgeschützte Tags unterhalb der Kontakte</string>
   <string name="enable_notifications">Aktiviere Benachrichtigungen</string>
-    <string name="conference_with">Starte Konferenz mit&#8230;</string>
+  <string name="conference_with">Starte Konferenz mit…</string>
   <string name="no_conference_server_found">Konferenz-Server kann nicht gefunden werden</string>
   <string name="conference_creation_failed">Starten der Konferenz fehlgeschlagen!</string>
   <string name="conference_created">Konferenz erstellt!</string>
@@ -362,7 +355,7 @@
   <string name="copy_otr_clipboard_description">OTR-Fingerabdruck in Zwischenablage kopieren</string>
   <string name="fetching_history_from_server">Lade Chatverlauf</string>
   <string name="no_more_history_on_server">Keine weiteren Nachrichten vorhanden</string>
-    <string name="updating">Aktualisiere&#8230;</string>
+  <string name="updating">Aktualisiere…</string>
   <string name="password_changed">Passwort geändert.</string>
   <string name="could_not_change_password">Passwort kann nicht geändert werden.</string>
   <string name="otr_session_not_started">Sende eine Nachricht, um eine verschlüsselte Unterhaltung zu beginnen</string>
@@ -389,16 +382,27 @@
   <string name="grant_admin_privileges">Administratorrechte gewähren</string>
   <string name="remove_admin_privileges">Administratorrechte entziehen</string>
   <string name="remove_from_room">Aus Konferenz entfernen</string>
-    <string name="could_not_change_affiliation">Zugehörigkeit von %s konnte nicht verändernd werden</string>
-    <string name="ban_from_conference">Von Konferenz ausschließen.</string>
-    <string name="removing_from_public_conference">Du versuchst %s aus einer öffentlichen Konferenz zu entfernen. Die einzige Möglichkeit, dies dauerhaft zu tun, ist den Kontakt aus dieser Konferenz zu verbannen.</string>
+  <string name="could_not_change_affiliation">Zugehörigkeit von %s konnte nicht verändert werden</string>
+  <string name="ban_from_conference">Von Konferenz ausschließen</string>
+  <string name="removing_from_public_conference">Du versuchst %s aus einer öffentlichen Konferenz zu entfernen. Die einzige Möglichkeit, dies dauerhaft zu tun, ist den Kontakt von dieser Konferenz auszuschließen.</string>
   <string name="ban_now">Kontakt ausschließen</string>
   <string name="could_not_change_role">Rolle von %s konnte nicht geändert werden</string>
-	<string name="public_conference">Das ist eine öffentlich zugängliche Konferenz</string>
-	<string name="private_conference">Das ist eine private Konferenz nur für Mitglieder</string>
+  <string name="public_conference">Öffentlich zugängliche Konferenz</string>
+  <string name="private_conference">Private Konferenz nur für Mitglieder</string>
   <string name="conference_options">Konferenzoptionen</string>
   <string name="members_only">Privat (Nur für Mitglieder)</string>
   <string name="non_anonymous">De-anonymisiert</string>
   <string name="modified_conference_options">Konferenzoptionen wurden modifiziert!</string>
   <string name="could_not_modify_conference_options">Konferenzoptionen konnten nicht modifiziert werden</string>
+  <string name="never">Niemals</string>
+  <string name="thirty_minutes">30 Minuten</string>
+  <string name="one_hour">1 Stunde</string>
+  <string name="two_hours">2 Stunden</string>
+  <string name="eight_hours">8 Stunden</string>
+  <string name="until_further_notice">Bis auf weiters</string>
+  <string name="pref_input_options">Eingabeoptionen</string>
+  <string name="pref_enter_is_send">Eingabetaste sendet Nachricht</string>
+  <string name="pref_enter_is_send_summary">Benutze die Eingabetaste zum Senden einer Nachricht</string>
+  <string name="pdf_document">PDF-Dokument</string>
+  <string name="received_x_file">%s empfangen</string>
 </resources>

src/main/res/values-es/strings.xml

@@ -1,6 +1,5 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <resources>
-
   <string name="action_settings">Ajustes</string>
   <string name="action_add">Nueva conversación</string>
   <string name="action_accounts">Gestionar cuentas</string>
@@ -10,8 +9,8 @@
   <string name="action_secure">Conversación segura</string>
   <string name="action_add_account">Añadir cuenta</string>
   <string name="action_edit_contact">Editar contacto</string>
-    <string name="action_delete_contact">Eliminar contacto de la lista</string>
   <string name="action_add_phone_book">Añadir a contactos del teléfono</string>
+  <string name="action_delete_contact">Eliminar contacto de la lista</string>
   <string name="action_block_contact">Bloquear contacto</string>
   <string name="action_unblock_contact">Desbloquear contacto</string>
   <string name="action_block_domain">Bloquear dominio</string>
@@ -20,17 +19,17 @@
   <string name="title_activity_settings">Ajustes</string>
   <string name="title_activity_conference_details">Detalles de Conversación en grupo</string>
   <string name="title_activity_contact_details">Detalles del Contacto</string>
-    <string name="title_activity_conversations">Conversations</string>
+  <string name="title_activity_conversations">Conversaciones</string>
   <string name="title_activity_sharewith">Compartir con Conversación</string>
   <string name="title_activity_start_conversation">Nueva Conversación</string>
-    <string name="title_activity_choose_contact">Elegir Contacto</string>
+  <string name="title_activity_choose_contact">Elegir contacto</string>
   <string name="title_activity_block_list">Lista contactos bloqueados</string>
   <string name="just_now">ahora</string>
   <string name="minute_ago">hace 1 min</string>
   <string name="minutes_ago">hace %d min</string>
   <string name="unread_conversations">conversaciones por leer</string>
-    <string name="sending">enviando&#8230;</string>
-    <string name="encrypted_message">Desencriptando mensaje. Espera por favor&#8230;</string>
+  <string name="sending">enviando…</string>
+  <string name="encrypted_message">Descifrando mensaje. Espera por favor…</string>
   <string name="nick_in_use">El apodo ya está en uso</string>
   <string name="admin">Administrador</string>
   <string name="owner">Propietario</string>
@@ -45,10 +44,10 @@
   <string name="contact_blocked">Contacto bloqueado</string>
   <string name="remove_bookmark_text">¿Quieres eliminar %s de tus marcadores? La conversación asociada con este marcador no se eliminará.</string>
   <string name="register_account">Registrar nueva cuenta en servidor</string>
-    <string name="change_password_on_server">Cambiar contraseña</string>
-    <string name="share_with">Compartir con</string>
+  <string name="change_password_on_server">Cambiar contraseña en servidor</string>
+  <string name="share_with">Compartir con...</string>
   <string name="start_conversation">Comenzar conversación</string>
-    <string name="invite_contact">Invitar contactos</string>
+  <string name="invite_contact">Invitar contacto</string>
   <string name="contacts">Contactos</string>
   <string name="cancel">Cancelar</string>
   <string name="set">Establecer</string>
@@ -67,11 +66,10 @@
   <string name="problem_connecting_to_accounts">No se ha podido conectar a múltiples cuentas</string>
   <string name="touch_to_fix">Pulsa aquí para gestionar tus cuentas</string>
   <string name="attach_file">Adjuntar</string>
-    <string name="not_in_roster">El contacto no está en tu lista. ¿Te gustaría añadirlo?</string>
+  <string name="not_in_roster">El contacto no está en tu lista. ¿Quieres añadirlo?</string>
   <string name="add_contact">Añadir contacto</string>
   <string name="send_failed">Error al enviar</string>
   <string name="send_rejected">rechazado</string>
-    <string name="receiving_image">Recibiendo archivo de imagen. Espera por favor&#8230;</string>
   <string name="preparing_image">Preparando imagen para enviar</string>
   <string name="action_clear_history">Limpiar historial</string>
   <string name="clear_conversation_history">Limpiar historial de conversación</string>
@@ -84,27 +82,24 @@
   <string name="send_pgp_message">Enviar mensaje cifrado con OpenPGP</string>
   <string name="your_nick_has_been_changed">Tu apodo se ha modificado</string>
   <string name="download_image">Descargar imagen</string>
-    <string name="image_offered_for_download"><i>Archivo de imagen ofrecido para descarga</i></string>
-    <string name="send_unencrypted">Enviar sin encriptar</string>
-    <string name="decryption_failed">Falló la desencriptación. Tal vez no tengas la clave privada apropiada.</string>
+  <string name="send_unencrypted">Enviar sin cifrar</string>
+  <string name="decryption_failed">Falló el descifrado. Tal vez no tengas la clave privada apropiada.</string>
   <string name="openkeychain_required">OpenKeychain</string>
-    <string name="openkeychain_required_long">Conversations utiliza una aplicación de terceros llamada <b>OpenKeychain</b> para encriptar y desencriptar mensajes y gestionar tus claves públicas.\n\nOpenKeychain está publicado bajo licencia GPLv3 y disponible on F-Droid y Google Play.\n\n<small>(Por favor, reinicie Conversations después.)</small></string>
+  <string name="openkeychain_required_long">Conversations utiliza una aplicación de terceros llamada <b>OpenKeychain</b> para cifrar y descifrar mensajes y gestionar tus claves públicas.\n\nOpenKeychain está publicado bajo licencia GPLv3 y disponible on F-Droid y Google Play.\n\n<small>(Por favor, reinicie Conversations después.)</small></string>
   <string name="restart">Reiniciar</string>
   <string name="install">Instalar</string>
-    <string name="offering">ofreciendo&#8230;</string>
-    <string name="waiting">esperando&#8230;</string>
+  <string name="offering">ofreciendo…</string>
+  <string name="waiting">esperando…</string>
   <string name="no_pgp_key">Clave OpenPGP no encontrada</string>
-    <string name="contact_has_no_pgp_key">Conversations no ha podido encriptar tus mensajes porque el contacto no está anunciando su clave publica.\n\n<small>Por favor, pide a tu contacto que configure OpenPGP.</small></string>
+  <string name="contact_has_no_pgp_key">Conversations no ha podido cifrar tus mensajes porque tu contacto no está anunciando su clave publica.\n\n<small>Por favor, pide a tu contacto que configure OpenPGP.</small></string>
   <string name="no_pgp_keys">Claves OpenPGP no encontradas</string>
-    <string name="contacts_have_no_pgp_keys">Conversations no ha podido encriptar tus mensajes porque tus contactos no están anunciando su clave publica.\n\n<small>Por favor, pide a tus contactos que configuren OpenPGP.</small></string>
+  <string name="contacts_have_no_pgp_keys">Conversations no ha podido cifrar tus mensajes porque tus contactos no están anunciando su clave publica.\n\n<small>Por favor, pide a tus contactos que configuren OpenPGP.</small></string>
   <string name="encrypted_message_received"><i>Mensaje cifrado recibido. Pulsa para ver.</i></string>
-    <string name="encrypted_image_received"><i>Imagen encriptada recibida. Pulsa para ver.</i></string>
-    <string name="image_file"><i>Imagen recibida. Pulsa para ver</i></string>
   <string name="pref_general">General</string>
   <string name="pref_xmpp_resource">Recurso</string>
   <string name="pref_xmpp_resource_summary">El nombre que identifica el cliente que estás utilizando</string>
   <string name="pref_accept_files">Aceptar archivos</string>
-    <string name="pref_accept_files_summary">De forma automática aceptar archivos menores que&#8230;</string>
+  <string name="pref_accept_files_summary">De forma automática aceptar archivos menores que…</string>
   <string name="pref_notification_settings">Ajustes de notificación</string>
   <string name="pref_notifications">Notificaciones</string>
   <string name="pref_notifications_summary">Notifica cuando llega un nuevo mensaje</string>
@@ -113,7 +108,7 @@
   <string name="pref_sound">Sonido</string>
   <string name="pref_sound_summary">Reproduce tono con la notificación</string>
   <string name="pref_conference_notifications">Notif. conversación grupo</string>
-    <string name="pref_conference_notifications_summary">Siempre notifica cuando llega un mensaje a una conversación en grupo y no solo cuando llega un mensaje destacado</string>
+  <string name="pref_conference_notifications_summary">Siempre notifica cuando llega un mensaje a una conversación en grupo y no solo cuando alguien menciona tu nombre en un mensaje</string>
   <string name="pref_notification_grace_period">Notificaciones Carbons</string>
   <string name="pref_notification_grace_period_summary">Deshabilita las notificaciones durante un corto periodo de tiempo después de recibir la copia del mensaje carbon</string>
   <string name="pref_advanced_options">Opciones avanzadas</string>
@@ -123,7 +118,7 @@
   <string name="pref_confirm_messages_summary">Permitir a tus contactos saber cuando recibes y lees un mensaje</string>
   <string name="pref_ui_options">Opciones de interfaz</string>
   <string name="openpgp_error">OpenKeychain reportó un error</string>
-    <string name="error_decrypting_file">Error desencriptando fichero</string>
+  <string name="error_decrypting_file">Error descifrando archivo</string>
   <string name="accept">Aceptar</string>
   <string name="error">Ha ocurrido un error</string>
   <string name="pref_grant_presence_updates">Suscripción de presencia</string>
@@ -136,12 +131,12 @@
   <string name="ask_for_presence_updates">Solicitar actualizaciones de presencia</string>
   <string name="attach_choose_picture">Seleccionar imagen</string>
   <string name="attach_take_picture">Hacer foto</string>
-    <string name="preemptively_grant">De forma automática conceder solicitud de suscripción</string>
+  <string name="preemptively_grant">De forma automática conceder suscripción de presencia</string>
   <string name="error_not_an_image_file">El archivo seleccionado no es una imagen</string>
   <string name="error_compressing_image">Error comprimiendo el archivo de imagen</string>
   <string name="error_file_not_found">Archivo no encontrado</string>
-    <string name="error_io_exception">Error general. ¿Puede que no tengas espacio en disco?</string>
-    <string name="error_security_exception_during_image_copy">La aplicación que usas para seleccionar imágenes no proporciona suficientes permisos para leer el archivo.\n\n<small>Utiliza un explorador de ficheros diferente para seleccionar la imagen</small></string>
+  <string name="error_io_exception">Error general. ¿Es posible que no tengas espacio en disco?</string>
+  <string name="error_security_exception_during_image_copy">La aplicación que usas para seleccionar esta imagen no proporciona suficientes permisos para leer el archivo.\n\n<small>Utiliza un explorador de archivos diferente para seleccionar la imagen</small></string>
   <string name="account_status_unknown">Desconocido</string>
   <string name="account_status_disabled">Deshabilitado temporalmente</string>
   <string name="account_status_online">Conectado</string>
@@ -175,9 +170,9 @@
   <string name="password">Contraseña</string>
   <string name="confirm_password">Confirmar contraseña</string>
   <string name="passwords_do_not_match">Las contraseñas no coinciden</string>
-    <string name="invalid_jid">El identificador no es un identificador de Jabber válido</string>
+  <string name="invalid_jid">El identificador no es un identificador Jabber válido</string>
   <string name="error_out_of_memory">Sin memoria. La imagen es demasiado grande</string>
-    <string name="add_phone_book_text">¿Te gustaría añadir a %s a tus contactos del teléfono?</string>
+  <string name="add_phone_book_text">¿Quieres añadir a %s a tus contactos del teléfono?</string>
   <string name="contact_status_online">Disponible</string>
   <string name="contact_status_free_to_chat">Hablador</string>
   <string name="contact_status_away">Ausente</string>
@@ -205,14 +200,14 @@
   <string name="last_seen_day">Visto última vez hace 1 día</string>
   <string name="last_seen_days">Visto última vez hace %d días</string>
   <string name="never_seen">Nunca visto</string>
-    <string name="install_openkeychain">Mensaje cifrado. Por favor instala OpenKeychain para desencriptar.</string>
+  <string name="install_openkeychain">Mensaje cifrado. Por favor instala OpenKeychain para descifrar.</string>
   <string name="unknown_otr_fingerprint">Huella digital OTR desconocida</string>
   <string name="openpgp_messages_found">Encontrado mensaje cifrado con OpenPGP</string>
   <string name="reception_failed">Error al recibir</string>
   <string name="your_fingerprint">Tu huella digital</string>
   <string name="otr_fingerprint">Huella digital OTR</string>
   <string name="verify">Verificar</string>
-    <string name="decrypt">Desencriptar</string>
+  <string name="decrypt">Descifrar</string>
   <string name="conferences">Conversación Grupo</string>
   <string name="search">Buscar</string>
   <string name="create_contact">Crear Contacto</string>
@@ -239,7 +234,7 @@
   <string name="publish">Publicar</string>
   <string name="touch_to_choose_picture">Pulsa para seleccionar una imagen de la galería</string>
   <string name="publish_avatar_explanation">Nota: Todos tus contactos podrán ver esta imagen.</string>
-    <string name="publishing">Publicando&#8230;</string>
+  <string name="publishing">Publicando…</string>
   <string name="error_publish_avatar_server_reject">El servidor rechazó la publicación</string>
   <string name="error_publish_avatar_converting">Se ha producido un error mientras se convertía la imagen</string>
   <string name="error_saving_avatar">No se ha podido guardar la imagen de perfil en disco</string>
@@ -258,7 +253,7 @@
   <string name="disable_notifications_for_this_conversation">Deshabilitar notificaciones para esta conversación</string>
   <string name="notifications_disabled">Las notificaciones están deshabilitadas</string>
   <string name="enable">Habilitar</string>
-    <string name="conference_requires_password">La conversación en grupo requiere contraseña</string>
+  <string name="conference_requires_password">Esta conversación requiere contraseña</string>
   <string name="enter_password">Introduce la contraseña</string>
   <string name="missing_presence_updates">Suscripción de actualizaciones de presencia del contacto perdida</string>
   <string name="request_presence_updates">Por favor, solicita la suscripción de presencia a tu contacto primero.\n\n<small>Esto será usado para determinar qué cliente(s) está usando tu contacto.</small></string>
@@ -267,13 +262,12 @@
   <string name="sure_delete_fingerprint">¿Estás seguro de que quieres eliminar esta huella digital OTR?</string>
   <string name="ignore">Ignorar</string>
   <string name="without_mutual_presence_updates"><b>Aviso:</b> Enviando esto sin suscripción de presencia por ambas partes podría causar problemas inesperados.\n\n<small>Verficia la suscripción de presencia en detalles del contacto.</small></string>
-    <string name="pref_encryption_settings">Ajustes de encriptación</string>
+  <string name="pref_encryption_settings">Ajustes de cifrado</string>
   <string name="pref_force_encryption">Forzar cifrado end-to-end</string>
   <string name="pref_force_encryption_summary">Siempre enviar mensajes cifrados (excepto para conversaciones en grupo)</string>
   <string name="pref_dont_save_encrypted">No guardar mensajes cifrados</string>
   <string name="pref_dont_save_encrypted_summary">Aviso: Esto podría llevar a pérdida de mensajes</string>
   <string name="pref_enable_legacy_ssl">Habilitar SSL heredado</string>
-    <string name="pref_enable_legacy_ssl_summary">Habilita soporte SSLv3 para servidores heredados. Advertencia: SSLv3 se considera no seguro.</string>
   <string name="pref_expert_options">Ajustes avanzados</string>
   <string name="pref_expert_options_summary">Por favor, cuidado con estas opciones</string>
   <string name="title_activity_about">Acerca de Conversations</string>
@@ -303,7 +297,6 @@
   <string name="check_image_filesize">Comprobar el tamaño del archivo de imagen</string>
   <string name="message_options">Opciones de mensaje</string>
   <string name="copy_text">Copiar texto</string>
-    <string name="share_image">Compartir imagen</string>
   <string name="copy_original_url">Copiar URL original</string>
   <string name="send_again">Volver a enviar</string>
   <string name="image_url">URL Imagen</string>
@@ -329,20 +322,19 @@
   <string name="secrets_do_not_match">Los secretos no coinciden</string>
   <string name="try_again">Intentar de nuevo</string>
   <string name="finish">Terminar</string>
-    <string name="verified">Verificado!</string>
+  <string name="verified">¡Verificado!</string>
   <string name="smp_requested">El contacto solicita verificación SMP</string>
   <string name="no_otr_session_found">¡No se ha encontrado una sesión OTR válida!</string>
   <string name="conversations_foreground_service">Conversations</string>
-    <string name="touch_to_disable">Pulsa para deshabilitar servicio en primer plano</string>
   <string name="pref_keep_foreground_service">Servicio en primer plano</string>
   <string name="pref_keep_foreground_service_summary">Mantener el servicio en primer plano previene que el sistema cierre la conexión</string>
   <string name="choose_file">Seleccionar archivo</string>
-    <string name="receiving_file">Recibiendo archivo %1$s (%2$d%% completado)</string>
-    <string name="open_file">Abrir archivo %s</string>
+  <string name="receiving_x_file">Recibiendo %1$s (%2$d%% completado)</string>
+  <string name="download_x_file">Descargar %s</string>
+  <string name="open_x_file">Abrir %s</string>
   <string name="sending_file">Enviando (%1$d%% completado)</string>
   <string name="preparing_file">Preparando transferencia de archivo</string>
-    <string name="file_offered_for_download">Archivo ofrecido para descarga</string>
-    <string name="file">Archivo %s</string>
+  <string name="x_file_offered_for_download">%s ofrecido para descarga</string>
   <string name="cancel_transmission">Cancelar transferencia</string>
   <string name="file_transmission_failed">falló la transferencia del archivo</string>
   <string name="file_deleted">El archivo ha sido eliminado</string>
@@ -368,8 +360,8 @@
   <string name="could_not_change_password">No se puede cambiar la contraseña</string>
   <string name="otr_session_not_started">Enviar mensaje para empezar una conversación cifrada</string>
   <string name="ask_question">Haz una pregunta</string>
-    <string name="smp_explain_question">Si tu contacto y tú tenéis un secreto en común que nadie más sabe (como una broma o simplemente lo que tomasteis para comer la última vez que os visteis) podéis usar ese secreto para verificar la huella digital de cada uno.\n\nPuedes usar una sugerencia o pregunta para hacer a tu contacto que deberá responder distinguiendo mayúsculas y minúsculas.</string>
-    <string name="smp_explain_answer">Tu contacto quiere verificar tu huella digital a través de un secreto compartido. Tu contacto te hace la siguiente sugerencia o pregunta para ese secreto.</string>
+  <string name="smp_explain_question">Si tu contacto y tú tenéis un secreto en común que nadie más sabe (como un pequeño juego o broma o simplemente lo que tomasteis para comer la última vez os visteis) podéis usar ese secreto para verificar la huella digital de cada uno.\n\nPuedes usar una sugerencia o pregunta para hacer a tu contacto que deberá responder distinguiendo mayúsculas y minúsculas.</string>
+  <string name="smp_explain_answer">Tu contacto quiere verificar tu huella digital a través de un secreto compartido. Te hace la siguiente sugerencia o pregunta para ese secreto.</string>
   <string name="shared_secret_hint_should_not_be_empty">La pregunta no puede ser vacía</string>
   <string name="shared_secret_can_not_be_empty">El secreto compartido no puede ser vacío</string>
   <string name="manual_verification_explanation">Compara detenidamente la huella digital mostrada abajo con la de tu contacto.\nPuedes usar cualquier forma de comunicación segura como un correo electrónico cifrado o conversación telefónica para verificarlo.</string>
@@ -385,4 +377,32 @@
   <string name="outcast">Rechazado</string>
   <string name="member">Miembro</string>
   <string name="advanced_mode">Modo avanzado</string>
+  <string name="grant_membership">Convertir en miembro</string>
+  <string name="remove_membership">Revocar membresía</string>
+  <string name="grant_admin_privileges">Conceder privilegios de administrador</string>
+  <string name="remove_admin_privileges">Revocar privilegios de administrador</string>
+  <string name="remove_from_room">Expulsar de la conversación</string>
+  <string name="could_not_change_affiliation">No se puede cambiar la afiliación de %s</string>
+  <string name="ban_from_conference">Prohibir entrada en la conversación</string>
+  <string name="removing_from_public_conference">Estás intentando expulsar a %s de una conversación de acceso público. La única forma de hacer esto es prohibir su entrada para siempre.</string>
+  <string name="ban_now">Prohibir ahora</string>
+  <string name="could_not_change_role">No se puede cambiar el rol de %s</string>
+  <string name="public_conference">Conversación de acceso público</string>
+  <string name="private_conference">Conversación privada solo para miembros</string>
+  <string name="conference_options">Opciones de conversación en grupo</string>
+  <string name="members_only">Privada (solo miembros)</string>
+  <string name="non_anonymous">No anónima</string>
+  <string name="modified_conference_options">¡Modificadas las opciones de la conversación en grupo!</string>
+  <string name="could_not_modify_conference_options">No se pueden modificar las opciones de la conversación en grupo.</string>
+  <string name="never">Nunca</string>
+  <string name="thirty_minutes">30 minutos</string>
+  <string name="one_hour">1 hora</string>
+  <string name="two_hours">2 horas</string>
+  <string name="eight_hours">8 horas</string>
+  <string name="until_further_notice">Hasta nuevo aviso</string>
+  <string name="pref_input_options">Opciones de entrada</string>
+  <string name="pref_enter_is_send">Intro para enviar</string>
+  <string name="pref_enter_is_send_summary">Usar la tecla intro para enviar el mensaje</string>
+  <string name="pdf_document">documento PDF</string>
+  <string name="received_x_file">Recibido %s</string>
 </resources>

src/main/res/values-eu/strings.xml

@@ -1,6 +1,5 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <resources>
-
   <string name="action_settings">Ezarpenak</string>
   <string name="action_add">Elkarrizketa berria</string>
   <string name="action_accounts">Kontuak kudeatu</string>
@@ -12,6 +11,10 @@
   <string name="action_edit_contact">Izena editatu</string>
   <string name="action_add_phone_book">Telefono kontaktuetara gehitu</string>
   <string name="action_delete_contact">Zerrendatik ezabatu</string>
+  <string name="action_block_contact">Kontaktua blokeatu</string>
+  <string name="action_unblock_contact">Kontaktua desblokeatu</string>
+  <string name="action_block_domain">Domeinua blokeatu</string>
+  <string name="action_unblock_domain">Domeinua desblokeatu</string>
   <string name="title_activity_manage_accounts">Kontuak kudeatu</string>
   <string name="title_activity_settings">Ezarpenak</string>
   <string name="title_activity_conference_details">Konferentziaren xehetasunak</string>
@@ -20,12 +23,13 @@
   <string name="title_activity_sharewith">Elkarrizketa batekin partekatu</string>
   <string name="title_activity_start_conversation">Elkarrizketa hasi</string>
   <string name="title_activity_choose_contact">Kontaktua hautatu</string>
+  <string name="title_activity_block_list">Blokeatutakoen zerrenda</string>
   <string name="just_now">orain</string>
   <string name="minute_ago">min 1 lehenago</string>
   <string name="minutes_ago">%d min lehenago</string>
   <string name="unread_conversations">irakurri gabeko elkarrizketak</string>
-    <string name="sending">bidaltzen&#8230;</string>
-    <string name="encrypted_message">Mezua desenkriptatzen. Mesedez itxaron&#8230;</string>
+  <string name="sending">bidaltzen…</string>
+  <string name="encrypted_message">Mezua desenkriptatzen. Mesedez itxaron…</string>
   <string name="nick_in_use">Ezizena erabilita dagoeneko</string>
   <string name="admin">Administratzailea</string>
   <string name="owner">Jabea</string>
@@ -33,16 +37,25 @@
   <string name="participant">Parte-hartzailea</string>
   <string name="visitor">Bisitaria</string>
   <string name="remove_contact_text">%s zure zerrendatik ezabatu nahi duzu? Kontu honekin lotutako elkarrizketa ez da ezabatuko.</string>
+  <string name="block_contact_text">%s(e)k zuri mezuak bidaltzea blokeatu nahi al duzu?</string>
+  <string name="unblock_contact_text">%s desblokeatu eta zuri mezuak bidali ahal izatea onartu nahi al duzu?</string>
+  <string name="block_domain_text">%s(r)en kontaktu guztiak blokeatu?</string>
+  <string name="unblock_domain_text">%s(r)en kontaktu guztiak desblokeatu?</string>
+  <string name="contact_blocked">Kontaktua blokeatu da</string>
   <string name="remove_bookmark_text">%s laster-marka bezala ezabatu nahi duzu? Laster-marka honekin lotutako elkarrizketa ez da ezabatuko.</string>
   <string name="register_account">Kontu berria zerbitzarian erregistratu</string>
-    <string name="share_with">Honekin partekatu</string>
+  <string name="change_password_on_server">Pasahitza zerbitzarian aldatu</string>
+  <string name="share_with">Partekatu honekin...</string>
   <string name="start_conversation">Elkarrizketa hasi</string>
   <string name="invite_contact">Kontaktu bat gonbidatu</string>
   <string name="contacts">Kontaktuak</string>
   <string name="cancel">Utzi</string>
+  <string name="set">Ezarri</string>
   <string name="add">Gehitu</string>
   <string name="edit">Editatu</string>
   <string name="delete">Ezabatu</string>
+  <string name="block">Blokeatu</string>
+  <string name="unblock">Desblokeatu</string>
   <string name="save">Gorde</string>
   <string name="ok">Ados</string>
   <string name="crash_report_title">Conversations gelditu da</string>
@@ -57,8 +70,7 @@
   <string name="add_contact">Kontaktua gehitu</string>
   <string name="send_failed">huts bidaltzerakoan</string>
   <string name="send_rejected">ukatua</string>
-    <string name="receiving_image">Irudi fitxategia jasotzen. Mesedez itxaron&#8230;</string>
-    <string name="preparing_image">Irudia transmisiorako prestatzen. Mesedez itxaron&#8230;</string>
+  <string name="preparing_image">Irudia transmisiorako prestatzen. 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>
@@ -70,27 +82,24 @@
   <string name="send_pgp_message">OpenPGPz enkriptatutako mezua bidali</string>
   <string name="your_nick_has_been_changed">Zure ezizena aldatu da</string>
   <string name="download_image">Irudia deskargatu</string>
-    <string name="image_offered_for_download"><i>Irudi fitxategia deskargarako eskeinia</i></string>
   <string name="send_unencrypted">Enkriptatu gabe bidali</string>
   <string name="decryption_failed">Desenkriptazioak huts egin du. Agian ez duzu gako pribatu egokia.</string>
   <string name="openkeychain_required">OpenKeychain</string>
   <string name="openkeychain_required_long">Conversationsek <b>OpenKeychain</b> izeneko hirugarren app bat erabiltzen du mezuak enkriptatu eta desenkriptatzeko eta zure gako publikoak kudeatzeko.\n\nOpenKeychain GPLv3 lizentziapean dago eta F-Droid eta Google Playn eskura daiteke.\n\n<small>(Mesedez ondoren Conversations berrabiarazi)</small></string>
   <string name="restart">Berrabiarazi</string>
   <string name="install">Instalatu</string>
-    <string name="offering">eskeintzen&#8230;</string>
-    <string name="waiting">itxaroten&#8230;</string>
+  <string name="offering">eskeintzen…</string>
+  <string name="waiting">itxaroten…</string>
   <string name="no_pgp_key">Ez da OpenPGP gakorik aurkitu</string>
   <string name="contact_has_no_pgp_key">Conversations ez da zure mezuak enkriptatzeko gai zure kontaktua bere gako publikoa jakinarazten ez dagoelako.\n\n<small>Mesedez eskatu ezaiozu zure kontaktuari openPGP konfigura dezan.</small></string>
   <string name="no_pgp_keys">Ez da OpenPGP gakorik aurkitu</string>
   <string name="contacts_have_no_pgp_keys">Conversations ez da zure mezuak enkriptatzeko gai zure kontaktuak haien gako publikoa jakinarazten ez daudelako.\n\n<small>Mesedez eskatu ezaiezu zure kontakuei OpenPGP konfigura dezaten.</small></string>
   <string name="encrypted_message_received"><i>Enkriptatutako mezua jaso da. Ukitu ikusi eta desenkriptatzeko.</i></string>
-    <string name="encrypted_image_received"><i>Enkriptatutako irudia jaso da. Ukitu ikusi eta desenkriptatzeko.</i></string>
-    <string name="image_file"><i>Irudia jaso da. Ukitu ikusteko</i></string>
   <string name="pref_general">Orokorrak</string>
   <string name="pref_xmpp_resource">XMPP baliabidea</string>
   <string name="pref_xmpp_resource_summary">Bezero honek bere burua aurkezteko erabiltzen duen izena</string>
   <string name="pref_accept_files">Fitxategiak onartu</string>
-    <string name="pref_accept_files_summary">Hurrengo tamaina baino fitxategi txikiagoak automatikoki onartu&#8230;</string>
+  <string name="pref_accept_files_summary">Hurrengo tamaina baino fitxategi txikiagoak automatikoki onartu…</string>
   <string name="pref_notification_settings">Jakinarazpenen ezarpenak</string>
   <string name="pref_notifications">Jakinarazpenak</string>
   <string name="pref_notifications_summary">Mezu berri bat heltzerakoan jakinarazi</string>
@@ -172,20 +181,25 @@
   <string name="contact_status_offline">lineaz kanpo</string>
   <string name="muc_details_conference">Konferentzia</string>
   <string name="muc_details_other_members">Beste kideak</string>
+  <string name="server_info_show_more">Zerbitzariaren informazioa</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 (Profileko argazkiak)</string>
   <string name="server_info_available">eskuragarri</string>
   <string name="server_info_unavailable">ez eskuragarri</string>
   <string name="missing_public_keys">Gako publikoen iragarpenak faltan</string>
   <string name="last_seen_now">azkenengoz ikusia orain</string>
+  <string name="last_seen_min">azkenengoz ikusia minutu 1 lehenago</string>
   <string name="last_seen_mins">azkenengoz ikusia %d minutu lehenago</string>
+  <string name="last_seen_hour">azkenengoz ikusia ordu 1 lehenago</string>
   <string name="last_seen_hours">azkenengoz ikusia %d ordu lehenago</string>
+  <string name="last_seen_day">azkenengoz ikusia egun 1 lehenago</string>
   <string name="last_seen_days">azkenengoz ikusia %d egun lehenago</string>
   <string name="never_seen">inoiz ez ikusia</string>
-    <string name="last_seen_min">azkenengoz ikusia minutu 1 lehenago</string>
-    <string name="last_seen_hour">azkenengoz ikusia ordu 1 lehenago</string>
-    <string name="last_seen_day">azkenengoz ikusia egun 1 lehenago</string>
   <string name="install_openkeychain">Mezu enkriptatua. Mesedez instalatu OpenKeychain desenkriptatzeko.</string>
   <string name="unknown_otr_fingerprint">OTR hatz-marka ezezaguna</string>
   <string name="openpgp_messages_found">OpenPGPz enkriptatutako mezuak aurkitu dira</string>
@@ -200,6 +214,8 @@
   <string name="join_conference">Konferentziara batu</string>
   <string name="delete_contact">Kontaktua ezabatu</string>
   <string name="view_contact_details">Kontaktuaren xehetasunak ikusi</string>
+  <string name="block_contact">Kontaktua blokeatu</string>
+  <string name="unblock_contact">Kontaktua desblokeatu</string>
   <string name="create">Sortu</string>
   <string name="contact_already_exists">Kontaktua existitzen da dagoeneko</string>
   <string name="join">Batu</string>
@@ -218,7 +234,7 @@
   <string name="publish">Argitaratu</string>
   <string name="touch_to_choose_picture">Ukitu profileko argazkia irudi bat galeriatik hautatzeko</string>
   <string name="publish_avatar_explanation">Adi: Zure presentzia eguneraketetara harpidetutako edonork irudi hau ikusi ahal izango du.</string>
-    <string name="publishing">Argitaratzen&#8230;</string>
+  <string name="publishing">Argitaratzen…</string>
   <string name="error_publish_avatar_server_reject">Zerbitzariak zure argitarapena ukatu du</string>
   <string name="error_publish_avatar_converting">Zerbait oker joan da zure irudia bihurtzerakoan</string>
   <string name="error_saving_avatar">Ezin izan da profileko argazkia diskoan gorde</string>
@@ -252,11 +268,15 @@
   <string name="pref_dont_save_encrypted">Ez gorde enkriptatutako mezuak</string>
   <string name="pref_dont_save_encrypted_summary">Adi: Honek mezuen galera ekar lezake</string>
   <string name="pref_enable_legacy_ssl">Oinordetutako SSL gaitu</string>
-    <string name="pref_enable_legacy_ssl_summary">SSLv3 gaitzen du oinordetutako zerbitzarietarako. Adi: SSLv3 ez segurutzat hartzen da.</string>
   <string name="pref_expert_options">Adituentzako aukerak</string>
   <string name="pref_expert_options_summary">Mesedez kontuz ibili hauekin</string>
   <string name="title_activity_about">Conversationsi buruz</string>
   <string name="pref_about_conversations_summary">Eraikitze eta lizentzia informazioa</string>
+  <string name="title_pref_quiet_hours">Ordu lasaiak</string>
+  <string name="title_pref_quiet_hours_start_time">Hasiera ordua</string>
+  <string name="title_pref_quiet_hours_end_time">Amaiera ordua</string>
+  <string name="title_pref_enable_quiet_hours">Ordu lasaiak gaitu</string>
+  <string name="pref_quiet_hours_summary">Jakinarazpenak isilaraziko dira ordu lasaiak iraun bitartean </string>
   <string name="pref_use_larger_font">Letraren tamaina handitu</string>
   <string name="pref_use_larger_font_summary">Letra tamaina handiagoa erabili aplikazio osoan zehar</string>
   <string name="pref_use_send_button_to_indicate_status">Bidaltze botoiak egoera adierazten du</string>
@@ -277,7 +297,6 @@
   <string name="check_image_filesize">Irudiaren tamaina egiaztatu</string>
   <string name="message_options">Mezuaren aukerak</string>
   <string name="copy_text">Testua kopiatu</string>
-    <string name="share_image">Irudia partekatu</string>
   <string name="copy_original_url">Jatorrizko URLa kopiatu</string>
   <string name="send_again">Berriro bidali</string>
   <string name="image_url">Irudiaren URLa</string>
@@ -287,6 +306,7 @@
   <string name="image_transmission_failed">Irudiaren transmisioak huts egin du</string>
   <string name="scan_qr_code">QR kodea eskaneatu</string>
   <string name="show_qr_code">QR 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>
   <string name="remote_fingerprint">Urruneko hatz-marka</string>
@@ -306,16 +326,15 @@
   <string name="smp_requested">Kontaktuak SMP egiaztapena eskatu du</string>
   <string name="no_otr_session_found">Ez da OTR saio baliodunik aurkitu!</string>
   <string name="conversations_foreground_service">Conversations</string>
-    <string name="touch_to_disable">Ikutu atzeko planoko zerbitzua ezgaitzeko</string>
   <string name="pref_keep_foreground_service">Zerbitzua atzeko planoan mantendu</string>
   <string name="pref_keep_foreground_service_summary">Sistema eragileak zure konexioa hiltzea galarazten du</string>
   <string name="choose_file">Fitxategia aukeratu</string>
-    <string name="receiving_file">%1$s fitxategia jasotzen (%2$d%% osatua)</string>
-    <string name="open_file">%s fitxategia ireki</string>
+  <string name="receiving_x_file">%1$s jasotzen (%2$d%% osatua)</string>
+  <string name="download_x_file">%s deskargatu</string>
+  <string name="open_x_file">%s ireki</string>
   <string name="sending_file">bidaltzen (%1$d%% osatua)</string>
   <string name="preparing_file">Fitxategia transmisiorako prestatzen</string>
-    <string name="file_offered_for_download">Fitxaegia deskargatzeko eskainita</string>
-    <string name="file">%s fitxategia</string>
+  <string name="x_file_offered_for_download">%s deskargatzeko eskeinita</string>
   <string name="cancel_transmission">Transmisioa utzi</string>
   <string name="file_transmission_failed">fitxategi transmisioak huts egin du</string>
   <string name="file_deleted">Fitxategia ezabatu egin da</string>
@@ -332,5 +351,58 @@
   <string name="conference_created">Konferentzia sortu da!</string>
   <string name="secret_accepted">Sekretua onartu da!</string>
   <string name="reset">Berrezarri</string>
-
+  <string name="account_image_description">Kontuaren profileko argazkia</string>
+  <string name="copy_otr_clipboard_description">OTR hatz-marka arbelera kopiatu</string>
+  <string name="fetching_history_from_server">Mezuak zerbitzaritik eskuratzen</string>
+  <string name="no_more_history_on_server">Mezu gehiagorik ez zerbitzarian</string>
+  <string name="updating">Eguneratzen...</string>
+  <string name="password_changed">Pasahitza aldatu da</string>
+  <string name="could_not_change_password">Pasahitza ezin izan da aldatu</string>
+  <string name="otr_session_not_started">Mezu bat bidali enkripatutako elkarrizketa hasteko</string>
+  <string name="ask_question">Galdetu</string>
+  <string name="smp_explain_question">Zu eta zure kontaktua beste inor ezagutzen ez duen elkarren arteko sekreturen bat baduzue (ohiko txantxa edo azkenengo aldian bazkaldu zenutena adibidez) bakoitzaren hatz-markak egiaztatzeko sekretu hori erabili dezakezue.\n\nIradokizun edo galdera bat eman behar duzu zure kontaktuak erantzun dezan, letra larri eta xeheak bereiziz.</string>
+  <string name="smp_explain_answer">Zure kontaktuak zure hatz-marka egiaztatu nahi du partekatutako sekretu batekin erronka eginez. Zure kontaktuak hurrengo iradokizuna edo sekretu horren galdera eman du.</string>
+  <string name="shared_secret_hint_should_not_be_empty">Zure iradokizuna ez luke hutsik egon behar</string>
+  <string name="shared_secret_can_not_be_empty">Zure partekatutako sekretua ezin da hutsik egon</string>
+  <string name="manual_verification_explanation">Kontu handiz konpara ezazu beheko hatz-marka zure kontaktuaren hatz-markarekin.\nEnkriptatutako email bat edota telefono dei bat bezalako edozein komunikabide fidagarriren bat erabili dezakezu horiek trukatzeko.</string>
+  <string name="change_password">Pasahitza aldatu</string>
+  <string name="current_password">Oraingo pasahitza</string>
+  <string name="new_password">Pasahitza berria</string>
+  <string name="password_should_not_be_empty">Pasahitza ez luke hutsik egon behar</string>
+  <string name="enable_all_accounts">Kontu guztiak gaitu</string>
+  <string name="disable_all_accounts">Kontu guztiak ezgaitu</string>
+  <string name="perform_action_with">Ekintza honekin egin</string>
+  <string name="no_affiliation">Afiliaziorik ez</string>
+  <string name="no_role">Rolik ez</string>
+  <string name="outcast">Baztertutakoa</string>
+  <string name="member">Kidea</string>
+  <string name="advanced_mode">Modu aurreratua</string>
+  <string name="grant_membership">Bazkidetza eman</string>
+  <string name="remove_membership">Bazkidetza ezezaztu</string>
+  <string name="grant_admin_privileges">Administratzaile baimenak eman</string>
+  <string name="remove_admin_privileges">Administratzaile baimenak ezeztatu</string>
+  <string name="remove_from_room">Konferentziatik kendu</string>
+  <string name="could_not_change_affiliation">%s(r)en afiliazioa ezin izan da aldatu</string>
+  <string name="ban_from_conference">Konferentzian egotea debekatu</string>
+  <string name="removing_from_public_conference">%s konferentzia publiko batetik ateratzen saiatzen ari zara. Hori lortzeko modu bakarra erabiltzaile hori betiko debekatzea da.</string>
+  <string name="ban_now">Debekatu orain</string>
+  <string name="could_not_change_role">%s(r)en rola ezin izan da aldatu</string>
+  <string name="public_conference">Publikoki edonor sar daiteken konferentzia</string>
+  <string name="private_conference">Konferentzia pribatua, kideentzat soilik</string>
+  <string name="conference_options">Konferentziaren aukerak</string>
+  <string name="members_only">Pribatua (kideak soilik)</string>
+  <string name="non_anonymous">Ez anonimoa</string>
+  <string name="modified_conference_options">Konferentziaren aukerak aldatu dira</string>
+  <string name="could_not_modify_conference_options">Konferentziaren aukerak ezin izan dira aldatu</string>
+  <string name="never">Inoiz</string>
+  <string name="thirty_minutes">30 minutu</string>
+  <string name="one_hour">ordu 1</string>
+  <string name="two_hours">2 ordu</string>
+  <string name="eight_hours">8 ordu</string>
+  <string name="until_further_notice">abisatu arte</string>
+  <string name="pref_input_options">Sarrera aukerak</string>
+  <string name="pref_enter_is_send">Sartu teklak bidaltzen du</string>
+  <string name="pref_enter_is_send_summary">Sartu tekla erabili mezua bidaltzeko</string>
+  <string name="pdf_document">PDF dokumentua</string>
+  <string name="received_x_file">%s jaso da</string>
 </resources>

src/main/res/values-fr/strings.xml

@@ -1,6 +1,5 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <resources>
-
   <string name="action_settings">Paramètres</string>
   <string name="action_add">Nouvelle conversation</string>
   <string name="action_accounts">Gérer les comptes</string>
@@ -12,6 +11,10 @@
   <string name="action_edit_contact">Modifier le nom</string>
   <string name="action_add_phone_book">Ajouter aux contacts</string>
   <string name="action_delete_contact">Retirer des contacts</string>
+  <string name="action_block_contact">Bloquer le contact</string>
+  <string name="action_unblock_contact">Débloquer le contact</string>
+  <string name="action_block_domain">Bloquer le domaine</string>
+  <string name="action_unblock_domain">Débloquer le domaine</string>
   <string name="title_activity_manage_accounts">Gestion des comptes</string>
   <string name="title_activity_settings">Paramètres</string>
   <string name="title_activity_conference_details">Détails de la conférence</string>
@@ -20,12 +23,13 @@
   <string name="title_activity_sharewith">Partager avec Conversation</string>
   <string name="title_activity_start_conversation">Lancement de Conversation</string>
   <string name="title_activity_choose_contact">Choix du contact</string>
+  <string name="title_activity_block_list">Bloquer la liste</string>
   <string name="just_now">À l\'instant</string>
   <string name="minute_ago">Il y a 1 minute</string>
   <string name="minutes_ago">Il y a %d minutes</string>
   <string name="unread_conversations">Conversations non lues</string>
-    <string name="sending">envoi&#8230;</string>
-    <string name="encrypted_message">Déchiffrement du message. Patientez&#8230;</string>
+  <string name="sending">envoi…</string>
+  <string name="encrypted_message">Déchiffrement du message. Patientez…</string>
   <string name="nick_in_use">Cet identifiant est déjà utilisé.</string>
   <string name="admin">Administrateur</string>
   <string name="owner">Propriétaire</string>
@@ -33,16 +37,25 @@
   <string name="participant">Participant</string>
   <string name="visitor">Visiteur</string>
   <string name="remove_contact_text">Voulez-vous supprimer %s de votre liste? Les conversations associées à ce compte ne seront pas supprimées.</string>
+  <string name="block_contact_text">Voulez-vous bloquer %s de vous envoyer des messages?</string>
+  <string name="unblock_contact_text">Voulez-vous débloquer %s et leur permettre de vous envoyer des messages?</string>
+  <string name="block_domain_text">Bloquer tous les contacts de %s?</string>
+  <string name="unblock_domain_text">Débloquer tous les contacts de %s?</string>
+  <string name="contact_blocked">Contact bloqué</string>
   <string name="remove_bookmark_text">Voulez-vous retirer %s des favoris? La conversation associée avec ce favoris ne sera pas supprimé.</string>
   <string name="register_account">Créer un nouveau compte sur le serveur</string>
-    <string name="share_with">Partager avec</string>
+  <string name="change_password_on_server">Changer de mot de passe sur le serveur</string>
+  <string name="share_with">Partager avec…</string>
   <string name="start_conversation">Démarrer une conversation</string>
   <string name="invite_contact">Inviter des contacts</string>
   <string name="contacts">Contacts</string>
   <string name="cancel">Annuler</string>
+  <string name="set">Établir</string>
   <string name="add">Ajouter</string>
   <string name="edit">Modifier</string>
   <string name="delete">Supprimer</string>
+  <string name="block">Bloquer</string>
+  <string name="unblock">Débloquer</string>
   <string name="save">Enregistrer</string>
   <string name="ok">OK</string>
   <string name="crash_report_title">Conversations s\'est arreté</string>
@@ -57,8 +70,7 @@
   <string name="add_contact">Ajouter un contact</string>
   <string name="send_failed">Echec de l\'envoi.</string>
   <string name="send_rejected">Rejeté</string>
-    <string name="receiving_image">Réception d\'une image. Patientez&#8230;</string>
-    <string name="preparing_image">Préparation de la transmission de l\'image. Patientez&#8230;</string>
+  <string name="preparing_image">Préparation de la transmission de l\'image. Patientez…</string>
   <string name="action_clear_history">Vider l\'historique</string>
   <string name="clear_conversation_history">Vider l\'historique de la conversation</string>
   <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 ce périphérique.</string>
@@ -70,27 +82,24 @@
   <string name="send_pgp_message">Envoyer un message sécurisé par OpenPGP</string>
   <string name="your_nick_has_been_changed">Votre identifiant a été changé</string>
   <string name="download_image">Télécharger l\'image</string>
-    <string name="image_offered_for_download"><i>Image proposée au téléchargement.</i></string>
   <string name="send_unencrypted">Envoyer en clair</string>
   <string name="decryption_failed">Echec du déchiffrement. Merci de vérifier la clef privée utilisé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>(Merci de redémarrer Conversations apres l\'installation du logiciel)</small></string>
   <string name="restart">Redémarrer</string>
   <string name="install">Installer</string>
-    <string name="offering">Proposition&#8230;</string>
-    <string name="waiting">Patientez&#8230;</string>
+  <string name="offering">Proposition…</string>
+  <string name="waiting">Patientez…</string>
   <string name="no_pgp_key">Aucune clef OpenPGP trouvée.</string>
   <string name="contact_has_no_pgp_key">Conversations ne peut chiffrer vos messages car votre correspondant n\'a pas communiqué sa clef publique.\n\n<small>Merci de demander à votre correspondant de configurer OpenPGP.</small></string>
   <string name="no_pgp_keys">Aucune clef OpenPGP n\'est disponible.</string>
   <string name="contacts_have_no_pgp_keys">Conversations ne peut pas chiffrer votre message car vous ne connaissez pas la clef publique de vos contacts.\n\n<small>Merci de les faire configurer leur OpenPGP.</small></string>
   <string name="encrypted_message_received"><i>Message chiffré reçu. Appuyez pour le déchiffrer.</i></string>
-    <string name="encrypted_image_received"><i>Image chiffrée reçue. Appuyez pour la déchiffrer.</i></string>
-    <string name="image_file"><i>Image reçue. Appuyez pour visualiser.</i></string>
   <string name="pref_general">Général</string>
   <string name="pref_xmpp_resource">Ressource XMPP</string>
   <string name="pref_xmpp_resource_summary">Nom permettant d\'identifier ce client XMPP</string>
   <string name="pref_accept_files">Accepter les fichiers</string>
-    <string name="pref_accept_files_summary">Accepter automatiquement les fichiers plus petits que&#8230;</string>
+  <string name="pref_accept_files_summary">Accepter automatiquement les fichiers plus petits que…</string>
   <string name="pref_notification_settings">Paramètres de notification</string>
   <string name="pref_notifications">Notifications</string>
   <string name="pref_notifications_summary">Notifier l\'arrivée d\'un message</string>
@@ -140,6 +149,8 @@
   <string name="account_status_regis_conflict">Identifiant déjà utilisé</string>
   <string name="account_status_regis_success">Enregistrement réussi</string>
   <string name="account_status_regis_not_sup">Le serveur ne permet pas l\'enregistrement</string>
+  <string name="account_status_security_error">Erreur de sécurité</string>
+  <string name="account_status_incompatible_server">Serveur incompatible</string>
   <string name="encryption_choice_none">Texte clair</string>
   <string name="encryption_choice_otr">OTR</string>
   <string name="encryption_choice_pgp">OpenPGP</string>
@@ -170,7 +181,12 @@
   <string name="contact_status_offline">Hors-ligne</string>
   <string name="muc_details_conference">Conférence</string>
   <string name="muc_details_other_members">Autres membres</string>
+  <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">Copies carbone</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">Gestion des flux</string>
   <string name="server_info_pep">XEP-0163: PEP (Avatars)</string>
   <string name="server_info_available">disponible</string>
@@ -198,6 +214,8 @@
   <string name="join_conference">Rejoindre la conférence</string>
   <string name="delete_contact">Supprimer le contact</string>
   <string name="view_contact_details">Afficher les détails du contact</string>
+  <string name="block_contact">Bloquer le contact</string>
+  <string name="unblock_contact">Débloquer le contact</string>
   <string name="create">Ajouter</string>
   <string name="contact_already_exists">Le contact existe déjà.</string>
   <string name="join">Rejoindre</string>
@@ -216,7 +234,7 @@
   <string name="publish">Publier</string>
   <string name="touch_to_choose_picture">Toucher l\'avatar pour choisir une image depuis la galerie.</string>
   <string name="publish_avatar_explanation">Nota Bene: Les personnes ayant activé les mises jour de présence verront cette image.</string>
-    <string name="publishing">Mise à jour&#8230;</string>
+  <string name="publishing">Mise à jour…</string>
   <string name="error_publish_avatar_server_reject">Le serveur a rejeté votre envoi d\'image</string>
   <string name="error_publish_avatar_converting">Une erreur s\'est produite pendant la conversion de votre image.</string>
   <string name="error_saving_avatar">Impossible de stocker l\'image sur le disque</string>
@@ -249,8 +267,16 @@
   <string name="pref_force_encryption_summary">Toujours envoyer des messages chiffrés (sauf pour les conférences)</string>
   <string name="pref_dont_save_encrypted">Ne pas sauvegarder les messages chiffrés</string>
   <string name="pref_dont_save_encrypted_summary">Attention: Celà peut mener à une perte de messages</string>
+  <string name="pref_enable_legacy_ssl">Activer SSL hérité</string>
   <string name="pref_expert_options">Options avancées</string>
   <string name="pref_expert_options_summary">A utiliser avec précautions</string>
+  <string name="title_activity_about">Sur Conversations</string>
+  <string name="pref_about_conversations_summary">Informations sur le build et les licenses</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>
+  <string name="title_pref_enable_quiet_hours">Activer les heures tranquilles</string>
+  <string name="pref_quiet_hours_summary">Les notifications seront rendu muets pendant les heures tranquilles</string>
   <string name="pref_use_larger_font">Augmenter la taille du texte</string>
   <string name="pref_use_larger_font_summary">Augmenter la taille du texte partout dans l\'application</string>
   <string name="pref_use_send_button_to_indicate_status">Le bouton Envoyer permet d\'indiquer le statut</string>
@@ -268,89 +294,113 @@
   <string name="checking_image">Vérification de l\'image</string>
   <string name="image_file_deleted">L\'image a été suprimée</string>
   <string name="not_connected_try_again">Vous n\'êtes pas connecté. Merci de retenter plus tard.</string>
-<string name="check_image_filesize">Vérifier la taille de l\'image</string>
-<string name="message_options">Options du message</string>
-<string name="copy_text">Copier le texte</string>
-<string name="share_image">Partager l\'image</string>
-<string name="copy_original_url">Copier l\'URL</string>
-<string name="send_again">Envoyer de nouveau</string>
-<string name="image_url">URL de l\'image</string>
-<string name="message_text">Message texte</string>
-<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">Echec lors de l\'envoi de l\'image</string>
-<string name="scan_qr_code">Scanner un QR code</string>
-<string name="show_qr_code">Afficher le QR code</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>
-<string name="remote_fingerprint">Supprimer l\'empreinte</string>
-<string name="scan">Scanner</string>
-<string name="or_touch_phones">(ou les touches)</string>
-<string name="smp">Socialist Millionaire Protocol</string>
-<string name="shared_secret_hint">Indice ou question</string>
-<string name="shared_secret_secret">Secret partagé</string>
-<string name="confirm">Confirmer</string>
-<string name="in_progress">En cours</string>
-<string name="respond">Répondre</string>
-<string name="failed">Echoué</string>
-<string name="secrets_do_not_match">Les secrets ne correspondent pas</string>
-<string name="try_again">Réessayer</string>
-<string name="finish">Terminé</string>
-<string name="verified">Vérifié!</string>
-<string name="smp_requested">Le contact requiert la vérification du SMP</string>
-<string name="no_otr_session_found">Aucune session valide d\'OTR n\'a été trouvée!</string>
-<string name="conversations_foreground_service">Conversations</string>
-<string name="touch_to_disable">Toucher pour désactiver le service au premier-plan</string>
-<string name="pref_keep_foreground_service">Garder le service au premier-plan</string>
-<string name="pref_keep_foreground_service_summary">Evite que le système ferme votre connexion</string>
-<string name="choose_file">Choix d\'un fichier</string>
-<string name="receiving_file">Réception %1$s fichier (%2$d%% complété)</string>
-<string name="open_file">Ouvrir %s fichier</string>
-<string name="sending_file">envoi (%1$d%% complété)</string>
-<string name="preparing_file">Préparation du fichier pour l\'envoi</string>
-<string name="file_offered_for_download">Fichier disponible pour téléchargement</string>
-<string name="file">%s fichier</string>
-<string name="cancel_transmission">Annuler l\'envoi</string>
-<string name="file_transmission_failed">Envoi du fichier échoué</string>
-<string name="file_deleted">Le fichier a été supprimé</string>
-<string name="no_application_found_to_open_file">Aucune application disponible pour ouvrir le fichier</string>
-<string name="could_not_verify_fingerprint">Impossible de vérifier l\'empreinte</string>
-<string name="manually_verify">Vérifier manuellement</string>
-<string name="are_you_sure_verify_fingerprint">Etes-vous sûr de vouloir vérifier l\'empreinte OTR de vos contacts?</string>
-<string name="pref_show_dynamic_tags">Afficher les tags dynamiques</string>
-<string name="pref_show_dynamic_tags_summary">Afficher les tags en lecture-seule sous les contacts</string>
-<string name="enable_notifications">Activer les notifications</string>
-<string name="conference_with">Créer une conférence avec…</string>
-<string name="no_conference_server_found">Aucun serveur de conférence disponible</string>
-<string name="conference_creation_failed">Echec de la création de la conférence!</string>
-<string name="conference_created">Conférence créée!</string>
-<string name="secret_accepted">Secret commun accepté!</string>
-<string name="reset">Réinitialiser</string>
-<string name="account_image_description">Image du compte</string>
-<string name="copy_otr_clipboard_description">Copier l\'empreinte OTR dans le presse-papier</string>
-<string name="fetching_history_from_server">Récupérer l\'historique depuis le serveur</string>
-<string name="no_more_history_on_server">Fin de l\'historique sur le serveur</string>
-<string name="updating">Mise à jour…</string>
-<string name="password_changed">Mot de passe modifié!</string>
-<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 un secret en commun connu par vous deux uniquement (comme une histoire personnelle ou même comme ce que vous avez mangé lors de votre dernière rencontre) vous pouvez utiliser ce secret pour vérifier vos empreintes respectives.\n\nVous envoyez un indice ou une question à votre contact qui devra répondre en faisant attention à la casse.</string>
-<string name="smp_explain_answer">Votre contact voudrait vous identifier de manière sûre grâce à un secret commun. Il vous envoie le message ou la question suivante.</string>
-<string name="shared_secret_hint_should_not_be_empty">Votre indice ne devrait pas être vide</string>
-<string name="shared_secret_can_not_be_empty">Votre secret ne peut être vide</string>
-<string name="manual_verification_explanation">Comparez avec soin l\'empreinte de votre contact avec celle indiquée ci-dessous.\nVous pouvez utiliser n\'importe quel moyen de communication sécurisée pour cela, tel que le télephone ou l\'envoi d\'un e-mail chiffré.</string>
-<string name="change_password">Changer de mot de passe</string>
-<string name="current_password">Mot de passe actuel</string>
-<string name="new_password">Nouveau mot de passe</string>
-<string name="password_should_not_be_empty">Le mot de passe ne peut être vide</string>
-<string name="enable_all_accounts">Activer tous les comptes</string>
-<string name="disable_all_accounts">Désactiver tous les comptes</string>
-<string name="perform_action_with">Faire une action avec</string>
-<string name="no_affiliation">Aucune affiliation</string>
-<string name="no_role">Aucun rôle</string>
-<string name="outcast">Banni</string>
-<string name="member">Membre</string>
-<string name="advanced_mode">Mode avancé</string>
+  <string name="check_image_filesize">Vérifier la taille de l\'image</string>
+  <string name="message_options">Options du message</string>
+  <string name="copy_text">Copier le texte</string>
+  <string name="copy_original_url">Copier l\'URL</string>
+  <string name="send_again">Envoyer de nouveau</string>
+  <string name="image_url">URL de l\'image</string>
+  <string name="message_text">Message texte</string>
+  <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">Echec lors de l\'envoi de l\'image</string>
+  <string name="scan_qr_code">Scanner un QR code</string>
+  <string name="show_qr_code">Afficher le QR code</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>
+  <string name="remote_fingerprint">Supprimer l\'empreinte</string>
+  <string name="scan">Scanner</string>
+  <string name="or_touch_phones">(ou les touches)</string>
+  <string name="smp">Socialist Millionaire Protocol</string>
+  <string name="shared_secret_hint">Indice ou question</string>
+  <string name="shared_secret_secret">Secret partagé</string>
+  <string name="confirm">Confirmer</string>
+  <string name="in_progress">En cours</string>
+  <string name="respond">Répondre</string>
+  <string name="failed">Echoué</string>
+  <string name="secrets_do_not_match">Les secrets ne correspondent pas</string>
+  <string name="try_again">Réessayer</string>
+  <string name="finish">Terminé</string>
+  <string name="verified">Vérifié!</string>
+  <string name="smp_requested">Le contact requiert la vérification du SMP</string>
+  <string name="no_otr_session_found">Aucune session valide d\'OTR n\'a été trouvée!</string>
+  <string name="conversations_foreground_service">Conversations</string>
+  <string name="pref_keep_foreground_service">Garder le service au premier-plan</string>
+  <string name="pref_keep_foreground_service_summary">Evite que le système ferme votre connexion</string>
+  <string name="choose_file">Choix d\'un fichier</string>
+  <string name="receiving_x_file">Réception %1$s (%2$d%% complété)</string>
+  <string name="download_x_file">Télecharger %s</string>
+  <string name="open_x_file">Ouvrir %s</string>
+  <string name="sending_file">envoi (%1$d%% complété)</string>
+  <string name="preparing_file">Préparation du fichier pour l\'envoi</string>
+  <string name="x_file_offered_for_download">%s disponible pour téléchargement</string>
+  <string name="cancel_transmission">Annuler l\'envoi</string>
+  <string name="file_transmission_failed">Envoi du fichier échoué</string>
+  <string name="file_deleted">Le fichier a été supprimé</string>
+  <string name="no_application_found_to_open_file">Aucune application disponible pour ouvrir le fichier</string>
+  <string name="could_not_verify_fingerprint">Impossible de vérifier l\'empreinte</string>
+  <string name="manually_verify">Vérifier manuellement</string>
+  <string name="are_you_sure_verify_fingerprint">Etes-vous sûr de vouloir vérifier l\'empreinte OTR de vos contacts?</string>
+  <string name="pref_show_dynamic_tags">Afficher les tags dynamiques</string>
+  <string name="pref_show_dynamic_tags_summary">Afficher les tags en lecture-seule sous les contacts</string>
+  <string name="enable_notifications">Activer les notifications</string>
+  <string name="conference_with">Créer une conférence avec…</string>
+  <string name="no_conference_server_found">Aucun serveur de conférence disponible</string>
+  <string name="conference_creation_failed">Echec de la création de la conférence!</string>
+  <string name="conference_created">Conférence créée!</string>
+  <string name="secret_accepted">Secret commun accepté!</string>
+  <string name="reset">Réinitialiser</string>
+  <string name="account_image_description">Image du compte</string>
+  <string name="copy_otr_clipboard_description">Copier l\'empreinte OTR dans le presse-papier</string>
+  <string name="fetching_history_from_server">Récupérer l\'historique depuis le serveur</string>
+  <string name="no_more_history_on_server">Fin de l\'historique sur le serveur</string>
+  <string name="updating">Mise à jour…</string>
+  <string name="password_changed">Mot de passe modifié!</string>
+  <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 un secret en commun connu par vous deux uniquement (comme une histoire personnelle ou même comme ce que vous avez mangé lors de votre dernière rencontre) vous pouvez utiliser ce secret pour vérifier vos empreintes respectives.\n\nVous envoyez un indice ou une question à votre contact qui devra répondre en faisant attention à la casse.</string>
+  <string name="smp_explain_answer">Votre contact voudrait vous identifier de manière sûre grâce à un secret commun. Il vous envoie le message ou la question suivante.</string>
+  <string name="shared_secret_hint_should_not_be_empty">Votre indice ne devrait pas être vide</string>
+  <string name="shared_secret_can_not_be_empty">Votre secret ne peut être vide</string>
+  <string name="manual_verification_explanation">Comparez avec soin l\'empreinte de votre contact avec celle indiquée ci-dessous.\nVous pouvez utiliser n\'importe quel moyen de communication sécurisée pour cela, tel que le télephone ou l\'envoi d\'un e-mail chiffré.</string>
+  <string name="change_password">Changer de mot de passe</string>
+  <string name="current_password">Mot de passe actuel</string>
+  <string name="new_password">Nouveau mot de passe</string>
+  <string name="password_should_not_be_empty">Le mot de passe ne peut être vide</string>
+  <string name="enable_all_accounts">Activer tous les comptes</string>
+  <string name="disable_all_accounts">Désactiver tous les comptes</string>
+  <string name="perform_action_with">Faire une action avec</string>
+  <string name="no_affiliation">Aucune affiliation</string>
+  <string name="no_role">Aucun rôle</string>
+  <string name="outcast">Banni</string>
+  <string name="member">Membre</string>
+  <string name="advanced_mode">Mode avancé</string>
+  <string name="grant_membership">Accorder le statut de membre</string>
+  <string name="remove_membership">Révoquer le statut de membre</string>
+  <string name="grant_admin_privileges">Accorder des privilèges d\'administrateur</string>
+  <string name="remove_admin_privileges">Révoquer des privilèges d\'administrateur</string>
+  <string name="remove_from_room">Supprimer de la conférence</string>
+  <string name="could_not_change_affiliation">Impossible de changer l\'affiliation de %s</string>
+  <string name="ban_from_conference">Interdire de la conférence</string>
+  <string name="removing_from_public_conference">Vous essayez de supprimer %s d\'une conférence publique. La seule façon de le faire consiste à l\'interdire définitivement.</string>
+  <string name="ban_now">Interdire maintenant</string>
+  <string name="could_not_change_role">Impossible de changer le rôle de %s</string>
+  <string name="public_conference">Conférence accessible au public</string>
+  <string name="private_conference">Conférence privée, réservée aux membres</string>
+  <string name="conference_options">Options de la conférence</string>
+  <string name="members_only">Privée (reservée aux membres)</string>
+  <string name="non_anonymous">Non anonyme</string>
+  <string name="modified_conference_options">Options de la conférence modifiée!</string>
+  <string name="could_not_modify_conference_options">Impossible de modifier les options de la conférence</string>
+  <string name="never">Jamais</string>
+  <string name="thirty_minutes">30 minutes</string>
+  <string name="one_hour">1 heure</string>
+  <string name="two_hours">2 heures</string>
+  <string name="eight_hours">8 heures</string>
+  <string name="until_further_notice">Jusqu\'à nouvel ordre</string>
+  <string name="pref_input_options">Options de saisie</string>
+  <string name="pdf_document">document PDF</string>
+  <string name="received_x_file">%s reçu</string>
 </resources>

src/main/res/values-gl/strings.xml

@@ -1,6 +1,5 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <resources>
-
   <string name="action_settings">Axustes</string>
   <string name="action_add">Nova conversa</string>
   <string name="action_accounts">Xestionar contas</string>
@@ -14,8 +13,8 @@
   <string name="just_now">agora</string>
   <string name="minutes_ago">min</string>
   <string name="unread_conversations">conversas sen ler</string>
-    <string name="sending">enviando&#8230;</string>
-    <string name="encrypted_message">Descifrando mensaxe. Agarda uns intres&#8230;</string>
+  <string name="sending">enviando…</string>
+  <string name="encrypted_message">Descifrando mensaxe. Agarda uns intres…</string>
   <string name="nick_in_use">O apodo xa está en uso</string>
   <string name="moderator">Moderador</string>
   <string name="participant">Participante</string>
@@ -25,6 +24,7 @@
   <string name="share_with">Compartir con</string>
   <string name="start_conversation">Comeza conversa</string>
   <string name="cancel">Cancelar</string>
+  <string name="save">Gardar</string>
   <string name="crash_report_title">Conversations deteuse.</string>
   <string name="crash_report_message">Enviando volcados de pilas axudas ao desenrolo de Conversations\n<b>Aviso:</b> Isto empregará a túa conta XMPP para enviar o volcado de pila ao desenrolador.</string>
   <string name="send_now">Enviar agora</string>
@@ -37,7 +37,6 @@
   <string name="add_contact">Engadir contacto</string>
   <string name="send_failed">Erro ao enviar</string>
   <string name="send_rejected">rechazado</string>
-    <string name="receiving_image">Recibindo arquivo de imaxe. Agarda por favor&#8230;</string>
   <string name="preparing_image">Preparando imaxe para enviar</string>
   <string name="action_clear_history">Limpar historial</string>
   <string name="clear_conversation_history">Limpar historial de conversa</string>
@@ -50,23 +49,20 @@
   <string name="send_pgp_message">Enviar mensaxe cifrado con OpenPGP</string>
   <string name="your_nick_has_been_changed">Modificouse o teu apodo</string>
   <string name="download_image">Descargar imaxe</string>
-    <string name="image_offered_for_download"><i>Arquivo de imaxe ofrecido para descarga</i></string>
   <string name="send_unencrypted">Enviar sen cifrar</string>
   <string name="decryption_failed">Fallou o descifrado. Quizábeis non teñas a clave privada apropiada.</string>
   <string name="openkeychain_required">OpenKeychain</string>
   <string name="openkeychain_required_long">Conversations emprega unha aplicación de terceiros chamada <b>OpenKeychain</b> para cifrar e descifrar mensaxes e xestionar as túas claves públicas.\n\nOpenKeychain está publicado baixo licencia GPLv3 e disponible en F-Droid e Google Play.\n\n<small>(Por favor, reinicie Conversations despois.)</small></string>
   <string name="restart">Reiniciar</string>
   <string name="install">Instalar</string>
-    <string name="offering">ofrecendo&#8230;</string>
+  <string name="offering">ofrecendo…</string>
   <string name="no_pgp_key">Clave OpenPGP non atopada</string>
   <string name="contact_has_no_pgp_key">Conversations non foi quen de cifrar as túas mensaxes porque o teu contactos non está anunciando a súa clave pública.\n\n<small>Por favor, pídelle ao teu contacto que configure OpenPGP.</small></string>
   <string name="encrypted_message_received"><i>Mensaxe cifrado recibido. Pulsa para ver.</i></string>
-    <string name="encrypted_image_received"><i>Imaxe cifrada recibida. Pulsa para ver.</i></string>
-    <string name="image_file"><i>Imaxe recibida. Pulsa para ver</i></string>
   <string name="pref_xmpp_resource">Recurso</string>
   <string name="pref_xmpp_resource_summary">O nome que identifica o cliente que estás a empregar</string>
   <string name="pref_accept_files">Aceptar arquivos</string>
-    <string name="pref_accept_files_summary">De forma automática aceptar arquivos menores de&#8230;</string>
+  <string name="pref_accept_files_summary">De forma automática aceptar arquivos menores de…</string>
   <string name="pref_notification_settings">Axustes de notificación</string>
   <string name="pref_notifications">Notificacións</string>
   <string name="pref_notifications_summary">Notifica cuando chega unha nova mensaxe</string>
@@ -81,6 +77,7 @@
   <string name="pref_advanced_options">Opcións avanzadas</string>
   <string name="pref_never_send_crash">Nunca enviar informe de erros</string>
   <string name="pref_never_send_crash_summary">Enviando volcados de pilas axudas al desenrolo de Conversations</string>
+  <string name="pref_ui_options">Opcións de interfaz</string>
   <string name="openpgp_error">OpenKeychain reportou un erro</string>
   <string name="error_decrypting_file">I/O Erro descifrando arquivo</string>
   <string name="accept">Aceptar</string>
@@ -121,9 +118,6 @@
   <string name="mgmt_account_disable">Deshabilitar temporalmente</string>
   <string name="mgmt_account_enable">Habilitar</string>
   <string name="attach_record_voice">Grabar audio</string>
-    <string name="save">Gardar</string>
   <string name="passwords_do_not_match">As contrasinais non coinciden</string>
   <string name="invalid_jid">O identificador non é un identificador de Jabber válido</string>
-    <string name="pref_ui_options">Opcións de interfaz</string>
-
 </resources>

src/main/res/values-it/strings.xml

@@ -1,6 +1,5 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <resources>
-
   <string name="action_settings">Impostazioni</string>
   <string name="action_add">Nuova conversazione</string>
   <string name="action_accounts">Gestisci utenti</string>
@@ -29,8 +28,8 @@
   <string name="minute_ago">1 min fa</string>
   <string name="minutes_ago">%d min fa</string>
   <string name="unread_conversations">Conversazioni non lette</string>
-    <string name="sending">invio&#8230;</string>
-    <string name="encrypted_message">Decifrazione del messaggio. Attendere prego&#8230;</string>
+  <string name="sending">invio…</string>
+  <string name="encrypted_message">Decifrazione del messaggio. Attendere prego…</string>
   <string name="nick_in_use">Nome utente già in uso</string>
   <string name="admin">Amministratore</string>
   <string name="owner">Proprietario</string>
@@ -71,7 +70,6 @@
   <string name="add_contact">Aggiungi contatto</string>
   <string name="send_failed">Invio fallito</string>
   <string name="send_rejected">rifiutato</string>
-    <string name="receiving_image">Ricezione di un’immagine. Attendere prego&#8230;</string>
   <string name="preparing_image">Preparazioone immagine per la trasmissione</string>
   <string name="action_clear_history">Pulisci la cronologia</string>
   <string name="clear_conversation_history">Pulisci la cronologia della Conversazione</string>
@@ -84,27 +82,24 @@
   <string name="send_pgp_message">Messaggio OpenPGP</string>
   <string name="your_nick_has_been_changed">Il tuo nome utente è stato cambiato</string>
   <string name="download_image">Scarica Immagine</string>
-    <string name="image_offered_for_download"><i>Immagine disponibile per il download</i></string>
   <string name="send_unencrypted">Invia non cifrato</string>
   <string name="decryption_failed">Decifrazione fallita. Forse non disponi della chiave privata corretta.</string>
   <string name="openkeychain_required">OpenKeychain</string>
   <string name="openkeychain_required_long">Conversations usa una app di terze parti chiamata <b>OpenKeychain</b> per cifrare e decifrare i messaggi per gestire le tue chiavi pubbliche.\n\nOpenKeychain è rilasciato secondo i termini della GPLv3 ed è disponibile sia su F-Droid, che su Google Play.\n\n<small>(Riavvia Conversations in seguito.)</small></string>
   <string name="restart">Riavvia</string>
   <string name="install">Installa</string>
-    <string name="offering">offrendo&#8230;</string>
-    <string name="waiting">in attesa&#8230;</string>
+  <string name="offering">offrendo…</string>
+  <string name="waiting">in attesa…</string>
   <string name="no_pgp_key">Nessuna chiave OpenPGP trovata</string>
   <string name="contact_has_no_pgp_key">Conversations non è in grado di cifrare i tuoi messaggi perché il contatto non sta annunciando la sua chiave pubblica.\n\n<small>Per favore chiedi al tuo contatto di configurare OpenPGP.</small></string>
   <string name="no_pgp_keys">Nessuna chiave OpenPGP trovata</string>
   <string name="contacts_have_no_pgp_keys">Conversations non è in grado di cifrare i tuoi messaggi perché i contatti non stanno annunciando la propria chiave pubblica.\n\n<small>Per favore chiedi ai tuoi contatti di configurare OpenPGP.</small></string>
   <string name="encrypted_message_received"><i>Messaggio cifrato ricevuto. Tocca per decifrare.</i></string>
-    <string name="encrypted_image_received"><i>Immagine cifrata ricevuta. Tocca per decifrare e mostrare.</i></string>
-    <string name="image_file"><i>Immagine ricevuta. Tocca per mostrare</i></string>
   <string name="pref_general">Generale</string>
   <string name="pref_xmpp_resource">Risorsa XMPP</string>
   <string name="pref_xmpp_resource_summary">Il nome con il quale questo client si identifica</string>
   <string name="pref_accept_files">Accetta i file</string>
-    <string name="pref_accept_files_summary">Accetta automaticamente i file più piccoli di&#8230;</string>
+  <string name="pref_accept_files_summary">Accetta automaticamente i file più piccoli di…</string>
   <string name="pref_notification_settings">Impostazioni di Notifica</string>
   <string name="pref_notifications">Notifiche</string>
   <string name="pref_notifications_summary">Notifica quando arriva un nuovo messaggio</string>
@@ -239,7 +234,7 @@
   <string name="publish">Pubblica</string>
   <string name="touch_to_choose_picture">Tocca l’avatar per selezionare l’immagine dalla galleria</string>
   <string name="publish_avatar_explanation">Nota bene: tutti i contatti sottoscritti agli aggiornamenti della tua presenza avranno il permesso di vedere questa immagine.</string>
-    <string name="publishing">Pubblicazione&#8230;</string>
+  <string name="publishing">Pubblicazione…</string>
   <string name="error_publish_avatar_server_reject">Il server ha rifiutato la tua pubblicazione</string>
   <string name="error_publish_avatar_converting">Qualcosa è andato storto durante la conversione della tua immagine</string>
   <string name="error_saving_avatar">Impossibile salvare l’avatar sulla memoria interna</string>
@@ -273,7 +268,6 @@
   <string name="pref_dont_save_encrypted">Non salvare i messaggi cifrati</string>
   <string name="pref_dont_save_encrypted_summary">Attenzione: Questo potrebbe comportare la perdita di messaggi</string>
   <string name="pref_enable_legacy_ssl">Abilita il vecchio SSL</string>
-    <string name="pref_enable_legacy_ssl_summary">Abilita il supporto per i server SSLv3. Attenzione: SSLv3 è considerato insicuro.</string>
   <string name="pref_expert_options">Opzioni da Esperto</string>
   <string name="pref_expert_options_summary">Fai attenzione con queste impostazioni</string>
   <string name="title_activity_about">Info su Conversations</string>
@@ -285,9 +279,9 @@
   <string name="pref_quiet_hours_summary">Le notifiche verranno silenziate durante le ore di quiete</string>
   <string name="pref_use_larger_font">Aumenta la dimensione dei caratteri</string>
   <string name="pref_use_larger_font_summary">Usa font più grandi in tutta l’app</string>
+  <string name="pref_use_send_button_to_indicate_status">Il pulsante di invio indica lo stato</string>
   <string name="pref_use_indicate_received">Richiedi la ricevuta di ritorno</string>
   <string name="pref_use_indicate_received_summary">I messaggi ricevuti verranno contrassegnati con una spunta verde se supportato</string>
-    <string name="pref_use_send_button_to_indicate_status">Il pulsante di invio indica lo stato</string>
   <string name="pref_use_send_button_to_indicate_status_summary">Colora il pulsante di invio per indicare lo stato di un contatto</string>
   <string name="pref_expert_options_other">Altro</string>
   <string name="pref_conference_name">Nome della conferenza</string>
@@ -303,7 +297,6 @@
   <string name="check_image_filesize">Controlla le dimensioni dell’immagine</string>
   <string name="message_options">Opzioni del messaggio</string>
   <string name="copy_text">Copia testo</string>
-    <string name="share_image">Condividi immagine</string>
   <string name="copy_original_url">Copia URL originale</string>
   <string name="send_again">Invia di nuovo</string>
   <string name="image_url">URL immagine</string>
@@ -332,7 +325,6 @@
   <string name="smp_requested">Il contatto ha richiesto la verifica SMP</string>
   <string name="no_otr_session_found">Non è stata trovata nessuna sessione OTR valida!</string>
   <string name="conversations_foreground_service">Conversations</string>
-    <string name="touch_to_disable">Tocca per disabilitare il servizio in primo piano</string>
   <string name="pref_keep_foreground_service">Mantieni il servizio in primo piano</string>
   <string name="pref_keep_foreground_service_summary">Evita che il sistema operativo chiuda la connessione</string>
   <string name="choose_file">Scegli file</string>
@@ -410,8 +402,6 @@
   <string name="pref_input_options">Opzioni di ingresso</string>
   <string name="pref_enter_is_send">Invio invia</string>
   <string name="pref_enter_is_send_summary">Il tasto invio spedisce il messaggio</string>
-	<string name="audio">file audio</string>
-	<string name="video">file video</string>
   <string name="pdf_document">Documento PDF</string>
   <string name="received_x_file">Ricevuto %s</string>
 </resources>

src/main/res/values-iw/strings.xml

@@ -1,6 +1,5 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <resources>
-
   <string name="action_settings">הגדרות</string>
   <string name="action_add">דיון חדש</string>
   <string name="action_accounts">נהל חשבונות</string>
@@ -24,8 +23,8 @@
   <string name="minute_ago">לפני דקה 1</string>
   <string name="minutes_ago">לפני %d דקות</string>
   <string name="unread_conversations">דיונים שלא נקראו</string>
-    <string name="sending">כעת שולח&#8230;</string>
-    <string name="encrypted_message">כעת מפענח הודעה. אנא המתן&#8230;</string>
+  <string name="sending">כעת שולח…</string>
+  <string name="encrypted_message">כעת מפענח הודעה. אנא המתן…</string>
   <string name="nick_in_use">שם כינוי כבר מצוי בשימוש</string>
   <string name="admin">מנהל</string>
   <string name="owner">בעלים</string>
@@ -57,7 +56,6 @@
   <string name="add_contact">הוסף איש קשר</string>
   <string name="send_failed">מסירה נכשלה</string>
   <string name="send_rejected">סורב</string>
-    <string name="receiving_image">כעת מקבל קובץ תצלום. אנא המתן&#8230;</string>
   <string name="preparing_image">כעת מכין תצלום לשם תמסורת</string>
   <string name="action_clear_history">טהר היסטוריה</string>
   <string name="clear_conversation_history">טהר היסטוריית דיונים</string>
@@ -70,26 +68,23 @@
   <string name="send_pgp_message">שלח הודעה מוצפנת OpenPGP</string>
   <string name="your_nick_has_been_changed">שם כינוי שלך השתנה</string>
   <string name="download_image">הורד תצלום</string>
-    <string name="image_offered_for_download"><i>קובץ תצלום מוצע להורדה</i></string>
   <string name="send_unencrypted">שלח לא מוצפנת</string>
   <string name="decryption_failed">פענוח נכשל. אולי אין לך את המפתח הפרטי המתאים.</string>
   <string name="openkeychain_required">OpenKeychain</string>
   <string name="openkeychain_required_long">Conversations מפיקה תועלת מן אפליקציית צד-שלישי הקרויה <b>OpenKeychain</b> כדי להצפין ולפענח הודעות וגם כדי לנהל את המפתחות הפומביים שלך.\n\nOpenKeychain הינה רשויה תחת GPLv3 וזמינה אצל F-Droid וגם Google Play.\n\n<small>(אנא התחל מחדש את Conversations לאחר מכן.)</small></string>
   <string name="restart">התחל מחדש</string>
   <string name="install">התקן</string>
-    <string name="offering">כעת מציע&#8230;</string>
-    <string name="waiting">כעת ממתין&#8230;</string>
+  <string name="offering">כעת מציע…</string>
+  <string name="waiting">כעת ממתין…</string>
   <string name="no_pgp_key">לא נמצא מפתח OpenPGP</string>
   <string name="contact_has_no_pgp_key">Conversations אינה מסוגלת להצפין את הודעותיך משום שאיש הקשר שלך אינו מכריז על המפתח הפומבי שלו או שלה.\n\n<small>אנא בקש מאיש הקשר שלך לארגן OpenPGP.</small></string>
   <string name="no_pgp_keys">לא נמצאו מפתחות OpenPGP</string>
   <string name="contacts_have_no_pgp_keys">Conversations אינה מסוגלת להצפין את הודעותיך משום שאנשי הקשר שלך אינם מכריזים על המפתח הפומבי שלהם.\n\n<small>אנא בקש מאנשי הקשר שלך לארגן OpenPGP.</small></string>
   <string name="encrypted_message_received"><i>הודעה מוצפנת התקבלה. לחץ כדי לצפות ולפענח.</i></string>
-    <string name="encrypted_image_received"><i>תצלום מוצפן התקבל. לחץ כדי לצפות ולפענח.</i></string>
-    <string name="image_file"><i>תצלום התקבל. לחץ כדי לצפות</i></string>
   <string name="pref_xmpp_resource">משאב XMPP</string>
   <string name="pref_xmpp_resource_summary">השם שלקוח זה מזהה את עצמו עם</string>
   <string name="pref_accept_files">קבל קבצים</string>
-    <string name="pref_accept_files_summary">קבל אוטומטית קבצים קטנים יותר מאשר&#8230;</string>
+  <string name="pref_accept_files_summary">קבל אוטומטית קבצים קטנים יותר מאשר…</string>
   <string name="pref_notification_settings">הגדרות התראה</string>
   <string name="pref_notifications">התראות</string>
   <string name="pref_notifications_summary">תודיע כאשר הודעה חדשה מגיעה</string>
@@ -106,6 +101,7 @@
   <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">שגיאת I/O פענוח קובץ</string>
   <string name="accept">קבל</string>
@@ -209,7 +205,7 @@
   <string name="contact_has_read_up_to_this_point">%s קרא עד לנקודה זו</string>
   <string name="touch_to_choose_picture">לחץ על אווטאר כדי לבחור תמונה מתוך גלריה</string>
   <string name="publish_avatar_explanation">לתשומת לבך: כל מי אשר רשום לעדכוני נוכחות שלך יורשה לראות את תמונה זו.</string>
-    <string name="publishing">כעת מפרסם&#8230;</string>
+  <string name="publishing">כעת מפרסם…</string>
   <string name="error_publish_avatar_server_reject">השרת פסל פרסום</string>
   <string name="error_publish_avatar_converting">משהו השתבש במהלך המרת תמונה</string>
   <string name="error_saving_avatar">לא היה מסוגל לשמור אווטאר אל כונן</string>
@@ -218,6 +214,4 @@
   <string name="private_message">בפרטי</string>
   <string name="private_message_to">בפרטי אל %s</string>
   <string name="send_private_message_to">שלח הודעה פרטית אל %s</string>
-    <string name="pref_ui_options">אפשרויות ממשק משתמש</string>
-
 </resources>

src/main/res/values-nl/strings.xml

@@ -1,6 +1,5 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <resources>
-
   <string name="action_settings">Instellingen</string>
   <string name="action_add">Nieuw gesprek</string>
   <string name="action_accounts">Beheer account</string>
@@ -29,7 +28,7 @@
   <string name="minute_ago">1 min. geleden</string>
   <string name="minutes_ago">%d min. geleden</string>
   <string name="unread_conversations">ongelezen gesprekken</string>
-    <string name="sending">versturen&#8230;</string>
+  <string name="sending">versturen…</string>
   <string name="encrypted_message">Bericht aan het ontsleutelen. Even geduld…</string>
   <string name="nick_in_use">Naam is al in gebruik</string>
   <string name="admin">Beheerder</string>
@@ -71,7 +70,6 @@
   <string name="add_contact">Voeg contact toe</string>
   <string name="send_failed">afleveren mislukt</string>
   <string name="send_rejected">geweigerd</string>
-    <string name="receiving_image">Bezig met ontvangen van afbeelding. Even geduld…</string>
   <string name="preparing_image">Bezig met voorbereiden van versturen van afbeelding</string>
   <string name="action_clear_history">Wis geschiedenis</string>
   <string name="clear_conversation_history">Wis gespreksgeschiedenis</string>
@@ -84,7 +82,6 @@
   <string name="send_pgp_message">Verstuur OpenPGP versleuteld bericht</string>
   <string name="your_nick_has_been_changed">Je naam is veranderd</string>
   <string name="download_image">Download afbeelding</string>
-    <string name="image_offered_for_download"><i>Afbeelding aangeboden voor downloaden</i></string>
   <string name="send_unencrypted">Verstuur onversleuteld</string>
   <string name="decryption_failed">Ontsleutelen mislukt. Misschien heb je niet de juiste private sleutel.</string>
   <string name="openkeychain_required">OpenKeychain</string>
@@ -98,8 +95,6 @@
   <string name="no_pgp_keys">Geen OpenPGP sleutels gevonden</string>
   <string name="contacts_have_no_pgp_keys">Conversations kan je berichten niet versleutelen omdat je contacten geen publieke sleutel hebben ingesteld.\n\n<small>Vraag je contacten om OpenPGP te configureren.</small></string>
   <string name="encrypted_message_received"><i>Versleuteld bericht ontvangen. Raak aan om te bekijken en te ontsleutelen.</i></string>
-    <string name="encrypted_image_received"><i>Versleutelde afbeelding ontvangen. Raak aan om te bekijken en te ontsleutelen.</i></string>
-    <string name="image_file"><i>Afbeelding ontvangen. Raak aan om te bekijken.</i></string>
   <string name="pref_general">Algemeen</string>
   <string name="pref_xmpp_resource">XMPP resource</string>
   <string name="pref_xmpp_resource_summary">De naam waarmee deze client zich identificeert</string>
@@ -273,7 +268,6 @@
   <string name="pref_dont_save_encrypted">Sla versleutelde berichten niet op</string>
   <string name="pref_dont_save_encrypted_summary"><b>Waarschuwing:</b> Dit kan leiden tot verlies van berichten</string>
   <string name="pref_enable_legacy_ssl">Sta legacy SSL toe</string>
-    <string name="pref_enable_legacy_ssl_summary">Staat ondersteuning voor SSLv3 voor legacy servers toe. <b>Waarschuwing:</b> SSLv3 is niet veilig.</string>
   <string name="pref_expert_options">Expert-instellingen</string>
   <string name="pref_expert_options_summary">Wees voorzichtig met deze instellingen</string>
   <string name="title_activity_about">Over Conversations</string>
@@ -303,7 +297,6 @@
   <string name="check_image_filesize">Bekijk bestandsgrootte van afbeelding</string>
   <string name="message_options">Berichtopties</string>
   <string name="copy_text">Kopieer tekst</string>
-    <string name="share_image">Deel afbeelding</string>
   <string name="copy_original_url">Kopieer oorspronkelijke URL</string>
   <string name="send_again">Verstuur opnieuw</string>
   <string name="image_url">AfbeeldingsURL</string>
@@ -333,16 +326,15 @@
   <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="touch_to_disable">Raak aan om voorgrond-service uit te zetten</string>
   <string name="pref_keep_foreground_service">Hou service in voorgrond</string>
   <string name="pref_keep_foreground_service_summary">Belet het besturingssysteem van je verbinding te onderbreken</string>
   <string name="choose_file">Kies bestand</string>
-    <string name="receiving_file">Ontvange van %1$s bestand (%2$d%% voltooid)</string>
-    <string name="open_file">Open %s bestand</string>
+  <string name="receiving_x_file">Ontvangen van %1$s (%2$d%% voltooid)</string>
+  <string name="download_x_file">Download %s</string>
+  <string name="open_x_file">Open %s</string>
   <string name="sending_file">versturen (%1$d%% voltooid)</string>
   <string name="preparing_file">Bestand klaarmaken voor versturen</string>
-    <string name="file_offered_for_download">Bestand aangeboden om te downloaden</string>
-    <string name="file">%s bestand</string>
+  <string name="x_file_offered_for_download">%s aangeboden om te downloaden</string>
   <string name="cancel_transmission">Annuleer bestandsoverdracht</string>
   <string name="file_transmission_failed">bestandsoverdracht mislukt</string>
   <string name="file_deleted">Het bestand is verwijderd</string>
@@ -391,5 +383,26 @@
   <string name="remove_admin_privileges">Administratorprivileges verwijderen</string>
   <string name="remove_from_room">Verwijderen uit kamer</string>
   <string name="could_not_change_affiliation">Kon aansluiting niet wijzigen</string>
-
+  <string name="ban_from_conference">Verbannen uit groepsgesprek</string>
+  <string name="removing_from_public_conference">Je probeert %s te verwijderen uit een publiek groepsgesprek. De enige manier om dat te doen is door hem/haar permanent te verbannen.</string>
+  <string name="ban_now">Nu verbannen</string>
+  <string name="could_not_change_role">Kon rol van %s niet wijzigen</string>
+  <string name="public_conference">Publiek toegankelijk groepsgesprek</string>
+  <string name="private_conference">Privé groepsgesprek, enkel toegankelijk voor leden</string>
+  <string name="conference_options">Groepsgespreksopties</string>
+  <string name="members_only">Privé (alleen leden)</string>
+  <string name="non_anonymous">Niet anoniem</string>
+  <string name="modified_conference_options">Groepsgespreksopties aangepast!</string>
+  <string name="could_not_modify_conference_options">Kon groepsgespreksopties niet aanpassen</string>
+  <string name="never">Nooit</string>
+  <string name="thirty_minutes">30 minuten</string>
+  <string name="one_hour">1 uur</string>
+  <string name="two_hours">2 uur</string>
+  <string name="eight_hours">8 uur</string>
+  <string name="until_further_notice">Voor onbepaalde duur</string>
+  <string name="pref_input_options">Input-opties</string>
+  <string name="pref_enter_is_send">Enter is versturen</string>
+  <string name="pref_enter_is_send_summary">Gebruik de enter-toets om berichten te versturen</string>
+  <string name="pdf_document">PDF-document</string>
+  <string name="received_x_file">%s ontvangen</string>
 </resources>

src/main/res/values-ru/strings.xml

@@ -1,6 +1,5 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <resources>
-
   <string name="action_settings">Настройки</string>
   <string name="action_add">Новая беседа</string>
   <string name="action_accounts">Управление аккаунтами</string>
@@ -24,8 +23,8 @@
   <string name="minute_ago">1 минуту назад</string>
   <string name="minutes_ago">%d мин. назад</string>
   <string name="unread_conversations">непрочитанных сообщений</string>
-    <string name="sending">отправка&#8230;</string>
-    <string name="encrypted_message">Расшифровка сообщения. Пожалуйста, подождите&#8230;</string>
+  <string name="sending">отправка…</string>
+  <string name="encrypted_message">Расшифровка сообщения. Пожалуйста, подождите…</string>
   <string name="nick_in_use">Имя уже используется</string>
   <string name="admin">Администратор</string>
   <string name="owner">Владелец</string>
@@ -57,7 +56,6 @@
   <string name="add_contact">Добавить контакт</string>
   <string name="send_failed">доставка не удалась</string>
   <string name="send_rejected">отклонено</string>
-    <string name="receiving_image">Получение изображения. Пожалуйста подождите&#8230;</string>
   <string name="preparing_image">Подготовка изображения к передаче</string>
   <string name="action_clear_history">Очистить историю</string>
   <string name="clear_conversation_history">Очистить историю</string>
@@ -70,27 +68,24 @@
   <string name="send_pgp_message">Отправить OpenPGP защифрованное сообщение</string>
   <string name="your_nick_has_been_changed">Ваш псевдоним был изменен</string>
   <string name="download_image">Загрузить изображение</string>
-    <string name="image_offered_for_download"><i>Изображение предложено для загрузки</i></string>
   <string name="send_unencrypted">Отправить в незашифрованном виде</string>
   <string name="decryption_failed">Расшифровка не удалась. Вероятно, что у вас нет надлежащего ключа.</string>
   <string name="openkeychain_required">Установите OpenKeychain</string>
   <string name="openkeychain_required_long">Conversations использует стороннее приложение под названием <b>OpenKeychain</b> для шифрования и расшифрования сообщений и управления открытыми ключами.\nПрограмма OpenKeychain распространяется под лицензией GPLv3 и доступна для загрузки через F-Droid или Google Play.\n\n<small>(Потребуется перезапуск Conversations после установки.)</small></string>
   <string name="restart">Перезапуск</string>
   <string name="install">Установка</string>
-    <string name="offering">предложение&#8230;</string>
-    <string name="waiting">ожидание&#8230;</string>
+  <string name="offering">предложение…</string>
+  <string name="waiting">ожидание…</string>
   <string name="no_pgp_key">Нет OpenPGP ключа</string>
   <string name="contact_has_no_pgp_key">Conversations не может зашифровать сообщение, потому что удаленный пользователь не анонсирует свой открытый ключ.\n\n<small>Пожалуйста, попросите удаленного пользователя тоже установить OpenPGP.</small></string>
   <string name="no_pgp_keys">Нет OpenPGP ключей</string>
   <string name="contacts_have_no_pgp_keys">Conversations не может зашифровать сообщения, потому что удаленные пользователи не анонсируют свои открытые ключи.\n\n<small>Пожалуйста, попросите удаленных пользователей тоже установить OpenPGP.</small></string>
   <string name="encrypted_message_received"><i>Зашифрованное сообщение получено. Нажмите здесь, чтобы расшифровать и посмотреть сообщение.</i></string>
-    <string name="encrypted_image_received"><i>Зашифрованное изображение получено. Нажмите здесь, чтобы расшифровать и посмотреть изображение.</i></string>
-    <string name="image_file"><i>Изображение получено. Нажмите здесь, чтобы посмотреть.</i></string>
   <string name="pref_general">Общие</string>
   <string name="pref_xmpp_resource">Название ресурса</string>
   <string name="pref_xmpp_resource_summary">Имя которым Conversations идентифицирует себя</string>
   <string name="pref_accept_files">Принимать файлы</string>
-    <string name="pref_accept_files_summary">Автоматический прием файлов&#8230;</string>
+  <string name="pref_accept_files_summary">Автоматический прием файлов…</string>
   <string name="pref_notification_settings">Настройки Уведомлений</string>
   <string name="pref_notifications">Уведомление</string>
   <string name="pref_notifications_summary">Использовать звуковое уведомление когда приходят новые сообщения</string>
@@ -131,8 +126,8 @@
   <string name="account_status_unknown">Неизвестен</string>
   <string name="account_status_disabled">Временно отключен</string>
   <string name="account_status_online">В сети</string>
-    <string name="account_status_offline">Не в сети</string>
   <string name="account_status_connecting">Соединение\u2026</string>
+  <string name="account_status_offline">Не в сети</string>
   <string name="account_status_unauthorized">Неавторизован</string>
   <string name="account_status_not_found">Сервер не найден</string>
   <string name="account_status_no_internet">Нет подключения к сети</string>
@@ -216,7 +211,7 @@
   <string name="publish">Опубликовать</string>
   <string name="touch_to_choose_picture">Нажмите на аватар, чтобы выбрать новую фотографию из галереи</string>
   <string name="publish_avatar_explanation">Пожалуйста, обратите внимание, что этот аватар смогут увидеть все ваши подписчики</string>
-    <string name="publishing">Установка&#8230;</string>
+  <string name="publishing">Установка…</string>
   <string name="error_publish_avatar_server_reject">Сервер отклонил размещение аватара</string>
   <string name="error_publish_avatar_converting">В процессе преобразования фотографии возникла ошибка</string>
   <string name="error_saving_avatar">Не удалось сохранить аватар</string>
@@ -255,5 +250,4 @@
   <string name="pref_use_larger_font_summary">Установите больший размер шрифта по всей программе</string>
   <string name="pref_use_send_button_to_indicate_status">Использовать кнопку-индикатор</string>
   <string name="pref_use_send_button_to_indicate_status_summary">Раскрасить кнопку отправить, указывая текущий статус собеседника</string>
-
 </resources>

src/main/res/values-sv/strings.xml

@@ -1,30 +1,35 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <resources>
-
   <string name="action_settings">Inställningar</string>
   <string name="action_add">Ny konversation</string>
   <string name="action_accounts">Kontoinställningar</string>
   <string name="action_end_conversation">Avsluta denna konversation</string>
   <string name="action_contact_details">Kontaktdetaljer</string>
   <string name="action_muc_details">Konferensdetaljer</string>
-    <string name="action_secure">Skyddad konversation</string>
+  <string name="action_secure">Säker konversation</string>
   <string name="action_add_account">Lägg till konto</string>
   <string name="action_edit_contact">Ändra namn</string>
   <string name="action_add_phone_book">Lägg till i telefonbok</string>
   <string name="action_delete_contact">Ta bort kontakt</string>
+  <string name="action_block_contact">Blockera kontakt</string>
+  <string name="action_unblock_contact">Avblockera kontakt</string>
+  <string name="action_block_domain">Blockera domän</string>
+  <string name="action_unblock_domain">Avblockera domän</string>
   <string name="title_activity_manage_accounts">Hantera konton</string>
   <string name="title_activity_settings">Inställningar</string>
   <string name="title_activity_conference_details">Konferensdetaljer</string>
   <string name="title_activity_contact_details">Kontaktdetaljer</string>
+  <string name="title_activity_conversations">Conversations</string>
   <string name="title_activity_sharewith">Dela med konversation</string>
   <string name="title_activity_start_conversation">Starta konversation</string>
   <string name="title_activity_choose_contact">Välj kontakt</string>
+  <string name="title_activity_block_list">Blockeringslista</string>
   <string name="just_now">just nu</string>
   <string name="minute_ago">1 min sedan</string>
   <string name="minutes_ago">%d min sedan</string>
   <string name="unread_conversations">olästa konversationer</string>
-    <string name="sending">skickar&#8230;</string>
-    <string name="encrypted_message">Avkrypterar meddelande. Vänta&#8230;</string>
+  <string name="sending">skickar…</string>
+  <string name="encrypted_message">Avkrypterar meddelande. Vänta…</string>
   <string name="nick_in_use">Nick används redan</string>
   <string name="admin">Admin</string>
   <string name="owner">Ägare</string>
@@ -32,16 +37,25 @@
   <string name="participant">Deltagare</string>
   <string name="visitor">Besökare</string>
   <string name="remove_contact_text">Vill du ta bort %s från din kontaktlista? Konversationer associerade med denna kontakt kommer inte tas bort.</string>
+  <string name="block_contact_text">Vill du blockera %s från att skicka dig meddelanden</string>
+  <string name="unblock_contact_text">Vill du avblockera %s och tillåta denne att skicka dig meddelanden?</string>
+  <string name="block_domain_text">Blockera alla kontakter från %s</string>
+  <string name="unblock_domain_text">Avblockera alla kontakter från %s</string>
+  <string name="contact_blocked">Kontakt blockerad</string>
   <string name="remove_bookmark_text">Vill du ta bort %s som bokmärke? Konversationer associerade med detta bokmärke kommer inte tas bort.</string>
   <string name="register_account">Registrera nytt konto på servern</string>
-    <string name="share_with">Dela med</string>
+  <string name="change_password_on_server">Byt lösenord på server</string>
+  <string name="share_with">Dela med…</string>
   <string name="start_conversation">Starta konversation</string>
   <string name="invite_contact">Bjud in kontakt</string>
   <string name="contacts">Kontakter</string>
   <string name="cancel">Avbryt</string>
+  <string name="set">Sätt</string>
   <string name="add">Lägg till</string>
   <string name="edit">Ändra</string>
   <string name="delete">Ta bort</string>
+  <string name="block">Blockera</string>
+  <string name="unblock">Avblockera</string>
   <string name="save">Spara</string>
   <string name="ok">Ok</string>
   <string name="crash_report_title">Conversations har kraschat</string>
@@ -56,38 +70,36 @@
   <string name="add_contact">Lägg till kontakt</string>
   <string name="send_failed">sändning misslyckades</string>
   <string name="send_rejected">avvisad</string>
-    <string name="receiving_image">Tar emot bildfil. Vänta&#8230;</string>
   <string name="preparing_image">Förbereder bild för sändning</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>
   <string name="delete_messages">Ta bort meddelanden</string>
   <string name="also_end_conversation">Avsluta denna konversation efter</string>
+  <string name="choose_presence">Välj tillgänglighet till kontakt</string>
   <string name="send_plain_text_message">Skicka meddelande i klartext</string>
   <string name="send_otr_message">Skicka OTR-krypterat meddelande</string>
   <string name="send_pgp_message">Skicka OpenPGP-krypterat meddelande</string>
   <string name="your_nick_has_been_changed">Ditt nick har ändrats</string>
   <string name="download_image">Ladda ner bild</string>
-    <string name="image_offered_for_download"><i>Bildfil erbjuds för nedladdning</i></string>
   <string name="send_unencrypted">Skicka okrypterat</string>
   <string name="decryption_failed">Avkryptering gick fel. Du kanske inte har rätt privat nyckel.</string>
   <string name="openkeychain_required">OpenKeychain</string>
   <string name="openkeychain_required_long">Conversations använder en tredjeparts applikation som heter <b>OpenKeychain</b> för att kryptera och avkryptera meddelanden och hantera dina publika nycklar.\n\nOpenKeychain är licensierat under GPLv3 och tillgängligt på F-Droid och Google Play.\n\n<small>(Starta om Conversations efter.)</small></string>
   <string name="restart">Starta om</string>
   <string name="install">Installera</string>
-    <string name="offering">erbjuder&#8230;</string>
-    <string name="waiting">väntar&#8230;</string>
+  <string name="offering">erbjuder…</string>
+  <string name="waiting">väntar…</string>
   <string name="no_pgp_key">Ingen OpenPGP-nyckel funnen</string>
   <string name="contact_has_no_pgp_key">Conversations kan inte avkryptera ditt meddelande eftersom din kontakt inte annonserar sin publika nyckel.\n\n<small>Be din kontakt att sätta upp OpenPGP.</small></string>
   <string name="no_pgp_keys">Inga OpenPGP-nycklar funna</string>
   <string name="contacts_have_no_pgp_keys">Conversations kan inte avkryptera ditt meddelande eftersom din kontakt inte annonserar sin publika nyckel.\n\n<small>Be din kontakt att sätta upp OpenPGP.</small></string>
   <string name="encrypted_message_received"><i>Krypterat meddelande mottaget. Tryck för att se och avkryptera.</i></string>
-    <string name="encrypted_image_received"><i>Krypterad bild mottagen. Tryck för att se och avkryptera.</i></string>
-    <string name="image_file"><i>Bild mottagen. Tryck för att se</i></string>
+  <string name="pref_general">Generellt</string>
   <string name="pref_xmpp_resource">XMPP resurs</string>
   <string name="pref_xmpp_resource_summary">Namnet som klienten identifierar sig med</string>
   <string name="pref_accept_files">Acceptera filer</string>
-    <string name="pref_accept_files_summary">Acceptera automatistk filer som är mindre än&#8230;</string>
+  <string name="pref_accept_files_summary">Acceptera automatistk filer som är mindre än…</string>
   <string name="pref_notification_settings">Notifieringsinställningar</string>
   <string name="pref_notifications">Notifieringar</string>
   <string name="pref_notifications_summary">Notifiera när meddelande tagits emot</string>
@@ -98,11 +110,13 @@
   <string name="pref_conference_notifications">Konferensnotifieringar</string>
   <string name="pref_conference_notifications_summary">Notifiera alltid när nytt konferensmeddelande tagits emot istället för endast vid highlight</string>
   <string name="pref_notification_grace_period">Notifieringsfrist</string>
+  <string name="pref_notification_grace_period_summary">Inaktivera notifieringar en kort stund efter att en carbon copy tagits emot</string>
   <string name="pref_advanced_options">Avancerade inställningar</string>
   <string name="pref_never_send_crash">Skicka aldrig krasch-rapporter</string>
   <string name="pref_never_send_crash_summary">Genom att skicka in stack traces hjälper du utvecklarna av Conversations</string>
   <string name="pref_confirm_messages">Bekräfta meddelanden</string>
   <string name="pref_confirm_messages_summary">Låter dina kontakter veta när du har tagit emot och läst ett meddelande</string>
+  <string name="pref_ui_options">UI inställningar</string>
   <string name="openpgp_error">OpenKeychain rapporterade ett fel</string>
   <string name="error_decrypting_file">I/O-fel vid avkryptering av fil</string>
   <string name="accept">Acceptera</string>
@@ -124,6 +138,7 @@
   <string name="error_io_exception">Generellt I/O-fel. Du kanske fick slut på plats?</string>
   <string name="error_security_exception_during_image_copy">Applikationen du använde för att välja bilden gav inte tillräckliga rättigheter för att läsa filen.\n\n<small>Använd en annan filhanterare för att välja bild</small></string>
   <string name="account_status_unknown">Okänd</string>
+  <string name="account_status_disabled">Tillfälligt inaktiverad</string>
   <string name="account_status_online">Online</string>
   <string name="account_status_connecting">Ansluter\u2026</string>
   <string name="account_status_offline">Offline</string>
@@ -134,11 +149,16 @@
   <string name="account_status_regis_conflict">Användarnamn används redan</string>
   <string name="account_status_regis_success">Registrering klar</string>
   <string name="account_status_regis_not_sup">Servern stödjer inte registrering</string>
+  <string name="account_status_security_error">Säkerhetsfel</string>
+  <string name="account_status_incompatible_server">Inkompatibel server</string>
   <string name="encryption_choice_none">Klartext</string>
   <string name="encryption_choice_otr">OTR</string>
   <string name="encryption_choice_pgp">OpenPGP</string>
   <string name="mgmt_account_edit">Ändra konto</string>
   <string name="mgmt_account_delete">Ta bort</string>
+  <string name="mgmt_account_disable">Inaktivera tillfälligt</string>
+  <string name="mgmt_account_publish_avatar">Publisera avatarbild</string>
+  <string name="mgmt_account_publish_pgp">Publisera OpenPGP publik nyckel</string>
   <string name="mgmt_account_enable">Aktivera</string>
   <string name="mgmt_account_are_you_sure">Är du säker?</string>
   <string name="mgmt_account_delete_confirm_text">Om du tar bort kontot kommer all konversationshistorik att försvinna</string>
@@ -161,8 +181,16 @@
   <string name="contact_status_offline">offline</string>
   <string name="muc_details_conference">Konferens</string>
   <string name="muc_details_other_members">Andra medlemmar</string>
+  <string name="server_info_show_more">Server info</string>
+  <string name="server_info_mam">XEP-0313: Message Archive</string>
   <string name="server_info_carbon_messages">Carbon Messages</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">Stream Management</string>
+  <string name="server_info_pep">XEP-0163: PEP (Avatarbilder)</string>
+  <string name="server_info_available">tillgänglig</string>
+  <string name="server_info_unavailable">otillgänglig</string>
   <string name="missing_public_keys">Annonsering om publik nyckel saknas</string>
   <string name="last_seen_now">senast sedd just nu</string>
   <string name="last_seen_min">senast sedd 1 minut sedan</string>
@@ -186,6 +214,8 @@
   <string name="join_conference">Gå med i konferens</string>
   <string name="delete_contact">Ta bort kontakt</string>
   <string name="view_contact_details">Se kontaktdetaljer</string>
+  <string name="block_contact">Blockera kontakt</string>
+  <string name="unblock_contact">Avblockera kontakt</string>
   <string name="create">Skapa</string>
   <string name="contact_already_exists">Kontakten finns redan</string>
   <string name="join">Gå med</string>
@@ -201,59 +231,178 @@
   <string name="contact_added_you">Kontakten lade till dig i sin kontaktlista</string>
   <string name="add_back">Addera tillbaks</string>
   <string name="contact_has_read_up_to_this_point">%s har läst fram hit</string>
-    <string name="next">Nästa</string>
-    <string name="server_info_unavailable">otillgänglig</string>
-    <string name="mgmt_account_publish_pgp">Publisera OpenPGP publik nyckel</string>
-    <string name="additional_information">Ytterligare information</string>
-    <string name="server_info_pep">XEP-0163: PEP (Avatarbilder)</string>
-    <string name="skip">skippa</string>
-    <string name="connect">Anslut</string>
-    <string name="account_already_exists">Detta konto finns redan</string>
-    <string name="private_message_to">till %s</string>
-    <string name="send_private_message_to">Skicka privat meddelande till %s</string>
+  <string name="publish">Publicera</string>
   <string name="touch_to_choose_picture">Tryck på avatarbild för att välja en bild från bildgalleriet</string>
-    <string name="mgmt_account_publish_avatar">Publisera avatarbild</string>
+  <string name="publish_avatar_explanation">Notera: Alla som kan se dina tillgänglighetsuppdateringar kommer se denna bild.</string>
+  <string name="publishing">Publiserar…</string>
   <string name="error_publish_avatar_server_reject">Servern kunde inte publisera</string>
   <string name="error_publish_avatar_converting">Något gick fel vid konvertering av din bild</string>
-    <string name="error_publish_avatar_no_server_support">Din server stödjer inte publisering av avatarbilder</string>
-    <string name="publishing">Publiserar&#8230;</string>
   <string name="error_saving_avatar">Kunde inte spara avatarbild till disk</string>
-    <string name="server_info_session_established">Nuvarande session upprättad</string>
   <string name="or_long_press_for_default">(Eller tryck länge för att få tillbaks förvald)</string>
-    <string name="server_info_available">tillgänglig</string>
-    <string name="pref_general">Generellt</string>
-    <string name="publish">Publicera</string>
+  <string name="error_publish_avatar_no_server_support">Din server stödjer inte publisering av avatarbilder</string>
   <string name="private_message">privat meddelande</string>
-    <string name="pref_ui_options">UI inställningar</string>
-    <string name="enable">Aktivera</string>
-    <string name="without_mutual_presence_updates"><b>Varning:</b> Skicka detta utan gemensamma tillgänglighetsuppdateringar kan ge oväntade problem.\n\n<small>Gå till kontaktdetaljer för att verifiera dina tillgänglighetsuppdateringar.</small></string>
+  <string name="private_message_to">till %s</string>
+  <string name="send_private_message_to">Skicka privat meddelande till %s</string>
+  <string name="connect">Anslut</string>
+  <string name="account_already_exists">Detta konto finns redan</string>
+  <string name="next">Nästa</string>
+  <string name="server_info_session_established">Nuvarande session upprättad</string>
+  <string name="additional_information">Ytterligare information</string>
+  <string name="skip">skippa</string>
   <string name="disable_notifications">Inaktivera notifieringar</string>
-    <string name="request_presence_updates">Begär tillgänglighetsuppdateringar från din kontakt först.\n\n<small>Detta används för att se vilken klient/klienter din kontakt använder.</small></string>
-    <string name="conference_requires_password">Konferensen kräver lösenord</string>
-    <string name="pref_dont_save_encrypted">Spara in krypterade meddelanden</string>
-    <string name="pref_encryption_settings">Krypteringsinställningar</string>
-    <string name="pref_use_send_button_to_indicate_status_summary">Färglägg skickaknappen för att indikera kontaktens status</string>
-    <string name="missing_presence_updates">Saknar tillgänglighetsuppdateringar från kontakt</string>
-    <string name="pref_expert_options">Expertinställningar</string>
-    <string name="pref_force_encryption_summary">Sänd alltid krypterade meddelanden (utom för konferenser)</string>
-    <string name="pref_expert_options_summary">Var försiktig med dem</string>
   <string name="disable_notifications_for_this_conversation">Inaktivera notifieringar för denna konversation</string>
-    <string name="pref_use_send_button_to_indicate_status">Skickaknappen indikerar status</string>
-    <string name="enter_password">Fyll i lösenord</string>
   <string name="notifications_disabled">Notifieringar är inaktiverade</string>
-    <string name="pref_force_encryption">Tvinga kryptering</string>
+  <string name="enable">Aktivera</string>
+  <string name="conference_requires_password">Konferensen kräver lösenord</string>
+  <string name="enter_password">Fyll i lösenord</string>
+  <string name="missing_presence_updates">Saknar tillgänglighetsuppdateringar från kontakt</string>
+  <string name="request_presence_updates">Begär tillgänglighetsuppdateringar från din kontakt först.\n\n<small>Detta används för att se vilken klient/klienter din kontakt använder.</small></string>
+  <string name="request_now">Begär nu</string>
+  <string name="delete_fingerprint">Ta bort fingeravtryck</string>
   <string name="sure_delete_fingerprint">Är du säker på att du vill ta bort detta fingeravtryck?</string>
   <string name="ignore">Ignorera</string>
-    <string name="pref_use_larger_font_summary">Använd större teckenstorlek för hela applikationen</string>
-    <string name="pref_use_larger_font">Öka teckenstorlek</string>
+  <string name="without_mutual_presence_updates"><b>Varning:</b> Skicka detta utan gemensamma tillgänglighetsuppdateringar kan ge oväntade problem.\n\n<small>Gå till kontaktdetaljer för att verifiera dina tillgänglighetsuppdateringar.</small></string>
+  <string name="pref_encryption_settings">Krypteringsinställningar</string>
+  <string name="pref_force_encryption">Tvinga kryptering</string>
+  <string name="pref_force_encryption_summary">Sänd alltid krypterade meddelanden (utom för konferenser)</string>
+  <string name="pref_dont_save_encrypted">Spara in krypterade meddelanden</string>
   <string name="pref_dont_save_encrypted_summary">Varning: Detta kan leda till att meddelanden förloras</string>
-    <string name="delete_fingerprint">Ta bort fingeravtryck</string>
-    <string name="request_now">Begär nu</string>
-    <string name="title_activity_conversations">Conversations</string>
-    <string name="publish_avatar_explanation">Notera: Alla som kan se dina tillgänglighetsuppdateringar kommer se denna bild.</string>
-    <string name="choose_presence">Välj tillgänglighet till kontakt</string>
-    <string name="pref_notification_grace_period_summary">Inaktivera notifieringar en kort stund efter att en carbon copy tagits emot</string>
-    <string name="account_status_disabled">Tillfälligt inaktiverad</string>
-    <string name="mgmt_account_disable">Inaktivera tillfälligt</string>
-
+  <string name="pref_enable_legacy_ssl">Aktivera förlegad SSL</string>
+  <string name="pref_expert_options">Expertinställningar</string>
+  <string name="pref_expert_options_summary">Var försiktig med dem</string>
+  <string name="title_activity_about">Om Conversations</string>
+  <string name="pref_about_conversations_summary">Bygg- och licensinformation</string>
+  <string name="title_pref_quiet_hours">Tysta timmar</string>
+  <string name="title_pref_quiet_hours_start_time">Starttid</string>
+  <string name="title_pref_quiet_hours_end_time">Sluttid</string>
+  <string name="title_pref_enable_quiet_hours">Aktivera tysta timmar</string>
+  <string name="pref_quiet_hours_summary">Notifieringar kommer vara tysta under tysta timmar</string>
+  <string name="pref_use_larger_font">Öka teckenstorlek</string>
+  <string name="pref_use_larger_font_summary">Använd större teckenstorlek för hela applikationen</string>
+  <string name="pref_use_send_button_to_indicate_status">Skickaknappen indikerar status</string>
+  <string name="pref_use_indicate_received">Begär mottagningskvitto</string>
+  <string name="pref_use_indicate_received_summary">Mottagna meddelanden markeras med en grön bock om det stöds</string>
+  <string name="pref_use_send_button_to_indicate_status_summary">Färglägg skickaknappen för att indikera kontaktens status</string>
+  <string name="pref_expert_options_other">Annat</string>
+  <string name="pref_conference_name">Konferensnamn</string>
+  <string name="pref_conference_name_summary">Använd konferensens ämne istället för JID för att identifiera konferenser</string>
+  <string name="toast_message_otr_fingerprint">OTR-fingeravtryck har kopierats till urklipp!</string>
+  <string name="conference_banned">Du är bannlyst från denna konferens</string>
+  <string name="conference_members_only">Medlemsskap krävs för denna konferens</string>
+  <string name="conference_kicked">Du har blivit utsparkad från denna konferens</string>
+  <string name="using_account">använder konto %s</string>
+  <string name="checking_image">Kontrollerar bild på HTTP host</string>
+  <string name="image_file_deleted">Bildfilen har blivit borttagen</string>
+  <string name="not_connected_try_again">Du är inte ansluten. Försök igen senare</string>
+  <string name="check_image_filesize">Kontrollera bildens filstorlek</string>
+  <string name="message_options">Meddelandealternativ</string>
+  <string name="copy_text">Kopiera text</string>
+  <string name="copy_original_url">Kopiera orginal-URL</string>
+  <string name="send_again">Skicka igen</string>
+  <string name="image_url">Bild-URL</string>
+  <string name="message_text">Meddelandetext</string>
+  <string name="url_copied_to_clipboard">URL kopierad till urklipp</string>
+  <string name="message_copied_to_clipboard">Meddelande kopierad till urklipp</string>
+  <string name="image_transmission_failed">Bildöverföring lyckades inte</string>
+  <string name="scan_qr_code">Skanna QR-kod</string>
+  <string name="show_qr_code">Visa QR-kod</string>
+  <string name="show_block_list">Visa blockeringslista</string>
+  <string name="account_details">Kontodetaljer</string>
+  <string name="verify_otr">Verifiera OTR</string>
+  <string name="remote_fingerprint">Fjärr-fingeravtryck</string>
+  <string name="scan">skanna</string>
+  <string name="or_touch_phones">(eller nudda telefoner)</string>
+  <string name="smp">Socialist Millionaire Protocol</string>
+  <string name="shared_secret_hint">Ledtråd eller fråga</string>
+  <string name="shared_secret_secret">Delad hemlighet</string>
+  <string name="confirm">Bekräfta</string>
+  <string name="in_progress">Pågående</string>
+  <string name="respond">Svara</string>
+  <string name="failed">Lyckades ej</string>
+  <string name="secrets_do_not_match">Hemligheter matchar inte</string>
+  <string name="try_again">Försök igen</string>
+  <string name="finish">Klar</string>
+  <string name="verified">Verifierad</string>
+  <string name="smp_requested">Kontakt begärde SMP verifikation</string>
+  <string name="no_otr_session_found">Ingen giltig OTR-session kunde hittas!</string>
+  <string name="conversations_foreground_service">Conversations</string>
+  <string name="pref_keep_foreground_service">Håll tjänst i förgrunden</string>
+  <string name="pref_keep_foreground_service_summary">Förehindrar operativsystemet att ta ner uppkopplingen</string>
+  <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="open_x_file">Öppna %s</string>
+  <string name="sending_file">skickar (%1$d%% klart)</string>
+  <string name="preparing_file">Förbereder fil för överföring</string>
+  <string name="x_file_offered_for_download">%s erbjuden för nedladdning</string>
+  <string name="cancel_transmission">Avbryt överföring</string>
+  <string name="file_transmission_failed">filöverföring lyckades inte</string>
+  <string name="file_deleted">Filen har blivit borttagen</string>
+  <string name="no_application_found_to_open_file">Ingen applikation kunde hittas för att öppna filen</string>
+  <string name="could_not_verify_fingerprint">Kunde inte verifiera fingeravtryck</string>
+  <string name="manually_verify">Verifiera manuellt</string>
+  <string name="are_you_sure_verify_fingerprint">Är du säker på att du vill verifiera din kontakts OTR-fingeravtryck</string>
+  <string name="pref_show_dynamic_tags">Visa dynamiska taggar</string>
+  <string name="pref_show_dynamic_tags_summary">Visa skrivskyddade taggar under kontakter</string>
+  <string name="enable_notifications">Aktivera notifieringar</string>
+  <string name="conference_with">Skapa konferens med…</string>
+  <string name="no_conference_server_found">Ingen konferensserver hittad</string>
+  <string name="conference_creation_failed">Kunde inte skapa konferens</string>
+  <string name="conference_created">Konferens skapad!</string>
+  <string name="secret_accepted">Hemlighet accepterad!</string>
+  <string name="reset">Återställ</string>
+  <string name="account_image_description">Kontots avatarbild</string>
+  <string name="copy_otr_clipboard_description">Kopiera OTR-fingeravtryck till urklipp</string>
+  <string name="fetching_history_from_server">Hämtar historik från server</string>
+  <string name="no_more_history_on_server">Ingen mer historik på server</string>
+  <string name="updating">Uppdaterar…</string>
+  <string name="password_changed">Lösenord bytt!</string>
+  <string name="could_not_change_password">Kunde inte byta lösenord</string>
+  <string name="otr_session_not_started">Skicka meddelande för att påbörja en krypterad chat</string>
+  <string name="ask_question">Ställ fråga</string>
+  <string name="smp_explain_question">Om du och din kontakt har en delad hemlighet som ingen annan känner till (som ett internt skämt eller vad ni åt till lunch senast ni träffades) så kan ni ange den hemligheten för att verifiera varandras fingeravtryck.\n\nDu ger en ledtråd eller en fråga till din kontakt som ska svara med ett svar som är skiftlägeskänsligt.</string>
+  <string name="smp_explain_answer">Din kontakt vill verifiera ditt fingeravtryck genom att utmana dig med en delad hemlighet. Din kontakt gav följande ledtråd eller fråga för hemligheten.</string>
+  <string name="shared_secret_hint_should_not_be_empty">Din ledtråd ska inte vara tom</string>
+  <string name="shared_secret_can_not_be_empty">Din delade hemlighet kan inte vara tom</string>
+  <string name="manual_verification_explanation">Jämför noggrant fingeravtrycker nedan med din kontakts fingeravtryck.\nDu kan använda valfri typ av betrodd kommunikation som ett krypterat e-mail eller ett telefonsamtal för att utbyta dessa.</string>
+  <string name="change_password">Byt lösenord</string>
+  <string name="current_password">Nuvarande lösenord</string>
+  <string name="new_password">Nytt lösenord</string>
+  <string name="password_should_not_be_empty">Lösenordet ska inte vara tomt</string>
+  <string name="enable_all_accounts">Aktivera alla konton</string>
+  <string name="disable_all_accounts">Deaktivera alla konton</string>
+  <string name="perform_action_with">Utför åtgärden med</string>
+  <string name="no_affiliation">Ingen anknytning</string>
+  <string name="no_role">Ingen roll</string>
+  <string name="outcast">Utstött</string>
+  <string name="member">Medlem</string>
+  <string name="advanced_mode">Avancerat läge</string>
+  <string name="grant_membership">Bevilja medlemsskap</string>
+  <string name="remove_membership">Återkalla medlemskap</string>
+  <string name="grant_admin_privileges">Bevilja administratörsbehörighet</string>
+  <string name="remove_admin_privileges">Återkalla administratörsbehörighet</string>
+  <string name="remove_from_room">Ta bort från konferens</string>
+  <string name="could_not_change_affiliation">Kunde inte ändra tillhörigheten för %s</string>
+  <string name="ban_from_conference">Bannlys från konferens</string>
+  <string name="removing_from_public_conference">Du försöker ta bort %s från en publik konferens. Det enda sätt att göra detta är att bannlysa användaren för evigt.</string>
+  <string name="ban_now">Bannlys nu</string>
+  <string name="could_not_change_role">Kunde inte ändra rollen för %s</string>
+  <string name="public_conference">Publikt tillgänglig konferens</string>
+  <string name="private_conference">Privat konferens där medlemsskap krävs</string>
+  <string name="conference_options">Konferensalternativ</string>
+  <string name="members_only">Privat (endast för medlemmar)</string>
+  <string name="non_anonymous">Icke-anonymt</string>
+  <string name="modified_conference_options">Ändrade konferensalternativ</string>
+  <string name="could_not_modify_conference_options">Kunde inte ändra konferensalternativ</string>
+  <string name="never">Aldrig</string>
+  <string name="thirty_minutes">30 minuter</string>
+  <string name="one_hour">1 timma</string>
+  <string name="two_hours">2 timmar</string>
+  <string name="eight_hours">8 timmar</string>
+  <string name="until_further_notice">Tills vidare</string>
+  <string name="pref_input_options">Inmatningsalternativ</string>
+  <string name="pref_enter_is_send">Skicka på enter</string>
+  <string name="pref_enter_is_send_summary">Använd enter-knappen för att skicka meddelande</string>
+  <string name="pdf_document">PDF-dokument</string>
+  <string name="received_x_file">Tagit emot %s</string>
 </resources>

src/main/res/values-zh-rCN/strings.xml

@@ -1,6 +1,5 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <resources>
-
   <string name="action_settings">设置</string>
   <string name="action_add">新会话</string>
   <string name="action_accounts">管理账户</string>
@@ -24,8 +23,8 @@
   <string name="minute_ago">1 分钟前</string>
   <string name="minutes_ago">%d分钟前</string>
   <string name="unread_conversations">未读会话</string>
-    <string name="sending">正在发送&#8230;</string>
-    <string name="encrypted_message">解密信息中. 请稍候&#8230;</string>
+  <string name="sending">正在发送…</string>
+  <string name="encrypted_message">解密信息中. 请稍候…</string>
   <string name="nick_in_use">该名称已存在</string>
   <string name="admin">管理员</string>
   <string name="owner">所有者</string>
@@ -57,7 +56,6 @@
   <string name="add_contact">添加联系人</string>
   <string name="send_failed">传递失败</string>
   <string name="send_rejected">拒绝</string>
-    <string name="receiving_image">接收图片文件中. 请稍候&#8230;</string>
   <string name="preparing_image">准备传输图像</string>
   <string name="action_clear_history">清除历史记录</string>
   <string name="clear_conversation_history">清除会话记录</string>
@@ -70,27 +68,24 @@
   <string name="send_pgp_message">发送 OpenPGP 加密信息</string>
   <string name="your_nick_has_been_changed">用户名修改成功</string>
   <string name="download_image">下载图片</string>
-    <string name="image_offered_for_download"><i>供下载的图像文件</i></string>
   <string name="send_unencrypted">不加密发送</string>
   <string name="decryption_failed">解密失败，可能是私钥不正确.</string>
   <string name="openkeychain_required">OpenKeychain</string>
   <string name="openkeychain_required_long">会话运用了第三方app，名为 <b>OpenKeychain</b> 用来加密、解码信息以及管理您的公钥.\n\nOpenKeychain 遵循 GPLv3 并且在 F-Droid和Google Play上可操作.\n\n<small>(之后请重启conversations.)</small></string>
   <string name="restart">重启</string>
   <string name="install">安装</string>
-    <string name="offering">输入&#8230;</string>
-    <string name="waiting">等待&#8230;</string>
+  <string name="offering">输入…</string>
+  <string name="waiting">等待…</string>
   <string name="no_pgp_key">未发现OpenPGP 密码</string>
   <string name="contact_has_no_pgp_key">会话加密信息失败，因为联系人未告知他/她的公钥.\n\n<small>请通知联系人设置 OpenPGP.</small></string>
   <string name="no_pgp_keys">未找到 OpenPGP 密码</string>
   <string name="contacts_have_no_pgp_keys">因您的联系人未公布公钥，Conversations未能成功加密您的信息.\n\n<small>请通知联系人设置OpenPGP.</small></string>
   <string name="encrypted_message_received"><i>加密信息已接收.点击进行解密和查看.</i></string>
-    <string name="encrypted_image_received"><i>加密图像已接收.点击进行解密和查看.</i></string>
-    <string name="image_file"><i>图片已成功接收，点击查看</i></string>
   <string name="pref_general">常规</string>
   <string name="pref_xmpp_resource">XMPP 资源</string>
   <string name="pref_xmpp_resource_summary">客户端标识名称</string>
   <string name="pref_accept_files">接收文件</string>
-    <string name="pref_accept_files_summary">自动接收小于 &#8230; 的文件</string>
+  <string name="pref_accept_files_summary">自动接收小于 … 的文件</string>
   <string name="pref_notification_settings">通知设置</string>
   <string name="pref_notifications">通知</string>
   <string name="pref_notifications_summary">收到新消息时通知</string>
@@ -216,7 +211,7 @@
   <string name="publish">发布</string>
   <string name="touch_to_choose_picture">点击头像可选择头像 </string>
   <string name="publish_avatar_explanation">请注意: 所有关注您最新动态的人将看到该图像.</string>
-    <string name="publishing">发布&#8230;</string>
+  <string name="publishing">发布…</string>
   <string name="error_publish_avatar_server_reject">服务器拒绝了您的发布请求</string>
   <string name="error_publish_avatar_converting">转换头像出错</string>
   <string name="error_saving_avatar">不能将头像保存至disk</string>
@@ -255,5 +250,4 @@
   <string name="pref_use_larger_font_summary">整个app界面使用更大号的字体</string>
   <string name="pref_use_send_button_to_indicate_status">发送按钮显示状态</string>
   <string name="pref_use_send_button_to_indicate_status_summary">发送按钮采用其他颜色以示发送状态的区别</string>
-
 </resources>

src/main/res/values-zh-rTW/strings.xml

@@ -1,6 +1,5 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <resources>
-
   <string name="action_settings">設定</string>
   <string name="action_add">新對話</string>
   <string name="action_accounts">管理帳戶</string>
@@ -22,8 +21,8 @@
   <string name="minute_ago">1 分鐘前</string>
   <string name="minutes_ago">%d 分鐘前</string>
   <string name="unread_conversations">未讀對話</string>
-    <string name="sending">正在發送&#8230;</string>
-    <string name="encrypted_message">正在解密訊息中，請稍候&#8230;</string>
+  <string name="sending">正在發送…</string>
+  <string name="encrypted_message">正在解密訊息中，請稍候…</string>
   <string name="nick_in_use">該用戶名稱已被使用</string>
   <string name="admin">管理員</string>
   <string name="owner">擁有人</string>
@@ -55,7 +54,6 @@
   <string name="add_contact">新增聯絡人</string>
   <string name="send_failed">傳遞失敗</string>
   <string name="send_rejected">拒絕</string>
-    <string name="receiving_image">接收圖片文件中，請稍候&#8230;</string>
   <string name="preparing_image">準備傳輸圖片</string>
   <string name="action_clear_history">清除歷史記錄</string>
   <string name="clear_conversation_history">清除對話記錄</string>
@@ -68,27 +66,24 @@
   <string name="send_pgp_message">發送 OpenPGP 加密訊息</string>
   <string name="your_nick_has_been_changed">用戶名稱修改成功</string>
   <string name="download_image">下載圖片</string>
-    <string name="image_offered_for_download"><i>可供下載的圖像文件</i></string>
   <string name="send_unencrypted">不加密發送</string>
   <string name="decryption_failed">解密失敗，可能是私鑰不正確。</string>
   <string name="openkeychain_required">OpenKeychain</string>
   <string name="openkeychain_required_long">Conversations 使用一個名為 <b>OpenKeychain</b> 的第三方程式來加密、解碼訊息以及管理您的公鑰。\n\nOpenKeychain 以 GPLv3 釋出，並可在 F-Droid 和 Google Play 上下載。\n\n<small>(之後請重新啟動 Conversations。)</small></string>
   <string name="restart">重新啟動</string>
   <string name="install">安裝</string>
-    <string name="offering">提供中&#8230;</string>
-    <string name="waiting">等待中&#8230;</string>
+  <string name="offering">提供中…</string>
+  <string name="waiting">等待中…</string>
   <string name="no_pgp_key">找不到 OpenPGP 鑰匙</string>
   <string name="contact_has_no_pgp_key">Conversations 不能將你的訊息加密，因為聯絡人沒有公佈他/她的公鑰。\n\n<small>請通知聯絡人設定 OpenPGP。</small></string>
   <string name="no_pgp_keys">找不到多條 OpenPGP 鑰匙</string>
   <string name="contacts_have_no_pgp_keys">Conversations 不能將你的訊息加密，因為多位聯絡人沒有公佈他/她的公鑰。\n\n<small>請通知聯絡人設定 OpenPGP。</small></string>
   <string name="encrypted_message_received"><i>已收到加密訊息，點擊進行解密和查看。</i></string>
-    <string name="encrypted_image_received"><i>已收到加密圖片，點擊進行解密和查看。</i></string>
-    <string name="image_file"><i>已收到圖片，點擊查看</i></string>
   <string name="pref_general">一般</string>
   <string name="pref_xmpp_resource">XMPP 資源</string>
   <string name="pref_xmpp_resource_summary">客戶端標示名稱</string>
   <string name="pref_accept_files">接收文件</string>
-    <string name="pref_accept_files_summary">自動接收小於 &#8230; 的文件</string>
+  <string name="pref_accept_files_summary">自動接收小於 … 的文件</string>
   <string name="pref_notification_settings">通知設定</string>
   <string name="pref_notifications">通知</string>
   <string name="pref_notifications_summary">收到新訊息時通知</string>
@@ -214,7 +209,7 @@
   <string name="publish">發佈</string>
   <string name="touch_to_choose_picture">點擊頭像可選擇頭像</string>
   <string name="publish_avatar_explanation">請注意: 所有關注你狀態訊息的人將看到該圖像。</string>
-    <string name="publishing">發佈中&#8230;</string>
+  <string name="publishing">發佈中…</string>
   <string name="error_publish_avatar_server_reject">伺服器拒絕了你的發佈請求</string>
   <string name="error_publish_avatar_converting">發佈頭像時發生錯誤</string>
   <string name="error_saving_avatar">將頭像儲存至硬碟時發生錯誤</string>
@@ -258,5 +253,4 @@
   <string name="pref_expert_options_other">其他</string>
   <string name="pref_conference_name">群組名稱</string>
   <string name="pref_conference_name_summary">使用群組的名稱而不是 JID 來識別之。 </string>
-
 </resources>