diff --git a/src/main/res/values-ar/strings.xml b/src/main/res/values-ar/strings.xml
index c0a1851cd..b3eac5cdf 100644
--- a/src/main/res/values-ar/strings.xml
+++ b/src/main/res/values-ar/strings.xml
@@ -8,7 +8,6 @@
   <string name="action_contact_details">بيانات جهة الإتصال</string>
   <string name="action_muc_details">تفاصيل مجموعة المحادثة</string>
   <string name="channel_details">تفاصيل القناة</string>
-  <string name="action_secure">تشفير المحادثة</string>
   <string name="action_add_account">إضافة حساب</string>
   <string name="action_edit_contact">تعديل الإسم</string>
   <string name="action_add_phone_book">أضف إلى دفتر العناوين</string>
diff --git a/src/main/res/values-bg/strings.xml b/src/main/res/values-bg/strings.xml
index 2b7e749e2..64b795079 100644
--- a/src/main/res/values-bg/strings.xml
+++ b/src/main/res/values-bg/strings.xml
@@ -8,7 +8,6 @@
   <string name="action_contact_details">Подробности за контакта</string>
   <string name="action_muc_details">Подробности за груповия разговор</string>
   <string name="channel_details">Подробности за канала</string>
-  <string name="action_secure">Защитен разговор</string>
   <string name="action_add_account">Добавяне на профил</string>
   <string name="action_edit_contact">Редактиране на името</string>
   <string name="action_add_phone_book">Добавяне към адресния указател</string>
diff --git a/src/main/res/values-ca/strings.xml b/src/main/res/values-ca/strings.xml
index e9d2fa29b..e4e02957d 100644
--- a/src/main/res/values-ca/strings.xml
+++ b/src/main/res/values-ca/strings.xml
@@ -7,7 +7,6 @@
   <string name="action_end_conversation">Tancar aquesta conversa</string>
   <string name="action_contact_details">Detalls del contacte</string>
   <string name="action_muc_details">Detalls del xat de grup</string>
-  <string name="action_secure">Conversa segura</string>
   <string name="action_add_account">Afegeix un compte</string>
   <string name="action_edit_contact">Edita el nom</string>
   <string name="action_add_phone_book">Afegeix a la llibreta d\'adreces</string>
diff --git a/src/main/res/values-cs/strings.xml b/src/main/res/values-cs/strings.xml
index 103c03430..6b612e751 100644
--- a/src/main/res/values-cs/strings.xml
+++ b/src/main/res/values-cs/strings.xml
@@ -6,7 +6,6 @@
   <string name="action_account">Nastavení účtu</string>
   <string name="action_end_conversation">Zavřít tuto konverzaci</string>
   <string name="action_contact_details">Detaily kontaktu</string>
-  <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 adresáře</string>
diff --git a/src/main/res/values-de/strings.xml b/src/main/res/values-de/strings.xml
index 03893364d..60c95baf4 100644
--- a/src/main/res/values-de/strings.xml
+++ b/src/main/res/values-de/strings.xml
@@ -8,7 +8,6 @@
   <string name="action_contact_details">Kontaktdetails</string>
   <string name="action_muc_details">Gruppenchatdetails</string>
   <string name="channel_details">Channeldetails</string>
-  <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>
diff --git a/src/main/res/values-el/strings.xml b/src/main/res/values-el/strings.xml
index 6948212ed..57b0ed24c 100644
--- a/src/main/res/values-el/strings.xml
+++ b/src/main/res/values-el/strings.xml
@@ -8,7 +8,6 @@
   <string name="action_contact_details">Λεπτομέρειες επαφής</string>
   <string name="action_muc_details">Λεπτομέρειες ομαδικής συζήτησης</string>
   <string name="channel_details">Λεπτομέρειες καναλιού</string>
-  <string name="action_secure">Ασφαλής συζήτηση</string>
   <string name="action_add_account">Προσθήκη λογαριασμού</string>
   <string name="action_edit_contact">Επεξεργασία ονόματος</string>
   <string name="action_add_phone_book">Προσθήκη στην ατζέντα</string>
diff --git a/src/main/res/values-es/strings.xml b/src/main/res/values-es/strings.xml
index 1daf200c5..0f91475f0 100644
--- a/src/main/res/values-es/strings.xml
+++ b/src/main/res/values-es/strings.xml
@@ -8,7 +8,6 @@
   <string name="action_contact_details">Detalles del contacto</string>
   <string name="action_muc_details">Detalles de conversación</string>
   <string name="channel_details">Detalles del canal</string>
-  <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</string>
diff --git a/src/main/res/values-eu/strings.xml b/src/main/res/values-eu/strings.xml
index bf595e4a5..701a02cbf 100644
--- a/src/main/res/values-eu/strings.xml
+++ b/src/main/res/values-eu/strings.xml
@@ -8,7 +8,6 @@
   <string name="action_contact_details">Kontaktuaren xehetasunak</string>
   <string name="action_muc_details">Taldearen xehetasunak</string>
   <string name="channel_details">Kanalaren xehetasunak</string>
-  <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">Helbideen liburura gehitu</string>
diff --git a/src/main/res/values-fa-rIR/strings.xml b/src/main/res/values-fa-rIR/strings.xml
index 682185323..728ec8e9c 100644
--- a/src/main/res/values-fa-rIR/strings.xml
+++ b/src/main/res/values-fa-rIR/strings.xml
@@ -5,7 +5,6 @@
   <string name="action_accounts">مدیریت حساب های کاربری</string>
   <string name="action_contact_details">جزییات مخاطب</string>
   <string name="action_muc_details">جزئیات چت گروهی</string>
-  <string name="action_secure">مکالمه امن</string>
   <string name="action_add_account">اضافه کردن حساب کاربری</string>
   <string name="action_edit_contact">تغییر نام</string>
   <string name="action_add_phone_book">اضافه کردن به لیست ادرس ها</string>
diff --git a/src/main/res/values-fr/strings.xml b/src/main/res/values-fr/strings.xml
index a6ebebacf..12b60ea77 100644
--- a/src/main/res/values-fr/strings.xml
+++ b/src/main/res/values-fr/strings.xml
@@ -8,7 +8,6 @@
   <string name="action_contact_details">Détails du contact</string>
   <string name="action_muc_details">Détails du groupe</string>
   <string name="channel_details">Détails du canal</string>
-  <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 au carnet d\'adresses</string>
diff --git a/src/main/res/values-gl/strings.xml b/src/main/res/values-gl/strings.xml
index 3cd0f8b7b..19c0b82a1 100644
--- a/src/main/res/values-gl/strings.xml
+++ b/src/main/res/values-gl/strings.xml
@@ -8,7 +8,6 @@
   <string name="action_contact_details">Detalles do contacto</string>
   <string name="action_muc_details">Detalles da conversa de grupo</string>
   <string name="channel_details">Detalles do canal</string>
-  <string name="action_secure">Conversa segura</string>
   <string name="action_add_account">Engadir conta</string>
   <string name="action_edit_contact">Editar contacto</string>
   <string name="action_add_phone_book">Engadir a libreta de enderezos</string>
diff --git a/src/main/res/values-hu/strings.xml b/src/main/res/values-hu/strings.xml
index 0aff10aa7..da848f274 100644
--- a/src/main/res/values-hu/strings.xml
+++ b/src/main/res/values-hu/strings.xml
@@ -8,7 +8,6 @@
   <string name="action_contact_details">Partner részletei</string>
   <string name="action_muc_details">Csoportos csevegés részletei</string>
   <string name="channel_details">Csatorna részletei</string>
-  <string name="action_secure">Biztonságos beszélgetés</string>
   <string name="action_add_account">Fiók hozzáadása</string>
   <string name="action_edit_contact">Név szerkesztése</string>
   <string name="action_add_phone_book">Hozzáadás a címjegyzékhez</string>
diff --git a/src/main/res/values-id/strings.xml b/src/main/res/values-id/strings.xml
index 78fa9411f..08fb2bc34 100644
--- a/src/main/res/values-id/strings.xml
+++ b/src/main/res/values-id/strings.xml
@@ -4,7 +4,6 @@
   <string name="action_add">Percakapan Baru</string>
   <string name="action_accounts">Pengaturan Akun</string>
   <string name="action_contact_details">Detil Kontak</string>
-  <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">Tambahkan ke daftar kontak</string>
diff --git a/src/main/res/values-it/strings.xml b/src/main/res/values-it/strings.xml
index c42c050d0..548bd03c0 100644
--- a/src/main/res/values-it/strings.xml
+++ b/src/main/res/values-it/strings.xml
@@ -8,7 +8,6 @@
   <string name="action_contact_details">Dettagli del contatto</string>
   <string name="action_muc_details">Dettagli chat di gruppo</string>
   <string name="channel_details">Dettagli canale</string>
-  <string name="action_secure">Conversazione sicura</string>
   <string name="action_add_account">Aggiungi account</string>
   <string name="action_edit_contact">Modifica il nome</string>
   <string name="action_add_phone_book">Aggiungi alla rubrica</string>
@@ -461,7 +460,11 @@
   <string name="server_info_broken">Rotto</string>
   <string name="pref_presence_settings">Disponibilità</string>
   <string name="pref_away_when_screen_off">\"Non disponibile\" a schermo spento</string>
+  <string name="pref_away_when_screen_off_summary">Imposta come non disponibile quando lo schermo è spento</string>
+  <string name="pref_dnd_on_silent_mode">\"Occupato\" in modalità silenziosa</string>
+  <string name="pref_dnd_on_silent_mode_summary">Imposta come occupato quando il dispositivo è in modalità silenziosa</string>
   <string name="pref_treat_vibrate_as_silent">Tratta vibrazione come modalità silenziosa</string>
+  <string name="pref_treat_vibrate_as_dnd_summary">Imposta come occupato quando il dispositivo è in modalità vibrazione</string>
   <string name="pref_show_connection_options">Impostazioni estese di connessione</string>
   <string name="pref_show_connection_options_summary">Mostra nome host e impostazioni della porta quando configuri un account</string>
   <string name="hostname_example">xmpp.esempio.it</string>
@@ -919,6 +922,8 @@
   <string name="could_not_switch_camera">Impossibile cambiare fotocamera</string>
   <string name="add_to_favorites">Aggiungi ai preferiti</string>
   <string name="remove_from_favorites">Rimuovi dai preferiti</string>
+  <string name="gpx_track">Traccia GPX</string>
+  <string name="could_not_correct_message">Impossibile correggere il messaggio</string>
   <plurals name="view_users">
     <item quantity="one">Vedi %1$d partecipante</item>
     <item quantity="other">Vedi %1$d partecipanti</item>
diff --git a/src/main/res/values-iw/strings.xml b/src/main/res/values-iw/strings.xml
index e12b2b5b3..228704ef3 100644
--- a/src/main/res/values-iw/strings.xml
+++ b/src/main/res/values-iw/strings.xml
@@ -4,7 +4,6 @@
   <string name="action_add">שיחה חדשה</string>
   <string name="action_accounts">נהל חשבונות</string>
   <string name="action_contact_details">פרטי איש קשר</string>
-  <string name="action_secure">דיון מאובטח</string>
   <string name="action_add_account">הוסף חשבון</string>
   <string name="action_edit_contact">ערוך שם</string>
   <string name="action_delete_contact">מחק מרשימת אנשי הקשר</string>
diff --git a/src/main/res/values-ja/strings.xml b/src/main/res/values-ja/strings.xml
index 870ac2ac2..f484efccc 100644
--- a/src/main/res/values-ja/strings.xml
+++ b/src/main/res/values-ja/strings.xml
@@ -8,7 +8,6 @@
   <string name="action_contact_details">連絡先の詳細</string>
   <string name="action_muc_details">談話室の詳細</string>
   <string name="channel_details">チャンネルの詳細</string>
-  <string name="action_secure">安全に会話</string>
   <string name="action_add_account">アカウントを追加</string>
   <string name="action_edit_contact">名前の編集</string>
   <string name="action_add_phone_book">アドレス帳に追加</string>
diff --git a/src/main/res/values-ko/strings.xml b/src/main/res/values-ko/strings.xml
index b8ae856be..d00ee1940 100644
--- a/src/main/res/values-ko/strings.xml
+++ b/src/main/res/values-ko/strings.xml
@@ -4,7 +4,6 @@
   <string name="action_add">새 대화</string>
   <string name="action_accounts">계정 </string>
   <string name="action_contact_details">연락처 정보</string>
-  <string name="action_secure">안전한 대화 </string>
   <string name="action_add_account">계정 추가 </string>
   <string name="action_edit_contact">이름 편집 </string>
   <string name="action_add_phone_book">주소록에 추가</string>
diff --git a/src/main/res/values-nb-rNO/strings.xml b/src/main/res/values-nb-rNO/strings.xml
index c237a8c79..2c94fcbba 100644
--- a/src/main/res/values-nb-rNO/strings.xml
+++ b/src/main/res/values-nb-rNO/strings.xml
@@ -5,7 +5,6 @@
   <string name="action_accounts">Kontobehandling</string>
   <string name="action_contact_details">Kontaktdetaljer</string>
   <string name="action_muc_details">Gruppesludringsdetaljer</string>
-  <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 kontaktliste</string>
diff --git a/src/main/res/values-nl/strings.xml b/src/main/res/values-nl/strings.xml
index 23bea3fa6..8e7303340 100644
--- a/src/main/res/values-nl/strings.xml
+++ b/src/main/res/values-nl/strings.xml
@@ -8,7 +8,6 @@
   <string name="action_contact_details">Contactgegevens</string>
   <string name="action_muc_details">Gespreksgegevens</string>
   <string name="channel_details">Kanaalinformatie</string>
-  <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 adresboek</string>
diff --git a/src/main/res/values-pl/strings.xml b/src/main/res/values-pl/strings.xml
index 03f17ff5a..f2c2593af 100644
--- a/src/main/res/values-pl/strings.xml
+++ b/src/main/res/values-pl/strings.xml
@@ -8,7 +8,6 @@
   <string name="action_contact_details">Szczegóły kontaktu</string>
   <string name="action_muc_details">Szczegóły konferencji</string>
   <string name="channel_details">Szczegóły kanału</string>
-  <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 kontaktów</string>
@@ -401,6 +400,7 @@
   <string name="mark_as_read">Oznacz jako przeczytane</string>
   <string name="pref_input_options">Ustawienia wprowadzania</string>
   <string name="pref_enter_is_send">Enter wysyła</string>
+  <string name="pref_enter_is_send_summary">Użyj klawisza Enter aby wysłać wiadomość. Możesz zawsze użyć Ctrl+Enter do wysyłania wiadomości, nawet jeśli ta opcja jest wyłączona.</string>
   <string name="pref_display_enter_key">Pokaż klawisz Enter</string>
   <string name="pref_display_enter_key_summary">Zamień klawisz emotikon na klawisz Enter</string>
   <string name="audio">plik audio</string>
@@ -462,7 +462,11 @@
   <string name="server_info_broken">Zepsute</string>
   <string name="pref_presence_settings">Dostępność</string>
   <string name="pref_away_when_screen_off">Status \"Oddalony\" gdy wyświetlacz jest wyłączony</string>
+  <string name="pref_away_when_screen_off_summary">Pokaż jako Oddalony kiedy ekran jest wyłączony.</string>
+  <string name="pref_dnd_on_silent_mode">Zajęty w trybie cichym</string>
+  <string name="pref_dnd_on_silent_mode_summary">Pokaż jako Zajęty jeśli urządzenie jest w trybie cichym</string>
   <string name="pref_treat_vibrate_as_silent">Traktuj tryb wibracji jak tryb cichy</string>
+  <string name="pref_treat_vibrate_as_dnd_summary">Pokaż jako Zajęty kiedy urządzenie jest w trybie wibracji</string>
   <string name="pref_show_connection_options">Rozszerzone ustawienia połączenia</string>
   <string name="pref_show_connection_options_summary">Pokaż nazwę hosta i ustawienia portu przy dodawaniu konta</string>
   <string name="hostname_example">xmpp.example.com</string>
@@ -929,12 +933,15 @@ Administrator twojego serwera będzie mógł czytać twoje wiadomości, ale moż
   <string name="audio_call">Połączenie audio</string>
   <string name="video_call">Połączenie wideo</string>
   <string name="help">Pomoc</string>
+  <string name="switch_to_conversation">Przełącz do rozmowy</string>
   <string name="microphone_unavailable">Twój mikrofon jest niedostępny</string>
   <string name="only_one_call_at_a_time">Możesz mieć tylko jedno połączenie na raz.</string>
   <string name="return_to_ongoing_call">Powróć do trwającego połączenia</string>
   <string name="could_not_switch_camera">Nie można zmienić aparatu</string>
   <string name="add_to_favorites">Dodaj do ulubionych</string>
   <string name="remove_from_favorites">Usuń z ulubionych</string>
+  <string name="gpx_track">Ścieżka GPX</string>
+  <string name="could_not_correct_message">Nie można poprawić wiadomości</string>
   <plurals name="view_users">
     <item quantity="one">Pokaż %1$d uczestnika</item>
     <item quantity="few">Pokaż %1$d uczestników</item>
diff --git a/src/main/res/values-pt-rBR/strings.xml b/src/main/res/values-pt-rBR/strings.xml
index 701f8f21f..675eeb91d 100644
--- a/src/main/res/values-pt-rBR/strings.xml
+++ b/src/main/res/values-pt-rBR/strings.xml
@@ -8,7 +8,6 @@
   <string name="action_contact_details">Detalhes do contato</string>
   <string name="action_muc_details">Detalhes da conversa em grupo</string>
   <string name="channel_details">Detalhes do canal</string>
-  <string name="action_secure">Conversa segura</string>
   <string name="action_add_account">Adicionar conta</string>
   <string name="action_edit_contact">Editar o nome</string>
   <string name="action_add_phone_book">Adicionar ao livro de endereços</string>
diff --git a/src/main/res/values-pt/strings.xml b/src/main/res/values-pt/strings.xml
index 48ac1af22..aa40d9cc8 100644
--- a/src/main/res/values-pt/strings.xml
+++ b/src/main/res/values-pt/strings.xml
@@ -4,7 +4,6 @@
   <string name="action_add">Nova conversa</string>
   <string name="action_accounts">Gerir contas</string>
   <string name="action_contact_details">Detalhes do contacto</string>
-  <string name="action_secure">Conversa segura</string>
   <string name="action_add_account">Adicionar conta</string>
   <string name="action_edit_contact">Editar nome</string>
   <string name="action_add_phone_book">Adicionar ao livro de endereços</string>
diff --git a/src/main/res/values-ro-rRO/strings.xml b/src/main/res/values-ro-rRO/strings.xml
index bb7f98a4e..e7fb11ba3 100644
--- a/src/main/res/values-ro-rRO/strings.xml
+++ b/src/main/res/values-ro-rRO/strings.xml
@@ -8,7 +8,6 @@
   <string name="action_contact_details">Detalii contact</string>
   <string name="action_muc_details">Detalii discuție de grup</string>
   <string name="channel_details">Detalii canal</string>
-  <string name="action_secure">Securizează conferința</string>
   <string name="action_add_account">Adaugă cont</string>
   <string name="action_edit_contact">Editează nume</string>
   <string name="action_add_phone_book">Adaugă la lista de contacte</string>
diff --git a/src/main/res/values-ru/strings.xml b/src/main/res/values-ru/strings.xml
index b4328ad26..8f9f1647c 100644
--- a/src/main/res/values-ru/strings.xml
+++ b/src/main/res/values-ru/strings.xml
@@ -8,7 +8,6 @@
   <string name="action_contact_details">Сведения о контакте</string>
   <string name="action_muc_details">Подробности конференции</string>
   <string name="channel_details">Сведения о канале</string>
-  <string name="action_secure">Защищённая беседа</string>
   <string name="action_add_account">Добавить аккаунт</string>
   <string name="action_edit_contact">Редактировать контакт</string>
   <string name="action_add_phone_book">Добавить в адресную книгу</string>
diff --git a/src/main/res/values-sk/strings.xml b/src/main/res/values-sk/strings.xml
index cd8643ff1..6cee3cc8e 100644
--- a/src/main/res/values-sk/strings.xml
+++ b/src/main/res/values-sk/strings.xml
@@ -4,7 +4,6 @@
   <string name="action_add">Nová konverzácia</string>
   <string name="action_accounts">Nastavenie účtov</string>
   <string name="action_contact_details">Detaily kontaktu</string>
-  <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_delete_contact">Vymazať zo zoznamu</string>
diff --git a/src/main/res/values-sr/strings.xml b/src/main/res/values-sr/strings.xml
index b89041668..0c5ef2675 100644
--- a/src/main/res/values-sr/strings.xml
+++ b/src/main/res/values-sr/strings.xml
@@ -5,7 +5,6 @@
   <string name="action_accounts">Управљај налозима</string>
   <string name="action_contact_details">Детаљи контакта</string>
   <string name="action_muc_details">Детаљи групног ћаскања</string>
-  <string name="action_secure">Безбедна преписка</string>
   <string name="action_add_account">Додај налог</string>
   <string name="action_edit_contact">Уреди име</string>
   <string name="action_add_phone_book">Додај у именик</string>
diff --git a/src/main/res/values-sv/strings.xml b/src/main/res/values-sv/strings.xml
index 95c39ba06..8ec4c630f 100644
--- a/src/main/res/values-sv/strings.xml
+++ b/src/main/res/values-sv/strings.xml
@@ -8,7 +8,6 @@
   <string name="action_contact_details">Kontaktdetaljer</string>
   <string name="action_muc_details">Gruppchattdetaljer</string>
   <string name="channel_details">Kanaldetaljer</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 kontakter</string>
diff --git a/src/main/res/values-tr-rTR/strings.xml b/src/main/res/values-tr-rTR/strings.xml
index aad58e3a5..64a694207 100644
--- a/src/main/res/values-tr-rTR/strings.xml
+++ b/src/main/res/values-tr-rTR/strings.xml
@@ -8,7 +8,6 @@
   <string name="action_contact_details">Kişi bilgileri</string>
   <string name="action_muc_details">Küme konuşması ayrıntıları</string>
   <string name="channel_details">Kanal ayrıntıları</string>
-  <string name="action_secure">Güvenli konuşma</string>
   <string name="action_add_account">Hesap ekle</string>
   <string name="action_edit_contact">İsmi düzenle</string>
   <string name="action_add_phone_book">Telefon rehberine ekle</string>
diff --git a/src/main/res/values-uk/strings.xml b/src/main/res/values-uk/strings.xml
index 9d02b5ff9..59782a2f7 100644
--- a/src/main/res/values-uk/strings.xml
+++ b/src/main/res/values-uk/strings.xml
@@ -8,7 +8,6 @@
   <string name="action_contact_details">Деталі контакту</string>
   <string name="action_muc_details">Деталі групи</string>
   <string name="channel_details">Деталі каналу</string>
-  <string name="action_secure">Захищена розмова</string>
   <string name="action_add_account">Додати обліковий запис</string>
   <string name="action_edit_contact">Редагувати ім\'я</string>
   <string name="action_add_phone_book">Додати до контактів</string>
diff --git a/src/main/res/values-vi/strings.xml b/src/main/res/values-vi/strings.xml
index adcd79e96..57d506c2d 100644
--- a/src/main/res/values-vi/strings.xml
+++ b/src/main/res/values-vi/strings.xml
@@ -4,7 +4,6 @@
   <string name="action_add">Hội thoại mới</string>
   <string name="action_accounts">Quản lý tài khoản</string>
   <string name="action_contact_details">Thông tin liên hệ</string>
-  <string name="action_secure">Bảo mật hội thoại</string>
   <string name="action_add_account">Thêm tài khoản</string>
   <string name="action_edit_contact">Chỉnh sửa tên</string>
   <string name="action_add_phone_book">Thêm vào danh bạ</string>
diff --git a/src/main/res/values-zh-rCN/strings.xml b/src/main/res/values-zh-rCN/strings.xml
index cdd7e736a..ddd506f48 100644
--- a/src/main/res/values-zh-rCN/strings.xml
+++ b/src/main/res/values-zh-rCN/strings.xml
@@ -8,7 +8,6 @@
   <string name="action_contact_details">联系人详情</string>
   <string name="action_muc_details">群聊详情</string>
   <string name="channel_details">频道详情</string>
-  <string name="action_secure">加密对话</string>
   <string name="action_add_account">添加账户</string>
   <string name="action_edit_contact">编辑名称</string>
   <string name="action_add_phone_book">添加到通讯录</string>
@@ -460,7 +459,11 @@
   <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_dnd_on_silent_mode">在静音模式显示为忙碌</string>
+  <string name="pref_dnd_on_silent_mode_summary">设备处于静音模式时显示为忙碌</string>
   <string name="pref_treat_vibrate_as_silent">将振动看作静音</string>
+  <string name="pref_treat_vibrate_as_dnd_summary">设备振动时显示为忙碌</string>
   <string name="pref_show_connection_options">高级连接设置</string>
   <string name="pref_show_connection_options_summary">注册账户时显示主机名和端口</string>
   <string name="hostname_example">xmpp.example.com</string>
@@ -911,6 +914,8 @@
   <string name="could_not_switch_camera">无法切换摄像头</string>
   <string name="add_to_favorites">添加到收藏夹</string>
   <string name="remove_from_favorites">从收藏夹删除</string>
+  <string name="gpx_track">GPX轨迹</string>
+  <string name="could_not_correct_message">无法更正消息</string>
   <plurals name="view_users">
     <item quantity="other">查看%1$d成员</item>
   </plurals>
diff --git a/src/main/res/values-zh-rTW/strings.xml b/src/main/res/values-zh-rTW/strings.xml
index b2323e52f..075df8dad 100644
--- a/src/main/res/values-zh-rTW/strings.xml
+++ b/src/main/res/values-zh-rTW/strings.xml
@@ -4,7 +4,6 @@
   <string name="action_add">新對話</string>
   <string name="action_accounts">管理帳戶</string>
   <string name="action_contact_details">聯絡人詳情</string>
-  <string name="action_secure">安全對話</string>
   <string name="action_add_account">新增帳戶</string>
   <string name="action_edit_contact">編輯姓名</string>
   <string name="action_add_phone_book">添加到地址薄</string>