diff --git a/src/main/res/values-ar/strings.xml b/src/main/res/values-ar/strings.xml
index d9128abca..b87e71795 100644
--- a/src/main/res/values-ar/strings.xml
+++ b/src/main/res/values-ar/strings.xml
@@ -9,7 +9,6 @@
   <string name="action_secure">تشفير المحادثة</string>
   <string name="action_add_account">إضافة حساب</string>
   <string name="action_edit_contact">تعديل الإسم</string>
-  <string name="action_add_phone_book">إضافة لسجل الهاتف</string>
   <string name="action_delete_contact">حذف من الإضافات</string>
   <string name="action_block_contact">حجب جهة إتصال</string>
   <string name="action_unblock_contact">إنهاء حجب جهة اتصال</string>
diff --git a/src/main/res/values-bg/strings.xml b/src/main/res/values-bg/strings.xml
index 40735189a..ced5aff23 100644
--- a/src/main/res/values-bg/strings.xml
+++ b/src/main/res/values-bg/strings.xml
@@ -9,7 +9,7 @@
   <string name="action_secure">Защитен разговор</string>
   <string name="action_add_account">Добавяне на профил</string>
   <string name="action_edit_contact">Редактиране на името</string>
-  <string name="action_add_phone_book">Добавяне към списъка с телефонни номера</string>
+  <string name="action_add_phone_book">Добавяне към адресния указател</string>
   <string name="action_delete_contact">Изтриване от списъка</string>
   <string name="action_block_contact">Блокиране на контакта</string>
   <string name="action_unblock_contact">Деблокиране на контакта</string>
@@ -173,7 +173,7 @@
   <string name="passwords_do_not_match">Паролите са различни</string>
   <string name="invalid_jid">Това не е правилен Jabber идентификатор</string>
   <string name="error_out_of_memory">Няма достатъчно памет. Изображението е твърде голямо.</string>
-  <string name="add_phone_book_text">Искате ли да добавите %s към списъка си контакти на устройството си?</string>
+  <string name="add_phone_book_text">Искате ли да добавите %s към адресния си указател?</string>
   <string name="contact_status_online">на линия</string>
   <string name="contact_status_free_to_chat">свободен за разговор</string>
   <string name="contact_status_away">отсъстващ</string>
@@ -222,12 +222,14 @@
   <string name="conferences">Беседи</string>
   <string name="search">Търсене</string>
   <string name="create_contact">Създаване на контакт</string>
+  <string name="enter_contact">Въведете контакт</string>
   <string name="join_conference">Присъединяване към беседа</string>
   <string name="delete_contact">Изтриване на контакт</string>
   <string name="view_contact_details">Преглед на подр. за контакта</string>
   <string name="block_contact">Блокиране на контакт</string>
   <string name="unblock_contact">Деблокиране на контакт</string>
   <string name="create">Създаване</string>
+  <string name="select">Избиране</string>
   <string name="contact_already_exists">Контактът вече съществува</string>
   <string name="join">Присъединяване</string>
   <string name="conference_address">Адрес на беседата</string>
@@ -320,7 +322,6 @@
   <string name="verify_otr">Проверка на OTR</string>
   <string name="remote_fingerprint">Отдалечен отпечатък</string>
   <string name="scan">сканиране</string>
-  <string name="or_touch_phones">(или докоснете телефоните)</string>
   <string name="smp">Протокол „Socialist Millionaire“</string>
   <string name="shared_secret_hint">Подсказка или въпрос</string>
   <string name="shared_secret_secret">Обща тайна</string>
@@ -493,7 +494,7 @@
   <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="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>
@@ -524,4 +525,24 @@
   <string name="no_storage_permission">Conversations се нуждае от достъп до външно място за съхранение</string>
   <string name="sync_with_contacts">Синхронизиране с контактите</string>
   <string name="sync_with_contacts_long">Conversations иска да съчетае Вашия списък в XMPP с контактите Ви, за да показва пълните им имена и снимки..\n\nConversations единствено ще чете контактите Ви и ще ги използва вътрешно, без да ги качва на сървъра Ви.\n\nЩе бъдете помолен/а за позволение за достъп до контактите Ви.</string>
+  <string name="certificate_information">Информация за сертификата</string>
+  <string name="certificate_subject">Обект</string>
+  <string name="certificate_issuer">Издател</string>
+  <string name="certificate_cn">Име</string>
+  <string name="certificate_o">Организация</string>
+  <string name="certificate_sha1">Контролна сума SHA1</string>
+  <string name="certicate_info_not_available">(Няма)</string>
+  <string name="certificate_not_found">Няма намерен сертификат</string>
+  <string name="notify_on_all_messages">Известяване за всички съобщения</string>
+  <string name="notify_only_when_highlighted">Известяване само на осветените</string>
+  <string name="notify_never">Известията са изключени</string>
+  <string name="notify_paused">Известията са спрени временно</string>
+  <string name="pref_picture_compression">Компресиране на снимките</string>
+  <string name="pref_picture_compression_summary">Преоразмеряване и компресиране на снимките</string>
+  <string name="always">Винаги</string>
+  <string name="automatically">Автоматично</string>
+  <string name="battery_optimizations_enabled">Оптимизациите за използв. на батерията са вкл.</string>
+  <string name="battery_optimizations_enabled_explained">Устройството Ви прилага сериозни оптимизации за използването на батерията върху Conversations, а те може да доведат до забавени известия и дори пропуснати съобщения.\nПрепоръчително е до ги изключите.</string>
+  <string name="battery_optimizations_enabled_dialog">Устройството Ви прилага сериозни оптимизации за използването на батерията върху Conversations, а те може да доведат до забавени известия и дори пропуснати съобщения.\n\nСега ще Ви бъде предложено да ги изключите.</string>
+  <string name="disable">Изключване</string>
 </resources>
diff --git a/src/main/res/values-ca/strings.xml b/src/main/res/values-ca/strings.xml
index 9f5845f6e..6e91e2b67 100644
--- a/src/main/res/values-ca/strings.xml
+++ b/src/main/res/values-ca/strings.xml
@@ -9,7 +9,6 @@
   <string name="action_secure">Conversa segura</string>
   <string name="action_add_account">Afegir compte</string>
   <string name="action_edit_contact">Edita el nom</string>
-  <string name="action_add_phone_book">Afegir a l\'agenda</string>
   <string name="action_delete_contact">Elimina de la llista de contactes</string>
   <string name="action_block_contact">Bloqueja contacte</string>
   <string name="action_unblock_contact">Desbloqueja contacte</string>
@@ -294,7 +293,6 @@
   <string name="verify_otr">Verificar OTR</string>
   <string name="remote_fingerprint">Empremta digital remota</string>
   <string name="scan">Escanejar</string>
-  <string name="or_touch_phones">( o toca altres mòbils)</string>
   <string name="smp">Protocol de socialistes millionaris</string>
   <string name="shared_secret_hint">Pista o pregunta</string>
   <string name="shared_secret_secret">Secret compartit</string>
diff --git a/src/main/res/values-cs/strings.xml b/src/main/res/values-cs/strings.xml
index e70d43597..050803ce5 100644
--- a/src/main/res/values-cs/strings.xml
+++ b/src/main/res/values-cs/strings.xml
@@ -9,7 +9,6 @@
   <string name="action_secure">Zabezpečená konverzace</string>
   <string name="action_add_account">Přidat účet</string>
   <string name="action_edit_contact">Upravit jméno</string>
-  <string name="action_add_phone_book">Přidat do telefonního seznamu</string>
   <string name="action_delete_contact">Smazat ze seznamu</string>
   <string name="action_block_contact">Zablokovat kontakt</string>
   <string name="action_unblock_contact">Odblokovat kontakt</string>
@@ -173,7 +172,6 @@
   <string name="passwords_do_not_match">Hesla nesouhlasí</string>
   <string name="invalid_jid">Toto není platné Jabber ID</string>
   <string name="error_out_of_memory">Nedostatek paměti. Obrázek je příliš velký</string>
-  <string name="add_phone_book_text">Chcete přidat %s do svého seznamu kontaktů v přístroji?</string>
   <string name="contact_status_online">online</string>
   <string name="contact_status_free_to_chat">volný pro chat</string>
   <string name="contact_status_away">pryč</string>
@@ -320,7 +318,6 @@
   <string name="verify_otr">Ověřit OTR</string>
   <string name="remote_fingerprint">Vzdálený otisk</string>
   <string name="scan">skenovat</string>
-  <string name="or_touch_phones">(nebo dotykové telefony)</string>
   <string name="smp">Socialist Millionaire Protocol</string>
   <string name="shared_secret_hint">Nápověda nebo Otázka</string>
   <string name="shared_secret_secret">Sdílené tajemství</string>
@@ -495,7 +492,6 @@
   <string name="pref_away_when_screen_off">Pryč při vypnuté obrazovce</string>
   <string name="pref_away_when_screen_off_summary">Při vypnuté obrazovce označí váš stav jako pryč</string>
   <string name="pref_xa_on_silent_mode">Nedostupný při vypnutém zvuku</string>
-  <string name="pref_xa_on_silent_mode_summary">Při vypnutém zvuku označí váš stav jako nedostupný</string>
   <string name="action_add_account_with_certificate">Přidat účet s certifikátem</string>
   <string name="unable_to_parse_certificate">Nelze načíst certifikát</string>
   <string name="authenticate_with_certificate">Nechat prázdné pro ověření s certifikátem</string>
diff --git a/src/main/res/values-de/strings.xml b/src/main/res/values-de/strings.xml
index 06454cc51..fefd900e9 100644
--- a/src/main/res/values-de/strings.xml
+++ b/src/main/res/values-de/strings.xml
@@ -9,7 +9,7 @@
   <string name="action_secure">Verschlüsselte Unterhaltung</string>
   <string name="action_add_account">Konto hinzufügen</string>
   <string name="action_edit_contact">Namen bearbeiten</string>
-  <string name="action_add_phone_book">Zum Telefonbuch hinzufügen</string>
+  <string name="action_add_phone_book">Zu Telefonbuch hinzufügen</string>
   <string name="action_delete_contact">Aus Kontaktliste entfernen</string>
   <string name="action_block_contact">Kontakt sperren</string>
   <string name="action_unblock_contact">Kontakt entsperren</string>
@@ -173,7 +173,7 @@
   <string name="passwords_do_not_match">Passwörter stimmen nicht überein</string>
   <string name="invalid_jid">Ungültige Jabber-ID</string>
   <string name="error_out_of_memory">Zu wenig Speicher vorhanden. Das Bild ist zu groß</string>
-  <string name="add_phone_book_text">Möchtest du %s zum Telefonbuch hinzufügen?</string>
+  <string name="add_phone_book_text">%s zum Telefonbuch hinzufügen</string>
   <string name="contact_status_online">online</string>
   <string name="contact_status_free_to_chat">bereit</string>
   <string name="contact_status_away">abwesend</string>
@@ -222,12 +222,14 @@
   <string name="conferences">Konferenzen</string>
   <string name="search">Suchen</string>
   <string name="create_contact">Kontakt erstellen</string>
+  <string name="enter_contact">Kontakt eingeben</string>
   <string name="join_conference">Konferenz beitreten</string>
   <string name="delete_contact">Kontakt löschen</string>
   <string name="view_contact_details">Kontakt-Details anzeigen</string>
   <string name="block_contact">Kontakt sperren</string>
   <string name="unblock_contact">Kontakt entsperren</string>
   <string name="create">Erstellen</string>
+  <string name="select">Auswählen</string>
   <string name="contact_already_exists">Der Kontakt existiert bereits</string>
   <string name="join">Beitreten</string>
   <string name="conference_address">Konferenz-Adresse</string>
@@ -320,7 +322,6 @@
   <string name="verify_otr">OTR prüfen</string>
   <string name="remote_fingerprint">Fingerabdruck der Gegenseite</string>
   <string name="scan">Scannen</string>
-  <string name="or_touch_phones">(oder Touch-Handys)</string>
   <string name="smp">Socialist Millionaire Protocol</string>
   <string name="shared_secret_hint">Hinweis oder Frage</string>
   <string name="shared_secret_secret">Gemeinsamer Schlüssel</string>
@@ -493,7 +494,7 @@
   <string name="pref_away_when_screen_off">Abwesend bei abgeschaltetem Bildschirm</string>
   <string name="pref_away_when_screen_off_summary">Setzt deinen Status auf \"abwesend\", solange dein Bildschirm abgeschaltet ist</string>
   <string name="pref_xa_on_silent_mode">Nicht verfügbar bei Stummschaltung</string>
-  <string name="pref_xa_on_silent_mode_summary">Setzt deinen Status auf \"nicht verfügbar\", solange dein Gerät stummgeschaltet ist</string>
+  <string name="pref_xa_on_silent_mode_summary">Setzt deinen Status auf \"nicht verfügbar\", solange dein Telefon lautlos ist</string>
   <string name="action_add_account_with_certificate">Konto 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>
@@ -524,4 +525,24 @@
   <string name="no_storage_permission">Conversations benötigt Zugriff auf externen Speicher</string>
   <string name="sync_with_contacts">Mit Kontakten synchronisieren</string>
   <string name="sync_with_contacts_long">Conversations möchte deine XMPP-Kontaktliste mit deinen Kontakten abgleichen, um deren vollständige Namen und Avatare anzuzeigen.\n\nConversations wird deine Kontakte nur lokal lesen und abgleichen und überträgt diese nicht auf den Server.\n\nDu wirst nun gefragt, ob du den Zugriff auf deine Kontakte erlauben möchtest.</string>
+  <string name="certificate_information">Zertifikatinformationen</string>
+  <string name="certificate_subject">Betreff</string>
+  <string name="certificate_issuer">Aussteller</string>
+  <string name="certificate_cn">Gemeinsamer Name</string>
+  <string name="certificate_o">Organisation</string>
+  <string name="certificate_sha1">SHA1</string>
+  <string name="certicate_info_not_available">(Nicht verfügbar)</string>
+  <string name="certificate_not_found">Kein Zertifikat gefunden</string>
+  <string name="notify_on_all_messages">Bei allen Nachrichten benachrichtigen</string>
+  <string name="notify_only_when_highlighted">Nur benachrichtigen, wenn ich angesprochen werde</string>
+  <string name="notify_never">Benachrichtigungen deaktiviert</string>
+  <string name="notify_paused">Benachrichtigungen pausiert</string>
+  <string name="pref_picture_compression">Bilder komprimieren</string>
+  <string name="pref_picture_compression_summary">Bildgröße anpassen und komprimieren</string>
+  <string name="always">Immer</string>
+  <string name="automatically">Automatisch</string>
+  <string name="battery_optimizations_enabled">Batterieoptimierung aktiv</string>
+  <string name="battery_optimizations_enabled_explained">Dein Telefon wendet Batterioptimierungen bei Conversations an, welche verspätete Benachrichtigungen oder Nachrichtenverlust verursachen können.\nEs ist empfehlenswert diese zu deaktivieren.</string>
+  <string name="battery_optimizations_enabled_dialog">Dein Telefon wendet Batterioptimierungen bei Conversations an, welche verspätete Benachrichtigungen oder Nachrichtenverlust verursachen können. Es ist empfehlenswert dies zu deaktivieren.</string>
+  <string name="disable">Deaktivieren</string>
 </resources>
diff --git a/src/main/res/values-el/strings.xml b/src/main/res/values-el/strings.xml
index 54daf96cf..e55a6b2d5 100644
--- a/src/main/res/values-el/strings.xml
+++ b/src/main/res/values-el/strings.xml
@@ -9,7 +9,6 @@
   <string name="action_secure">Ασφαλής συζήτηση</string>
   <string name="action_add_account">Προσθήκη λογαριασμού</string>
   <string name="action_edit_contact">Επεξεργασία ονόματος</string>
-  <string name="action_add_phone_book">Προσθήκη στον τηλεφωνικό κατάλογο</string>
   <string name="action_delete_contact">Διαγραφή από τη λίστα επαφών</string>
   <string name="action_block_contact">Αποκλεισμός επαφής</string>
   <string name="action_unblock_contact">Άρση αποκλεισμού επαφής</string>
@@ -294,7 +293,6 @@
   <string name="verify_otr">Επαλήθευση OTR</string>
   <string name="remote_fingerprint">Απομακρυσμένο αποτύπωμα</string>
   <string name="scan">σάρωση</string>
-  <string name="or_touch_phones">(ή τηλέφωνα επαφής)</string>
   <string name="smp">Πρωτόκολλο Socialist Millionaire</string>
   <string name="shared_secret_hint">Υπαινιγμός ή ερώτηση</string>
   <string name="shared_secret_secret">Κοινό μυστικό</string>
diff --git a/src/main/res/values-es/strings.xml b/src/main/res/values-es/strings.xml
index ef83b460c..7365261f6 100644
--- a/src/main/res/values-es/strings.xml
+++ b/src/main/res/values-es/strings.xml
@@ -9,7 +9,6 @@
   <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_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>
@@ -173,7 +172,6 @@
   <string name="passwords_do_not_match">Las contraseñas no coinciden</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">¿Quieres añadir a %s a tu lista de dispositivos?</string>
   <string name="contact_status_online">Disponible</string>
   <string name="contact_status_free_to_chat">Hablador</string>
   <string name="contact_status_away">Ausente</string>
@@ -320,7 +318,6 @@
   <string name="verify_otr">Verificar OTR</string>
   <string name="remote_fingerprint">Huella digital remota</string>
   <string name="scan">escanear</string>
-  <string name="or_touch_phones">(o une los teléfonos)</string>
   <string name="smp">Protocolo del Socialista Millonario</string>
   <string name="shared_secret_hint">Sugerencia o pregunta</string>
   <string name="shared_secret_secret">Secreto compartido</string>
@@ -493,7 +490,6 @@
   <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>
diff --git a/src/main/res/values-eu/strings.xml b/src/main/res/values-eu/strings.xml
index 28d058587..144189259 100644
--- a/src/main/res/values-eu/strings.xml
+++ b/src/main/res/values-eu/strings.xml
@@ -9,7 +9,6 @@
   <string name="action_secure">Elkarrizketa segurua</string>
   <string name="action_add_account">Kontua gehitu</string>
   <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>
@@ -173,7 +172,6 @@
   <string name="passwords_do_not_match">Pasahitzak ez dute bat egiten</string>
   <string name="invalid_jid">Hau ez da Jabber ID baliodun bat</string>
   <string name="error_out_of_memory">Memoriarik gabe. Irudia handiegia da</string>
-  <string name="add_phone_book_text">%s zure gailuko kontaktu zerrendara gehitu nahi al duzu?</string>
   <string name="contact_status_online">konektatuta</string>
   <string name="contact_status_free_to_chat">hitzegiteko aske</string>
   <string name="contact_status_away">kanpoan</string>
@@ -320,7 +318,6 @@
   <string name="verify_otr">OTR egiaztatu</string>
   <string name="remote_fingerprint">Urruneko hatz-marka</string>
   <string name="scan">eskaneatu</string>
-  <string name="or_touch_phones">(edo telefonoak ikutu)</string>
   <string name="smp">Socialist Millionaire protokoloa</string>
   <string name="shared_secret_hint">Iradokizuna edo galdera</string>
   <string name="shared_secret_secret">Partekatutako sekretua</string>
@@ -493,7 +490,6 @@
   <string name="pref_away_when_screen_off">Urrun pantaila itzalita dagoenean</string>
   <string name="pref_away_when_screen_off_summary">Zure baliabidea urrun bezala markatzen du pantaila itzalita dagoenean</string>
   <string name="pref_xa_on_silent_mode">Ez eskuragarri modu isilean</string>
-  <string name="pref_xa_on_silent_mode_summary">Zure baliabidea ez eskuragarri bezala markatzen du mugikorra modu isilean dagoenean</string>
   <string name="action_add_account_with_certificate">Kontua ziurtagiriarekin gehitu</string>
   <string name="unable_to_parse_certificate">Ezin izan da ziurtagiria aztertu</string>
   <string name="authenticate_with_certificate">Utzi hutsik ziurtagiririk gabe autentifikatzeko</string>
diff --git a/src/main/res/values-fr/strings.xml b/src/main/res/values-fr/strings.xml
index ffd48c474..5f75834e0 100644
--- a/src/main/res/values-fr/strings.xml
+++ b/src/main/res/values-fr/strings.xml
@@ -9,7 +9,6 @@
   <string name="action_secure">Conversation sécurisée</string>
   <string name="action_add_account">Ajouter un compte</string>
   <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>
@@ -173,7 +172,6 @@
   <string name="passwords_do_not_match">Les deux mots de passe ne correspondent pas.</string>
   <string name="invalid_jid">Cet identifiant n\'est pas valide.</string>
   <string name="error_out_of_memory">Plus de mémoire disponible. L\'image est trop volumineuse.</string>
-  <string name="add_phone_book_text">Voulez-vous ajouter %s aux contacts de l\'appareil ?</string>
   <string name="contact_status_online">En ligne</string>
   <string name="contact_status_free_to_chat">Disponible</string>
   <string name="contact_status_away">Absent</string>
@@ -320,7 +318,6 @@
   <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 faites se toucher les appareils)</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>
@@ -493,7 +490,6 @@
   <string name="pref_away_when_screen_off">Absent quand l\'écran est éteint</string>
   <string name="pref_away_when_screen_off_summary">Marquer cette ressource comme absente quand l\'écran est éteint.</string>
   <string name="pref_xa_on_silent_mode">Indisponible en mode silencieux</string>
-  <string name="pref_xa_on_silent_mode_summary">Marque cette ressource comme indisponible quand l\'appareil est en mode silencieux</string>
   <string name="action_add_account_with_certificate">Ajouter un compte avec un certificat</string>
   <string name="unable_to_parse_certificate">Impossible d\'analyser le certificat</string>
   <string name="authenticate_with_certificate">Laisser vide pour s\'identifier avec un certificat</string>
diff --git a/src/main/res/values-id/strings.xml b/src/main/res/values-id/strings.xml
index 419816c86..745e15ad4 100644
--- a/src/main/res/values-id/strings.xml
+++ b/src/main/res/values-id/strings.xml
@@ -9,7 +9,6 @@
   <string name="action_secure">Amankan Percakapan</string>
   <string name="action_add_account">Tambah Akun</string>
   <string name="action_edit_contact">Ubah Nama</string>
-  <string name="action_add_phone_book">Tambah ke buku telepon</string>
   <string name="action_delete_contact">Hapus dari roster</string>
   <string name="action_block_contact">Blokir kontak</string>
   <string name="action_unblock_contact">Batal blokir kontak</string>
@@ -298,7 +297,6 @@
   <string name="verify_otr">Verifikasi OTR</string>
   <string name="remote_fingerprint">Remote Sidik jari</string>
   <string name="scan">pindai</string>
-  <string name="or_touch_phones">(atau menyentuh telepon)</string>
   <string name="smp">Socialist Millionaire Protocol</string>
   <string name="shared_secret_hint">Petunjuk atau Pertanyaan</string>
   <string name="shared_secret_secret">Rahasia bersama</string>
diff --git a/src/main/res/values-it/strings.xml b/src/main/res/values-it/strings.xml
index 3916b532a..c83c7a8a2 100644
--- a/src/main/res/values-it/strings.xml
+++ b/src/main/res/values-it/strings.xml
@@ -9,7 +9,6 @@
   <string name="action_secure">Conversazione sicura</string>
   <string name="action_add_account">Aggiungi utente</string>
   <string name="action_edit_contact">Modifica il nome</string>
-  <string name="action_add_phone_book">Aggiungi alla rubrica</string>
   <string name="action_delete_contact">Cancella dalla lista</string>
   <string name="action_block_contact">Blocca contatto</string>
   <string name="action_unblock_contact">Sblocca contatto</string>
@@ -171,7 +170,6 @@
   <string name="passwords_do_not_match">Le Password non corrispondono</string>
   <string name="invalid_jid">Questo non è un ID Jabber valido</string>
   <string name="error_out_of_memory">Memoria esaurita. L’immagine è tropppo grande</string>
-  <string name="add_phone_book_text">Vuoi aggiungere %s alla lista contatti del tuo dispositivo?</string>
   <string name="contact_status_online">online</string>
   <string name="contact_status_free_to_chat">vuole chattare</string>
   <string name="contact_status_away">assente</string>
@@ -317,7 +315,6 @@
   <string name="verify_otr">Verifica OTR</string>
   <string name="remote_fingerprint">Impronta remota</string>
   <string name="scan">scan</string>
-  <string name="or_touch_phones">(o fai toccare i dispositivi)</string>
   <string name="smp">Socialist Millionaire Protocol</string>
   <string name="shared_secret_hint">Suggerimento o Domanda</string>
   <string name="shared_secret_secret">Segreto condiviso</string>
@@ -486,7 +483,6 @@
   <string name="server_info_broken">Rotto</string>
   <string name="pref_presence_settings">Impostazioni presenza</string>
   <string name="pref_xa_on_silent_mode">Non disponibile in modalità silenzioso</string>
-  <string name="pref_xa_on_silent_mode_summary">Segna la tua risorsa come non disponibile quando il telefono è in modalità silenzioso</string>
   <string name="action_add_account_with_certificate">Aggiungi account con certificato</string>
   <string name="unable_to_parse_certificate">Impossibile analizzare il certificato</string>
   <string name="authenticate_with_certificate">Lasciare vuoto per autenticarsi con certificato</string>
diff --git a/src/main/res/values-iw/strings.xml b/src/main/res/values-iw/strings.xml
index 39dd55b7e..26283bbec 100644
--- a/src/main/res/values-iw/strings.xml
+++ b/src/main/res/values-iw/strings.xml
@@ -9,7 +9,6 @@
   <string name="action_secure">דיון מאובטח</string>
   <string name="action_add_account">הוסף חשבון</string>
   <string name="action_edit_contact">ערוך שם</string>
-  <string name="action_add_phone_book">הוסף לפנקס הטלפונים</string>
   <string name="action_delete_contact">מחק מרשימת אנשי הקשר</string>
   <string name="action_block_contact">חסום איש קשר</string>
   <string name="action_unblock_contact">בטל חסימת איש קשר</string>
@@ -172,7 +171,6 @@
   <string name="passwords_do_not_match">סיסמאות לא תואמות</string>
   <string name="invalid_jid">מזהה ה Jabber אינו תקין</string>
   <string name="error_out_of_memory">חסר זיכרון. תצלום גדול מדי</string>
-  <string name="add_phone_book_text">האם ברצונך להוסיף את %s לתוך רשימת הקשר של המכשיר שלך?</string>
   <string name="contact_status_online">מקוון</string>
   <string name="contact_status_free_to_chat">חופשי לשיחה</string>
   <string name="contact_status_away">נעדר</string>
@@ -314,7 +312,6 @@
   <string name="verify_otr">אמת OTR</string>
   <string name="remote_fingerprint">טביעת אצבע מרוחקת</string>
   <string name="scan">סרוק</string>
-  <string name="or_touch_phones">(או קיים מגע בין הניידים)</string>
   <string name="smp">Socialist Millionaire Protocol</string>
   <string name="shared_secret_hint">שאלה או רמז</string>
   <string name="shared_secret_secret">סוד משותף</string>
@@ -485,7 +482,6 @@
   <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>
diff --git a/src/main/res/values-ja/strings.xml b/src/main/res/values-ja/strings.xml
index f1c2e7927..976fecddd 100644
--- a/src/main/res/values-ja/strings.xml
+++ b/src/main/res/values-ja/strings.xml
@@ -9,7 +9,6 @@
   <string name="action_secure">安全に会話</string>
   <string name="action_add_account">アカウントを追加</string>
   <string name="action_edit_contact">名前の編集</string>
-  <string name="action_add_phone_book">電話帳に追加</string>
   <string name="action_delete_contact">名簿から削除</string>
   <string name="action_block_contact">連絡先をブロック</string>
   <string name="action_unblock_contact">連絡先のブロックを解除</string>
@@ -173,7 +172,6 @@
   <string name="passwords_do_not_match">パスワードが一致しません</string>
   <string name="invalid_jid">これは有効な Jabber ID ではありません</string>
   <string name="error_out_of_memory">メモリ不足です。画像が大きすぎます</string>
-  <string name="add_phone_book_text">お使いのデバイスの連絡先リストに %s を追加しますか?</string>
   <string name="contact_status_online">オンライン</string>
   <string name="contact_status_free_to_chat">自由にチャットできます</string>
   <string name="contact_status_away">離席中</string>
@@ -320,7 +318,6 @@
   <string name="verify_otr">OTR を検証</string>
   <string name="remote_fingerprint">リモート フィンガープリント</string>
   <string name="scan">スキャン</string>
-  <string name="or_touch_phones">(または電話をタッチ)</string>
   <string name="smp">ソーシャリスト ミリオネア プロトコル</string>
   <string name="shared_secret_hint">ヒントまたは質問</string>
   <string name="shared_secret_secret">共有の秘密</string>
@@ -491,7 +488,6 @@
   <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>
diff --git a/src/main/res/values-ko/strings.xml b/src/main/res/values-ko/strings.xml
index bcc7a8006..4c00d81f3 100644
--- a/src/main/res/values-ko/strings.xml
+++ b/src/main/res/values-ko/strings.xml
@@ -9,7 +9,6 @@
   <string name="action_secure">안전한 대화 </string>
   <string name="action_add_account">계정 추가 </string>
   <string name="action_edit_contact">이름 편집 </string>
-  <string name="action_add_phone_book">주소록에 추가 </string>
   <string name="action_delete_contact">명단에서 삭제 </string>
   <string name="action_block_contact">연락처 </string>
   <string name="action_unblock_contact">연락처 차단 해제 </string>
@@ -294,7 +293,6 @@
   <string name="verify_otr">OTR 검증 </string>
   <string name="remote_fingerprint">Remote Fingerprint</string>
   <string name="scan">스캔 </string>
-  <string name="or_touch_phones">(혹은 기기 터치) </string>
   <string name="smp">Socialist Millionaire Protocol</string>
   <string name="shared_secret_hint">힌트 혹은 질문 </string>
   <string name="shared_secret_secret">공유된 비밀 </string>
diff --git a/src/main/res/values-nb-rNO/strings.xml b/src/main/res/values-nb-rNO/strings.xml
index e30a767b3..a2010c6f2 100644
--- a/src/main/res/values-nb-rNO/strings.xml
+++ b/src/main/res/values-nb-rNO/strings.xml
@@ -9,7 +9,6 @@
   <string name="action_secure">Sikret samtale</string>
   <string name="action_add_account">Legg til samtale</string>
   <string name="action_edit_contact">Rediger navn</string>
-  <string name="action_add_phone_book">Legg til i telefonbok</string>
   <string name="action_delete_contact">Fjern fra kontaktliste</string>
   <string name="action_block_contact">Blokker kontakt</string>
   <string name="action_unblock_contact">Avblokker kontakt</string>
@@ -173,7 +172,6 @@
   <string name="passwords_do_not_match">Passordene samsvarer ikke</string>
   <string name="invalid_jid">Dette er ikke en gyldig Jabber-ID</string>
   <string name="error_out_of_memory">Slapp opp for minne, bildet er for stort</string>
-  <string name="add_phone_book_text">Ønsker du å legge til %s til din enhets kontaktliste?</string>
   <string name="contact_status_online">pålogget</string>
   <string name="contact_status_free_to_chat">tilgjengelig for sludring</string>
   <string name="contact_status_away">fraværende</string>
@@ -320,7 +318,6 @@
   <string name="verify_otr">Bekreft OTR</string>
   <string name="remote_fingerprint">Eksternt fingeravtrykk</string>
   <string name="scan">skann</string>
-  <string name="or_touch_phones">(eller klem sammen telefonene)</string>
   <string name="smp">Sosialistisk-millionær-protokoll</string>
   <string name="shared_secret_hint">Ledetråd eller spørsmål</string>
   <string name="shared_secret_secret">Delt hemmelighet</string>
@@ -493,7 +490,6 @@
   <string name="pref_away_when_screen_off">Borte når skjermen er av</string>
   <string name="pref_away_when_screen_off_summary">Markerer din ressurs som borte når skjermen er avskrudd</string>
   <string name="pref_xa_on_silent_mode">Ikke tilgjengelig i stille-modus</string>
-  <string name="pref_xa_on_silent_mode_summary">Markerer din ressurs som ikke tilgjengelig når telefonen er i stille-modus</string>
   <string name="action_add_account_with_certificate">Legg til konto med sertifikat</string>
   <string name="unable_to_parse_certificate">Kunne ikke behandle sertifikat</string>
   <string name="authenticate_with_certificate">La stå tom for bekreftelse med sertifikat</string>
diff --git a/src/main/res/values-nl/strings.xml b/src/main/res/values-nl/strings.xml
index 58a3c5567..030eadf7c 100644
--- a/src/main/res/values-nl/strings.xml
+++ b/src/main/res/values-nl/strings.xml
@@ -9,7 +9,6 @@
   <string name="action_secure">Beveiligd gesprek</string>
   <string name="action_add_account">Account toevoegen</string>
   <string name="action_edit_contact">Naam veranderen</string>
-  <string name="action_add_phone_book">Toevoegen aan telefoonboek</string>
   <string name="action_delete_contact">Verwijderen uit lijst</string>
   <string name="action_block_contact">Contact blokkeren</string>
   <string name="action_unblock_contact">Contact deblokkeren</string>
@@ -310,7 +309,6 @@
   <string name="verify_otr">OTR bevestigen</string>
   <string name="remote_fingerprint">Externe vingerafdruk</string>
   <string name="scan">scan</string>
-  <string name="or_touch_phones">(of raak gsm\'s aan)</string>
   <string name="smp">Socialist Millionaire Protocol</string>
   <string name="shared_secret_hint">Hint of vraag</string>
   <string name="shared_secret_secret">Gedeeld geheim</string>
diff --git a/src/main/res/values-pl/strings.xml b/src/main/res/values-pl/strings.xml
index ad8084587..518a4a3a7 100644
--- a/src/main/res/values-pl/strings.xml
+++ b/src/main/res/values-pl/strings.xml
@@ -9,7 +9,6 @@
   <string name="action_secure">Konwersacja szyfrowana</string>
   <string name="action_add_account">Dodaj konto</string>
   <string name="action_edit_contact">Edytuj nazwę</string>
-  <string name="action_add_phone_book">Dodaj do książki telefonicznej</string>
   <string name="action_delete_contact">Usuń z rostera</string>
   <string name="action_block_contact">Zablokuj kontakt</string>
   <string name="action_unblock_contact">Odblokuj kontakt</string>
@@ -310,7 +309,6 @@
   <string name="verify_otr">Weryfikuj OTR</string>
   <string name="remote_fingerprint">Zdalny odcisk klucza</string>
   <string name="scan">skanuj</string>
-  <string name="or_touch_phones">(lub zetknij telefony)</string>
   <string name="smp">Protokół socialist millionaire</string>
   <string name="shared_secret_hint">Podpowiedź lub pytanie</string>
   <string name="shared_secret_secret">Wspólny sekret</string>
diff --git a/src/main/res/values-pt/strings.xml b/src/main/res/values-pt/strings.xml
index e32dadea0..137d38b47 100644
--- a/src/main/res/values-pt/strings.xml
+++ b/src/main/res/values-pt/strings.xml
@@ -9,7 +9,6 @@
   <string name="action_secure">Conversa segura</string>
   <string name="action_add_account">Adicionar conta</string>
   <string name="action_edit_contact">Editar nome</string>
-  <string name="action_add_phone_book">Adicionar aos contatos</string>
   <string name="action_block_contact">Bloquear contato</string>
   <string name="action_unblock_contact">Desbloquear contato</string>
   <string name="action_block_domain">Bloquear domínio</string>
diff --git a/src/main/res/values-ro-rRO/strings.xml b/src/main/res/values-ro-rRO/strings.xml
index a865ac44d..b71ed947f 100644
--- a/src/main/res/values-ro-rRO/strings.xml
+++ b/src/main/res/values-ro-rRO/strings.xml
@@ -9,7 +9,7 @@
   <string name="action_secure">Securizeaza conferinta</string>
   <string name="action_add_account">Adauga cont</string>
   <string name="action_edit_contact">Editeaza nume</string>
-  <string name="action_add_phone_book">Adauga in agenda</string>
+  <string name="action_add_phone_book">Adauga la lista de contacte</string>
   <string name="action_delete_contact">Sterge din lista</string>
   <string name="action_block_contact">Blocheaza contact</string>
   <string name="action_unblock_contact">Deblocheaza contact</string>
@@ -173,7 +173,7 @@
   <string name="passwords_do_not_match">Parolele nu sunt identice</string>
   <string name="invalid_jid">Acesta nu este un ID Jabber valabil</string>
   <string name="error_out_of_memory">Memorie epuizata. Imaginea este prea mare.</string>
-  <string name="add_phone_book_text">Vrei sa adaugi pe %s in lista de contacte a dispozitivului?</string>
+  <string name="add_phone_book_text">Vrei sa adaugi pe %s in lista de contacte?</string>
   <string name="contact_status_online">conectat</string>
   <string name="contact_status_free_to_chat">disponibil pentru conversatie</string>
   <string name="contact_status_away">plecat</string>
@@ -222,12 +222,14 @@
   <string name="conferences">Conferinte</string>
   <string name="search">Cauta</string>
   <string name="create_contact">Adauga contact</string>
+  <string name="enter_contact">Introdu contact</string>
   <string name="join_conference">Alatura-te conferintei</string>
   <string name="delete_contact">Sterge contact</string>
   <string name="view_contact_details">Arata detalii contact</string>
   <string name="block_contact">Blocheaza contact</string>
   <string name="unblock_contact">Deblocheaza contact</string>
   <string name="create">Creeaza</string>
+  <string name="select">Selecteaza</string>
   <string name="contact_already_exists">Contactul exista deja</string>
   <string name="join">Alatura-te</string>
   <string name="conference_address">Adresa conferinta</string>
@@ -320,7 +322,6 @@
   <string name="verify_otr">Verifica OTR</string>
   <string name="remote_fingerprint">Amprenta la distanta</string>
   <string name="scan">scaneaza</string>
-  <string name="or_touch_phones">(sau dispozitive touch)</string>
   <string name="smp">Socialist Millionaire Protocol</string>
   <string name="shared_secret_hint">Indiciu sau Intrebare</string>
   <string name="shared_secret_secret">Secret impartasit</string>
@@ -495,7 +496,7 @@
   <string name="pref_away_when_screen_off">Plecat cand ecranul este oprit</string>
   <string name="pref_away_when_screen_off_summary">Marcheaza clientul drept plecat cand ecranul este oprit</string>
   <string name="pref_xa_on_silent_mode">Indisponibil in mod silentios</string>
-  <string name="pref_xa_on_silent_mode_summary">Marcheaza clientul drept indisponibil cand dispozitivul este in mod silentios</string>
+  <string name="pref_xa_on_silent_mode_summary">Declara clientul drept indisponibil atunci cand dispozitivul este in mod silentios</string>
   <string name="action_add_account_with_certificate">Adauga un cont cu certificat</string>
   <string name="unable_to_parse_certificate">Nu se poate analiza certificatul</string>
   <string name="authenticate_with_certificate">Lasa gol pentru a autentifica cu un certificat</string>
@@ -527,4 +528,25 @@
   <string name="no_storage_permission">Conversations are nevoie de acces la stocarea externa</string>
   <string name="sync_with_contacts">Sincronizeaza cu contactele</string>
   <string name="sync_with_contacts_long">Conversations doreste sa potriveasta lista de contacte XMPP cu cea din dispozitiv pentru a putea afisa numule lor complete si avatarele.\n\nConversations doar v-a citi si potrivi local fara sa le incarce catre vreun server.\n\nUrmeaza sa fii intrebat daca doresti sa permiti accesul la contacte.</string>
+  <string name="certificate_information">Informatii despre certificat</string>
+  <string name="certificate_subject">Subiect</string>
+  <string name="certificate_issuer">
+Emitent</string>
+  <string name="certificate_cn">Nume comun</string>
+  <string name="certificate_o">Organizatie</string>
+  <string name="certificate_sha1">SHA1</string>
+  <string name="certicate_info_not_available">(Indisponibil)</string>
+  <string name="certificate_not_found">Certificat inexistent</string>
+  <string name="notify_on_all_messages">Notifica la toate mesajele</string>
+  <string name="notify_only_when_highlighted">Notifica numai la evidentiere</string>
+  <string name="notify_never">Notificari dezactivate</string>
+  <string name="notify_paused">Notificari suspendate</string>
+  <string name="pref_picture_compression">Comprima imaginile</string>
+  <string name="pref_picture_compression_summary">Redimensioneaza si comprima imaginile</string>
+  <string name="always">Mereu</string>
+  <string name="automatically">Automat</string>
+  <string name="battery_optimizations_enabled">Optimizare baterie activata</string>
+  <string name="battery_optimizations_enabled_explained">Dispozitivul dumneavoastra incearca sa optimizeze agresiv consumul bateriei pentru Conversations, asta poate duce la notificari intarziate sau chiar pierderi de mesaje.\nEste recomandat sa dezactivati aceste optimizari.</string>
+  <string name="battery_optimizations_enabled_dialog">Dispozitivul dumneavoastra incearca sa optimizeze agresiv consumul bateriei pentru Conversations, asta poate duce la notificari intarziate sau chiar pierderi de mesaje.\nIn continuare veti fi rugat sa dezactivati aceste optimizari.</string>
+  <string name="disable">Dezactivat</string>
 </resources>
diff --git a/src/main/res/values-ru/strings.xml b/src/main/res/values-ru/strings.xml
index f0a670fc9..220a8e577 100644
--- a/src/main/res/values-ru/strings.xml
+++ b/src/main/res/values-ru/strings.xml
@@ -9,7 +9,6 @@
   <string name="action_secure">Защищенная беседа</string>
   <string name="action_add_account">Добавить аккаунт</string>
   <string name="action_edit_contact">Редактировать контакт</string>
-  <string name="action_add_phone_book">Добавить в телефонную книгу</string>
   <string name="action_delete_contact">Удалить из списка</string>
   <string name="action_block_contact">Заблокировать контакт</string>
   <string name="action_unblock_contact">Разблокировать контакт</string>
@@ -173,7 +172,6 @@
   <string name="passwords_do_not_match">Пароли не совпадают</string>
   <string name="invalid_jid">Недопустимый JID (Джаббер ID)</string>
   <string name="error_out_of_memory">Недостаточно памяти. Изображение слишком большое</string>
-  <string name="add_phone_book_text">Вы хотите добавить %s в список контактов устройства?</string>
   <string name="contact_status_online">в сети</string>
   <string name="contact_status_free_to_chat">свободен для общения</string>
   <string name="contact_status_away">скоро буду</string>
@@ -320,7 +318,6 @@
   <string name="verify_otr">Подтвердить OTR</string>
   <string name="remote_fingerprint">Удалённый отпечаток</string>
   <string name="scan">поиск</string>
-  <string name="or_touch_phones">(или сенсорные телефоны)</string>
   <string name="smp">Socialist Millionaire Protocol</string>
   <string name="shared_secret_hint">Подсказка или вопрос</string>
   <string name="shared_secret_secret">Общий секретный ключ</string>
@@ -497,7 +494,6 @@
   <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>
diff --git a/src/main/res/values-sk/strings.xml b/src/main/res/values-sk/strings.xml
index 25a9945e7..2990a8edf 100644
--- a/src/main/res/values-sk/strings.xml
+++ b/src/main/res/values-sk/strings.xml
@@ -9,7 +9,6 @@
   <string name="action_secure">Zabezpečená konverzácia</string>
   <string name="action_add_account">Pridať účet</string>
   <string name="action_edit_contact">Upraviť meno</string>
-  <string name="action_add_phone_book">Pridať do telefónneho zoznamu</string>
   <string name="action_delete_contact">Vymazať zo zoznamu</string>
   <string name="action_block_contact">Zablokovať kontakt</string>
   <string name="action_unblock_contact">Odblokovať kontakt</string>
@@ -310,7 +309,6 @@
   <string name="verify_otr">Overiť OTR</string>
   <string name="remote_fingerprint">Vzdialený identifikátor</string>
   <string name="scan">skenovať</string>
-  <string name="or_touch_phones">(alebo dotykové telefóny)</string>
   <string name="smp">Socialist Millionaire Protocol</string>
   <string name="shared_secret_hint">Pomôcka alebo Otázka</string>
   <string name="shared_secret_secret">Spoločné tajomstvo</string>
diff --git a/src/main/res/values-sr/strings.xml b/src/main/res/values-sr/strings.xml
index a19a6b904..69a0796aa 100644
--- a/src/main/res/values-sr/strings.xml
+++ b/src/main/res/values-sr/strings.xml
@@ -173,7 +173,7 @@
   <string name="passwords_do_not_match">Лозинке се не поклапају</string>
   <string name="invalid_jid">Ово није исправан Џабер ИД</string>
   <string name="error_out_of_memory">Нестало меморије. Слика је превелика</string>
-  <string name="add_phone_book_text">Желите ли да додате %s у именик вашег уређаја?</string>
+  <string name="add_phone_book_text">Желите ли да додате %s у ваш именик?</string>
   <string name="contact_status_online">на вези</string>
   <string name="contact_status_free_to_chat">слободан за ћаскање</string>
   <string name="contact_status_away">одсутан</string>
@@ -222,12 +222,14 @@
   <string name="conferences">Групна ћаскања</string>
   <string name="search">Тражи</string>
   <string name="create_contact">Направи контакт</string>
+  <string name="enter_contact">Унеси контакт</string>
   <string name="join_conference">Придружи се групном ћаскању</string>
   <string name="delete_contact">Обриши контакт</string>
   <string name="view_contact_details">Прикажи детаље контакта</string>
   <string name="block_contact">Блокирај контакт</string>
   <string name="unblock_contact">Одблокирај контакт</string>
   <string name="create">Направи</string>
+  <string name="select">Изабери</string>
   <string name="contact_already_exists">Контакт већ постоји</string>
   <string name="join">Придружи се</string>
   <string name="conference_address">Адреса групног ћаскања</string>
@@ -320,7 +322,6 @@
   <string name="verify_otr">Овери ОТР</string>
   <string name="remote_fingerprint">Отисак удаљеног</string>
   <string name="scan">очитај</string>
-  <string name="or_touch_phones">(или додирните телефоне)</string>
   <string name="smp">Социјалистички милионер протокол</string>
   <string name="shared_secret_hint">Наговештај или питање</string>
   <string name="shared_secret_secret">Заједничка тајна</string>
@@ -495,7 +496,7 @@
   <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="pref_xa_on_silent_mode_summary">Означава ваш ресурс недоступним кад је уређај у тихом режиму</string>
   <string name="unable_to_parse_certificate">Не могу да рашчланим сертификат</string>
   <string name="authenticate_with_certificate">Оставите празно за аутентификацију сертификатом</string>
   <string name="captcha_ocr">Текст стопке</string>
@@ -525,4 +526,17 @@
   <string name="shared_image_with_x">Подељена слика са %s</string>
   <string name="no_storage_permission">Конверзацији је потребан приступ спољашњем складишту</string>
   <string name="sync_with_contacts">Синхронизуј са контактима</string>
+  <string name="certificate_information">Подаци о сертификату</string>
+  <string name="certificate_subject">Предмет</string>
+  <string name="certificate_issuer">Издавач</string>
+  <string name="certificate_cn">Заједничко име</string>
+  <string name="certificate_o">Организација</string>
+  <string name="certificate_sha1">СХА1</string>
+  <string name="certicate_info_not_available">(није доступно)</string>
+  <string name="certificate_not_found">Сертификат није нађен</string>
+  <string name="notify_on_all_messages">Обавештења за све поруке</string>
+  <string name="notify_only_when_highlighted">Обавештења само за означене поруке</string>
+  <string name="notify_never">Обавештења искључена</string>
+  <string name="notify_paused">Обавештења паузирана</string>
+  <string name="pref_picture_compression">Компресуј слике</string>
 </resources>
diff --git a/src/main/res/values-sv/strings.xml b/src/main/res/values-sv/strings.xml
index cf0ce8e6d..920fc65e4 100644
--- a/src/main/res/values-sv/strings.xml
+++ b/src/main/res/values-sv/strings.xml
@@ -9,7 +9,7 @@
   <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_add_phone_book">Lägg till i kontakter</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>
@@ -173,7 +173,7 @@
   <string name="passwords_do_not_match">Lösenorden är inte lika</string>
   <string name="invalid_jid">Detta är inte ett korrekt Jabber-ID</string>
   <string name="error_out_of_memory">Slut på minne. Bilden är för stor</string>
-  <string name="add_phone_book_text">Vill du lägga till %s i din enhets kontaktlista?</string>
+  <string name="add_phone_book_text">Vill du lägga till %s i din enhets kontakter?</string>
   <string name="contact_status_online">online</string>
   <string name="contact_status_free_to_chat">tillgänglig</string>
   <string name="contact_status_away">borta</string>
@@ -222,12 +222,14 @@
   <string name="conferences">Konferenser</string>
   <string name="search">Sök</string>
   <string name="create_contact">Skapa kontakt</string>
+  <string name="enter_contact">Fyll i kontakt</string>
   <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="select">Välj</string>
   <string name="contact_already_exists">Kontakten finns redan</string>
   <string name="join">Gå med</string>
   <string name="conference_address">Konferensadress</string>
@@ -320,7 +322,6 @@
   <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>
@@ -524,4 +525,24 @@
   <string name="no_storage_permission">Conversations behöver access till extern lagring</string>
   <string name="sync_with_contacts">Synkronisera med kontakter</string>
   <string name="sync_with_contacts_long">Conversations vill matcha din XMPP-kontaktlista med dina kontakter för att visa deras namn och profilbild.\n\nConversations läser endast dina kontakter för att matcha dem lokalt utan att ladda upp dem till din server.\n\nDu kommer nu få frågan om tillåtelse för att använda kontakterna.</string>
+  <string name="certificate_information">Certifikatinformation</string>
+  <string name="certificate_subject">Ämne</string>
+  <string name="certificate_issuer">Utfärdare</string>
+  <string name="certificate_cn">Common Name</string>
+  <string name="certificate_o">Organisation</string>
+  <string name="certificate_sha1">SHA1</string>
+  <string name="certicate_info_not_available">(Ej tillgänglig)</string>
+  <string name="certificate_not_found">Inget certifikat funnet</string>
+  <string name="notify_on_all_messages">Notifiera för alla meddelanden</string>
+  <string name="notify_only_when_highlighted">Notifiera endast vid highlight</string>
+  <string name="notify_never">Notifieringar deaktiverade</string>
+  <string name="notify_paused">Notifieringar pausade</string>
+  <string name="pref_picture_compression">Komprimera bilder</string>
+  <string name="pref_picture_compression_summary">Storleksjustera och komprimera bilder</string>
+  <string name="always">Alltid</string>
+  <string name="automatically">Automatiskt</string>
+  <string name="battery_optimizations_enabled">Batterioptimeringar aktiverade</string>
+  <string name="battery_optimizations_enabled_explained">Din enhet har kraftiga batterioptimeringar som påverkar Conversations på så sätt att inkommande meddelanden kan försenas eller kan till och med gå förlorade.\nDet är rekommenderat att deaktivera batterioptimeringarna.</string>
+  <string name="battery_optimizations_enabled_dialog">Din enhet har kraftiga batterioptimeringar som påverkar Conversations på så sätt att inkommande meddelanden kan försenas eller kan till och med gå förlorade.\nDu kommer nu att bli ombedd att stänga av batterioptimeringarna för Conversations.</string>
+  <string name="disable">Deaktivera</string>
 </resources>
diff --git a/src/main/res/values-zh-rCN/strings.xml b/src/main/res/values-zh-rCN/strings.xml
index 316e6cdae..26aa7bc58 100644
--- a/src/main/res/values-zh-rCN/strings.xml
+++ b/src/main/res/values-zh-rCN/strings.xml
@@ -9,7 +9,6 @@
   <string name="action_secure">安全对话</string>
   <string name="action_add_account">添加账号</string>
   <string name="action_edit_contact">编辑姓名</string>
-  <string name="action_add_phone_book">添加到手机通讯录</string>
   <string name="action_delete_contact">从列表中删除</string>
   <string name="action_block_contact">屏蔽联系人</string>
   <string name="action_unblock_contact">解除联系人屏蔽</string>
@@ -173,7 +172,6 @@
   <string name="passwords_do_not_match">密码不一致</string>
   <string name="invalid_jid">该 Jabber ID 无效</string>
   <string name="error_out_of_memory">空间不足。图片过大</string>
-  <string name="add_phone_book_text">你想把 %s 加到你设备的联系人列表吗？</string>
   <string name="contact_status_online">在线</string>
   <string name="contact_status_free_to_chat">自由畅聊</string>
   <string name="contact_status_away">离开</string>
@@ -320,7 +318,6 @@
   <string name="verify_otr">验证 OTR</string>
   <string name="remote_fingerprint">远程指纹</string>
   <string name="scan">扫描</string>
-  <string name="or_touch_phones">(或轻触手机)</string>
   <string name="smp">Socialist Millionaire Protocol</string>
   <string name="shared_secret_hint">提示或问题</string>
   <string name="shared_secret_secret">共知的秘密</string>
@@ -491,7 +488,6 @@
   <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">留空以认证 w/ 证书</string>
diff --git a/src/main/res/values-zh-rTW/strings.xml b/src/main/res/values-zh-rTW/strings.xml
index 619e5a6c5..b66c87c76 100644
--- a/src/main/res/values-zh-rTW/strings.xml
+++ b/src/main/res/values-zh-rTW/strings.xml
@@ -8,7 +8,6 @@
   <string name="action_secure">安全對話</string>
   <string name="action_add_account">新增帳戶</string>
   <string name="action_edit_contact">編輯姓名</string>
-  <string name="action_add_phone_book">新增到手機通訊錄</string>
   <string name="action_delete_contact">從列表中刪除</string>
   <string name="title_activity_manage_accounts">管理帳戶</string>
   <string name="title_activity_conference_details">群組詳情</string>