From 1738673c53b8ac0abbb2e5939dff16300a9c67b8 Mon Sep 17 00:00:00 2001
From: Daniel Gultsch <daniel@gultsch.de>
Date: Wed, 14 Oct 2015 23:05:00 +0200
Subject: [PATCH] pulled translations from transifex

---
 src/main/res/values-ar/strings.xml     |  1 -
 src/main/res/values-bg/strings.xml     | 21 +++++++++++++++++++--
 src/main/res/values-ca/strings.xml     |  1 -
 src/main/res/values-cs/strings.xml     |  1 -
 src/main/res/values-de/strings.xml     | 17 +++++++++++++++++
 src/main/res/values-el/strings.xml     |  1 -
 src/main/res/values-es/strings.xml     | 20 +++++++++++++++++++-
 src/main/res/values-eu/strings.xml     |  1 -
 src/main/res/values-fr/strings.xml     |  1 -
 src/main/res/values-gl/strings.xml     |  1 -
 src/main/res/values-id/strings.xml     |  1 -
 src/main/res/values-it/strings.xml     |  1 -
 src/main/res/values-iw/strings.xml     |  1 -
 src/main/res/values-ja/strings.xml     |  1 -
 src/main/res/values-ko/strings.xml     |  1 -
 src/main/res/values-nb-rNO/strings.xml |  7 ++++++-
 src/main/res/values-nl/strings.xml     |  1 -
 src/main/res/values-pl/strings.xml     |  1 -
 src/main/res/values-pt/strings.xml     |  1 -
 src/main/res/values-ro-rRO/strings.xml |  1 -
 src/main/res/values-ru/strings.xml     |  1 -
 src/main/res/values-sk/strings.xml     |  1 -
 src/main/res/values-sr/strings.xml     |  1 -
 src/main/res/values-sv/strings.xml     |  1 -
 src/main/res/values-zh-rCN/strings.xml |  1 -
 src/main/res/values-zh-rTW/strings.xml |  1 -
 26 files changed, 61 insertions(+), 26 deletions(-)

diff --git a/src/main/res/values-ar/strings.xml b/src/main/res/values-ar/strings.xml
index 7bffdf248656c9def799be8e74bac6d74a1502e4..586a58cf6f031e790b4f38714ab856a4af648ae7 100644
--- a/src/main/res/values-ar/strings.xml
+++ b/src/main/res/values-ar/strings.xml
@@ -74,7 +74,6 @@
   <string name="clear_conversation_history">حذف سجل المحفوظات للمحادثة</string>
   <string name="clear_histor_msg">هل ترغب بحذف جميع الرسائل في تلك المحادثة?\n\n<b>تنويه:</b> هذا لن يؤثر على الرسائل المخزنة على الأجهزة أو أي أماكن أخرى.</string>
   <string name="delete_messages">حذف الرسائل</string>
-  <string name="also_end_conversation">انهاء هذه المحادثة بعد الكلمات</string>
   <string name="choose_presence">اختيار ظهورك لجهات الإتصال</string>
   <string name="send_otr_message">OTRارساله رساله مشفره عبر</string>
   <string name="send_pgp_message">OpenPGPارساله رساله مشفره عبر</string>
diff --git a/src/main/res/values-bg/strings.xml b/src/main/res/values-bg/strings.xml
index 31928a4627578848c53a45eaeb144b0fd7cc6ea8..030432ad625c8b0209951914f9c4db718fd8e6fa 100644
--- a/src/main/res/values-bg/strings.xml
+++ b/src/main/res/values-bg/strings.xml
@@ -74,7 +74,7 @@
   <string name="clear_conversation_history">Изчистване на историята на разговорите</string>
   <string name="clear_histor_msg">Искате ли да изтриете всички съобщения от този разговор?\n\n<b>Внимание:</b> Това няма да изтрие съобщенията, съхранявани на други устройства или на сървърите.</string>
   <string name="delete_messages">Изтриване на съобщенията</string>
-  <string name="also_end_conversation">Този разговор да приключи след това</string>
+  <string name="also_end_conversation">Приключване на този разговор след това</string>
   <string name="choose_presence">Изберете присъствие за контакта</string>
   <string name="send_unencrypted_message">Изпр. на нешифр. съобщение</string>
   <string name="send_otr_message">Изпр. на съобщение, шифр. чрез OTP</string>
@@ -335,6 +335,9 @@
   <string name="conversations_foreground_service">Conversations</string>
   <string name="pref_keep_foreground_service">Услугата да е на преден план</string>
   <string name="pref_keep_foreground_service_summary">Предотвратява прекъсването на връзката Ви от операционната система</string>
+  <string name="pref_export_logs">Изнасяне на журналите</string>
+  <string name="pref_export_logs_summary">Записване на журналите в картата с памет</string>
+  <string name="notification_export_logs_title">Записване на журналите в картата с памет</string>
   <string name="choose_file">Изберете файл</string>
   <string name="receiving_x_file">Получаване на %1$s (%2$d%% завършено)</string>
   <string name="download_x_file">Сваляне на %s</string>
@@ -483,5 +486,19 @@
   <string name="pref_use_white_background">Използване на бял фон</string>
   <string name="pref_use_white_background_summary">Показване на получените съобщения с черен текст на бял фон</string>
   <string name="account_status_dns_timeout">Време на изчакване на DNS</string>
-  <string name="server_info_broken">Недостъпен</string>
+  <string name="server_info_broken">Повредено</string>
+  <string name="pref_presence_settings">Настройки за присъствието</string>
+  <string name="pref_away_when_screen_off">Отсъстващ, когато екранът е изключен</string>
+  <string name="pref_away_when_screen_off_summary">Преминава в състояние „отсъстващ“ когато екранът бъде изключен</string>
+  <string name="pref_xa_on_silent_mode">Недостъпен, в тих режим</string>
+  <string name="pref_xa_on_silent_mode_summary">Преминава в състояние „недостъпен“ когато телефонът е в тих режим</string>
+  <string name="action_add_account_with_certificate">Добавяне на профил със сертификат</string>
+  <string name="unable_to_parse_certificate">Неуспешно прочитане на сертификата</string>
+  <string name="authenticate_with_certificate">Оставете празно за удостоверяване със сертификат</string>
+  <string name="captcha_ocr">Текст за проверка</string>
+  <string name="captcha_required">Проверката е задължителна</string>
+  <string name="captcha_hint">въведете текста от изображението</string>
+  <string name="certificate_chain_is_not_trusted">Сертификатът не е потвърден</string>
+  <string name="jid_does_not_match_certificate">Jabber идентификатора не съответства на сертификата</string>
+  <string name="action_renew_certificate">Подновяване на сертификата</string>
 </resources>
diff --git a/src/main/res/values-ca/strings.xml b/src/main/res/values-ca/strings.xml
index c4d75c0ab27d72a0147e7cd1694e63addda4c078..806ed7a03984d8ff66712126ef641086d98a3917 100644
--- a/src/main/res/values-ca/strings.xml
+++ b/src/main/res/values-ca/strings.xml
@@ -74,7 +74,6 @@
   <string name="clear_conversation_history">Netejar historial de conversa</string>
   <string name="clear_histor_msg">Vols esborrar tots els missatges d\'aquesta conversa?\n\n<b>Avís:</b> Això no afectarà els missatges desats en altres dispositius o servidors.</string>
   <string name="delete_messages">Esborrar missatges</string>
-  <string name="also_end_conversation">Finalitzar aquesta conversa més tard</string>
   <string name="choose_presence">Selecciona recurs del contacte</string>
   <string name="send_otr_message">Enviar missatge xifrat amb OTR</string>
   <string name="send_pgp_message">Enviar missatge xifrat amb OpenPGP</string>
diff --git a/src/main/res/values-cs/strings.xml b/src/main/res/values-cs/strings.xml
index de7945599098e5802c12d4e92c775d08d3963f15..0c5dca5524e5320780da5a264d5f6bbec361c6ae 100644
--- a/src/main/res/values-cs/strings.xml
+++ b/src/main/res/values-cs/strings.xml
@@ -74,7 +74,6 @@
   <string name="clear_conversation_history">Smaže historii konverzací</string>
   <string name="clear_histor_msg">Chcete smazat všechny zprávy v této konverzaci?\n\n<b>Varování:</b> Toto neovlivní zprávy uložené na jiných přístrojích nebo serverech.</string>
   <string name="delete_messages">Smazat zprávy</string>
-  <string name="also_end_conversation">Poté ukončit i tuto konverzaci</string>
   <string name="choose_presence">Vybrat aktualizaci stavu pro kontakt</string>
   <string name="send_unencrypted_message">Odeslat nešifrovanou zprávu</string>
   <string name="send_otr_message">Poslat OTR šifrovanou zprávu</string>
diff --git a/src/main/res/values-de/strings.xml b/src/main/res/values-de/strings.xml
index 74461b720771f6c510ab48af09f4226441fe3057..b7cc4440f5a9bd12122c750bd5a737fa096c2503 100644
--- a/src/main/res/values-de/strings.xml
+++ b/src/main/res/values-de/strings.xml
@@ -335,6 +335,9 @@
   <string name="conversations_foreground_service">Conversations</string>
   <string name="pref_keep_foreground_service">Den Dienst im Vordergrund ausführen.</string>
   <string name="pref_keep_foreground_service_summary">Verhindert, dass Android Conversations beendet und die Verbindung unterbricht</string>
+  <string name="pref_export_logs">Chats exportieren</string>
+  <string name="pref_export_logs_summary">Chats auf SD-Karte schreiben</string>
+  <string name="notification_export_logs_title">Chats auf SD-Karte schreiben</string>
   <string name="choose_file">Datei auswählen</string>
   <string name="receiving_x_file">Empfange  %1$s (%2$d%% abgeschlossen)</string>
   <string name="download_x_file">%s wird heruntergeladen</string>
@@ -484,4 +487,18 @@
   <string name="pref_use_white_background_summary">Empfangene Nachrichten als schwarzen Text auf weißem Hintergrund anzeigen</string>
   <string name="account_status_dns_timeout">Zeitüberschreitung bei der Namensauflösung</string>
   <string name="server_info_broken">Fehlerhaft</string>
+  <string name="pref_presence_settings">Status Einstellungen</string>
+  <string name="pref_away_when_screen_off">Abwesend</string>
+  <string name="pref_away_when_screen_off_summary">Setze deinen Status auf abwesend, wenn dein Bildschirm abgeschaltet ist</string>
+  <string name="pref_xa_on_silent_mode">Nicht verfügbar</string>
+  <string name="pref_xa_on_silent_mode_summary">Setze deinen Status auf nicht verfügbar, wenn dein Gerät stumm geschaltet ist</string>
+  <string name="action_add_account_with_certificate">Kontakt mit Zertifikat hinzufügen</string>
+  <string name="unable_to_parse_certificate">Zertifikat kann nicht gelesen werden</string>
+  <string name="authenticate_with_certificate">Leer lassen, um mit Zertifikat anzumelden</string>
+  <string name="captcha_ocr">Captcha Text</string>
+  <string name="captcha_required">Captcha erforderlich</string>
+  <string name="captcha_hint">Text aus Captcha eintragen</string>
+  <string name="certificate_chain_is_not_trusted">Zertifikat wird nicht vertraut</string>
+  <string name="jid_does_not_match_certificate">Jabber-ID stimmt nicht dem Zertifikat überein</string>
+  <string name="action_renew_certificate">Zertifikat erneuern</string>
 </resources>
diff --git a/src/main/res/values-el/strings.xml b/src/main/res/values-el/strings.xml
index 535109be0fc514ac02a663d496157313e61e0d3c..ed38d0c06892c038a1adfb7ad0861bd34d80e588 100644
--- a/src/main/res/values-el/strings.xml
+++ b/src/main/res/values-el/strings.xml
@@ -74,7 +74,6 @@
   <string name="clear_conversation_history">Καθαρισμός ιστορικού Συζήτησης</string>
   <string name="clear_histor_msg">Θέλετε να σβήσετε όλα τα μηνύματα αυτής της Συζήτησης;\n\n<b>Προειδοποίηση:</b> Αυτό δεν θα επηρεάσει τα μηνύματα που είναι αποθηκευμένα σε άλλες συσκευές ή άλλους διακομιστές.</string>
   <string name="delete_messages">Διαγραφή μηνυμάτων</string>
-  <string name="also_end_conversation">Τερματισμός αυτής της συζήτησης αμέσως μετά</string>
   <string name="choose_presence">Επιλέξτε παρουσία για επικοινωνία</string>
   <string name="send_otr_message">Αποστολή κρυπτογραφημένου μηνύματος OTR</string>
   <string name="send_pgp_message">Αποστολή κρυπτογραφημένου μηνύματος OpenPGP</string>
diff --git a/src/main/res/values-es/strings.xml b/src/main/res/values-es/strings.xml
index c76c1eea5a0b4ca417be17de6fe2f7931e66fa7c..cdddfb16444f7410a20dfd591ebaaffedeb8a3b0 100644
--- a/src/main/res/values-es/strings.xml
+++ b/src/main/res/values-es/strings.xml
@@ -74,7 +74,7 @@
   <string name="clear_conversation_history">Limpiar historial de conversación</string>
   <string name="clear_histor_msg">¿Quieres borrar todos los mensajes de esta conversación?\n\n<b>Aviso:</b> Esto no afectará a los mensajes guardados en otros dispositivos o servidores.</string>
   <string name="delete_messages">Borrar mensajes</string>
-  <string name="also_end_conversation">Además, terminar esta conversación</string>
+  <string name="also_end_conversation">Terminar esta conversación después</string>
   <string name="choose_presence">Selecciona recurso del contacto</string>
   <string name="send_unencrypted_message">Enviar mensaje sin cifrar</string>
   <string name="send_otr_message">Enviar mensaje cifrado con OTR</string>
@@ -335,6 +335,9 @@
   <string name="conversations_foreground_service">Conversations</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="pref_export_logs">Exportar logs</string>
+  <string name="pref_export_logs_summary">Escribir logs en la tarjeta SD</string>
+  <string name="notification_export_logs_title">Escribiendo logs en la tarjeta SD</string>
   <string name="choose_file">Seleccionar archivo</string>
   <string name="receiving_x_file">Recibiendo %1$s (%2$d%% completado)</string>
   <string name="download_x_file">Descargar %s</string>
@@ -483,4 +486,19 @@
   <string name="pref_use_white_background">Usar fondo blanco</string>
   <string name="pref_use_white_background_summary">Mostrar mensajes recibidos en texto negro con fondo blanco</string>
   <string name="account_status_dns_timeout">Timeout en DNS</string>
+  <string name="server_info_broken">Error</string>
+  <string name="pref_presence_settings">Opciones de presencia</string>
+  <string name="pref_away_when_screen_off">Ausente con pantalla apagada</string>
+  <string name="pref_away_when_screen_off_summary">Cambia tu estado a ausente cuando la pantalla está apagada</string>
+  <string name="pref_xa_on_silent_mode">No disponible en modo silencio</string>
+  <string name="pref_xa_on_silent_mode_summary">Cambia tu estado a no disponible cuando el teléfono está en modo silencio</string>
+  <string name="action_add_account_with_certificate">Añadir cuenta con certificado</string>
+  <string name="unable_to_parse_certificate">No se ha podido leer el certificado</string>
+  <string name="authenticate_with_certificate">Dejar vacío para autenticar certificado w/ </string>
+  <string name="captcha_ocr">Texto captcha</string>
+  <string name="captcha_required">Captcha requerido</string>
+  <string name="captcha_hint">Introduce el texto de la imagen</string>
+  <string name="certificate_chain_is_not_trusted">La cadena de certificados no es de confianza</string>
+  <string name="jid_does_not_match_certificate">El identificador Jabber no coincide con el del certificado</string>
+  <string name="action_renew_certificate">Renovar certificado</string>
 </resources>
diff --git a/src/main/res/values-eu/strings.xml b/src/main/res/values-eu/strings.xml
index 70fa22e58f864da8f3f9ecddf01568fd0d9e0dee..86f39b0f6c3f206aec3568d31b8c3b486724a10d 100644
--- a/src/main/res/values-eu/strings.xml
+++ b/src/main/res/values-eu/strings.xml
@@ -74,7 +74,6 @@
   <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>
   <string name="delete_messages">Mezuak ezabatu</string>
-  <string name="also_end_conversation">Elkarrizketa hau jarraian amaitu</string>
   <string name="choose_presence">Hautatu agerpena kontaktuarentzat</string>
   <string name="send_unencrypted_message">Enkriptatu gabeko mezua bidali</string>
   <string name="send_otr_message">OTRz enkriptatutako mezua bidali</string>
diff --git a/src/main/res/values-fr/strings.xml b/src/main/res/values-fr/strings.xml
index 7a3a3256fbe5ed8ccfbb687509035ba00e4a1fdc..b6c5f0dafba4ca867af79d87074d4c28bd198283 100644
--- a/src/main/res/values-fr/strings.xml
+++ b/src/main/res/values-fr/strings.xml
@@ -74,7 +74,6 @@
   <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 cet appareil.</string>
   <string name="delete_messages">Supprimer les messages</string>
-  <string name="also_end_conversation">Terminer cette conversation après</string>
   <string name="choose_presence">Choisir le status de présence</string>
   <string name="send_unencrypted_message">Envoyer un message non chiffré</string>
   <string name="send_otr_message">Envoyer un message chiffré avec OTR</string>
diff --git a/src/main/res/values-gl/strings.xml b/src/main/res/values-gl/strings.xml
index 972a7bfead0ddd42e84e58cb2109fc388f987936..019d4677ff2dec371677a4ea5f937d753393ecfb 100644
--- a/src/main/res/values-gl/strings.xml
+++ b/src/main/res/values-gl/strings.xml
@@ -42,7 +42,6 @@
   <string name="clear_conversation_history">Limpar historial de conversa</string>
   <string name="clear_histor_msg">¿Queres borrar todas as mensaxes desta conversa?\n\n<b>Ollo:</b> Isto non afectará ás mensaxes gardadas noutros dispositivos ou servidores.</string>
   <string name="delete_messages">Borrar mensaxes</string>
-  <string name="also_end_conversation">Terminar esta conversa máis tarde</string>
   <string name="choose_presence">Selecciona recurso del contacto</string>
   <string name="send_otr_message">Enviar mensaxe cifrado con OTR</string>
   <string name="send_pgp_message">Enviar mensaxe cifrado con OpenPGP</string>
diff --git a/src/main/res/values-id/strings.xml b/src/main/res/values-id/strings.xml
index 45f4b33c79f50dff995feb790fc4b29e3e6ab936..894c18a713fe6559fc26e76209d1ffc5c9392723 100644
--- a/src/main/res/values-id/strings.xml
+++ b/src/main/res/values-id/strings.xml
@@ -74,7 +74,6 @@
   <string name="clear_conversation_history">Hapus Riwayat Percakapan</string>
   <string name="clear_histor_msg">Apakah Anda ingin menghapus semua pesan dalam Percakapan ini\n\n<b>Peringatan:</b>ini tidak akan mempengaruhi pesan yang disimpan pada perangkat atau server lain.</string>
   <string name="delete_messages">Hapus pesan</string>
-  <string name="also_end_conversation">Akhiri percakapan setelahnya</string>
   <string name="choose_presence">Pilih kehadiran untuk kontak</string>
   <string name="send_otr_message">Kirim pesan terenskripsi OTR</string>
   <string name="send_pgp_message">Kirim pesan terenskripsi OpenPGP</string>
diff --git a/src/main/res/values-it/strings.xml b/src/main/res/values-it/strings.xml
index 549e40032a3d04944896e770301176195caf97e3..97311427c687b704e073879dfc70a5e83ec1e410 100644
--- a/src/main/res/values-it/strings.xml
+++ b/src/main/res/values-it/strings.xml
@@ -74,7 +74,6 @@
   <string name="clear_conversation_history">Pulisci la cronologia della Conversazione</string>
   <string name="clear_histor_msg">Vuoi cancellare tutti i messaggi di questa Conversazione?\n\n<b>Attenzione:</b> Questo non influenzerà i messaggi presenti su altri dispositivi o server.</string>
   <string name="delete_messages">Elimina messaggi</string>
-  <string name="also_end_conversation">Termina questa conversazione in seguito</string>
   <string name="choose_presence">Choose presence to contact</string>
   <string name="send_otr_message">Messaggio OTR</string>
   <string name="send_pgp_message">Messaggio OpenPGP</string>
diff --git a/src/main/res/values-iw/strings.xml b/src/main/res/values-iw/strings.xml
index a344be2bbcfa8100cd6f3fdfad3d9e6c28d51e8b..d5fda1c23859af4cd040b7b453466beeb4b0498c 100644
--- a/src/main/res/values-iw/strings.xml
+++ b/src/main/res/values-iw/strings.xml
@@ -73,7 +73,6 @@
   <string name="clear_conversation_history">נקה היסטוריית שיחה</string>
   <string name="clear_histor_msg">האם ברצונך למחוק את כל ההודעות בשיחה זאת?\n\n<b>אזהרה:</b> פעולה זו לא תשפיע על הודעות מאוחסנות על מכשירים או שרתים אחרים.</string>
   <string name="delete_messages">מחק הודעות</string>
-  <string name="also_end_conversation">בנוסף, סיים שיחה זו</string>
   <string name="choose_presence">בחר נוכחות לאיש קשר</string>
   <string name="send_unencrypted_message">שלח הודעה בלתי מוצפנת</string>
   <string name="send_otr_message">שלח הודעה בהצפנת OTR</string>
diff --git a/src/main/res/values-ja/strings.xml b/src/main/res/values-ja/strings.xml
index fbc3beb82bc443540723bf3397b643f5f59bd010..45c67940e33ba45e8bf23e346844672313929107 100644
--- a/src/main/res/values-ja/strings.xml
+++ b/src/main/res/values-ja/strings.xml
@@ -74,7 +74,6 @@
   <string name="clear_conversation_history">会話履歴をクリア</string>
   <string name="clear_histor_msg">この会話のすべてのメッセージを削除しますか?\n\n<b>警告:</b> これは、他のデバイスやサーバーに保存されているメッセージには影響しません。</string>
   <string name="delete_messages">メッセージを削除</string>
-  <string name="also_end_conversation">その後、この会話を終了</string>
   <string name="choose_presence">連絡する参加を選択</string>
   <string name="send_unencrypted_message">暗号化されていないメッセージを送信</string>
   <string name="send_otr_message">OTR 暗号化メッセージを送信</string>
diff --git a/src/main/res/values-ko/strings.xml b/src/main/res/values-ko/strings.xml
index cfbdb8d412d95b7884eac501baefe94badcb4bec..6f654dcf731524a84bc829e8069fc927c9220259 100644
--- a/src/main/res/values-ko/strings.xml
+++ b/src/main/res/values-ko/strings.xml
@@ -74,7 +74,6 @@
   <string name="clear_conversation_history">대화 기록 삭제 </string>
   <string name="clear_histor_msg">이 대화의 모든 메세지를 삭제하시겠습니까? 경고: 이것은 다른 기기나 서버에 있는 메세지에는 영향을 미치지 않습니다. </string>
   <string name="delete_messages">메세지 삭제 </string>
-  <string name="also_end_conversation">나중에 이 대화 끝내기 </string>
   <string name="choose_presence">연락할 프레즌스 선택 </string>
   <string name="send_otr_message">OTR 암호화된 메세지 전송 </string>
   <string name="send_pgp_message">OpenPGP 암호화된 메세지 전송 </string>
diff --git a/src/main/res/values-nb-rNO/strings.xml b/src/main/res/values-nb-rNO/strings.xml
index b739bbc7014b7b232565ceed2fae1994a0e3b1c5..dee41b7b43846885ecc7b517951d30fa08e94333 100644
--- a/src/main/res/values-nb-rNO/strings.xml
+++ b/src/main/res/values-nb-rNO/strings.xml
@@ -90,9 +90,14 @@
   <string name="pref_never_send_crash">Aldri send feilrettingsrapporter</string>
   <string name="pref_confirm_messages">Bekreft meldinger</string>
   <string name="pref_ui_options">Valg for grensesnitt</string>
-  <string name="openpgp_error">OpenKeychain rapporterte en feil</string>
+  <string name="openpgp_error">Feilmelding fra OpenKeychain</string>
   <string name="accept">Godta</string>
   <string name="error">En feil har inntruffet</string>
+  <string name="subscriptions">Abonnement</string>
+  <string name="your_account">Din konto</string>
+  <string name="keys">Nøkler</string>
+  <string name="attach_choose_picture">Velg bilde</string>
+  <string name="attach_take_picture">Ta bilde</string>
   <string name="account_status_unknown">Ukjent</string>
   <string name="account_status_disabled">Midlertidig avskrudd</string>
   <string name="account_status_online">Pålogget</string>
diff --git a/src/main/res/values-nl/strings.xml b/src/main/res/values-nl/strings.xml
index 263cdccaf18e1a386ff5e60b35a97aafa8130bf2..61d57b260411aee5aaadfcfe23d49cca338391bb 100644
--- a/src/main/res/values-nl/strings.xml
+++ b/src/main/res/values-nl/strings.xml
@@ -74,7 +74,6 @@
   <string name="clear_conversation_history">Gespreksgeschiedenis wissen</string>
   <string name="clear_histor_msg">Wil je alle berichten in dit gesprek verwijderen?\n\n<b>Waarschuwing:</b> Dit zal geen invloed hebben op de berichten opgeslagen op andere apparaten of servers.</string>
   <string name="delete_messages">Berichten verwijderen</string>
-  <string name="also_end_conversation">Beëindig dit gesprek na afloop</string>
   <string name="choose_presence">Kies aanwezigheid om te tonen aan contact</string>
   <string name="send_unencrypted_message">Verstuur onversleuteld bericht</string>
   <string name="send_otr_message">Verstuur OTR-versleuteld bericht</string>
diff --git a/src/main/res/values-pl/strings.xml b/src/main/res/values-pl/strings.xml
index 6ba357d4711022b80b867d1fd539643c0609ec38..408672ca1fcc1959e719d5247d4ad52f664ab629 100644
--- a/src/main/res/values-pl/strings.xml
+++ b/src/main/res/values-pl/strings.xml
@@ -74,7 +74,6 @@
   <string name="clear_conversation_history">Wyczyść historię konwersacji</string>
   <string name="clear_histor_msg">Czy na pewno usunąć wszystkie wiadomości powiązane z konwersacją?\n\n<b>Uwaga:</b> Działanie nie wpływa na wiadomości przechowywane na innych urządzeniach lub serwerach.</string>
   <string name="delete_messages">Usuń wiadomości</string>
-  <string name="also_end_conversation">Zakończ konwersację po usunięciu historii</string>
   <string name="choose_presence">Wybierz widoczność dla kontaktu</string>
   <string name="send_unencrypted_message">Wyślij wiadomość bez szyfrowania</string>
   <string name="send_otr_message">Wyślij zaszyfrowaną wiadomość (OTR)</string>
diff --git a/src/main/res/values-pt/strings.xml b/src/main/res/values-pt/strings.xml
index f5e2750a80bc2612f10b71d0ec6e346deb656a5a..57f9d7c6ea0d9f9d1e8f888a95be734d3d3fc166 100644
--- a/src/main/res/values-pt/strings.xml
+++ b/src/main/res/values-pt/strings.xml
@@ -72,7 +72,6 @@
   <string name="clear_conversation_history">Limpar o histórico de conversas</string>
   <string name="clear_histor_msg">Você deseja remover todas as mensagens nessa conversa?\n\n&lt;b&gt;Atenção:&lt;b&gt; Isso não irá influenciar mensagens salvas em outros dispositivos ou servidores.</string>
   <string name="delete_messages">Remover mensagens</string>
-  <string name="also_end_conversation">Finalizar essa conversa ao final</string>
   <string name="choose_presence">Escolha a presença do contato</string>
   <string name="send_otr_message">Enviar mensagem criptografada com OTR</string>
   <string name="send_pgp_message">Enviar mensagem criptografada com OpenPGP</string>
diff --git a/src/main/res/values-ro-rRO/strings.xml b/src/main/res/values-ro-rRO/strings.xml
index c70ce0520bc0cb45595830f1b30de38b4a919272..991201e54bf355f015130f1b38e671136d807bff 100644
--- a/src/main/res/values-ro-rRO/strings.xml
+++ b/src/main/res/values-ro-rRO/strings.xml
@@ -73,7 +73,6 @@
   <string name="clear_conversation_history">Sterge istoria conversatiei</string>
   <string name="clear_histor_msg">Doresti sa stergi toate mesajele din Conversatii?\n\n<b>Atentie:</b> Aceasta actiune nu va influenta mesajele aflate pe alte telefoane/tabelete/servere.</string>
   <string name="delete_messages">Sterge mesajele</string>
-  <string name="also_end_conversation">Termina conversatia aceasta dupa</string>
   <string name="choose_presence">Alege prezenta pentru a contacta</string>
   <string name="send_otr_message">Trimite mesaj criptat cu OTR</string>
   <string name="send_pgp_message">Trimite mesaj criptat cu OpenPGP</string>
diff --git a/src/main/res/values-ru/strings.xml b/src/main/res/values-ru/strings.xml
index e8b58dd667c060750cad6620e39ec95339ad563a..4c5c205fef820d8cda3a861f9ed4f7f696f21e35 100644
--- a/src/main/res/values-ru/strings.xml
+++ b/src/main/res/values-ru/strings.xml
@@ -74,7 +74,6 @@
   <string name="clear_conversation_history">Очистить историю</string>
   <string name="clear_histor_msg">Вы хотите удалить все сообщения в этой беседе?\n\n<b>Предупреждение:</b> Данная операция не повлияет на сообщения, хранящиеся на других устройствах.</string>
   <string name="delete_messages">Удалить сообщения</string>
-  <string name="also_end_conversation">Завершить беседу</string>
   <string name="choose_presence">Укажите статус для контакта</string>
   <string name="send_unencrypted_message">Отправить незащифрованное сообщение</string>
   <string name="send_otr_message">Отправить OTR защифрованное сообщение</string>
diff --git a/src/main/res/values-sk/strings.xml b/src/main/res/values-sk/strings.xml
index bf6b436492907468f99f3b31784eb889d1f49c6c..b0f982c201d821e2db23d7f9003cf2646d5aca48 100644
--- a/src/main/res/values-sk/strings.xml
+++ b/src/main/res/values-sk/strings.xml
@@ -74,7 +74,6 @@
   <string name="clear_conversation_history">Vymazať históriu konverzácií</string>
   <string name="clear_histor_msg">Chcete vymazať všetky správy v tejto konverzácii?\n\n<b>Varovanie:</b> Toto neovplyvní správy uložené v iných zariadeniach alebo serveroch.</string>
   <string name="delete_messages">Vymazať správy</string>
-  <string name="also_end_conversation">Následne ukončiť aj túto konverzáciu</string>
   <string name="choose_presence">Vybrať aktualizáciu stavu pre kontakt</string>
   <string name="send_otr_message">Poslať OTR šifrovanú správu</string>
   <string name="send_pgp_message">Poslať OpenPGP šifrovanú správu</string>
diff --git a/src/main/res/values-sr/strings.xml b/src/main/res/values-sr/strings.xml
index 86a4561dde4b8b427677a6aace45c981467fe526..5cf49475f58a78728b6109c475e50dc229c21b1d 100644
--- a/src/main/res/values-sr/strings.xml
+++ b/src/main/res/values-sr/strings.xml
@@ -74,7 +74,6 @@
   <string name="clear_conversation_history">Брисање историјата преписки</string>
   <string name="clear_histor_msg">Желите ли да обришете све поруке ове преписке?\n\n<b>Упозорење:</b> Ово неће утицати на поруке складиштене на осталим уређајима или серверима.</string>
   <string name="delete_messages">Обриши поруке</string>
-  <string name="also_end_conversation">Окончај ову преписку након тога</string>
   <string name="choose_presence">Избор присутности за контакта</string>
   <string name="send_unencrypted_message">Пошаљи нешифровану поруку</string>
   <string name="send_otr_message">Пошаљи ОТР шифровану поруку</string>
diff --git a/src/main/res/values-sv/strings.xml b/src/main/res/values-sv/strings.xml
index 6a7908848150570a011497dbb96ff2744835fb68..90a0248ed71f5ebcdc6aa1a07e91ce4a46244018 100644
--- a/src/main/res/values-sv/strings.xml
+++ b/src/main/res/values-sv/strings.xml
@@ -74,7 +74,6 @@
   <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 sedan denna konversation</string>
   <string name="choose_presence">Välj tillgänglighet till kontakt</string>
   <string name="send_unencrypted_message">Skicka okrypterat meddelande</string>
   <string name="send_otr_message">Skicka OTR-krypterat meddelande</string>
diff --git a/src/main/res/values-zh-rCN/strings.xml b/src/main/res/values-zh-rCN/strings.xml
index de37c46837ea70eed5d008f4f116240a91047483..455d13a8b7af20c06656fbb79d1fb6f24c48031e 100644
--- a/src/main/res/values-zh-rCN/strings.xml
+++ b/src/main/res/values-zh-rCN/strings.xml
@@ -74,7 +74,6 @@
   <string name="clear_conversation_history">清除会话记录</string>
   <string name="clear_histor_msg">删除该会话中所有信息？\n\n<b>注:</b> 该操作不会影响其他设备或服务器保存的信息。</string>
   <string name="delete_messages">删除消息</string>
-  <string name="also_end_conversation">之后结束该会话</string>
   <string name="choose_presence">添加在线用户至联系人</string>
   <string name="send_otr_message">发送 OTR 加密信息</string>
   <string name="send_pgp_message">发送 OpenPGP 加密信息</string>
diff --git a/src/main/res/values-zh-rTW/strings.xml b/src/main/res/values-zh-rTW/strings.xml
index 7c73b646fe8258c08a42c17db375e587d2496742..161d49db266b3f6d8287fa393ed7e2a3b16126ae 100644
--- a/src/main/res/values-zh-rTW/strings.xml
+++ b/src/main/res/values-zh-rTW/strings.xml
@@ -58,7 +58,6 @@
   <string name="clear_conversation_history">清除對話記錄</string>
   <string name="clear_histor_msg">你確定要刪除該對話中所有訊息嗎？\n\n<b>警告:</b> 這將不會影響其他設備或伺服器儲存的訊息。</string>
   <string name="delete_messages">刪除訊息</string>
-  <string name="also_end_conversation">之後結束這對話</string>
   <string name="choose_presence">選擇狀態訊息</string>
   <string name="send_otr_message">發送 OTR 加密訊息</string>
   <string name="send_pgp_message">發送 OpenPGP 加密訊息</string>