pulled translations from transifex

29 files changed, 212 insertions, 253 deletions

diff --git a/src/main/res/values-ar/strings.xml b/src/main/res/values-ar/strings.xml
index b87e7179..2e59983c 100644
--- a/src/main/res/values-ar/strings.xml
+++ b/src/main/res/values-ar/strings.xml
@@ -92,14 +92,12 @@
   <string name="pref_xmpp_resource">الريسورس</string>
   <string name="pref_accept_files">ضبط استقبال الملفات</string>
   <string name="pref_accept_files_summary">اقبل تلقائيا الملفات أقل من</string>
-  <string name="pref_notification_settings">اعدادات الإشعارات</string>
   <string name="pref_notifications">الإشعارات</string>
   <string name="pref_notifications_summary">أخبرني عندما تصل رساله جديده</string>
   <string name="pref_vibrate">إعداد الإهتزاز</string>
   <string name="pref_vibrate_summary">تفعيل الاهتزاز عندما تصل رساله جديده</string>
   <string name="pref_sound">التبيه الصوتي</string>
   <string name="pref_sound_summary">سماع صوت عندما تصل رساله</string>
-  <string name="pref_advanced_options">اعدادات متقدمّة</string>
   <string name="pref_never_send_crash">لا ترسل تقارير أخطاء</string>
   <string name="pref_never_send_crash_summary">الغاء ارسال تقارير الأخطاء يقلل من فرص حل المشكلة سريعا فكن متعاون</string>
   <string name="pref_confirm_messages">تأكيد الرسالة</string>
@@ -288,7 +286,6 @@
   <string name="two_hours">ساعتين</string>
   <string name="eight_hours">8 ساعات</string>
   <string name="until_further_notice">حتى إشعار آخر</string>
-  <string name="pref_input_options">خيارات الادخال</string>
   <string name="pref_enter_is_send">أدخل للإرسال</string>
   <string name="pref_enter_is_send_summary">استخدام مفتاح الدخول لإرسال رسالة</string>
   <string name="pref_display_enter_key">عرض مفتاح الادخال</string>
diff --git a/src/main/res/values-bg/strings.xml b/src/main/res/values-bg/strings.xml
index b87de768..4f2a548c 100644
--- a/src/main/res/values-bg/strings.xml
+++ b/src/main/res/values-bg/strings.xml
@@ -102,7 +102,7 @@
   <string name="pref_xmpp_resource_summary">Името, с което се определя този клиент</string>
   <string name="pref_accept_files">Приемане на файлове</string>
   <string name="pref_accept_files_summary">Автоматично приемане на файлове с размер, по-малък от…</string>
-  <string name="pref_notification_settings">Настройки за известията</string>
+  <string name="pref_notification_settings">Известие</string>
   <string name="pref_notifications">Известия</string>
   <string name="pref_notifications_summary">Известяване при получаване на ново съобщение</string>
   <string name="pref_vibrate">Вибрация</string>
@@ -111,12 +111,12 @@
   <string name="pref_sound_summary">Изпълнение на звук с известието</string>
   <string name="pref_notification_grace_period">Продължителност на отсрочване на известията</string>
   <string name="pref_notification_grace_period_summary">Изключва известията за кратко, след като бъде получено копие на съобщение</string>
-  <string name="pref_advanced_options">Разширени настройки</string>
+  <string name="pref_advanced_options">Разширени</string>
   <string name="pref_never_send_crash">Никога да не се изпращат доклади за сривове</string>
   <string name="pref_never_send_crash_summary">Изпращайки проследявания на стека, Вие помагате за непрекъснатото развитие на Conversations</string>
   <string name="pref_confirm_messages">Потвърждаване на съобщенията</string>
   <string name="pref_confirm_messages_summary">Уведомява контакта Ви, че сте приели и прочели съобщението му</string>
-  <string name="pref_ui_options">Настройки на интерфейса</string>
+  <string name="pref_ui_options">Потр. интерфейс</string>
   <string name="openpgp_error">OpenKeychain докладва за грешка</string>
   <string name="error_decrypting_file">В/И грешка при дешифроването на файла</string>
   <string name="accept">Приемане</string>
@@ -191,6 +191,7 @@
   <string name="server_info_stream_management">XEP-0198: Управление на потоците</string>
   <string name="server_info_pep">XEP-0163: PEP (Аватари / OMEMO)</string>
   <string name="server_info_http_upload">XEP-0363: Качване на файл през HTTP</string>
+  <string name="server_info_push">XEP-0357: Изпращане</string>
   <string name="server_info_available">налично</string>
   <string name="server_info_unavailable">не е налично</string>
   <string name="missing_public_keys">Липсват обявления за публичен ключ</string>
@@ -275,12 +276,14 @@
   <string name="sure_delete_fingerprint">Сигурни ли сте, че искате да изтриете този отпечатък?</string>
   <string name="ignore">Пренебрегване</string>
   <string name="without_mutual_presence_updates"><b>Внимание:</b> Изпращането на това без съвместни актуализации на присъствието може да доведе до неочаквани проблеми.\n\n<small>Погледнете подробностите за контакта, за да проверите дали сте абониран за актуализации на присъствието.</small></string>
-  <string name="pref_encryption_settings">Настройки за шифроване</string>
+  <string name="pref_security_settings">Сигурност</string>
   <string name="pref_force_encryption">Налагане на шифроване в двете посоки</string>
   <string name="pref_force_encryption_summary">Съобщенията да се изпращат винаги шифровани (освен в беседите)</string>
+  <string name="pref_allow_message_correction">Позволяване на поправянето на съобщения</string>
+  <string name="pref_allow_message_correction_summary">Позволяване на контактите да редактират съобщенията си след като са ги изпратили.</string>
   <string name="pref_dont_save_encrypted">Шифрованите съобщения да не се запазват</string>
   <string name="pref_dont_save_encrypted_summary">Внимание: Това може да доведе до загуба на съобщения</string>
-  <string name="pref_expert_options">Настройки за напреднали</string>
+  <string name="pref_expert_options">Експертни настройки</string>
   <string name="pref_expert_options_summary">Моля, бъдете внимателни с тези</string>
   <string name="title_activity_about">Относно Conversations</string>
   <string name="pref_about_conversations_summary">Информация за версията и лицензите</string>
@@ -430,7 +433,7 @@
   <string name="two_hours">2 часа</string>
   <string name="eight_hours">8 часа</string>
   <string name="until_further_notice">До отмяна</string>
-  <string name="pref_input_options">Настройки за въвеждане</string>
+  <string name="pref_input_options">Въвеждане</string>
   <string name="pref_enter_is_send">Enter изпраща</string>
   <string name="pref_enter_is_send_summary">Натискането на клавиша Enter изпраща съобщението</string>
   <string name="pref_display_enter_key">Показване на клавиша Enter</string>
@@ -494,18 +497,19 @@
   <string name="pref_use_white_background_summary">Показване на получените съобщения с черен текст на бял фон</string>
   <string name="account_status_tor_unavailable">Мрежата на Тор е недостъпна</string>
   <string name="server_info_broken">Повредено</string>
-  <string name="pref_presence_settings">Настройки за присъствието</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="pref_show_connection_options">Разширени настройки на връзката</string>
+  <string name="pref_show_connection_options">Разширени настройки за връзката</string>
   <string name="pref_show_connection_options_summary">Показване на настройките за сървър и порт при установка на профил</string>
   <string name="hostname_example">xmpp.example.com</string>
   <string name="action_add_account_with_certificate">Добавяне на профил със сертификат</string>
   <string name="unable_to_parse_certificate">Неуспешно прочитане на сертификата</string>
   <string name="authenticate_with_certificate">Оставете празно за удостоверяване със сертификат</string>
   <string name="mam_prefs">Настройки за архивирането</string>
+  <string name="server_side_mam_prefs">Настройки за архивирането на сървъра</string>
   <string name="fetching_mam_prefs">Получаване на настройките за архивирането. Моля, изчакайте…</string>
   <string name="unable_to_fetch_mam_prefs">Неуспешно получаване на настройките за архивирането</string>
   <string name="captcha_ocr">Текст за проверка</string>
@@ -517,7 +521,7 @@
   <string name="error_fetching_omemo_key">Грешка при получаването на ключа за OMEMO!</string>
   <string name="verified_omemo_key_with_certificate">Ключът за OMEMO беше потвърден със сертификат!</string>
   <string name="device_does_not_support_certificates">Устройството Ви не поддържа избраните клиентски сертификати!</string>
-  <string name="pref_connection_options">Настройки за връзката</string>
+  <string name="pref_connection_options">Връзка</string>
   <string name="pref_use_tor">Свързване през Тор</string>
   <string name="pref_use_tor_summary">Всички връзки да минават през мрежата на Тор. Изисква Орбот</string>
   <string name="account_settings_hostname">Име на сървър</string>
@@ -541,7 +545,7 @@
   <string name="certificate_issuer">Издател</string>
   <string name="certificate_cn">Име</string>
   <string name="certificate_o">Организация</string>
-  <string name="certificate_sha1">Контролна сума SHA1</string>
+  <string name="certificate_sha1">SHA-1</string>
   <string name="certicate_info_not_available">(Няма)</string>
   <string name="certificate_not_found">Няма намерен сертификат</string>
   <string name="notify_on_all_messages">Известяване за всички съобщения</string>
@@ -559,4 +563,6 @@
   <string name="selection_too_large">Избраната област е твърде голяма</string>
   <string name="no_accounts">(Няма активирани профили)</string>
   <string name="this_field_is_required">Това поле е задължително</string>
+  <string name="correct_message">Поправяне на съобщението</string>
+  <string name="send_corrected_message">Изпращане на поправеното съобщение</string>
 </resources>
diff --git a/src/main/res/values-ca/strings.xml b/src/main/res/values-ca/strings.xml
index 6e91e2b6..6f48ab63 100644
--- a/src/main/res/values-ca/strings.xml
+++ b/src/main/res/values-ca/strings.xml
@@ -93,7 +93,6 @@
   <string name="pref_xmpp_resource_summary">El nom que identifica aquest client amb</string>
   <string name="pref_accept_files">Acceptar fitxers</string>
   <string name="pref_accept_files_summary">Accepta fitxers automàticament amb una mida menor a…</string>
-  <string name="pref_notification_settings">Ajustos de notificacions</string>
   <string name="pref_notifications">Notificacions</string>
   <string name="pref_notifications_summary">Notifica quan arriba un nou missatge</string>
   <string name="pref_vibrate">Vibra</string>
@@ -102,12 +101,10 @@
   <string name="pref_sound_summary">Reprodueix el to de trucada amb la notificació</string>
   <string name="pref_notification_grace_period">Notificació del període d\'espera</string>
   <string name="pref_notification_grace_period_summary">Desactiva les notificacions durant un breu termini després de rebre una còpia de missatges carbon</string>
-  <string name="pref_advanced_options">Opcions avançades</string>
   <string name="pref_never_send_crash">Mai enviïs informes d\'errors</string>
   <string name="pref_never_send_crash_summary">Enviant traces d\'execució d\'ajudes al futur desenvolupament del Conversations.</string>
   <string name="pref_confirm_messages">Confirmant missatges</string>
   <string name="pref_confirm_messages_summary">Deixeu que el seu contacte sàpiga quan heu rebut i llegit un missatge</string>
-  <string name="pref_ui_options">Opcions de UI</string>
   <string name="openpgp_error">OpenKeychain ha reportat un error</string>
   <string name="error_decrypting_file">I/O Error al desxifrar un arxiu</string>
   <string name="accept">Acceptar</string>
@@ -249,12 +246,10 @@
   <string name="sure_delete_fingerprint">Estàs segur que t\'agradaria eliminar l\'empremta digital?</string>
   <string name="ignore">Ignorar</string>
   <string name="without_mutual_presence_updates"><b>Perill:</b>L\'enviament d\'aquest sense actualitzacions de presència podria causar problemes inesperats.\n\n<small> Ves als detalls del contacte per verificar les subscripcions de presència.</small></string>
-  <string name="pref_encryption_settings">Configuració del xifratge</string>
   <string name="pref_force_encryption">Força d\'extrema extrem del xifrat</string>
   <string name="pref_force_encryption_summary">Enviar sempre missatges xifrat( Excepte per les sales)</string>
   <string name="pref_dont_save_encrypted">No guardar els misstages xifrats</string>
   <string name="pref_dont_save_encrypted_summary">Perill: Podria portar a la pèrdua dels missatges</string>
-  <string name="pref_expert_options">Opcions per a experts</string>
   <string name="pref_expert_options_summary">Aneu amb cura amb aixó</string>
   <string name="title_activity_about">Sobre Conversations</string>
   <string name="pref_about_conversations_summary">Informació sobre la construció i la seva llicència</string>
@@ -381,7 +376,6 @@
   <string name="two_hours">2 Hores</string>
   <string name="eight_hours">8 Hores</string>
   <string name="until_further_notice">Fins nou avís</string>
-  <string name="pref_input_options">Opcions d\'entrada</string>
   <string name="pref_enter_is_send">Entra per enviar</string>
   <string name="pref_enter_is_send_summary">Utilitza el botó enter per enviar el missatge</string>
   <string name="pref_display_enter_key">Mostra el botó enter</string>
diff --git a/src/main/res/values-cs/strings.xml b/src/main/res/values-cs/strings.xml
index aeaf7f69..10730490 100644
--- a/src/main/res/values-cs/strings.xml
+++ b/src/main/res/values-cs/strings.xml
@@ -102,7 +102,7 @@
   <string name="pref_xmpp_resource_summary">Jméno se kterým se tento klient identifikuje</string>
   <string name="pref_accept_files">Přijímat soubory</string>
   <string name="pref_accept_files_summary">Automaticky přijímat soubory menší než…</string>
-  <string name="pref_notification_settings">Nastavení upozornění</string>
+  <string name="pref_notification_settings">Upozornění</string>
   <string name="pref_notifications">Upozornění</string>
   <string name="pref_notifications_summary">Upozornit při přijetí nové zprávy</string>
   <string name="pref_vibrate">Vibrovat</string>
@@ -111,12 +111,12 @@
   <string name="pref_sound_summary">Přehrát zvuk společně s upozorněním</string>
   <string name="pref_notification_grace_period">Četnost upozornění</string>
   <string name="pref_notification_grace_period_summary">Neupozorňovat krátce poté co byla obdržena kopie zprávy</string>
-  <string name="pref_advanced_options">Pokročilé nastavení</string>
+  <string name="pref_advanced_options">Rozšířené</string>
   <string name="pref_never_send_crash">Neodesílat detaily o pádu aplikace</string>
   <string name="pref_never_send_crash_summary">Zasláním detailů o důvodu selhání pomůžete dalšímu vývoji aplikace Konverzace</string>
   <string name="pref_confirm_messages">Potvrzovat zprávy</string>
   <string name="pref_confirm_messages_summary">Oznamovat kontaktům, že zpráva byla přijata a přečtena</string>
-  <string name="pref_ui_options">Nastavení UI</string>
+  <string name="pref_ui_options">UI</string>
   <string name="openpgp_error">OpenKeychain nahlásil chybu</string>
   <string name="error_decrypting_file">I/O chyba dešifrování souboru</string>
   <string name="accept">Přijmout</string>
@@ -191,6 +191,7 @@
   <string name="server_info_stream_management">XEP-0198: Nastavení proudu</string>
   <string name="server_info_pep">XEP-0163: PEP (Avatars / OMEMO)</string>
   <string name="server_info_http_upload">XEP-0363: HTTP File Upload</string>
+  <string name="server_info_push">XEP-0357: Push</string>
   <string name="server_info_available">dostupný</string>
   <string name="server_info_unavailable">nedostupný</string>
   <string name="missing_public_keys">Chybí oznámení o veřejném klíči</string>
@@ -275,9 +276,11 @@
   <string name="sure_delete_fingerprint">Chcete opravdu smazat tento identifikátor?</string>
   <string name="ignore">Ignorovat</string>
   <string name="without_mutual_presence_updates"><b>Varování:</b> Odeslání bez povolení změn stavu může způsobit nečekané problémy na obou stranách.\n\n<small>Přejdi na detaily kontaktu pro ověření povolení o změnách stavu.</small></string>
-  <string name="pref_encryption_settings">Nastavení šifrování</string>
+  <string name="pref_security_settings">Zabezpečení</string>
   <string name="pref_force_encryption">Vynutit šifrování</string>
   <string name="pref_force_encryption_summary">Vždy zasílat šifrované zprávy (mimo konference)</string>
+  <string name="pref_allow_message_correction">Povolit opravu zpráv</string>
+  <string name="pref_allow_message_correction_summary">Povolí kontaktům zpětné upravování jejich zpráv</string>
   <string name="pref_dont_save_encrypted">Neukládat šifrované zprávy</string>
   <string name="pref_dont_save_encrypted_summary">Varování: Toto může vést ke ztrátě zpráv</string>
   <string name="pref_expert_options">Expertní nastavení</string>
@@ -430,7 +433,7 @@
   <string name="two_hours">2 hodiny</string>
   <string name="eight_hours">8 hodin</string>
   <string name="until_further_notice">Než opět změním</string>
-  <string name="pref_input_options">Nastavení zadávání</string>
+  <string name="pref_input_options">Vstup</string>
   <string name="pref_enter_is_send">Enter odesílá</string>
   <string name="pref_enter_is_send_summary">Použít klávesu enter pro odesílání zpráv</string>
   <string name="pref_display_enter_key">Zobrazit klávesu enter</string>
@@ -496,20 +499,21 @@
   <string name="pref_use_white_background_summary">Zobrazovat přijaté zprávy jako černý text na bílém pozadí</string>
   <string name="account_status_tor_unavailable">Tor síť není dostupná</string>
   <string name="server_info_broken">Rozbité</string>
-  <string name="pref_presence_settings">Nastavení přítomnosti</string>
+  <string name="pref_presence_settings">Stav</string>
   <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 tichém módu označí váš stav jako nedostupný</string>
-  <string name="pref_show_connection_options">Rozšířené možnosti připojení</string>
-  <string name="pref_show_connection_options_summary">Zobrazovat hodnoty hostname a port při nastavování účtu</string>
+  <string name="pref_show_connection_options">Rozšířená nastavení připojení</string>
+  <string name="pref_show_connection_options_summary">Zobrazovat nastavení hostname a port  při vytváření účtu</string>
   <string name="hostname_example">xmpp.server.cz</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>
   <string name="mam_prefs">Nastavení archivace</string>
+  <string name="server_side_mam_prefs">Nastavení archivace na serveru</string>
   <string name="fetching_mam_prefs">Získávání nastavení archivace. Chvíli strpení...</string>
-  <string name="unable_to_fetch_mam_prefs">Získání nastavení archivace se nezdařilo</string>
+  <string name="unable_to_fetch_mam_prefs">Nelze získat nastavení archivace</string>
   <string name="captcha_ocr">Captcha text</string>
   <string name="captcha_required">Captcha vyžadována</string>
   <string name="captcha_hint">opište text z obrázku</string>
@@ -519,7 +523,7 @@
   <string name="error_fetching_omemo_key">Chyba získání OMEMO klíče!</string>
   <string name="verified_omemo_key_with_certificate">OMEMO klíč ověřen certifikátem!</string>
   <string name="device_does_not_support_certificates">Tento přístroj nepodporuje výběr klientského certifikátu!</string>
-  <string name="pref_connection_options">Možnosti připojení</string>
+  <string name="pref_connection_options">Připojení</string>
   <string name="pref_use_tor">Připojit přes Tor</string>
   <string name="pref_use_tor_summary">Vedení všech připojení po Tor síti vyžaduje aplikaci Orbot</string>
   <string name="account_settings_hostname">Hostname</string>
@@ -544,7 +548,7 @@
   <string name="certificate_issuer">Vydavatel</string>
   <string name="certificate_cn">Jméno</string>
   <string name="certificate_o">Organizace</string>
-  <string name="certificate_sha1">SHA1</string>
+  <string name="certificate_sha1">SHA-1</string>
   <string name="certicate_info_not_available">(Nedostupné)</string>
   <string name="certificate_not_found">Certifikát nenalezen</string>
   <string name="notify_on_all_messages">Upozorňovat na všechny zprávy</string>
@@ -552,7 +556,7 @@
   <string name="notify_never">Upozornění vypnuta</string>
   <string name="notify_paused">Upozornění pozastavena</string>
   <string name="pref_picture_compression">Komprimovat obrázky</string>
-  <string name="pref_picture_compression_summary">Upravené a komprimované obrázky</string>
+  <string name="pref_picture_compression_summary">Upravit velikost a komprimovat obrázky</string>
   <string name="always">Vždy</string>
   <string name="automatically">Automaticky</string>
   <string name="battery_optimizations_enabled">Povolena optimalizace využití baterie</string>
@@ -562,4 +566,6 @@
   <string name="selection_too_large">Vybraný obsah je příliš dlouhý</string>
   <string name="no_accounts">(Žádné aktivované účty)</string>
   <string name="this_field_is_required">Toto pole je vyžadováno</string>
+  <string name="correct_message">Opravit zprávu</string>
+  <string name="send_corrected_message">Odeslat opravenou zprávu</string>
 </resources>
diff --git a/src/main/res/values-de/strings.xml b/src/main/res/values-de/strings.xml
index c7afc348..0968a5f7 100644
--- a/src/main/res/values-de/strings.xml
+++ b/src/main/res/values-de/strings.xml
@@ -102,7 +102,7 @@
   <string name="pref_xmpp_resource_summary">Der Name, mit dem sich der Client selbst identifiziert</string>
   <string name="pref_accept_files">Dateien annehmen</string>
   <string name="pref_accept_files_summary">Dateien automatisch annehmen, die kleiner sind als …</string>
-  <string name="pref_notification_settings">Benachrichtigungen</string>
+  <string name="pref_notification_settings">Benachrichtigung</string>
   <string name="pref_notifications">Benachrichtigungen</string>
   <string name="pref_notifications_summary">Benachrichtigen bei Erhalt einer neuen Nachricht</string>
   <string name="pref_vibrate">Vibrieren</string>
@@ -111,7 +111,7 @@
   <string name="pref_sound_summary">Benachrichtigungston wiedergeben</string>
   <string name="pref_notification_grace_period">Gnadenfrist</string>
   <string name="pref_notification_grace_period_summary">Deaktiviere Benachrichtigungen für eine kurze Zeit nach Erhalt einer Nachricht, die von einem anderen deiner Clients kommt.</string>
-  <string name="pref_advanced_options">Erweiterte Optionen</string>
+  <string name="pref_advanced_options">Erweitert</string>
   <string name="pref_never_send_crash">Niemals Absturzberichte senden</string>
   <string name="pref_never_send_crash_summary">Wenn du Absturzberichte einschickst, hilfst du Conversations stetig zu verbessern</string>
   <string name="pref_confirm_messages">Lese- und Empfangsbestätigung senden</string>
@@ -191,6 +191,7 @@
   <string name="server_info_stream_management">XEP-0198: Stream Management</string>
   <string name="server_info_pep">XEP-0163: PEP (Avatare/OMEMO)</string>
   <string name="server_info_http_upload">XEP-0363: HTTP File Upload</string>
+  <string name="server_info_push">XEP-0357: Push</string>
   <string name="server_info_available">ja</string>
   <string name="server_info_unavailable">nein</string>
   <string name="missing_public_keys">Öffentlicher Schlüssel fehlt</string>
@@ -275,12 +276,14 @@
   <string name="sure_delete_fingerprint">Soll dieser Fingerabdruck wirklich gelöscht werden?</string>
   <string name="ignore">Ignorieren</string>
   <string name="without_mutual_presence_updates"><b>Achtung:</b> Ohne gegenseitige Kenntnis des Online-Status kann es zu unerwarteten Problemen kommen.\n\n<small>Bitte die Einstellungen in den Kontakt-Details prüfen.</small></string>
-  <string name="pref_encryption_settings">Verschlüsselungs-Einstellungen</string>
+  <string name="pref_security_settings">Sicherheit</string>
   <string name="pref_force_encryption">Ende-zu-Ende-Verschlüsselung erzwingen</string>
   <string name="pref_force_encryption_summary">Nachrichten immer verschlüsseln (außer für Konferenzen)</string>
+  <string name="pref_allow_message_correction">Nachrichtenkorrektur erlauben</string>
+  <string name="pref_allow_message_correction_summary">Erlaube Deinen Kontakten das nachträgliche Korrigieren ihrer Nachrichten</string>
   <string name="pref_dont_save_encrypted">Verschlüsselte Nachrichten nicht speichern</string>
   <string name="pref_dont_save_encrypted_summary">Achtung: kann zu Nachrichtenverlust führen</string>
-  <string name="pref_expert_options">Einstellungen für Experten</string>
+  <string name="pref_expert_options">Experteneinstellungen</string>
   <string name="pref_expert_options_summary">Hier bitte vorsichtig sein</string>
   <string name="title_activity_about">Über Conversations</string>
   <string name="pref_about_conversations_summary">Versions- und Lizenzinformationen</string>
@@ -299,7 +302,7 @@
   <string name="pref_conference_name">Konferenz-Name</string>
   <string name="pref_conference_name_summary">Konferenz-Thema statt Raum-JID als Namen verwenden</string>
   <string name="pref_autojoin">Unterhaltung automatisch beitreten</string>
-  <string name="pref_autojoin_summary">Autojoin Flag in Unterhaltungslesezeichen beachten</string>
+  <string name="pref_autojoin_summary">Autojoin-Flag in Konferenzlesezeichen beachten</string>
   <string name="toast_message_otr_fingerprint">OTR-Fingerabdruck in die Zwischenablage kopiert!</string>
   <string name="toast_message_omemo_fingerprint">OMEMO-Fingerabdruck in die Zwischenablage kopiert!</string>
   <string name="conference_banned">Du wurdest von der Konferenz ausgeschlossen</string>
@@ -430,7 +433,7 @@
   <string name="two_hours">2 Stunden</string>
   <string name="eight_hours">8 Stunden</string>
   <string name="until_further_notice">Bis auf Weiteres</string>
-  <string name="pref_input_options">Eingabe-Optionen</string>
+  <string name="pref_input_options">Eingabe</string>
   <string name="pref_enter_is_send">Eingabe-Taste (Enter) sendet Nachricht</string>
   <string name="pref_enter_is_send_summary">Eingabe-Taste (Enter) zum Versenden einer Nachricht verwenden</string>
   <string name="pref_display_enter_key">Zeige Eingabe-Taste (Enter)</string>
@@ -494,19 +497,20 @@
   <string name="pref_use_white_background_summary">Empfangene Nachrichten als schwarzen Text auf weißem Hintergrund anzeigen</string>
   <string name="account_status_tor_unavailable">Tor-Netzwerk nicht verfügbar</string>
   <string name="server_info_broken">Fehlerhaft</string>
-  <string name="pref_presence_settings">Status Einstellungen</string>
+  <string name="pref_presence_settings">Status</string>
   <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 Telefon lautlos ist</string>
   <string name="pref_show_connection_options">Erweiterte Verbindungs-Optionen</string>
-  <string name="pref_show_connection_options_summary">Zeige Hostname- und Port-Optionen</string>
+  <string name="pref_show_connection_options_summary">Hostname- und Port-Optionen bei Kontoeinrichtung anzeigen</string>
   <string name="hostname_example">xmpp.domain.de</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>
   <string name="mam_prefs">Archivierungseinstellungen</string>
-  <string name="fetching_mam_prefs">Archivierungseinstellungen werden abgerufen. Bitte warten ...</string>
+  <string name="server_side_mam_prefs">Archivierungseinstellungen des Servers</string>
+  <string name="fetching_mam_prefs">Archivierungseinstellungen werden abgerufen. Bitte warten …</string>
   <string name="unable_to_fetch_mam_prefs">Archivierungseinstellungen konnten nicht abgerufen werden</string>
   <string name="captcha_ocr">Captcha Text</string>
   <string name="captcha_required">Captcha erforderlich</string>
@@ -517,7 +521,7 @@
   <string name="error_fetching_omemo_key">Kann OMEMO Schlüssel nicht empfangen!</string>
   <string name="verified_omemo_key_with_certificate">OMEMO Schlüssel mit Zertifikat bestätigt!</string>
   <string name="device_does_not_support_certificates">Dein Gerät unterstützt das Auswählen von Client-Zertifikaten nicht!</string>
-  <string name="pref_connection_options">Verbindungs-Optionen</string>
+  <string name="pref_connection_options">Verbindung</string>
   <string name="pref_use_tor">Über TOR verbinden</string>
   <string name="pref_use_tor_summary">Alle Verbindungen über das Tor-Netzwerk tunneln. Benötigt Orbot</string>
   <string name="account_settings_hostname">Hostname</string>
@@ -539,9 +543,9 @@
   <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_cn">Name</string>
   <string name="certificate_o">Organisation</string>
-  <string name="certificate_sha1">SHA1</string>
+  <string name="certificate_sha1">SHA-1</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>
@@ -559,4 +563,6 @@
   <string name="selection_too_large">Der ausgewählte Bereich ist zu groß</string>
   <string name="no_accounts">(Keine aktivierten Konten)</string>
   <string name="this_field_is_required">Dieses Feld ist erforderlich</string>
+  <string name="correct_message">Nachricht korrigieren</string>
+  <string name="send_corrected_message">Korrigierte Nachricht senden</string>
 </resources>
diff --git a/src/main/res/values-el/strings.xml b/src/main/res/values-el/strings.xml
index e55a6b2d..0bdc6a5e 100644
--- a/src/main/res/values-el/strings.xml
+++ b/src/main/res/values-el/strings.xml
@@ -93,7 +93,6 @@
   <string name="pref_xmpp_resource_summary">Το όνομα με το οποίο ταυτοποιείται αυτό το πρόγραμμα-πελάτης</string>
   <string name="pref_accept_files">Αποδοχή αρχείων</string>
   <string name="pref_accept_files_summary">Αυτόματη αποδοχή αρχείων μικρότερα από...</string>
-  <string name="pref_notification_settings">Επιλογές ειδοποιήσεων</string>
   <string name="pref_notifications">Ειδοποιήσεις</string>
   <string name="pref_notifications_summary">Ειδοποίηση όταν λαμβάνεται ένα νέο μήνυμα</string>
   <string name="pref_vibrate">Δόνηση</string>
@@ -102,12 +101,10 @@
   <string name="pref_sound_summary">Αναπαραγωγή ήχου κλήσης με την ειδοποίηση</string>
   <string name="pref_notification_grace_period">Περίοδος χάριτος ειδοποιήσεων</string>
   <string name="pref_notification_grace_period_summary">Απενεργοποίηση ειδοποιήσεων για λίγο χρόνο μετά από τη λήψη ακριβούς αντιγράφου</string>
-  <string name="pref_advanced_options">Προχωρημένες επιλογές</string>
   <string name="pref_never_send_crash">Να μην αποστέλλονται αναφορές λαθών</string>
   <string name="pref_never_send_crash_summary">Στέλνοντας ίχνη στοίβας βοηθάτε την συνεχόμενη ανάπτυξη του Conversations</string>
   <string name="pref_confirm_messages">Επιβεβαίωση μηνυμάτων</string>
   <string name="pref_confirm_messages_summary">Επιτρέψτε στην επαφή σας να ειδοποιείται όταν έχετε λάβει και διαβάσει ένα μήνυμα</string>
-  <string name="pref_ui_options">Επιλογές διεπαφής χρήστη</string>
   <string name="openpgp_error">Το OpenKeychain ανέφερε κάποιο σφάλμα</string>
   <string name="error_decrypting_file">Σφάλμα εισόδου/εξόδου κατά την αποκρυπτογράφηση αρχείου</string>
   <string name="accept">Αποδοχή</string>
@@ -249,12 +246,10 @@
   <string name="sure_delete_fingerprint">Είστε βέβαιοι ότι θέλετε να διαγράψετε αυτό το αποτύπωμα;</string>
   <string name="ignore">Αγνόηση</string>
   <string name="without_mutual_presence_updates"><b>Προειδοποίηση:</b> Η αποστολή αυτού χωρίς αμφίδρομες ενημερώσεις παρουσίας μπορεί να προκαλέσει απροσδόκητα προβλήματα.\n\n<small>Πηγαίνετε στις λεπτομέρειες επαφής για να επαληθεύσετε τις συνδρομές παρουσίας σας.</small></string>
-  <string name="pref_encryption_settings">Ρυθμίσεις κρυπτογράφησης</string>
   <string name="pref_force_encryption">Επιβολή κρυπτογράφησης από άκρη σε άκρη</string>
   <string name="pref_force_encryption_summary">Πάντα αποστολή κρυπτογραφημένων μηνυμάτων (εκτός από συνδιασκέψεις)</string>
   <string name="pref_dont_save_encrypted">Χωρίς αποθήκευση κρυπτογραφημένων μηνυμάτων</string>
   <string name="pref_dont_save_encrypted_summary">Προειδοποίηση: Αυτό μπορεί να οδηγήσει σε απώλεια μηνυμάτων</string>
-  <string name="pref_expert_options">Επιλογές για προχωρημένους</string>
   <string name="pref_expert_options_summary">Παρακαλώ να είστε προσεκτικοί με αυτά</string>
   <string name="title_activity_about">Σχετικά με το Conversations</string>
   <string name="pref_about_conversations_summary">Πληροφορίες δημιουργίας και αδειών</string>
@@ -381,7 +376,6 @@
   <string name="two_hours">2 ώρες</string>
   <string name="eight_hours">8 ώρες</string>
   <string name="until_further_notice">Μέχρι νεωτέρας</string>
-  <string name="pref_input_options">Επιλογές εισόδου</string>
   <string name="pref_enter_is_send">Αποστολή με το πλήκτρο Enter</string>
   <string name="pref_enter_is_send_summary">Χρήση του πλήκτρου Enter για την αποστολή μηνύματος</string>
   <string name="pref_display_enter_key">Εμφάνιση του πλήκτρου Enter</string>
diff --git a/src/main/res/values-es/strings.xml b/src/main/res/values-es/strings.xml
index 2a8ede55..84df1850 100644
--- a/src/main/res/values-es/strings.xml
+++ b/src/main/res/values-es/strings.xml
@@ -102,7 +102,7 @@
   <string name="pref_xmpp_resource_summary">El nombre que identifica el cliente que estás utilizando</string>
   <string name="pref_accept_files">Aceptar archivos</string>
   <string name="pref_accept_files_summary">De forma automática aceptar archivos menores que…</string>
-  <string name="pref_notification_settings">Ajustes de notificación</string>
+  <string name="pref_notification_settings">Notificaciones</string>
   <string name="pref_notifications">Notificaciones</string>
   <string name="pref_notifications_summary">Notificar cuando llega un nuevo mensaje</string>
   <string name="pref_vibrate">Vibrar</string>
@@ -111,12 +111,12 @@
   <string name="pref_sound_summary">Reproduce tono con la notificación</string>
   <string name="pref_notification_grace_period">Notificaciones Carbons</string>
   <string name="pref_notification_grace_period_summary">Deshabilita las notificaciones durante un corto periodo de tiempo después de recibir la copia del mensaje carbon</string>
-  <string name="pref_advanced_options">Opciones avanzadas</string>
+  <string name="pref_advanced_options">Avanzado</string>
   <string name="pref_never_send_crash">Nunca informar de errores</string>
   <string name="pref_never_send_crash_summary">Si envías registros de error ayudas al desarrollo de Conversations</string>
   <string name="pref_confirm_messages">Confirmar mensajes</string>
   <string name="pref_confirm_messages_summary">Permitir a tus contactos saber cuando recibes y lees un mensaje</string>
-  <string name="pref_ui_options">Opciones de interfaz</string>
+  <string name="pref_ui_options">Pantalla</string>
   <string name="openpgp_error">OpenKeychain reportó un error</string>
   <string name="error_decrypting_file">Error descifrando archivo</string>
   <string name="accept">Aceptar</string>
@@ -191,6 +191,7 @@
   <string name="server_info_stream_management">XEP-0198: Stream Management</string>
   <string name="server_info_pep">XEP-0163: PEP (Avatars / OMEMO)</string>
   <string name="server_info_http_upload">XEP-0363: HTTP File Upload</string>
+  <string name="server_info_push">XEP-0357: Push</string>
   <string name="server_info_available">Sí</string>
   <string name="server_info_unavailable">No</string>
   <string name="missing_public_keys">Se han perdido las claves de anuncio públicas</string>
@@ -275,12 +276,14 @@
   <string name="sure_delete_fingerprint">¿Estás seguro de que quieres eliminar esta huella digital OTR?</string>
   <string name="ignore">Ignorar</string>
   <string name="without_mutual_presence_updates"><b>Aviso:</b> Enviando esto sin suscripción de presencia por ambas partes podría causar problemas inesperados.\n\n<small>Verficia la suscripción de presencia en detalles del contacto.</small></string>
-  <string name="pref_encryption_settings">Ajustes de cifrado</string>
+  <string name="pref_security_settings">Seguridad</string>
   <string name="pref_force_encryption">Forzar cifrado end-to-end</string>
   <string name="pref_force_encryption_summary">Siempre enviar mensajes cifrados (excepto para conversaciones en grupo)</string>
+  <string name="pref_allow_message_correction">Corrección de mensaje</string>
+  <string name="pref_allow_message_correction_summary">Permitir a tus contactos editar mensajes previamente enviados</string>
   <string name="pref_dont_save_encrypted">No guardar mensajes cifrados</string>
   <string name="pref_dont_save_encrypted_summary">Aviso: Esto podría llevar a pérdida de mensajes</string>
-  <string name="pref_expert_options">Ajustes avanzados</string>
+  <string name="pref_expert_options">Opciones para expertos</string>
   <string name="pref_expert_options_summary">Por favor, cuidado con estas opciones</string>
   <string name="title_activity_about">Acerca de Conversations</string>
   <string name="pref_about_conversations_summary">Información de compilación y licencia</string>
@@ -430,7 +433,7 @@
   <string name="two_hours">2 horas</string>
   <string name="eight_hours">8 horas</string>
   <string name="until_further_notice">Hasta nuevo aviso</string>
-  <string name="pref_input_options">Opciones de entrada</string>
+  <string name="pref_input_options">Entrada</string>
   <string name="pref_enter_is_send">Intro para enviar</string>
   <string name="pref_enter_is_send_summary">Usar la tecla intro para enviar el mensaje</string>
   <string name="pref_display_enter_key">Mostrar tecla Intro</string>
@@ -494,19 +497,20 @@
   <string name="pref_use_white_background_summary">Mostrar mensajes recibidos en texto negro con fondo blanco</string>
   <string name="account_status_tor_unavailable">Red Tor no disponible.</string>
   <string name="server_info_broken">Error</string>
-  <string name="pref_presence_settings">Opciones de presencia</string>
+  <string name="pref_presence_settings">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 dispositivo está en modo silencio</string>
-  <string name="pref_show_connection_options">Opciones de conexión avanzadas</string>
-  <string name="pref_show_connection_options_summary">Mostrar las opciones de hostname y puerto cuando se está creando una nueva cuenta</string>
+  <string name="pref_show_connection_options">Opciones de conexión</string>
+  <string name="pref_show_connection_options_summary">Mostrar el hostname y el puerto cuando se está creando una cuenta</string>
   <string name="hostname_example">xmpp.ejemplo.com</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="mam_prefs">Preferencias de archivado</string>
-  <string name="fetching_mam_prefs">Buscando las preferencias de archivado. Por favor, espera...</string>
+  <string name="server_side_mam_prefs">Preferencias de archivado en servidor</string>
+  <string name="fetching_mam_prefs">Buscando preferencias de archivado. Por favor, espera...</string>
   <string name="unable_to_fetch_mam_prefs">No se ha podido conseguir las preferencias de archivado</string>
   <string name="captcha_ocr">Texto captcha</string>
   <string name="captcha_required">Captcha requerido</string>
@@ -517,7 +521,7 @@
   <string name="error_fetching_omemo_key">¡Error buscando clave OMEMO!</string>
   <string name="verified_omemo_key_with_certificate">¡Clave OMEMO con certificado verificada!</string>
   <string name="device_does_not_support_certificates">¡Tu dispositivo no soporta la elección de certificados de cliente!</string>
-  <string name="pref_connection_options">Opciones de conexión</string>
+  <string name="pref_connection_options">Conexión</string>
   <string name="pref_use_tor">Conectar via Tor</string>
   <string name="pref_use_tor_summary">Todas las conexiones se realizan a través de la red TOR. Requiere Orbot</string>
   <string name="account_settings_hostname">Hostname</string>
@@ -541,7 +545,7 @@
   <string name="certificate_issuer">Editor</string>
   <string name="certificate_cn">Nombre</string>
   <string name="certificate_o">Organización</string>
-  <string name="certificate_sha1">SHA1</string>
+  <string name="certificate_sha1">SHA-1</string>
   <string name="certicate_info_not_available">(No disponible)</string>
   <string name="certificate_not_found">Certificado no encontrado</string>
   <string name="notify_on_all_messages">Notificar para todos los mensajes</string>
@@ -549,7 +553,7 @@
   <string name="notify_never">Notificaciones deshabilitadas</string>
   <string name="notify_paused">Notificaciones pausadas</string>
   <string name="pref_picture_compression">Comprimir imágenes</string>
-  <string name="pref_picture_compression_summary">Redimensionar y comprimir imágenes</string>
+  <string name="pref_picture_compression_summary">Redimensionar y comprimir las imágenes</string>
   <string name="always">Siempre</string>
   <string name="automatically">Automáticamente</string>
   <string name="battery_optimizations_enabled">Optimizaciones de uso de batería habilitadas</string>
@@ -559,4 +563,6 @@
   <string name="selection_too_large">El área seleccionada es demasiado grande</string>
   <string name="no_accounts">(No hay cuentas activas)</string>
   <string name="this_field_is_required">Este campo es requerido</string>
+  <string name="correct_message">Corregir mensaje</string>
+  <string name="send_corrected_message">Enviar mensaje corregido</string>
 </resources>
diff --git a/src/main/res/values-eu/strings.xml b/src/main/res/values-eu/strings.xml
index f093a52b..ea91da79 100644
--- a/src/main/res/values-eu/strings.xml
+++ b/src/main/res/values-eu/strings.xml
@@ -102,7 +102,7 @@
   <string name="pref_xmpp_resource_summary">Bezero honek bere burua aurkezteko erabiltzen duen izena</string>
   <string name="pref_accept_files">Fitxategiak onartu</string>
   <string name="pref_accept_files_summary">Hurrengo tamaina baino fitxategi txikiagoak automatikoki onartu…</string>
-  <string name="pref_notification_settings">Jakinarazpenen ezarpenak</string>
+  <string name="pref_notification_settings">Jakinarazpena</string>
   <string name="pref_notifications">Jakinarazpenak</string>
   <string name="pref_notifications_summary">Mezu berri bat heltzerakoan jakinarazi</string>
   <string name="pref_vibrate">Dardaratu</string>
@@ -111,12 +111,12 @@
   <string name="pref_sound_summary">Dei-tonua jo jakinarazpenarekin</string>
   <string name="pref_notification_grace_period">Jakinarazpenen grazia epea</string>
   <string name="pref_notification_grace_period_summary">Jakinarazpenak denbora labur baterako ezgaitu ikatz-kopia bat jaso ondoren</string>
-  <string name="pref_advanced_options">Aukera aurreratuak</string>
+  <string name="pref_advanced_options">Aurreratua</string>
   <string name="pref_never_send_crash">Gelditze txostenik ez bidali inoiz</string>
   <string name="pref_never_send_crash_summary">Akats harraskak bidaliz Conversationsen garapenean laguntzen duzu</string>
   <string name="pref_confirm_messages">Mezuak egiaztatu</string>
   <string name="pref_confirm_messages_summary">Zure kontaktuak mezu bat noiz jaso eta irakurri duzun jakin dezan baimendu</string>
-  <string name="pref_ui_options">Erabiltzaile-interfazearen aukerak</string>
+  <string name="pref_ui_options">Erabiltzaile-interfazea</string>
   <string name="openpgp_error">OpenKeychainek akats baten berri eman du</string>
   <string name="error_decrypting_file">Sarrera/Irteera akatsa fitxategia desenkriptatzerakoan</string>
   <string name="accept">Onartu</string>
@@ -191,6 +191,7 @@
   <string name="server_info_stream_management">XEP-0198: Stream Management</string>
   <string name="server_info_pep">XEP-0163: PEP (Avatars / OMEMO)</string>
   <string name="server_info_http_upload">XEP-0363: HTTP File Upload</string>
+  <string name="server_info_push">XEP-0357: Push</string>
   <string name="server_info_available">eskuragarri</string>
   <string name="server_info_unavailable">ez eskuragarri</string>
   <string name="missing_public_keys">Gako publikoen iragarpenak faltan</string>
@@ -240,6 +241,7 @@
   <string name="you">Zu</string>
   <string name="action_edit_subject">Konferentziaren gaia editatu</string>
   <string name="conference_not_found">Konferentzia ez da aurkitu</string>
+  <string name="conference_unknown_error">Akats ezezaguna jaso da</string>
   <string name="leave">Alde egin</string>
   <string name="contact_added_you">Kontaktuak bere zerrendara gehitu zaitu</string>
   <string name="add_back">Bera gehitu</string>
@@ -274,12 +276,14 @@
   <string name="sure_delete_fingerprint">Ziur al zaude hatz-marka hau ezabatu nahi duzulaz?</string>
   <string name="ignore">Kasurik ez egin</string>
   <string name="without_mutual_presence_updates"><b>Adi:</b> Bien arteko presentzia eguneraketarik gabe hau bidaltzeak ustekabeko arazoak sor litzake.\n\n<small>Joan zaitez kontaktuaren xehetasunetara zure presentzia eguneraketak egiaztatzeko.</small></string>
-  <string name="pref_encryption_settings">Enkriptazio ezarpenak</string>
+  <string name="pref_security_settings">Segurtasuna</string>
   <string name="pref_force_encryption">End-to-end enkriptazioa behartu</string>
   <string name="pref_force_encryption_summary">Mezuak beti enkriptatuta bidali (konferentzietan izan ezik)</string>
+  <string name="pref_allow_message_correction">Mezuen zuzenketa baimendu</string>
+  <string name="pref_allow_message_correction_summary">Zure kontaktuak haien mezuak atzeraeraginez editatzea baimendu</string>
   <string name="pref_dont_save_encrypted">Ez gorde enkriptatutako mezuak</string>
   <string name="pref_dont_save_encrypted_summary">Adi: Honek mezuen galera ekar lezake</string>
-  <string name="pref_expert_options">Adituentzako aukerak</string>
+  <string name="pref_expert_options">Adituentzako ezarpenak</string>
   <string name="pref_expert_options_summary">Mesedez kontuz ibili hauekin</string>
   <string name="title_activity_about">Conversationsi buruz</string>
   <string name="pref_about_conversations_summary">Eraikitze eta lizentzia informazioa</string>
@@ -297,6 +301,8 @@
   <string name="pref_expert_options_other">Besteak</string>
   <string name="pref_conference_name">Konferentziaren izena</string>
   <string name="pref_conference_name_summary">Erabili gelaren gaia konferentziak identifikatzeko eta ez JIDa</string>
+  <string name="pref_autojoin">Konferentzietara automatikoki batu</string>
+  <string name="pref_autojoin_summary">Automatikoki batzeko marka errespetatu konferentzien laster-marketan</string>
   <string name="toast_message_otr_fingerprint">OTR hatz-marka arbelara kopiatu da</string>
   <string name="toast_message_omemo_fingerprint">OMEMO hatz-marka arbelara kopiatu da</string>
   <string name="conference_banned">Konferentzia honetara sartzea debekatuta duzu</string>
@@ -427,7 +433,7 @@
   <string name="two_hours">2 ordu</string>
   <string name="eight_hours">8 ordu</string>
   <string name="until_further_notice">abisatu arte</string>
-  <string name="pref_input_options">Sarrera aukerak</string>
+  <string name="pref_input_options">Sarrera</string>
   <string name="pref_enter_is_send">Sartu teklak bidaltzen du</string>
   <string name="pref_enter_is_send_summary">Sartu tekla erabili mezua bidaltzeko</string>
   <string name="pref_display_enter_key">Sartu tekla erakutsi</string>
@@ -491,14 +497,21 @@
   <string name="pref_use_white_background_summary">Jasotako mezuak testu beltza atzeko-plano zuri baten gainean bezala erakutsi</string>
   <string name="account_status_tor_unavailable">Tor sarea ez dago eskuragarri</string>
   <string name="server_info_broken">Hondatuta</string>
-  <string name="pref_presence_settings">Presentzia ezarpenak</string>
+  <string name="pref_presence_settings">Presentzia</string>
   <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 gailua modu isilean dagoenean</string>
+  <string name="pref_show_connection_options">Konexioaren ezarpen luzatuak</string>
+  <string name="pref_show_connection_options_summary">Ostalariaren izena eta ataka ezarpenak erakutsi kontu bat ezartzerakoan</string>
+  <string name="hostname_example">xmpp.adibidea.com</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>
+  <string name="mam_prefs">Artxibatze hobespenak</string>
+  <string name="server_side_mam_prefs">Zerbitzariaren aldeko artxibatze hobespenak</string>
+  <string name="fetching_mam_prefs">Artxibatze hobespenak eskuratzen. Mesedez itxaron...</string>
+  <string name="unable_to_fetch_mam_prefs">Ezin izan dira artxibatze hobespenak eskuratu</string>
   <string name="captcha_ocr">Captcharen testua</string>
   <string name="captcha_required">Captcha beharrezkoa da</string>
   <string name="captcha_hint">Sartu irudiaren testua</string>
@@ -508,7 +521,7 @@
   <string name="error_fetching_omemo_key">Akatsa OMEMO gakoa eskuratzerakoan!</string>
   <string name="verified_omemo_key_with_certificate">OMEMO gakoa ziurtagiriarekin egiaztatuta!</string>
   <string name="device_does_not_support_certificates">Zure gailuak ez du bezero ziurtagiriak aukeratzea onartzen!</string>
-  <string name="pref_connection_options">Konexioaren aukerak</string>
+  <string name="pref_connection_options">Konexioa</string>
   <string name="pref_use_tor">Tor bidez konektatu</string>
   <string name="pref_use_tor_summary">Konexio guztiak Tor sarean zehar igaro. Orbot behar du</string>
   <string name="account_settings_hostname">Ostalariaren izena</string>
@@ -521,6 +534,7 @@
     <item quantity="one">mezu %d</item>
     <item quantity="other">%d mezu</item>
   </plurals>
+  <string name="load_more_messages">Mezu gehiago kargatu</string>
   <string name="shared_file_with_x">Fitxategia %s(r)ekin partekatu da</string>
   <string name="shared_image_with_x">Irudia %s(r)ekin partekatu da</string>
   <string name="no_storage_permission">Conversationsek kanpoko biltegirako sarbidea behar du</string>
@@ -531,7 +545,7 @@
   <string name="certificate_issuer">Igorlea</string>
   <string name="certificate_cn">Izen arrunta</string>
   <string name="certificate_o">Erakundea</string>
-  <string name="certificate_sha1">SHA1</string>
+  <string name="certificate_sha1">SHA-1</string>
   <string name="certicate_info_not_available">(Ez eskuragarri)</string>
   <string name="certificate_not_found">Ez da ziurtagiririk aurkitu</string>
   <string name="notify_on_all_messages">Mezu guztiak jakinarazi</string>
@@ -539,7 +553,7 @@
   <string name="notify_never">Jakinarazpenak ezgaituta</string>
   <string name="notify_paused">Jakinarazpenak gelditu dira</string>
   <string name="pref_picture_compression">Irudiak konprimitu</string>
-  <string name="pref_picture_compression_summary">Irudiak konprimitu eta neurria aldatu</string>
+  <string name="pref_picture_compression_summary">Irudiak konprimitu eta neurriz aldatu</string>
   <string name="always">Beti</string>
   <string name="automatically">Automatikoki</string>
   <string name="battery_optimizations_enabled">Bateriaren optimizazioak gaituta</string>
@@ -547,4 +561,8 @@
   <string name="battery_optimizations_enabled_dialog">Zure gailua jakinarazpen atzeratuak edota mezuen galera ekar lezaketen bateriaren optimizazio handiak egiten ari da Conversationsen.\nJarraian hauek ezgaitzea eskatuko zaizu.</string>
   <string name="disable">Ezgaitu</string>
   <string name="selection_too_large">Hautatutako zatia handiegia da</string>
+  <string name="no_accounts">(Ez dago kontu aktiborik)</string>
+  <string name="this_field_is_required">Datu hau beharrezkoa da</string>
+  <string name="correct_message">Mezua zuzendu</string>
+  <string name="send_corrected_message">Mezu zuzendua bidali</string>
 </resources>
diff --git a/src/main/res/values-fr/strings.xml b/src/main/res/values-fr/strings.xml
index 22b5daab..4105dad3 100644
--- a/src/main/res/values-fr/strings.xml
+++ b/src/main/res/values-fr/strings.xml
@@ -93,7 +93,7 @@
   <string name="offering">Proposition…</string>
   <string name="waiting">Patientez…</string>
   <string name="no_pgp_key">Aucune clef OpenPGP trouvée.</string>
-  <string name="contact_has_no_pgp_key">Conversations ne peut pas chiffrer vos messages car votre correspondant n\'a pas communiqué sa clef publique.\n\n<small>Demandez-lui de configurer OpenPGP.</small></string>
+  <string name="contact_has_no_pgp_key">Conversations ne peut pas chiffrer vos messages car votre contact n\'a pas communiqué sa clef publique.\n\n<small>Demandez-lui de configurer OpenPGP.</small></string>
   <string name="no_pgp_keys">Aucune clef OpenPGP n\'a été trouvée.</string>
   <string name="contacts_have_no_pgp_keys">Conversations ne peut pas chiffrer votre message car vos contacts ne communiquent pas leur clef publique.\n\n<small>Demandez-leur de configurer OpenPGP.</small></string>
   <string name="encrypted_message_received"><i>Message chiffré reçu. Appuyez pour déchiffrer.</i></string>
@@ -102,7 +102,7 @@
   <string name="pref_xmpp_resource_summary">Nom utilisé par ce client pour s\'identifier</string>
   <string name="pref_accept_files">Accepter les fichiers</string>
   <string name="pref_accept_files_summary">Accepter automatiquement les fichiers plus petits que…</string>
-  <string name="pref_notification_settings">Options de notification</string>
+  <string name="pref_notification_settings">Notification</string>
   <string name="pref_notifications">Notifications</string>
   <string name="pref_notifications_summary">Notifier de l\'arrivée d\'un message.</string>
   <string name="pref_vibrate">Vibration</string>
@@ -111,12 +111,12 @@
   <string name="pref_sound_summary">Jouer une sonnerie pour notifier.</string>
   <string name="pref_notification_grace_period">Période sans notification</string>
   <string name="pref_notification_grace_period_summary">Désactiver momentanément les notifications après l\'arrivée d\'une copie carbone.</string>
-  <string name="pref_advanced_options">Options avancées</string>
+  <string name="pref_advanced_options">Avancé</string>
   <string name="pref_never_send_crash">Ne pas envoyer de rapports d\'erreurs</string>
   <string name="pref_never_send_crash_summary">En envoyant des logs vous aidez le développement de Conversations.</string>
   <string name="pref_confirm_messages">Confirmation de lecture</string>
   <string name="pref_confirm_messages_summary">Informer le contact lorsque vous avez reçu et lu un message.</string>
-  <string name="pref_ui_options">Options d\'interface</string>
+  <string name="pref_ui_options">Interface</string>
   <string name="openpgp_error">OpenKeychain a signalé une erreur</string>
   <string name="error_decrypting_file">Erreur d\'E/S lors du déchiffrement du fichier</string>
   <string name="accept">Accepter</string>
@@ -191,6 +191,7 @@
   <string name="server_info_stream_management">XEP-0198 : Gestion des flux</string>
   <string name="server_info_pep">XEP-0163 : PEP (Avatars / OMEMO)</string>
   <string name="server_info_http_upload">XEP-0363 : Envoi de fichiers via HTTP</string>
+  <string name="server_info_push">XEP-0357 : Notifications Push</string>
   <string name="server_info_available">supporté</string>
   <string name="server_info_unavailable">non supporté</string>
   <string name="missing_public_keys">Annonce de clef publique manquante</string>
@@ -240,6 +241,7 @@
   <string name="you">Vous</string>
   <string name="action_edit_subject">Modifier le sujet de la conférence</string>
   <string name="conference_not_found">Impossible de trouver la conférence</string>
+  <string name="conference_unknown_error">Erreur inconnue reçue</string>
   <string name="leave">Partir</string>
   <string name="contact_added_you">Votre correspondant vous a ajouté dans sa liste de contacts</string>
   <string name="add_back">Ré-ajouter</string>
@@ -274,12 +276,14 @@
   <string name="sure_delete_fingerprint">Etes-vous sûr de vouloir supprimer l\'empreinte ?</string>
   <string name="ignore">Ignorer</string>
   <string name="without_mutual_presence_updates"><b>Attention :</b> peut poser problème si l\'un des deux correspondants n\'a pas activé les mises à jour de présence.\n\n<small>Vérifiez dans les détails du contact que vous y avez bien souscrit.</small></string>
-  <string name="pref_encryption_settings">Options de chiffrement</string>
+  <string name="pref_security_settings">Sécurité</string>
   <string name="pref_force_encryption">Forcer le chiffrement de bout en bout</string>
   <string name="pref_force_encryption_summary">Toujours envoyer des messages chiffrés (sauf pour les conférences)</string>
+  <string name="pref_allow_message_correction">Autoriser la correction</string>
+  <string name="pref_allow_message_correction_summary">Permet à vos contacts d\'éditer leurs messages rétroactivement</string>
   <string name="pref_dont_save_encrypted">Messages chiffrés non sauvegardés</string>
   <string name="pref_dont_save_encrypted_summary">Attention : peut provoquer la perte de messages.</string>
-  <string name="pref_expert_options">Paramètres expert</string>
+  <string name="pref_expert_options">Paramètres avancés</string>
   <string name="pref_expert_options_summary">À utiliser avec précaution.</string>
   <string name="title_activity_about">À propos</string>
   <string name="pref_about_conversations_summary">Informations sur la version et les licenses</string>
@@ -297,6 +301,8 @@
   <string name="pref_expert_options_other">Autres</string>
   <string name="pref_conference_name">Nom de la conférence </string>
   <string name="pref_conference_name_summary">Identifier les conférences par leur sujet plutôt que leur JID.</string>
+  <string name="pref_autojoin">Rejoindre automatiquement les conférences</string>
+  <string name="pref_autojoin_summary">Respecter le paramètre de connexion automatique des favoris de conférence</string>
   <string name="toast_message_otr_fingerprint">Empreinte OTR copiée dans le presse-papier !</string>
   <string name="toast_message_omemo_fingerprint">Empreinte OMEMO copiée dans le presse-papier !</string>
   <string name="conference_banned">Vous êtes banni de cette conférence</string>
@@ -386,7 +392,7 @@
   <string name="otr_session_not_started">Envoyez un message pour commencer la conversation chiffrée</string>
   <string name="ask_question">Poser une question</string>
   <string name="smp_explain_question">Si vous et votre contact avez en commun un secret que personne d\'autre ne connait (comme une blague ou ce que vous avez mangé lors de votre dernière rencontre), vous pouvez utiliser ce secret pour vérifier vos empreintes respectives.\n\nVous donnez un indice ou posez votre question à votre contact, qui répondra en faisant attention à la casse.</string>
-  <string name="smp_explain_answer">Votre contact voudrait confirmer votre identité grâce à un secret partagé. Il vous a envoyé le message/indice suivant concernant ce secret.</string>
+  <string name="smp_explain_answer">Votre contact souhaite confirmer votre identité grâce à un secret partagé. Il vous a envoyé le message/indice suivant concernant ce secret.</string>
   <string name="shared_secret_hint_should_not_be_empty">Votre indice ne doit pas être vide</string>
   <string name="shared_secret_can_not_be_empty">Votre secret partagé ne doit pas être vide</string>
   <string name="manual_verification_explanation">Comparez avec soin l\'empreinte ci-dessous avec celle de votre contact.\nPour ce faire, vous pouvez utiliser n\'importe quel moyen de communication auquel vous avez confiance : appel téléphonique, e-mail encrypté...</string>
@@ -427,7 +433,7 @@
   <string name="two_hours">2 heures</string>
   <string name="eight_hours">8 heures</string>
   <string name="until_further_notice">Jusqu\'à nouvel ordre</string>
-  <string name="pref_input_options">Options de saisie</string>
+  <string name="pref_input_options">Saisie</string>
   <string name="pref_enter_is_send">Touche Entrée pour envoyer</string>
   <string name="pref_enter_is_send_summary">Utiliser la touche Entrée pour envoyer un message.</string>
   <string name="pref_display_enter_key">Afficher la touche Entrée</string>
@@ -471,7 +477,7 @@
   </plurals>
   <plurals name="select_contact">
     <item quantity="one">%d contact séléctionné</item>
-    <item quantity="other">%d contacts séléctionnés</item>
+    <item quantity="other">%d contacts sélectionnés</item>
   </plurals>
   <string name="pref_quick_action_summary">Remplacer le bouton Envoyer par une action rapide.</string>
   <string name="pref_quick_action">Action Rapide</string>
@@ -491,14 +497,21 @@
   <string name="pref_use_white_background_summary">Afficher les messages reçus en texte noir sur fond blanc.</string>
   <string name="account_status_tor_unavailable">Réseau Tor inaccessible</string>
   <string name="server_info_broken">Détraqué</string>
-  <string name="pref_presence_settings">Options de présence</string>
+  <string name="pref_presence_settings">Présence</string>
   <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="pref_show_connection_options">Paramètres de connexioin avancés</string>
+  <string name="pref_show_connection_options_summary">Montrer le nom d\'hôte et le port lors du paramétrage d\'un compte</string>
+  <string name="hostname_example">xmpp.example.com</string>
   <string name="action_add_account_with_certificate">Ajouter un compte avec un certificat</string>
   <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>
+  <string name="mam_prefs">Paramètres d\'archivage</string>
+  <string name="server_side_mam_prefs">Paramètres d\'archivage du serveur</string>
+  <string name="fetching_mam_prefs">Récupération des paramètres d\'archivage en cours...</string>
+  <string name="unable_to_fetch_mam_prefs">Impossible de récupérer les paramètres d\'archivage</string>
   <string name="captcha_ocr">Texte du captcha</string>
   <string name="captcha_required">Captcha obligatoire</string>
   <string name="captcha_hint">Saisissez le texte dans l\'image</string>
@@ -508,7 +521,7 @@
   <string name="error_fetching_omemo_key">Erreur lors de la récupération de la clef OMEMO !</string>
   <string name="verified_omemo_key_with_certificate">Clef OMEMO vérifiée avec un certificat !</string>
   <string name="device_does_not_support_certificates">Votre appareil ne supporte pas la sélection de certificats client !</string>
-  <string name="pref_connection_options">Options de connexion</string>
+  <string name="pref_connection_options">Connexion</string>
   <string name="pref_use_tor">Connection via Tor</string>
   <string name="pref_use_tor_summary">Rediriger toutes les connexions via le réseau Tor. Nécessite Orbot.</string>
   <string name="account_settings_hostname">Nom d\'hôte</string>
@@ -521,6 +534,7 @@
     <item quantity="one">%d message</item>
     <item quantity="other">%d messages</item>
   </plurals>
+  <string name="load_more_messages">Charger plus de messages</string>
   <string name="shared_file_with_x">Fichier partagé avec %s</string>
   <string name="shared_image_with_x">Image partagée avec %s</string>
   <string name="no_storage_permission">Conversations a besoin d\'accéder au stockage externe</string>
@@ -547,4 +561,8 @@
   <string name="battery_optimizations_enabled_dialog">Votre appareil applique sur Conversations des optimisations de batterie très strictes qui pourraient provoquer des retards dans les notifications, voire des pertes de messages.\nVous allez maintenant avoir la possibilité de les désactiver.</string>
   <string name="disable">Désactiver</string>
   <string name="selection_too_large">La zone sélectionnée est trop grande</string>
+  <string name="no_accounts">(Aucun compte activé)</string>
+  <string name="this_field_is_required">Ce champ est requis</string>
+  <string name="correct_message">Corriger le message</string>
+  <string name="send_corrected_message">Envoyer le message corrigé</string>
 </resources>
diff --git a/src/main/res/values-gl/strings.xml b/src/main/res/values-gl/strings.xml
index c0e0b9aa..0a414b9e 100644
--- a/src/main/res/values-gl/strings.xml
+++ b/src/main/res/values-gl/strings.xml
@@ -58,7 +58,6 @@
   <string name="pref_xmpp_resource_summary">O nome que identifica o cliente que estás a empregar</string>
   <string name="pref_accept_files">Aceptar arquivos</string>
   <string name="pref_accept_files_summary">De forma automática aceptar arquivos menores de…</string>
-  <string name="pref_notification_settings">Axustes de notificación</string>
   <string name="pref_notifications">Notificacións</string>
   <string name="pref_notifications_summary">Notifica cuando chega unha nova mensaxe</string>
   <string name="pref_vibrate">Tremer</string>
@@ -67,10 +66,8 @@
   <string name="pref_sound_summary">Reproduce un ton ca notificación</string>
   <string name="pref_notification_grace_period">Notificacións Carbons</string>
   <string name="pref_notification_grace_period_summary">Deshabilita as notificacións durante un corto periodo de tiempo despois de recibir a copia da mensaxe carbón</string>
-  <string name="pref_advanced_options">Opcións avanzadas</string>
   <string name="pref_never_send_crash">Nunca enviar informe de erros</string>
   <string name="pref_never_send_crash_summary">Enviando volcados de pilas axudas al desenrolo de Conversations</string>
-  <string name="pref_ui_options">Opcións de interfaz</string>
   <string name="openpgp_error">OpenKeychain reportou un erro</string>
   <string name="error_decrypting_file">I/O Erro descifrando arquivo</string>
   <string name="accept">Aceptar</string>
diff --git a/src/main/res/values-id/strings.xml b/src/main/res/values-id/strings.xml
index 745e15ad..eae96d30 100644
--- a/src/main/res/values-id/strings.xml
+++ b/src/main/res/values-id/strings.xml
@@ -93,7 +93,6 @@
   <string name="pref_xmpp_resource_summary">Identifikasi nama klien ini dengan</string>
   <string name="pref_accept_files">Terima berkas</string>
   <string name="pref_accept_files_summary">Otomatis menerima berkas lebih kecil dari...</string>
-  <string name="pref_notification_settings">Pengaturan Notifikasi</string>
   <string name="pref_notifications">Notifikasi</string>
   <string name="pref_notifications_summary">Notifikasikan jika pesan baru tiba</string>
   <string name="pref_vibrate">Getar</string>
@@ -102,12 +101,10 @@
   <string name="pref_sound_summary">mainkan suara saat menerima notifikasi</string>
   <string name="pref_notification_grace_period">Tenggang waktu pemberitahuan</string>
   <string name="pref_notification_grace_period_summary">Nonaktifkan pemberitahuan untuk waktu yang singkat setelah salinan diterima</string>
-  <string name="pref_advanced_options">Opsi Lanjutan</string>
   <string name="pref_never_send_crash">Jangan kirim laporan kerusakan</string>
   <string name="pref_never_send_crash_summary">Dengan mengirimkan kesalahan Anda membantu pengembangan Aplikasi Conversations</string>
   <string name="pref_confirm_messages">Konfirmasi Pesan</string>
   <string name="pref_confirm_messages_summary">Biarkan kontak Anda tahu kapan Anda telah menerima dan membaca pesan</string>
-  <string name="pref_ui_options">Opsi Tampilan</string>
   <string name="openpgp_error">OpenKeychain melaporkan kesalahan</string>
   <string name="error_decrypting_file">I/O Error menerjemahkan berkas</string>
   <string name="accept">Menerima</string>
@@ -251,12 +248,10 @@
   <string name="sure_delete_fingerprint">Apakah anda yakin menghapus sidik jari?</string>
   <string name="ignore">Abaikan</string>
   <string name="without_mutual_presence_updates"><b>Perhatian</b> Mengirim ini tanpa kehadiran sesama pembaruan bisa menyebabkan masalah tak terduga.\n\n<small>Pergi ke kontak untuk memverifikasi langganan kehadiran anda.</small></string>
-  <string name="pref_encryption_settings">Pengaturan enskripsi</string>
   <string name="pref_force_encryption">Paksa enskripsi end-to-end</string>
   <string name="pref_force_encryption_summary">Selalu mengirim pesan terenkripsi (kecuali untuk conferences)</string>
   <string name="pref_dont_save_encrypted">jangan simpan pesan terenskripsi</string>
   <string name="pref_dont_save_encrypted_summary">Peringatan: Hal ini bisa mengakibatkan hilangnya pesan</string>
-  <string name="pref_expert_options">Pengaturan lanjutan</string>
   <string name="pref_expert_options_summary">Harap berhati-hati dengan ini</string>
   <string name="title_activity_about">Tentang Conversations</string>
   <string name="pref_about_conversations_summary">Build dan informasi lisensi</string>
@@ -386,7 +381,6 @@
   <string name="two_hours">2 jam</string>
   <string name="eight_hours">8 jam</string>
   <string name="until_further_notice">Sampai pemberitahuan selanjutnya</string>
-  <string name="pref_input_options">Opsi input</string>
   <string name="pref_enter_is_send">Enter untuk mengirim</string>
   <string name="pref_enter_is_send_summary">Gunakan enter untuk mengrim pesan</string>
   <string name="pref_display_enter_key">Tampilkan masukan kunci</string>
diff --git a/src/main/res/values-it/strings.xml b/src/main/res/values-it/strings.xml
index 26db33ae..5554efc4 100644
--- a/src/main/res/values-it/strings.xml
+++ b/src/main/res/values-it/strings.xml
@@ -102,7 +102,6 @@
   <string name="pref_xmpp_resource_summary">Il nome con il quale questo client si identifica</string>
   <string name="pref_accept_files">Accetta i file</string>
   <string name="pref_accept_files_summary">Accetta automaticamente i file più piccoli di…</string>
-  <string name="pref_notification_settings">Impostazioni di Notifica</string>
   <string name="pref_notifications">Notifiche</string>
   <string name="pref_notifications_summary">Notifica quando arriva un nuovo messaggio</string>
   <string name="pref_vibrate">Vibra</string>
@@ -111,12 +110,10 @@
   <string name="pref_sound_summary">Riproduci una suoneria con la notifica</string>
   <string name="pref_notification_grace_period">Periodo tra notifiche</string>
   <string name="pref_notification_grace_period_summary">Disabilita le notifiche per un breve lasso di tempo dopo che un messaggio è stato ricevuto</string>
-  <string name="pref_advanced_options">Opzioni Avanzate</string>
   <string name="pref_never_send_crash">Non inviare mai segnalazioni di errore</string>
   <string name="pref_never_send_crash_summary">Se scegli di inviare una segnalazione dell’errore aiuterai lo sviluppo di Conversations</string>
   <string name="pref_confirm_messages">Conferma Messaggi</string>
   <string name="pref_confirm_messages_summary">Fai sapere ai tuoi contatti quando hai ricevuto il messaggio e l’hai letto</string>
-  <string name="pref_ui_options">Opzioni Interfaccia</string>
   <string name="openpgp_error">OpenKeychain ha riportato un errore</string>
   <string name="error_decrypting_file">Errore di I/O nel decifrare il file</string>
   <string name="accept">Accetta</string>
@@ -274,12 +271,10 @@
   <string name="sure_delete_fingerprint">Sei sicuro di voler eliminare questa impronta?</string>
   <string name="ignore">Ignora</string>
   <string name="without_mutual_presence_updates"><b>Attenzione:</b> Inviando questo messaggio senza aggiornamenti della presenza reciproci potrebbe causare problemi inaspettati.\n\n<small>Vai nei dettagli del contatto per verificare le tue sottoscrizioni alla presenza.</small></string>
-  <string name="pref_encryption_settings">Impostazioni di cifratura</string>
   <string name="pref_force_encryption">Forza cifratura end-to-end</string>
   <string name="pref_force_encryption_summary">Manda sempre messaggi cifrati (ad eccezione delle conferenze)</string>
   <string name="pref_dont_save_encrypted">Non salvare i messaggi cifrati</string>
   <string name="pref_dont_save_encrypted_summary">Attenzione: Questo potrebbe comportare la perdita di messaggi</string>
-  <string name="pref_expert_options">Opzioni da Esperto</string>
   <string name="pref_expert_options_summary">Fai attenzione con queste impostazioni</string>
   <string name="title_activity_about">Info su Conversations</string>
   <string name="pref_about_conversations_summary">Informazioni sulla licenza</string>
@@ -427,7 +422,6 @@
   <string name="two_hours">2 ore</string>
   <string name="eight_hours">8 ore</string>
   <string name="until_further_notice">Fino a nuovo avviso</string>
-  <string name="pref_input_options">Opzioni di ingresso</string>
   <string name="pref_enter_is_send">Invio spedisce</string>
   <string name="pref_enter_is_send_summary">Il tasto invio spedisce il messaggio</string>
   <string name="pref_display_enter_key">Mostra il tasto invio</string>
@@ -491,7 +485,6 @@
   <string name="pref_use_white_background_summary">Mostra i messaggi ricevuti con testo nero su sfondo bianco</string>
   <string name="account_status_tor_unavailable">Rete Tor non disponibile</string>
   <string name="server_info_broken">Rotto</string>
-  <string name="pref_presence_settings">Impostazioni presenza</string>
   <string name="pref_away_when_screen_off">\"Non disponibile\" a schermo spento</string>
   <string name="pref_away_when_screen_off_summary">Imposta la tua risorsa come non disponibile quando lo schermo è spento</string>
   <string name="pref_xa_on_silent_mode">Non disponibile in modalità silenzioso</string>
@@ -508,7 +501,6 @@
   <string name="error_fetching_omemo_key">Errore ricezione chiave OMEMO!</string>
   <string name="verified_omemo_key_with_certificate">Chiave OMEMO verificata con certificato!</string>
   <string name="device_does_not_support_certificates">Il tuo dispositivo non supporta la selezione di certificati utente!</string>
-  <string name="pref_connection_options">Opzioni di connessione</string>
   <string name="pref_use_tor">Connettiti via Tor</string>
   <string name="pref_use_tor_summary">Indirizza tutte le connessioni attraverso la rete Tor. Richiede Orbot</string>
   <string name="account_settings_hostname">Nome host</string>
@@ -531,7 +523,6 @@
   <string name="certificate_issuer">Emittente</string>
   <string name="certificate_cn">Nome comune</string>
   <string name="certificate_o">Organizzazione</string>
-  <string name="certificate_sha1">SHA1</string>
   <string name="certicate_info_not_available">(Non disponibile)</string>
   <string name="certificate_not_found">Nessun certificato trovato</string>
   <string name="notify_on_all_messages">Notifica per tutti i messaggi</string>
@@ -539,7 +530,6 @@
   <string name="notify_never">Notifiche disabilitate</string>
   <string name="notify_paused">Notifiche in pausa</string>
   <string name="pref_picture_compression">Comprimi immagini</string>
-  <string name="pref_picture_compression_summary">Ridimensiona e comprimi le immagini</string>
   <string name="always">Sempre</string>
   <string name="automatically">Automaticamente</string>
   <string name="battery_optimizations_enabled">Ottimizzazioni batteria abilitate</string>
diff --git a/src/main/res/values-iw/strings.xml b/src/main/res/values-iw/strings.xml
index 9348a88e..2495360e 100644
--- a/src/main/res/values-iw/strings.xml
+++ b/src/main/res/values-iw/strings.xml
@@ -100,7 +100,6 @@
   <string name="pref_xmpp_resource_summary">השם שבעזרתו לקוח זה מזהה את עצמו</string>
   <string name="pref_accept_files">קבל קבצים</string>
   <string name="pref_accept_files_summary">קבל אוטומטית קבצים שגודלם קטן מ…</string>
-  <string name="pref_notification_settings">הגדרות התראות</string>
   <string name="pref_notifications">התראות</string>
   <string name="pref_notifications_summary">תודיע כאשר הודעה חדשה מגיעה</string>
   <string name="pref_vibrate">הרטט</string>
@@ -109,12 +108,10 @@
   <string name="pref_sound_summary">נגן צלצול עם כל התראה</string>
   <string name="pref_notification_grace_period">משך תקופת ארכה</string>
   <string name="pref_notification_grace_period_summary">נטרל התראות לזמן קצר לאחר שהודעת Carbon Copy מתקבלת</string>
-  <string name="pref_advanced_options">אפשרויות מתקדמות</string>
   <string name="pref_never_send_crash">לעולם אל תשלח דיווחי קריסה</string>
   <string name="pref_never_send_crash_summary">על ידי שליחת עקבות מחסנית אתה עוזר להתקדמות הפיתוח של Conversations</string>
   <string name="pref_confirm_messages">אשר הודעות</string>
   <string name="pref_confirm_messages_summary">אפשר לאיש קשר שלך לדעת מתי קיבלת וקראת הודעה</string>
-  <string name="pref_ui_options">אפשרויות ממשק משתמש</string>
   <string name="openpgp_error">אפליקציית OpenKeychain דיווחה על שגיאה</string>
   <string name="error_decrypting_file">שגיאת I/O פענוח קובץ</string>
   <string name="accept">קבל</string>
@@ -265,12 +262,10 @@
   <string name="sure_delete_fingerprint">האם את/ה בטוח שברצונך למחוק טביעת אצבע זו?</string>
   <string name="ignore">התעלם</string>
   <string name="without_mutual_presence_updates"><b>אזהרה:</b>שליחה ללא הרשאות עדכוני נוכחות הדדיות עלולה לגרום לתוצאות בלתי צפויות.\n\n<small>השתמש בתפריט \"פרטי משתמש\" ואשר עדכוני נוכחות</small></string>
-  <string name="pref_encryption_settings">הגדרות הצפנה</string>
   <string name="pref_force_encryption">אלץ הצפנת end-to-end</string>
   <string name="pref_force_encryption_summary">תמיד שלח הודעות מוצפנות (חוץ מבועידות)</string>
   <string name="pref_dont_save_encrypted">אל תשמור הודעות מוצפנות</string>
   <string name="pref_dont_save_encrypted_summary">אזהרה: פעולה זו עלולה לגרום לאיבוד הודעות</string>
-  <string name="pref_expert_options">הגדרות מתקדמות</string>
   <string name="pref_expert_options_summary">נא להיזהר!</string>
   <string name="title_activity_about">אודות Conversations</string>
   <string name="pref_about_conversations_summary">אודות גרסה ורישיון </string>
@@ -414,7 +409,6 @@
   <string name="two_hours">2 שעות</string>
   <string name="eight_hours">8 שעות</string>
   <string name="until_further_notice">עד אחרית הימים</string>
-  <string name="pref_input_options">הגדרות קלט</string>
   <string name="pref_enter_is_send">לחצן Enter שולח את ההודעה</string>
   <string name="pref_enter_is_send_summary">השתמש בלחצן ה-Enter כלחצן השליחה</string>
   <string name="pref_display_enter_key">הראה את לחצן ה Enter</string>
@@ -477,7 +471,6 @@
   <string name="pref_use_white_background">השתמש ברקע לבן</string>
   <string name="pref_use_white_background_summary">הראה הודעות שהתקבלו בטקסט שחור על גבי רקע לבען</string>
   <string name="server_info_broken">לא עובד</string>
-  <string name="pref_presence_settings">הגדרות נוכחות Presence</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>
@@ -491,7 +484,6 @@
   <string name="jid_does_not_match_certificate">אין התאמה בין מזהה Jabber לבין תעודה</string>
   <string name="action_renew_certificate">חידוש תעודה</string>
   <string name="error_fetching_omemo_key">שגיאה בתפיסת OMEMO!</string>
-  <string name="pref_connection_options">אפשרוית חיבור</string>
   <string name="pref_use_tor">התחבר דרך Tor</string>
   <string name="account_settings_hostname">שם מארח</string>
   <string name="account_settings_port">פורט</string>
diff --git a/src/main/res/values-ja/strings.xml b/src/main/res/values-ja/strings.xml
index fb30d544..b77c30b5 100644
--- a/src/main/res/values-ja/strings.xml
+++ b/src/main/res/values-ja/strings.xml
@@ -102,7 +102,7 @@
   <string name="pref_xmpp_resource_summary">自分自身を識別するこのクライアントの名前</string>
   <string name="pref_accept_files">ファイルを受取</string>
   <string name="pref_accept_files_summary">自動的に小さいファイルを受取…</string>
-  <string name="pref_notification_settings">通知設定</string>
+  <string name="pref_notification_settings">通知</string>
   <string name="pref_notifications">通知</string>
   <string name="pref_notifications_summary">新しいメッセージが到着したときに通知します</string>
   <string name="pref_vibrate">振動</string>
@@ -111,12 +111,12 @@
   <string name="pref_sound_summary">通知で着信音を再生します</string>
   <string name="pref_notification_grace_period">通知猶予期間</string>
   <string name="pref_notification_grace_period_summary">カーボンコピーを受信した後、短時間、通知を無効にします</string>
-  <string name="pref_advanced_options">詳細オプション</string>
+  <string name="pref_advanced_options">詳細</string>
   <string name="pref_never_send_crash">クラッシュレポートを送信しない</string>
   <string name="pref_never_send_crash_summary">スタックトレースを送信することで、あなたは Conversations の継続的な開発を支援しています</string>
   <string name="pref_confirm_messages">メッセージの確認</string>
   <string name="pref_confirm_messages_summary">あなたがメッセージを受け取って読んだことを、連絡先に知らせます</string>
-  <string name="pref_ui_options">UI オプション</string>
+  <string name="pref_ui_options">UI</string>
   <string name="openpgp_error">OpenKeychain がエラーを報告しました</string>
   <string name="error_decrypting_file">ファイルの復号化中に I/O エラー</string>
   <string name="accept">受付</string>
@@ -191,6 +191,7 @@
   <string name="server_info_stream_management">XEP-0198: ストリーム管理</string>
   <string name="server_info_pep">XEP-0163: PEP (アバター / OMEMO)</string>
   <string name="server_info_http_upload">XEP-0363: HTTP ファイルアップロード</string>
+  <string name="server_info_push">XEP-0357: プッシュ</string>
   <string name="server_info_available">利用可能</string>
   <string name="server_info_unavailable">利用不可</string>
   <string name="missing_public_keys">公開鍵の通知がありません</string>
@@ -275,12 +276,14 @@
   <string name="sure_delete_fingerprint">このフィンガープリントを削除してもよろしいですか?</string>
   <string name="ignore">無視</string>
   <string name="without_mutual_presence_updates"><b>警告:</b> 相互の参加アップデートなしにこれを送信すると、予期しない問題が発生する可能性があります。\n\n<small>あなたの参加サブスクリプションを検証するために、連絡先の詳細に移動します。</small></string>
-  <string name="pref_encryption_settings">暗号化設定</string>
+  <string name="pref_security_settings">セキュリティ</string>
   <string name="pref_force_encryption">強制的にエンドツーエンド暗号化を使用する</string>
   <string name="pref_force_encryption_summary">常に暗号化されたメッセージを送信します (会議を除く)</string>
+  <string name="pref_allow_message_correction">メッセージの修正を許可</string>
+  <string name="pref_allow_message_correction_summary">連絡先が、遡及的に自分のメッセージを編集することを許可します</string>
   <string name="pref_dont_save_encrypted">暗号化されたメッセージを保存しない</string>
   <string name="pref_dont_save_encrypted_summary">警告: これはメッセージの損失につながる可能性があります</string>
-  <string name="pref_expert_options">上級者オプション</string>
+  <string name="pref_expert_options">エキスパート設定</string>
   <string name="pref_expert_options_summary">ご利用は注意してください</string>
   <string name="title_activity_about">Conversations について</string>
   <string name="pref_about_conversations_summary">ビルドおよびライセンス情報</string>
@@ -430,7 +433,7 @@
   <string name="two_hours">2 時間</string>
   <string name="eight_hours">8 時間</string>
   <string name="until_further_notice">通知があるまで</string>
-  <string name="pref_input_options">入力オプション</string>
+  <string name="pref_input_options">入力</string>
   <string name="pref_enter_is_send">Enter は送信</string>
   <string name="pref_enter_is_send_summary">Enter キーをメッセージの送信に使用します</string>
   <string name="pref_display_enter_key">Enter キーを表示</string>
@@ -492,18 +495,19 @@
   <string name="pref_use_white_background_summary">白地に黒の文字で、受け取ったメッセージを表示します</string>
   <string name="account_status_tor_unavailable">Tor ネットワークが利用できません</string>
   <string name="server_info_broken">壊れています</string>
-  <string name="pref_presence_settings">参加設定</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="pref_show_connection_options">拡張接続オプション</string>
-  <string name="pref_show_connection_options_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>
   <string name="action_add_account_with_certificate">アカウントに証明書を追加</string>
   <string name="unable_to_parse_certificate">証明書を解析できません</string>
   <string name="authenticate_with_certificate">空にすると、証明書で認証します</string>
   <string name="mam_prefs">アーカイブの設定</string>
+  <string name="server_side_mam_prefs">サーバーサイドのアーカイブの設定</string>
   <string name="fetching_mam_prefs">アーカイブの設定を取得しています。しばらくお待ちください…</string>
   <string name="unable_to_fetch_mam_prefs">アーカイブの設定を取得できません</string>
   <string name="captcha_ocr">キャプチャ テキスト</string>
@@ -515,7 +519,7 @@
   <string name="error_fetching_omemo_key">OMEMO 鍵の取得中にエラー!</string>
   <string name="verified_omemo_key_with_certificate">OMEMO 鍵の取得中にエラー!</string>
   <string name="device_does_not_support_certificates">お使いのデバイスはクライアント証明書の選択をサポートしていません!</string>
-  <string name="pref_connection_options">接続オプション</string>
+  <string name="pref_connection_options">接続</string>
   <string name="pref_use_tor">Tor 経由で接続</string>
   <string name="pref_use_tor_summary">Tor ネットワークを介してすべての接続をトンネルします。 Orbot が必要です</string>
   <string name="account_settings_hostname">ホスト名</string>
@@ -538,7 +542,7 @@
   <string name="certificate_issuer">発行者</string>
   <string name="certificate_cn">一般名称</string>
   <string name="certificate_o">組織</string>
-  <string name="certificate_sha1">SHA1</string>
+  <string name="certificate_sha1">SHA-1</string>
   <string name="certicate_info_not_available">(利用不可)</string>
   <string name="certificate_not_found">証明書がありません</string>
   <string name="notify_on_all_messages">すべてのメッセージで通知</string>
@@ -546,7 +550,7 @@
   <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="pref_picture_compression_summary">写真のサイズ変更と圧縮</string>
   <string name="always">常に</string>
   <string name="automatically">自動</string>
   <string name="battery_optimizations_enabled">バッテリー最適化が有効</string>
@@ -556,4 +560,6 @@
   <string name="selection_too_large">選択した範囲が大きすぎます</string>
   <string name="no_accounts">(アクティベートしたアカウントはありません)</string>
   <string name="this_field_is_required">このフィールドは必須です</string>
+  <string name="correct_message">メッセージを修正</string>
+  <string name="send_corrected_message">修正したメッセージを送信</string>
 </resources>
diff --git a/src/main/res/values-ko/strings.xml b/src/main/res/values-ko/strings.xml
index 46db5168..0931f7f6 100644
--- a/src/main/res/values-ko/strings.xml
+++ b/src/main/res/values-ko/strings.xml
@@ -102,7 +102,6 @@
   <string name="pref_xmpp_resource_summary">이 클라이언트가 자신을 알아보는 이름</string>
   <string name="pref_accept_files">파일 수락 </string>
   <string name="pref_accept_files_summary">이 크기보다 작은 파일을 자동으로 수락 </string>
-  <string name="pref_notification_settings">알림 설정 </string>
   <string name="pref_notifications">알림 </string>
   <string name="pref_notifications_summary">새 메세지 도착시 알림 </string>
   <string name="pref_vibrate">진동 </string>
@@ -111,12 +110,10 @@
   <string name="pref_sound_summary">알림과 동시에 벨소리 재생 </string>
   <string name="pref_notification_grace_period">알림 유예 </string>
   <string name="pref_notification_grace_period_summary">Carbon Copy 수신 후에 잠시동안 알림 해제</string>
-  <string name="pref_advanced_options">추가 설정 </string>
   <string name="pref_never_send_crash">충돌 보고서 보내지 않음 </string>
   <string name="pref_never_send_crash_summary">Stack trace 정보를 보냄으로서 Conversations의 개발에 기여할 수 있습니다 </string>
   <string name="pref_confirm_messages">메세지 확인 </string>
   <string name="pref_confirm_messages_summary">메세지를 수신하고 읽었는지를 연락처에게 알려줌 </string>
-  <string name="pref_ui_options">사용자 환경 설정 </string>
   <string name="openpgp_error">OpenKeychain이 오류를 보고합니다 </string>
   <string name="error_decrypting_file">파일 복호화 입출력 오류 </string>
   <string name="accept">수락 </string>
@@ -274,12 +271,10 @@
   <string name="sure_delete_fingerprint">이 핑거프린트를 삭제하시겠습니까? </string>
   <string name="ignore">무시 </string>
   <string name="without_mutual_presence_updates">경고: 상호간의 프레즌스 업데이트 없이 이것을 보내면 예기치 못한 문제를 발생시킬 수 있습니다. 당신의 프레즌스 구독을 검증하기 위해 연락처 상세 정보로 가세요. </string>
-  <string name="pref_encryption_settings">암호화 설정 </string>
   <string name="pref_force_encryption">강제적인 종단간 암호화</string>
   <string name="pref_force_encryption_summary">언제나 암호화 메세지로 전송 (회의 제외) </string>
   <string name="pref_dont_save_encrypted">암호화된 메세지 저장하지 않음 </string>
   <string name="pref_dont_save_encrypted_summary">경고: 메세지가 손실될 수 있습니다 </string>
-  <string name="pref_expert_options">전문가 설정 </string>
   <string name="pref_expert_options_summary">설정시 주의하시기 바랍니다</string>
   <string name="title_activity_about">Conversations에 대해서 </string>
   <string name="pref_about_conversations_summary">빌드 및 라이센스 정보 </string>
@@ -427,7 +422,6 @@
   <string name="two_hours">2시간 </string>
   <string name="eight_hours">8시간 </string>
   <string name="until_further_notice">나중에 알릴때까지 </string>
-  <string name="pref_input_options">입력 설정 </string>
   <string name="pref_enter_is_send">엔터 키로 전송  </string>
   <string name="pref_enter_is_send_summary">엔터 키로 메세지를 보냅니다 </string>
   <string name="pref_display_enter_key">엔터 키 표시 </string>
@@ -489,7 +483,6 @@
   <string name="pref_use_white_background_summary">받은 메세지를 하얀색 배경에 검은색 글씨로 표시</string>
   <string name="account_status_tor_unavailable">Tor 네트워크 사용할 수 없음</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>
@@ -505,7 +498,6 @@
   <string name="error_fetching_omemo_key">OMEMO key를 가져오는 도중 오류가 발생했습니다</string>
   <string name="verified_omemo_key_with_certificate">OMEMO 키와 인증서 검증됨</string>
   <string name="device_does_not_support_certificates">기기가 선택된 클라이언트 인증서를 지원하지 않습니다</string>
-  <string name="pref_connection_options">접속 옵션</string>
   <string name="pref_use_tor">Tor를 통해 접속</string>
   <string name="pref_use_tor_summary">모든 연결을 Tor 네트워크를 통하도록 유도함. Orbot이 필요합니다</string>
   <string name="account_settings_hostname">호스트 이름</string>
@@ -527,7 +519,6 @@
   <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>
@@ -535,7 +526,6 @@
   <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>
diff --git a/src/main/res/values-nb-rNO/strings.xml b/src/main/res/values-nb-rNO/strings.xml
index 0b8ad688..19b46aac 100644
--- a/src/main/res/values-nb-rNO/strings.xml
+++ b/src/main/res/values-nb-rNO/strings.xml
@@ -102,7 +102,6 @@
   <string name="pref_xmpp_resource_summary">Navnet denne klienten identifiserer seg med</string>
   <string name="pref_accept_files">Godta filer</string>
   <string name="pref_accept_files_summary">Automatisk godkjenning av filer mindre enn...</string>
-  <string name="pref_notification_settings">Varslingsinnstillinger</string>
   <string name="pref_notifications">Varslinger</string>
   <string name="pref_notifications_summary">Varsle når en ny melding ankommer</string>
   <string name="pref_vibrate">Vibrer</string>
@@ -111,12 +110,10 @@
   <string name="pref_sound_summary">Spill av ringetone ved varsel</string>
   <string name="pref_notification_grace_period">Stilleperiode</string>
   <string name="pref_notification_grace_period_summary">Deaktiver varslinger for en kort periode etter at en kopi er mottatt</string>
-  <string name="pref_advanced_options">Avanserte valg</string>
   <string name="pref_never_send_crash">Aldri send feilrettingsrapporter</string>
   <string name="pref_never_send_crash_summary">Ved å sende inn stabelsporinger hjelper du den pågående utviklingen av Conversations</string>
   <string name="pref_confirm_messages">Bekreft meldinger</string>
   <string name="pref_confirm_messages_summary">La din kontakt få vite når du har mottatt og lest en melding</string>
-  <string name="pref_ui_options">Valg for grensesnitt</string>
   <string name="openpgp_error">Feilmelding fra OpenKeychain</string>
   <string name="error_decrypting_file">I/O-feil ved dekryptering av fil</string>
   <string name="accept">Godta</string>
@@ -274,12 +271,10 @@
   <string name="sure_delete_fingerprint">Bekreft fjerning av fingeravtrykk.</string>
   <string name="ignore">Ignorer</string>
   <string name="without_mutual_presence_updates"><b>Advarsel:</b> Å sende dette uten at tilstandsoppdateringer er i overenstemmelse kan forårsake uventede problemer.\n\n<small>Gå til kontaktdetaljer for å bekrefte dine tilstedeværelsesabonnementer.</small></string>
-  <string name="pref_encryption_settings">Krypteringsinnstillinger</string>
   <string name="pref_force_encryption">Krev ende-til-ende-kryptering</string>
   <string name="pref_force_encryption_summary">Alltid send meldinger kryptert (bortsett fra konferanser)</string>
   <string name="pref_dont_save_encrypted">Ikke lagre krypterte meldinger</string>
   <string name="pref_dont_save_encrypted_summary">Advarsel: Dette kan føre til at meldinger går tapt</string>
-  <string name="pref_expert_options">Ekspertinnstillinger</string>
   <string name="pref_expert_options_summary">Vær forsiktig med disse</string>
   <string name="title_activity_about">Om Conversations</string>
   <string name="pref_about_conversations_summary">Utgave og lisensinformasjon</string>
@@ -427,7 +422,6 @@
   <string name="two_hours">2 timer</string>
   <string name="eight_hours">8 timer</string>
   <string name="until_further_notice">Til videre beskjed</string>
-  <string name="pref_input_options">Inndata-valg</string>
   <string name="pref_enter_is_send">Enter er forsendelsesknapp</string>
   <string name="pref_enter_is_send_summary">Bruk enter for å sende en melding</string>
   <string name="pref_display_enter_key">Vis enter-tast</string>
@@ -491,7 +485,6 @@
   <string name="pref_use_white_background_summary">Vis mottatte meldinger som svart tekst på hvit bakgrunn</string>
   <string name="account_status_tor_unavailable">Tor-nettverk utilgjengelig</string>
   <string name="server_info_broken">Knekt</string>
-  <string name="pref_presence_settings">Tilstedeværelse-innstillinger</string>
   <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>
@@ -508,7 +501,6 @@
   <string name="error_fetching_omemo_key">Feil ved innhenting av OMEMO-nøkkel!</string>
   <string name="verified_omemo_key_with_certificate">Bekreftet OMEMO-nøkkel med sertifikat!</string>
   <string name="device_does_not_support_certificates">Din enhet støtter ikke valg av klientsertifikat!</string>
-  <string name="pref_connection_options">Tilkoblingsalternativ</string>
   <string name="pref_use_tor">Koble til via Tor</string>
   <string name="pref_use_tor_summary">Send alle tilkoblinger i tunnel gjennom Tor-nettverket. Krever Orbot</string>
   <string name="account_settings_hostname">Tjenernavn</string>
@@ -531,7 +523,6 @@
   <string name="certificate_issuer">Utsteder</string>
   <string name="certificate_cn">Vanlig navn</string>
   <string name="certificate_o">Organisasjon</string>
-  <string name="certificate_sha1">SHA1</string>
   <string name="certicate_info_not_available">(Ikke tilgjengelig)</string>
   <string name="certificate_not_found">Fant ikke noe sertifikat</string>
   <string name="notify_on_all_messages">Varsle ved alle meldinger</string>
@@ -539,7 +530,6 @@
   <string name="notify_never">Varslinger deaktivert</string>
   <string name="notify_paused">Varslinger pauset</string>
   <string name="pref_picture_compression">Komprimer bilder</string>
-  <string name="pref_picture_compression_summary">Komprimer og juster bildestørrelser</string>
   <string name="always">Alltid</string>
   <string name="automatically">Automatisk</string>
   <string name="battery_optimizations_enabled">Batterioptimaliseringer aktivert</string>
diff --git a/src/main/res/values-nl/strings.xml b/src/main/res/values-nl/strings.xml
index 2a3138df..c5d03158 100644
--- a/src/main/res/values-nl/strings.xml
+++ b/src/main/res/values-nl/strings.xml
@@ -102,7 +102,6 @@
   <string name="pref_xmpp_resource_summary">De naam waarmee deze cliënt zich identificeert</string>
   <string name="pref_accept_files">Aanvaard bestanden</string>
   <string name="pref_accept_files_summary">Aanvaard automatisch bestanden kleiner dan…</string>
-  <string name="pref_notification_settings">Meldingsinstellingen</string>
   <string name="pref_notifications">Meldingen</string>
   <string name="pref_notifications_summary">Melding als een nieuw bericht arriveert</string>
   <string name="pref_vibrate">Trillen</string>
@@ -111,12 +110,10 @@
   <string name="pref_sound_summary">Speel beltoon af bij melding</string>
   <string name="pref_notification_grace_period">Uitstelperiode voor meldingen</string>
   <string name="pref_notification_grace_period_summary">Schakel meldingen voor korte tijd uit als er een carbon copy wordt ontvangen</string>
-  <string name="pref_advanced_options">Geavanceerde instellingen</string>
   <string name="pref_never_send_crash">Verstuur nooit crashrapportages</string>
   <string name="pref_never_send_crash_summary">Door crashrapportages te versturen help je de ontwikkeling van Conversations</string>
   <string name="pref_confirm_messages">Bevestig berichten</string>
   <string name="pref_confirm_messages_summary">Laat je contacten weten wanneer je berichten hebt ontvangen en gelezen</string>
-  <string name="pref_ui_options">UI-opties</string>
   <string name="openpgp_error">OpenKeychain rapporteerde een fout</string>
   <string name="error_decrypting_file">I/O-fout tijdens ontsleutelen van bestand</string>
   <string name="accept">Aanvaarden</string>
@@ -274,12 +271,10 @@
   <string name="sure_delete_fingerprint">Ben je zeker dat je deze vingerafdruk wil verwijderen?</string>
   <string name="ignore">Negeren</string>
   <string name="without_mutual_presence_updates"><b>Waarschuwing:</b> Dit verzenden zonder wederzijdse aanwezigheidsupdates kan voor onverwachte problemen zorgen.\n\n<small>Ga naar contactgegevens om je aanwezigheidsupdates te bevestigen.</small></string>
-  <string name="pref_encryption_settings">Versleutelingsinstellingen</string>
   <string name="pref_force_encryption">Verplicht end-to-end-versleuteling</string>
   <string name="pref_force_encryption_summary">Stuur berichten altijd versleuteld (behalve in groepsgesprekken)</string>
   <string name="pref_dont_save_encrypted">Sla versleutelde berichten niet op</string>
   <string name="pref_dont_save_encrypted_summary">Waarschuwing: dit kan leiden tot verlies van berichten</string>
-  <string name="pref_expert_options">Expert-instellingen</string>
   <string name="pref_expert_options_summary">Wees voorzichtig met deze instellingen</string>
   <string name="title_activity_about">Over Conversations</string>
   <string name="pref_about_conversations_summary">Build en licentie-informatie</string>
@@ -427,7 +422,6 @@
   <string name="two_hours">2 uur</string>
   <string name="eight_hours">8 uur</string>
   <string name="until_further_notice">Voor onbepaalde duur</string>
-  <string name="pref_input_options">Invoer-opties</string>
   <string name="pref_enter_is_send">Enter is versturen</string>
   <string name="pref_enter_is_send_summary">Gebruik de enter-toets om berichten te versturen</string>
   <string name="pref_display_enter_key">Toon enter-toets</string>
@@ -491,7 +485,6 @@
   <string name="pref_use_white_background_summary">Toon ontvangen berichten als zwarte tekst op een witte achtergrond</string>
   <string name="account_status_tor_unavailable">Tor-netwerk niet beschikbaar</string>
   <string name="server_info_broken">Gebroken</string>
-  <string name="pref_presence_settings">Aanwezigheidsinstellingen</string>
   <string name="pref_away_when_screen_off">Even weg wanneer scherm uit staat</string>
   <string name="pref_away_when_screen_off_summary">Stelt je bron in als even weg wanneer het scherm uitgeschakeld is</string>
   <string name="pref_xa_on_silent_mode">Niet beschikbaar in stille modus</string>
@@ -508,7 +501,6 @@
   <string name="error_fetching_omemo_key">Fout bij ophalen van OMEMO-sleutel!</string>
   <string name="verified_omemo_key_with_certificate">OMEMO-sleutel geverifieerd met certificaat!</string>
   <string name="device_does_not_support_certificates">Je apparaat ondersteunt de selectie van cliënt-certificaten niet!</string>
-  <string name="pref_connection_options">Verbindingsopties</string>
   <string name="pref_use_tor">Verbinden via Tor</string>
   <string name="pref_use_tor_summary">Tunnel alle verbindingen door het Tor-netwerk. Vereist Orbot</string>
   <string name="account_settings_hostname">Hostnaam</string>
@@ -531,7 +523,6 @@
   <string name="certificate_issuer">Uitgever</string>
   <string name="certificate_cn">Algemene naam</string>
   <string name="certificate_o">Organisatie</string>
-  <string name="certificate_sha1">SHA1</string>
   <string name="certicate_info_not_available">(Niet beschikbaar)</string>
   <string name="certificate_not_found">Geen certificaat gevonden</string>
   <string name="notify_on_all_messages">Melding bij alle berichten</string>
@@ -539,7 +530,6 @@
   <string name="notify_never">Meldingen uitgeschakeld</string>
   <string name="notify_paused">Meldingen gepauzeerd</string>
   <string name="pref_picture_compression">Afbeeldingen comprimeren</string>
-  <string name="pref_picture_compression_summary">Afbeeldingen verkleinen en comprimeren</string>
   <string name="always">Altijd</string>
   <string name="automatically">Automatisch</string>
   <string name="battery_optimizations_enabled">Batterij-optimalisaties ingeschakeld</string>
diff --git a/src/main/res/values-pl/strings.xml b/src/main/res/values-pl/strings.xml
index 240eed92..2a9e3135 100644
--- a/src/main/res/values-pl/strings.xml
+++ b/src/main/res/values-pl/strings.xml
@@ -102,7 +102,6 @@
   <string name="pref_xmpp_resource_summary">Nazwa identyfikująca urządzenie</string>
   <string name="pref_accept_files">Akceptuj pliki</string>
   <string name="pref_accept_files_summary">Automatycznie akceptuj pliki mniejsze niż...</string>
-  <string name="pref_notification_settings">Ustawienia powiadamiania</string>
   <string name="pref_notifications">Powiadomienia</string>
   <string name="pref_notifications_summary">Powiadamiaj, gdy nadejdzie wiadomość</string>
   <string name="pref_vibrate">Wibracje</string>
@@ -111,12 +110,10 @@
   <string name="pref_sound_summary">Odtwórz dźwięk z powiadomieniem</string>
   <string name="pref_notification_grace_period">Opóźnienie powiadomień</string>
   <string name="pref_notification_grace_period_summary">Wyłącz powiadomienia przez krótki czas po otrzymaniu kopii wiadomości</string>
-  <string name="pref_advanced_options">Opcje zaawansowane</string>
   <string name="pref_never_send_crash">Nie wysyłaj raportów awarii</string>
   <string name="pref_never_send_crash_summary">Wysyłając ślady stosu pomagasz rozwijać Conversations</string>
   <string name="pref_confirm_messages">Potwierdzenia wiadomości</string>
   <string name="pref_confirm_messages_summary">Powiadamiaj kontakty o otrzymaniu lub przeczytaniu wiadomości</string>
-  <string name="pref_ui_options">Ustawienia interfejsu</string>
   <string name="openpgp_error">Wystąpił błąd OpenKeychain</string>
   <string name="error_decrypting_file">Błąd podczas deszyfrowania pliku</string>
   <string name="accept">Akceptuj</string>
@@ -274,12 +271,10 @@
   <string name="sure_delete_fingerprint">Czy na pewno chcesz usunąć odcisk klucza?</string>
   <string name="ignore">Ignoruj</string>
   <string name="without_mutual_presence_updates"><b>Uwaga:</b> Wysyłanie bez obustronnych powiadomień o obecności może powodować nieoczekiwane problemy.\n\n<small>Sprawdź subskrypcję powiadomień w szczegółach kontaktu.</small></string>
-  <string name="pref_encryption_settings">Ustawienia szyfrowania</string>
   <string name="pref_force_encryption">Wymuszaj szyfrowanie typu end-to-end</string>
   <string name="pref_force_encryption_summary">Szyfruj wszystkie wiadomości (poza konferencjami)</string>
   <string name="pref_dont_save_encrypted">Nie zapisuj zaszyfrowanych wiadomości</string>
   <string name="pref_dont_save_encrypted_summary">Uwaga: Może powodować utratę wiadomości</string>
-  <string name="pref_expert_options">Ustawienia zaawansowane</string>
   <string name="pref_expert_options_summary">Modyfikuj ustawienia ostrożnie</string>
   <string name="title_activity_about">O Conversations</string>
   <string name="pref_about_conversations_summary">Informacje o kompilacji i licencji</string>
@@ -427,7 +422,6 @@
   <string name="two_hours">2 godziny</string>
   <string name="eight_hours">8 godzin</string>
   <string name="until_further_notice">Ręcznie</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żywaj klawisza Enter do wysyłania wiadomości</string>
   <string name="pref_display_enter_key">Pokaż klawisz Enter</string>
@@ -493,7 +487,6 @@
   <string name="pref_use_white_background_summary">Pokazuj otrzymane wiadomości jako czarny tekst na białym tle</string>
   <string name="account_status_tor_unavailable">Sieć TOR jest niedostepna</string>
   <string name="server_info_broken">Zepsute</string>
-  <string name="pref_presence_settings">Ustawienia obecności</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">Oznacza Twój zasób jako \"Oddalony\", gdy wyświetlacz jest wyłączony</string>
   <string name="pref_xa_on_silent_mode">Niedostepne w trybie cichym</string>
@@ -510,7 +503,6 @@
   <string name="error_fetching_omemo_key">Błąd pobierania klucza OMEMO!</string>
   <string name="verified_omemo_key_with_certificate">Zweryfikowano klucz OMEMO z certyfikatem</string>
   <string name="device_does_not_support_certificates">Twoje urządzenie nie wspiera wyboru certyfikatów klienckich</string>
-  <string name="pref_connection_options">Opcje połączenia</string>
   <string name="pref_use_tor">Połącz przez sieć TOR</string>
   <string name="pref_use_tor_summary">Tuneluj wszystkie połączenia przez sieć TOR. Wymaga zainstalowania aplikacji \"Orbot\"</string>
   <string name="account_settings_hostname">Nazwa hosta</string>
@@ -534,7 +526,6 @@
   <string name="certificate_issuer">Wystawca</string>
   <string name="certificate_cn">Nazwa</string>
   <string name="certificate_o">Organizacja</string>
-  <string name="certificate_sha1">SHA1</string>
   <string name="certicate_info_not_available">(Niedostępne)</string>
   <string name="certificate_not_found">Nie znaleziono certyfikatu</string>
   <string name="notify_on_all_messages">Powiadom o wszystkich wiadomościach</string>
@@ -542,7 +533,6 @@
   <string name="notify_never">Powiadomienia wyłączone</string>
   <string name="notify_paused">Powiadomienia wstrzymane</string>
   <string name="pref_picture_compression">Kompresuj obrazki</string>
-  <string name="pref_picture_compression_summary">Zmień rozmiar i kompresuj obrazki</string>
   <string name="always">Zawsze</string>
   <string name="automatically">Automatycznie</string>
   <string name="battery_optimizations_enabled">Optymalizacje zużycia baterii włączone</string>
diff --git a/src/main/res/values-pt-rBR/strings.xml b/src/main/res/values-pt-rBR/strings.xml
index 6d4991e9..368e17fa 100644
--- a/src/main/res/values-pt-rBR/strings.xml
+++ b/src/main/res/values-pt-rBR/strings.xml
@@ -102,7 +102,7 @@
   <string name="pref_xmpp_resource_summary">O nome pelo qual esse cliente se identifica</string>
   <string name="pref_accept_files">Aceitar arquivos</string>
   <string name="pref_accept_files_summary">Aceitar automaticamente arquivos menores que...</string>
-  <string name="pref_notification_settings">Configurações de notificações</string>
+  <string name="pref_notification_settings">Notificação</string>
   <string name="pref_notifications">Notificações</string>
   <string name="pref_notifications_summary">Notificar quando uma nova mensagem for recebida</string>
   <string name="pref_vibrate">Vibração</string>
@@ -111,12 +111,12 @@
   <string name="pref_sound_summary">Som de notificação</string>
   <string name="pref_notification_grace_period">Tempo de espera da notificação</string>
   <string name="pref_notification_grace_period_summary">Desativar notificações por um curto período após uma copia ser recebida</string>
-  <string name="pref_advanced_options">Opções avançadas</string>
+  <string name="pref_advanced_options">Avançado</string>
   <string name="pref_never_send_crash">Nunca enviar relatórios de erros</string>
   <string name="pref_never_send_crash_summary">Ao enviar os stack traces você está colaborando com o desenvolvimento do Conversations</string>
   <string name="pref_confirm_messages">Confirmação de mensangens</string>
   <string name="pref_confirm_messages_summary">Permitir que um contato saiba quando você recebeu e leu uma mensagem</string>
-  <string name="pref_ui_options">Opções de interface</string>
+  <string name="pref_ui_options">IU</string>
   <string name="openpgp_error">O OpenKeychain informou um erro</string>
   <string name="error_decrypting_file">Ocorreu um erro de E/S na descriptografia o arquivo</string>
   <string name="accept">Aceitar</string>
@@ -191,6 +191,7 @@
   <string name="server_info_stream_management">XEP-0198: Gerenciamento de fluxo</string>
   <string name="server_info_pep">XEP-0163: PEP (Avatares / OMEMO)</string>
   <string name="server_info_http_upload">XEP-0363: Envio de arquivos via HTTP</string>
+  <string name="server_info_push">XEP-0357: Push</string>
   <string name="server_info_available">disponível</string>
   <string name="server_info_unavailable">indisponível</string>
   <string name="missing_public_keys">Avisos de ausência de chave pública</string>
@@ -240,6 +241,7 @@
   <string name="you">Você</string>
   <string name="action_edit_subject">Editar o assunto da conferência</string>
   <string name="conference_not_found">A conferência não foi encontrada</string>
+  <string name="conference_unknown_error">Foi recebido um erro desconhecido</string>
   <string name="leave">Sair</string>
   <string name="contact_added_you">O contato foi adicionado à sua lista de contatos</string>
   <string name="add_back">Adicionar novamente</string>
@@ -274,12 +276,14 @@
   <string name="sure_delete_fingerprint">Tem certeza que deseja remover essa impressão digital?</string>
   <string name="ignore">Ignorar</string>
   <string name="without_mutual_presence_updates"><b>Aviso:</b> Enviar isso sem atualizações mútuas de presença pode provocar problemas inesperados.\n\n<small>Verifique nos detalhes do contato suas inscrições de presença.</small></string>
-  <string name="pref_encryption_settings">Configurações de criptografia</string>
+  <string name="pref_security_settings">Segurança</string>
   <string name="pref_force_encryption">Forçar criptografia ponto-a-ponto</string>
   <string name="pref_force_encryption_summary">Sempre envie mensagem criptografada (exceto para conferências)</string>
+  <string name="pref_allow_message_correction">Permitir a correção da mensagem</string>
+  <string name="pref_allow_message_correction_summary">Permite que seus contatos edite suas mensagens retroativamente</string>
   <string name="pref_dont_save_encrypted">Não salve as mensagens criptografadas</string>
   <string name="pref_dont_save_encrypted_summary">Atenção: Isso pode levar a perda de mensagens</string>
-  <string name="pref_expert_options">Opções avançadas</string>
+  <string name="pref_expert_options">Configurações avançadas</string>
   <string name="pref_expert_options_summary">Por favor, use com cuidado</string>
   <string name="title_activity_about">Sobre o Conversations</string>
   <string name="pref_about_conversations_summary">Informações de licenciamento e construção</string>
@@ -297,6 +301,8 @@
   <string name="pref_expert_options_other">Outras</string>
   <string name="pref_conference_name">Nome da conferência</string>
   <string name="pref_conference_name_summary">Use o assunto da sala ao invés do JID para identificar as conferências</string>
+  <string name="pref_autojoin">Entrar automaticamente nas conferências</string>
+  <string name="pref_autojoin_summary">Respeitar a opção de entrada automática dos marcadores de conferência</string>
   <string name="toast_message_otr_fingerprint">Impressão digital OTR copiada para a área de transferência!</string>
   <string name="toast_message_omemo_fingerprint">Impressão digital OMEMO copiada para a área de transferência!</string>
   <string name="conference_banned">Você foi banido dessa conferência</string>
@@ -427,7 +433,7 @@
   <string name="two_hours">2 horas</string>
   <string name="eight_hours">8 horas</string>
   <string name="until_further_notice">Até segunda ordem</string>
-  <string name="pref_input_options">Opções de entrada</string>
+  <string name="pref_input_options">Entrada</string>
   <string name="pref_enter_is_send">Enter envia</string>
   <string name="pref_enter_is_send_summary">Use o botão Enter para enviar a mensagem</string>
   <string name="pref_display_enter_key">Exibir o botão Enter</string>
@@ -491,14 +497,21 @@
   <string name="pref_use_white_background_summary">Exibir a mensagens recebidas como texto preto em um fundo branco</string>
   <string name="account_status_tor_unavailable">Rede Tor não disponível</string>
   <string name="server_info_broken">Quebrado</string>
-  <string name="pref_presence_settings">Configurações de presença</string>
+  <string name="pref_presence_settings">Presença</string>
   <string name="pref_away_when_screen_off">Afastado quando a tela estiver desligada</string>
   <string name="pref_away_when_screen_off_summary">Marcar o seu status como afastado quando a tela estiver desligada</string>
   <string name="pref_xa_on_silent_mode">Não disponível quando em modo silencioso</string>
   <string name="pref_xa_on_silent_mode_summary">Marcar o seu status como não disponível quando o dispositivo estiver em modo silencioso</string>
+  <string name="pref_show_connection_options">Configurações detalhadas da conexão</string>
+  <string name="pref_show_connection_options_summary">Exibe o nome de host e configurações da porta ao configurar uma conta</string>
+  <string name="hostname_example">xmpp.example.com</string>
   <string name="action_add_account_with_certificate">Adicionar uma conta com certificado</string>
   <string name="unable_to_parse_certificate">Não foi possível analisar o certificado</string>
   <string name="authenticate_with_certificate">Deixe em branco para autenticar com um certificado</string>
+  <string name="mam_prefs">Preferências de arquivamento</string>
+  <string name="server_side_mam_prefs">Preferências de arquivamento no servidor</string>
+  <string name="fetching_mam_prefs">Obtendo as preferências de arquivamento. Por favor aguarde...</string>
+  <string name="unable_to_fetch_mam_prefs">Não foi possível obter as preferências de arquivamento</string>
   <string name="captcha_ocr">Texto captcha</string>
   <string name="captcha_required">Captcha obrigatório</string>
   <string name="captcha_hint">digite o texto da imagem</string>
@@ -508,7 +521,7 @@
   <string name="error_fetching_omemo_key">Ocorreu um erro na obtenção da chave OMEMO!</string>
   <string name="verified_omemo_key_with_certificate">A chave OMEMO foi verificada com o certificado.</string>
   <string name="device_does_not_support_certificates">O seu dispositivo não suporta a seleção de certificados de clientes.</string>
-  <string name="pref_connection_options">Opções de conexão</string>
+  <string name="pref_connection_options">Conexão</string>
   <string name="pref_use_tor">Conectar via Tor</string>
   <string name="pref_use_tor_summary">Faça o tunelamento de todas as conexões através de redes Tor. Necessita do Orbot.</string>
   <string name="account_settings_hostname">Nome do host</string>
@@ -521,6 +534,7 @@
     <item quantity="one">%d mensagem</item>
     <item quantity="other">%d mensagens</item>
   </plurals>
+  <string name="load_more_messages">Carregar mais mensagens</string>
   <string name="shared_file_with_x">Arquivo compartilhado com %s</string>
   <string name="shared_image_with_x">Imagem compartilhada com %s</string>
   <string name="no_storage_permission">O Conversations necessita de acesso ao armazenamento externo</string>
@@ -531,7 +545,7 @@
   <string name="certificate_issuer">Emitente</string>
   <string name="certificate_cn">Common Name</string>
   <string name="certificate_o">Organização</string>
-  <string name="certificate_sha1">SHA1</string>
+  <string name="certificate_sha1">SHA-1</string>
   <string name="certicate_info_not_available">(Não disponível)</string>
   <string name="certificate_not_found">Não foi encontrado nenhum certificado</string>
   <string name="notify_on_all_messages">Notificar em todas as mensagens</string>
@@ -547,4 +561,8 @@
   <string name="battery_optimizations_enabled_dialog">O seu dispositivo está aplicando uma otimização de bateria intensa no Conversations, que pode levar a atraso nas notificações ou até mesmo perda de mensagens.\nAgora você será solicitado a desabilitá-la.</string>
   <string name="disable">Desabilitar</string>
   <string name="selection_too_large">A área selecionada é muito grande</string>
+  <string name="no_accounts">(Nenhuma conta ativa)</string>
+  <string name="this_field_is_required">Este campo é necessário</string>
+  <string name="correct_message">Corrigir a mensagem</string>
+  <string name="send_corrected_message">Enviar a mensagem corrigida</string>
 </resources>
diff --git a/src/main/res/values-pt/strings.xml b/src/main/res/values-pt/strings.xml
index 137d38b4..30265948 100644
--- a/src/main/res/values-pt/strings.xml
+++ b/src/main/res/values-pt/strings.xml
@@ -88,7 +88,6 @@
   <string name="pref_xmpp_resource_summary">O nome pelo qual esse cliente se identifica</string>
   <string name="pref_accept_files">Aceitar arquivos</string>
   <string name="pref_accept_files_summary">Automaticamente aceita arquivos menores que...</string>
-  <string name="pref_notification_settings">Configurações de notificação</string>
   <string name="pref_notifications">Notificações</string>
   <string name="pref_notifications_summary">Notificar quando uma nova mensagem for recebida</string>
   <string name="pref_vibrate">Vibrar</string>
@@ -97,12 +96,10 @@
   <string name="pref_sound_summary">Tocar um som com a notificação</string>
   <string name="pref_notification_grace_period">Período de carência da notificação</string>
   <string name="pref_notification_grace_period_summary">Desativar notificações por um curto período após a copia oculta ser recebida</string>
-  <string name="pref_advanced_options">Opções avançadas</string>
   <string name="pref_never_send_crash">Nunca enviar relatórios de quebra</string>
   <string name="pref_never_send_crash_summary">Ao enviar os stack traces você ajuda o desenvolvimento do aplicativo</string>
   <string name="pref_confirm_messages">Confirmar mensanges</string>
   <string name="pref_confirm_messages_summary">Permitir que um contato saiba quando você recebeu e leu uma mensagem</string>
-  <string name="pref_ui_options">Opções de UI</string>
   <string name="openpgp_error">O OpenKeychain informou um erro</string>
   <string name="error_decrypting_file">Erro de I/O de critpografia</string>
   <string name="accept">Aceitar</string>
@@ -230,12 +227,10 @@
   <string name="request_now">Solicitar agora</string>
   <string name="delete_fingerprint">Remover impressão</string>
   <string name="sure_delete_fingerprint">Tem certeza que deseja remover essa assinatura?</string>
-  <string name="pref_encryption_settings">Configurações de criptografia</string>
   <string name="pref_force_encryption">Forçar criptografia ponto-a-ponto</string>
   <string name="pref_force_encryption_summary">Sempre envie mensagem criptografada (exceto para conferências)</string>
   <string name="pref_dont_save_encrypted">Não salve mensagens criptografadas</string>
   <string name="pref_dont_save_encrypted_summary">Atenção: Isso pode levar a perda de mensagens</string>
-  <string name="pref_expert_options">Opções de expert</string>
   <string name="pref_expert_options_summary">Por favor tenha cuidado com essas</string>
   <string name="title_activity_about">Sobre Conversas</string>
   <string name="pref_about_conversations_summary">Informação de licença e construção</string>
@@ -265,7 +260,6 @@
   <string name="two_hours">2 horas</string>
   <string name="eight_hours">8 horas</string>
   <string name="until_further_notice">Até segunda ordem</string>
-  <string name="pref_input_options">Opções de entrada</string>
   <string name="pref_enter_is_send">O enter envia</string>
   <string name="pref_enter_is_send_summary">Use o enter para enviar a mensagem</string>
   <string name="pref_display_enter_key">Exibir tecla enter</string>
diff --git a/src/main/res/values-ro-rRO/strings.xml b/src/main/res/values-ro-rRO/strings.xml
index b98dd86e..afcf90e0 100644
--- a/src/main/res/values-ro-rRO/strings.xml
+++ b/src/main/res/values-ro-rRO/strings.xml
@@ -102,7 +102,7 @@
   <string name="pref_xmpp_resource_summary">Numele cu care acest client se identifica</string>
   <string name="pref_accept_files">Accepta fisiere</string>
   <string name="pref_accept_files_summary">Accepta automat fisiere mai mici decat...</string>
-  <string name="pref_notification_settings">Setari notificari</string>
+  <string name="pref_notification_settings">Notificare</string>
   <string name="pref_notifications">Notificari</string>
   <string name="pref_notifications_summary">Notifica cand un nou mesaj este primit</string>
   <string name="pref_vibrate">Vibreaza</string>
@@ -191,6 +191,7 @@
   <string name="server_info_stream_management">XEP-0198: Management flux</string>
   <string name="server_info_pep">XEP-0163: PEP (Avatare / OMEMO)</string>
   <string name="server_info_http_upload">XEP-0363: Incarcare fisiere prin HTTP</string>
+  <string name="server_info_push">XEP-0357: Push</string>
   <string name="server_info_available">disponibil</string>
   <string name="server_info_unavailable">indisponibil</string>
   <string name="missing_public_keys">Cheile publice ce nu au fost anuntate</string>
@@ -275,9 +276,11 @@
   <string name="sure_delete_fingerprint">Sigur vrei sa stergi amprenta</string>
   <string name="ignore">Ignora</string>
   <string name="without_mutual_presence_updates"><b>Atentie:</b> Trimitand aceasta fara actualizari de prezenta reciproce, ar putea produce probleme neprevazute.\n\n<small>Mergi la lista de contacte, la detalii, sa iti verifici abonarile la actualizarile de prezenta.</small></string>
-  <string name="pref_encryption_settings">Setari criptare</string>
+  <string name="pref_security_settings">Siguranta</string>
   <string name="pref_force_encryption">Forteaza criptarea conexiunii de la un capat la altul</string>
   <string name="pref_force_encryption_summary">Trimite mereu mesajele criptate (exceptand conferintele)</string>
+  <string name="pref_allow_message_correction">Permite corectia mesajelor</string>
+  <string name="pref_allow_message_correction_summary">Permite contactelor sa isi editeze mesajele din trecut</string>
   <string name="pref_dont_save_encrypted">Nu salva mesaje criptate</string>
   <string name="pref_dont_save_encrypted_summary">Atentie: Asta poate duce la pierderea de mesaje</string>
   <string name="pref_expert_options">Optiuni expert</string>
@@ -508,8 +511,9 @@
   <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>
   <string name="mam_prefs">Preferinte arhivare</string>
+  <string name="server_side_mam_prefs">Preferinte arhivare pe server</string>
   <string name="fetching_mam_prefs">Descarc preferinte arhivare. Va rugam asteptati...</string>
-  <string name="unable_to_fetch_mam_prefs">Nu s-au putut descarca setarile de arhivare</string>
+  <string name="unable_to_fetch_mam_prefs">Nu s-au putut descarca preferintele de arhivare</string>
   <string name="captcha_ocr">Text captcha de verificare</string>
   <string name="captcha_required">Text captcha de verificare necesar</string>
   <string name="captcha_hint">introdu textul din imagine</string>
@@ -545,7 +549,7 @@
 Emitent</string>
   <string name="certificate_cn">Nume comun</string>
   <string name="certificate_o">Organizatie</string>
-  <string name="certificate_sha1">SHA1</string>
+  <string name="certificate_sha1">SHA-1</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>
@@ -563,4 +567,6 @@ Emitent</string>
   <string name="selection_too_large">Zona selectata este prea mare</string>
   <string name="no_accounts">(Nici un cont activat)</string>
   <string name="this_field_is_required">Acest camp este obligatoriu</string>
+  <string name="correct_message">Corectie mesaj</string>
+  <string name="send_corrected_message">Trimite text corectat</string>
 </resources>
diff --git a/src/main/res/values-ru/strings.xml b/src/main/res/values-ru/strings.xml
index 68d84396..01cdbcdd 100644
--- a/src/main/res/values-ru/strings.xml
+++ b/src/main/res/values-ru/strings.xml
@@ -102,7 +102,6 @@
   <string name="pref_xmpp_resource_summary">Имя которым Conversations идентифицирует себя</string>
   <string name="pref_accept_files">Принимать файлы</string>
   <string name="pref_accept_files_summary">Автоматический прием файлов…</string>
-  <string name="pref_notification_settings">Настройки Уведомлений</string>
   <string name="pref_notifications">Уведомление</string>
   <string name="pref_notifications_summary">Использовать звуковое уведомление когда приходят новые сообщения</string>
   <string name="pref_vibrate">Вибрация</string>
@@ -111,12 +110,10 @@
   <string name="pref_sound_summary">Выберите звуковой сигнал для сообщений</string>
   <string name="pref_notification_grace_period">Отсрочка уведомлений</string>
   <string name="pref_notification_grace_period_summary">Не использовать уведомления, если вы прочитали сообщение на другом устройстве</string>
-  <string name="pref_advanced_options">Дополнительные параметры</string>
   <string name="pref_never_send_crash">Отчеты об ошибках</string>
   <string name="pref_never_send_crash_summary">Отправляя отчеты об ошибках, вы помогаете исправить и улучшить Conversations, поддерживая дальнейшее развитие программы</string>
   <string name="pref_confirm_messages">Отчеты о получении</string>
   <string name="pref_confirm_messages_summary">Разрешить уведомлять отправителя, когда вы получили и прочитали сообщение</string>
-  <string name="pref_ui_options">Параметры интерфейса</string>
   <string name="openpgp_error">Возникла ошибка в OpenKeychain</string>
   <string name="error_decrypting_file">Ошибка расшифровки файла</string>
   <string name="accept">Принять</string>
@@ -274,12 +271,10 @@
   <string name="sure_delete_fingerprint">Вы уверены, что хотите удалить данную контрольную сумму?</string>
   <string name="ignore">Отменить</string>
   <string name="without_mutual_presence_updates"><b>Внимание:</b> Если обновления присутствия не включены на обеих сторонах, это может привести к возникновению неожиданных проблемам.\n\n<small>Уточните сведения о контакте, проверив настройки обновлений присутствия.</small></string>
-  <string name="pref_encryption_settings">Настройки шифрования</string>
   <string name="pref_force_encryption">Обязательное сквозное шифрование</string>
   <string name="pref_force_encryption_summary">Всегда отправлять сообщения зашифрованными (за исключением конференций)</string>
   <string name="pref_dont_save_encrypted">Не сохранять зашифрованные сообщения</string>
   <string name="pref_dont_save_encrypted_summary">Внимание: Это может привести к потере сообщений</string>
-  <string name="pref_expert_options">Расширенные настройки</string>
   <string name="pref_expert_options_summary">Пожалуйста, будьте осторожны с данными настройками</string>
   <string name="title_activity_about">О Conversations</string>
   <string name="pref_about_conversations_summary">Информация о билде и лицензировании</string>
@@ -426,7 +421,6 @@
   <string name="two_hours">2 часа</string>
   <string name="eight_hours">8 часов</string>
   <string name="until_further_notice">До следующего уведомления</string>
-  <string name="pref_input_options">Настройки ввода</string>
   <string name="pref_enter_is_send">Отправить на \"Enter\"</string>
   <string name="pref_enter_is_send_summary">Клавиша \"Enter\" отправляет сообщение</string>
   <string name="pref_display_enter_key">Показывать клавишу ввода</string>
@@ -494,7 +488,6 @@
   <string name="pref_use_white_background_summary">Показывать принятые сообщения черным текстом на белом фоне</string>
   <string name="account_status_tor_unavailable">Сеть Tor недоступна</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>
@@ -510,7 +503,6 @@
   <string name="error_fetching_omemo_key">Ошибка при получении OMEMO ключа!</string>
   <string name="verified_omemo_key_with_certificate">Проверен OMEMO ключ с сертификатом!</string>
   <string name="device_does_not_support_certificates">Ваше устройство не поддерживает выбор клиентских сертификатов!</string>
-  <string name="pref_connection_options">Настройки соединения</string>
   <string name="pref_use_tor">Соединение через Tor</string>
   <string name="pref_use_tor_summary">Направить все соединения через сеть TOR. Требуется Orbot</string>
   <string name="account_settings_hostname">Имя сервера</string>
@@ -528,7 +520,6 @@
   <string name="certificate_subject">Subject</string>
   <string name="certificate_issuer">Выпустил</string>
   <string name="certificate_o">Организация</string>
-  <string name="certificate_sha1">SHA-1</string>
   <string name="certicate_info_not_available">(недоступно)</string>
   <string name="certificate_not_found">Сертификатов не найдено</string>
   <string name="notify_on_all_messages">Уведомлять о всех сообщениях</string>
diff --git a/src/main/res/values-sk/strings.xml b/src/main/res/values-sk/strings.xml
index 2990a8ed..ce99da94 100644
--- a/src/main/res/values-sk/strings.xml
+++ b/src/main/res/values-sk/strings.xml
@@ -96,7 +96,6 @@
   <string name="pref_xmpp_resource_summary">Meno, ktorým sa tento klient identifikuje</string>
   <string name="pref_accept_files">Prijať súbory</string>
   <string name="pref_accept_files_summary">Automaticky prijať súbory menšie ako…</string>
-  <string name="pref_notification_settings">Nastavenia upozornení</string>
   <string name="pref_notifications">Upozornenia</string>
   <string name="pref_notifications_summary">Upozorniť pri prijatí novej správy</string>
   <string name="pref_vibrate">Vibrovať</string>
@@ -105,12 +104,10 @@
   <string name="pref_sound_summary">Prehrať zvuk spolu s upozornením</string>
   <string name="pref_notification_grace_period">Doba na prečítanie upozornenia</string>
   <string name="pref_notification_grace_period_summary">Neupozorňovať krátko po obdržaní kópie správy</string>
-  <string name="pref_advanced_options">Rozšírené možnosti</string>
   <string name="pref_never_send_crash">Neodosielať detaily o zlyhaní aplikácie</string>
   <string name="pref_never_send_crash_summary">Zaslaním detailov o dôvode zlyhania pomáhate ďalšiemu vývoju aplikácie Conversations</string>
   <string name="pref_confirm_messages">Potvrdzovať správy</string>
   <string name="pref_confirm_messages_summary">Oznámi kontaktom, že správa bola prijatá a prečítaná</string>
-  <string name="pref_ui_options">Možnosti UI</string>
   <string name="openpgp_error">OpenKeychain nahlásil chybu</string>
   <string name="error_decrypting_file">I/O chyba dešifrovania súboru</string>
   <string name="accept">Prijať</string>
@@ -262,12 +259,10 @@
   <string name="sure_delete_fingerprint">Naozaj chcete vymazať tento identifikátor?</string>
   <string name="ignore">Ignorovať</string>
   <string name="without_mutual_presence_updates"><b>Varovanie:</b> Odoslanie bez povolenia zmien stavu môže spôsobiť nečakané problémy na obidvoch stranách.\n\n<small>Prejdi na detaily kontaktu pre overenie povolenia o zmenách stavu.</small></string>
-  <string name="pref_encryption_settings">Nastavenie šifrovania</string>
   <string name="pref_force_encryption">Vynútiť šifrovanie</string>
   <string name="pref_force_encryption_summary">Vždy zasielať šifrované správy (okrem skupinových konverzácií)</string>
   <string name="pref_dont_save_encrypted">Neukladať šifrované správy</string>
   <string name="pref_dont_save_encrypted_summary">Varovanie: Toto môže viesť k strate správ</string>
-  <string name="pref_expert_options">Expertné možnosti</string>
   <string name="pref_expert_options_summary">S týmto narábajte veľmi opatrne, prosím</string>
   <string name="title_activity_about">O Conversations</string>
   <string name="pref_about_conversations_summary">Informácie o tvorbe a licencii</string>
@@ -400,7 +395,6 @@
   <string name="two_hours">2 hodiny</string>
   <string name="eight_hours">8 hodín</string>
   <string name="until_further_notice">Až do odvolania</string>
-  <string name="pref_input_options">Možnosti zadávaní</string>
   <string name="pref_enter_is_send">Enter odosiela</string>
   <string name="pref_enter_is_send_summary">Použiť klávesu enter na odoslanie správy</string>
   <string name="pref_display_enter_key">Zobraziť klávesu enter</string>
diff --git a/src/main/res/values-sr/strings.xml b/src/main/res/values-sr/strings.xml
index 17a0bbdf..2be86f05 100644
--- a/src/main/res/values-sr/strings.xml
+++ b/src/main/res/values-sr/strings.xml
@@ -102,7 +102,6 @@
   <string name="pref_xmpp_resource_summary">Име са којим се овај клијент идентификује</string>
   <string name="pref_accept_files">Прихватај фајлове</string>
   <string name="pref_accept_files_summary">Аутоматски прихватај фајлове мање од…</string>
-  <string name="pref_notification_settings">Поставке обавештења</string>
   <string name="pref_notifications">Обавештења</string>
   <string name="pref_notifications_summary">Обавести кад стигне нова порука</string>
   <string name="pref_vibrate">Вибрирај</string>
@@ -111,12 +110,10 @@
   <string name="pref_sound_summary">Звуци обавештења</string>
   <string name="pref_notification_grace_period">Период одгоде обавештења</string>
   <string name="pref_notification_grace_period_summary">Искључи обавештења на кратко по примању карбон копије</string>
-  <string name="pref_advanced_options">Напредне поставке</string>
   <string name="pref_never_send_crash">Никад не шаљи извештаје о паду</string>
   <string name="pref_never_send_crash_summary">Слањем контратрага помажете текући развој Конверзације</string>
   <string name="pref_confirm_messages">Потврди поруке</string>
   <string name="pref_confirm_messages_summary">Обзнаните контакту кад примите и прочитате поруку</string>
-  <string name="pref_ui_options">Поставке сучеља</string>
   <string name="openpgp_error">Отворени кључарник је пријавио грешку</string>
   <string name="error_decrypting_file">У/И грешка дешифровања фајла</string>
   <string name="accept">Прихвати</string>
@@ -275,12 +272,10 @@
   <string name="sure_delete_fingerprint">Желите ли заиста да обришете овај отисак?</string>
   <string name="ignore">Занемари</string>
   <string name="without_mutual_presence_updates"><b>Упозорење:</b> Слање овога без узајамних ажурирања присутности би могло да узрокује неочекиване проблеме.\n\n<small>Идите на детаље контакта да бисте проверили претплате на присутности.</small></string>
-  <string name="pref_encryption_settings">Поставке шифровања</string>
   <string name="pref_force_encryption">Присили крај-на-крај шифровање</string>
   <string name="pref_force_encryption_summary">Увек шифруј поруке (осим за групна ћаскања)</string>
   <string name="pref_dont_save_encrypted">Не успремај шифроване поруке</string>
   <string name="pref_dont_save_encrypted_summary">Упозорење: Ово може да доведе до губитка порука</string>
-  <string name="pref_expert_options">Опције за стручњаке</string>
   <string name="pref_expert_options_summary">Будите пажљиви са овим</string>
   <string name="title_activity_about">О Конверзацији</string>
   <string name="pref_about_conversations_summary">Подаци о издању и лиценци</string>
@@ -428,7 +423,6 @@
   <string name="two_hours">2 сата</string>
   <string name="eight_hours">8 сати</string>
   <string name="until_further_notice">до даљњег</string>
-  <string name="pref_input_options">Опције уноса</string>
   <string name="pref_enter_is_send">Ентер шаље</string>
   <string name="pref_enter_is_send_summary">Користи Ентер тастер за слање порука</string>
   <string name="pref_display_enter_key">Прикажи Ентер тастер</string>
@@ -494,7 +488,6 @@
   <string name="pref_use_white_background_summary">Приказ примљених порука црним текстом на белој позадини</string>
   <string name="account_status_tor_unavailable">Тор мрежа недоступна</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>
@@ -512,7 +505,6 @@
   <string name="error_fetching_omemo_key">Грешка добављања ОМЕМО кључа!</string>
   <string name="verified_omemo_key_with_certificate">Оверен ОМЕМО кључ помоћу сертификата!</string>
   <string name="device_does_not_support_certificates">Ваш уређај не подржава избор сертификата клијента!</string>
-  <string name="pref_connection_options">Опције повезивања</string>
   <string name="pref_use_tor">Повежи се преко Тора</string>
   <string name="pref_use_tor_summary">Тунеловање свих веза кроз Тор мрежу. Захтева Орбот</string>
   <string name="account_settings_hostname">Име домаћина</string>
@@ -537,7 +529,6 @@
   <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>
@@ -545,7 +536,6 @@
   <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>
diff --git a/src/main/res/values-sv/strings.xml b/src/main/res/values-sv/strings.xml
index 310afe9f..c1feeaab 100644
--- a/src/main/res/values-sv/strings.xml
+++ b/src/main/res/values-sv/strings.xml
@@ -102,7 +102,7 @@
   <string name="pref_xmpp_resource_summary">Namnet klienten identifierar sig med</string>
   <string name="pref_accept_files">Acceptera filer</string>
   <string name="pref_accept_files_summary">Acceptera automatiskt filer som är mindre än…</string>
-  <string name="pref_notification_settings">Notifieringsinställningar</string>
+  <string name="pref_notification_settings">Notifiering</string>
   <string name="pref_notifications">Notifieringar</string>
   <string name="pref_notifications_summary">Notifiera när meddelande tagits emot</string>
   <string name="pref_vibrate">Vibrera</string>
@@ -111,12 +111,12 @@
   <string name="pref_sound_summary">Spela ljud med notifiering</string>
   <string name="pref_notification_grace_period">Notifieringsfrist</string>
   <string name="pref_notification_grace_period_summary">Inaktivera notifieringar en kort stund efter att en carbon copy tagits emot</string>
-  <string name="pref_advanced_options">Avancerade inställningar</string>
+  <string name="pref_advanced_options">Avancerat</string>
   <string name="pref_never_send_crash">Skicka aldrig krasch-rapporter</string>
   <string name="pref_never_send_crash_summary">Genom att skicka in stack traces hjälper du utvecklarna av Conversations</string>
   <string name="pref_confirm_messages">Bekräfta meddelanden</string>
   <string name="pref_confirm_messages_summary">Låter dina kontakter veta när du har tagit emot och läst ett meddelande</string>
-  <string name="pref_ui_options">UI-inställningar</string>
+  <string name="pref_ui_options">Gränssnitt</string>
   <string name="openpgp_error">OpenKeychain rapporterade ett fel</string>
   <string name="error_decrypting_file">I/O-fel vid avkryptering av fil</string>
   <string name="accept">Acceptera</string>
@@ -191,6 +191,7 @@
   <string name="server_info_stream_management">XEP-0198: Stream Management</string>
   <string name="server_info_pep">XEP-0163: PEP (Avatarbilder / OMEMO)</string>
   <string name="server_info_http_upload">XEP-0363: Ladda upp via HTTP</string>
+  <string name="server_info_push">XEP-0357: Push</string>
   <string name="server_info_available">tillgänglig</string>
   <string name="server_info_unavailable">otillgänglig</string>
   <string name="missing_public_keys">Annonsering om publik nyckel saknas</string>
@@ -275,9 +276,11 @@
   <string name="sure_delete_fingerprint">Är du säker på att du vill ta bort detta fingeravtryck?</string>
   <string name="ignore">Ignorera</string>
   <string name="without_mutual_presence_updates"><b>Varning:</b> Skicka detta utan gemensamma tillgänglighetsuppdateringar kan ge oväntade problem.\n\n<small>Gå till kontaktdetaljer för att verifiera dina tillgänglighetsuppdateringar.</small></string>
-  <string name="pref_encryption_settings">Krypteringsinställningar</string>
+  <string name="pref_security_settings">Säkerhet</string>
   <string name="pref_force_encryption">Tvinga kryptering</string>
   <string name="pref_force_encryption_summary">Sänd alltid krypterade meddelanden (utom för konferenser)</string>
+  <string name="pref_allow_message_correction">Tillåt korrigeringar av meddelanden</string>
+  <string name="pref_allow_message_correction_summary">Tillåt att dina kontakter kan ändra sina meddelanden i efterhand</string>
   <string name="pref_dont_save_encrypted">Spara inte krypterade meddelanden</string>
   <string name="pref_dont_save_encrypted_summary">Varning: Detta kan leda till att meddelanden förloras</string>
   <string name="pref_expert_options">Expertinställningar</string>
@@ -430,7 +433,7 @@
   <string name="two_hours">2 timmar</string>
   <string name="eight_hours">8 timmar</string>
   <string name="until_further_notice">Tills vidare</string>
-  <string name="pref_input_options">Inmatningsalternativ</string>
+  <string name="pref_input_options">Input</string>
   <string name="pref_enter_is_send">Skicka med enter</string>
   <string name="pref_enter_is_send_summary">Använd enter-knappen för att skicka meddelande</string>
   <string name="pref_display_enter_key">Visa enter-knappen</string>
@@ -494,18 +497,19 @@
   <string name="pref_use_white_background_summary">Visa mottagna meddelanden som svart text på vit bakgrund</string>
   <string name="account_status_tor_unavailable">Tor-nätverk ej tillgängligt</string>
   <string name="server_info_broken">Sönder</string>
-  <string name="pref_presence_settings">Tillgänglighetsinställningar</string>
+  <string name="pref_presence_settings">Tillgänglighet</string>
   <string name="pref_away_when_screen_off">Status borta när skärmen är av</string>
   <string name="pref_away_when_screen_off_summary">Sätter din tillgänglighet till borta när skrämen är av</string>
   <string name="pref_xa_on_silent_mode">Status ej tillgänglig i tyst läge</string>
   <string name="pref_xa_on_silent_mode_summary">Sätter din tillgänglighet till ej tillgänglig när enheten är i tyst läge</string>
-  <string name="pref_show_connection_options">Utökade anslutningsalternativ</string>
+  <string name="pref_show_connection_options">Utökade anslutningsinställningar</string>
   <string name="pref_show_connection_options_summary">Visa val av servernamn och port vid inställning av konto</string>
   <string name="hostname_example">xmpp.example.com</string>
   <string name="action_add_account_with_certificate">Lägg till konto med certifikat</string>
   <string name="unable_to_parse_certificate">Kan inte läsa certifikat</string>
   <string name="authenticate_with_certificate">Lämna tom för att för att logga in med certifikat</string>
   <string name="mam_prefs">Arkiveringsinställningar</string>
+  <string name="server_side_mam_prefs">Arkiveringsinställningar på servern</string>
   <string name="fetching_mam_prefs">Hämtar arkiveringsinställningar, vänta...</string>
   <string name="unable_to_fetch_mam_prefs">Kan ej hämta arkiveringsinställningar</string>
   <string name="captcha_ocr">CAPTCHA-text</string>
@@ -517,7 +521,7 @@
   <string name="error_fetching_omemo_key">Misslyckades med att hämta OMEMO-nyckel!</string>
   <string name="verified_omemo_key_with_certificate">Verifierade OMEMO-nyckel med certifikat!</string>
   <string name="device_does_not_support_certificates">Din enhet stödjer inte val av klientcertifikat!</string>
-  <string name="pref_connection_options">Anslutningsalternativ</string>
+  <string name="pref_connection_options">Anslutning</string>
   <string name="pref_use_tor">Ansluten via Tor</string>
   <string name="pref_use_tor_summary">Tunnla alla anslutningar genom Tor-nätverket. Kräver Orbot</string>
   <string name="account_settings_hostname">Servernamn</string>
@@ -541,7 +545,7 @@
   <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="certificate_sha1">SHA-1</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>
@@ -559,4 +563,6 @@
   <string name="selection_too_large">The valda området är för stort</string>
   <string name="no_accounts">(Inget konto aktiverat)</string>
   <string name="this_field_is_required">Detta fält måste fyllas i</string>
+  <string name="correct_message">Korrigera meddelanden</string>
+  <string name="send_corrected_message">Skicka korrigerat meddelande</string>
 </resources>
diff --git a/src/main/res/values-tr-rTR/strings.xml b/src/main/res/values-tr-rTR/strings.xml
index d9908d8a..2a674290 100644
--- a/src/main/res/values-tr-rTR/strings.xml
+++ b/src/main/res/values-tr-rTR/strings.xml
@@ -102,7 +102,7 @@
   <string name="pref_xmpp_resource_summary">İstemci kimliği</string>
   <string name="pref_accept_files">Dosyaları kabul et</string>
   <string name="pref_accept_files_summary">…‘den küçük olan dosyaları otomatik olarak kabul et</string>
-  <string name="pref_notification_settings">Bildirim Ayarları</string>
+  <string name="pref_notification_settings">Bildirim</string>
   <string name="pref_notifications">Bildirimler</string>
   <string name="pref_notifications_summary">Yeni ileti geldiğinde bildir</string>
   <string name="pref_vibrate">Titreşim</string>
@@ -111,12 +111,12 @@
   <string name="pref_sound_summary">Bildirimle birlikte zil çalsın</string>
   <string name="pref_notification_grace_period">Bildirim mühleti</string>
   <string name="pref_notification_grace_period_summary">Karbon kopya alındıktan sonra kısa bir süre için bildirimleri kapa</string>
-  <string name="pref_advanced_options">İleri Seçenekler</string>
+  <string name="pref_advanced_options">Gelişmiş</string>
   <string name="pref_never_send_crash">Asla çöküş raporu gönderme</string>
   <string name="pref_never_send_crash_summary">Çöküş raporu göndermeniz Conversations\n’ın geliştirilmesine katkıda bulunacaktır.</string>
   <string name="pref_confirm_messages">İletileri onayla</string>
   <string name="pref_confirm_messages_summary">Karşı tarafa ileti alındı ve okundu raporu gönder.</string>
-  <string name="pref_ui_options">Arabirim Seçenekleri</string>
+  <string name="pref_ui_options">Arabirim</string>
   <string name="openpgp_error">OpenKeychain bir hata bildirdi</string>
   <string name="error_decrypting_file">Dosyanın deşifresinde G/Ç hatası</string>
   <string name="accept">Kabul et</string>
@@ -191,6 +191,7 @@
   <string name="server_info_stream_management">XEP-0198: Stream Management</string>
   <string name="server_info_pep">XEP-0163: PEP (Avatars / OMEMO)</string>
   <string name="server_info_http_upload">XEP-0363: HTTP File Upload</string>
+  <string name="server_info_push">XEP-0357: Push</string>
   <string name="server_info_available">mevcut</string>
   <string name="server_info_unavailable">mevcut değil</string>
   <string name="missing_public_keys">Kayıp genel anahtar bildirimleri</string>
@@ -275,9 +276,11 @@
   <string name="sure_delete_fingerprint">Bu parmak izini silmek istediğinizden emin misiniz?</string>
   <string name="ignore">Yok say</string>
   <string name="without_mutual_presence_updates"><b>Uyarı:</b> Karşılıklı çevrimiçi durum bildirimi güncellemeleri olmaksızın bunu göndermeniz beklenmedik sorunlara sebep olabilir.\n\n\n\n<small>Çevrimiçi durum bildirimi aboneliklerinizi kontrol etmek için kişi bilgilerine gidin.</small></string>
-  <string name="pref_encryption_settings">Şifreleme ayarları</string>
+  <string name="pref_security_settings">Güvenlik</string>
   <string name="pref_force_encryption">Uçtan uca şifrelemeye zorla</string>
   <string name="pref_force_encryption_summary">Her zaman şifrelenmiş ileti gönder (Conversations hariç)</string>
+  <string name="pref_allow_message_correction">İleti düzeltmeye izin ver</string>
+  <string name="pref_allow_message_correction_summary">Kişilerinizin geçmiş iletilerini düzeltmelerine izin ver</string>
   <string name="pref_dont_save_encrypted">Şifrelenmiş iletileri kaydetme</string>
   <string name="pref_dont_save_encrypted_summary">Uyarı: Bu, iletilerin kaybedilmesine neden olabilir</string>
   <string name="pref_expert_options">Uzman seçenekleri</string>
@@ -430,7 +433,7 @@
   <string name="two_hours">2 saat</string>
   <string name="eight_hours">8 saat</string>
   <string name="until_further_notice">İkinci bildirime kadar</string>
-  <string name="pref_input_options">Girdi seçenekleri</string>
+  <string name="pref_input_options">Girdi</string>
   <string name="pref_enter_is_send">Enter=gönder</string>
   <string name="pref_enter_is_send_summary">İleti göndermek için \"enter\" tuşunu kullanın</string>
   <string name="pref_display_enter_key">\"Enter\" tuşunu göster</string>
@@ -492,7 +495,7 @@
   <string name="pref_use_white_background_summary">Alınan iletileri beyaz arka plan üzerinde siyah yazıyla göster</string>
   <string name="account_status_tor_unavailable">Tor ağına erişilemiyor</string>
   <string name="server_info_broken">Bozuk</string>
-  <string name="pref_presence_settings">Çevrimiçi durum bildirim ayarları</string>
+  <string name="pref_presence_settings">Durum</string>
   <string name="pref_away_when_screen_off">Ekran kapandığında uzakta</string>
   <string name="pref_away_when_screen_off_summary">Ekran kapandığında çevrimiçi durum bildiriminizi uzakta olarak değiştirir</string>
   <string name="pref_xa_on_silent_mode">Sessiz moddayken erişilemez</string>
@@ -504,6 +507,7 @@
   <string name="unable_to_parse_certificate">Sertifika çözümlenemedi</string>
   <string name="authenticate_with_certificate">w/ sertifikasının kimlik denetimi için boş bırak </string>
   <string name="mam_prefs">Arşivleme tercihleri</string>
+  <string name="server_side_mam_prefs">Sunucu tarafı arşivleme tercihleri</string>
   <string name="fetching_mam_prefs">Arşivleme tercihleri alınıyor. Lütfen bekleyin...</string>
   <string name="unable_to_fetch_mam_prefs">Arşivleme tercihleri alınamadı</string>
   <string name="captcha_ocr">Captcha metni</string>
@@ -515,7 +519,7 @@
   <string name="error_fetching_omemo_key">OMEMO anahtarı alınırken hata oluştu!</string>
   <string name="verified_omemo_key_with_certificate">Sertifikalı OMEMO anahtarı onaylandı!</string>
   <string name="device_does_not_support_certificates">Cihazınız seçilen istemci sertifikalarını desteklemiyor!</string>
-  <string name="pref_connection_options">Bağlantı seçenekleri</string>
+  <string name="pref_connection_options">Bağlantı</string>
   <string name="pref_use_tor">Tor üzerinden bağlan</string>
   <string name="pref_use_tor_summary">Bütün bağlantıları Tor ağı üzerinden aktar. Orbot gerekir.</string>
   <string name="account_settings_hostname">Sunucu adı</string>
@@ -538,7 +542,7 @@
   <string name="certificate_issuer">Veren</string>
   <string name="certificate_cn">Ortak ad</string>
   <string name="certificate_o">Organizasyon</string>
-  <string name="certificate_sha1">SHA1</string>
+  <string name="certificate_sha1">SHA-1</string>
   <string name="certicate_info_not_available">(mevcut değil)</string>
   <string name="certificate_not_found">Sertifika bulunamadı</string>
   <string name="notify_on_all_messages">Tüm iletilerde uyar</string>
@@ -556,4 +560,6 @@
   <string name="selection_too_large">Seçilen alan çok büyük</string>
   <string name="no_accounts">(Aktif hesap bulunmuyor)</string>
   <string name="this_field_is_required">Bu alan zorunludur</string>
+  <string name="correct_message">ileti düzelt</string>
+  <string name="send_corrected_message">Düzeltilmiş iletiyi gönder</string>
 </resources>
diff --git a/src/main/res/values-vi/strings.xml b/src/main/res/values-vi/strings.xml
index 92fa1133..2d7511d6 100644
--- a/src/main/res/values-vi/strings.xml
+++ b/src/main/res/values-vi/strings.xml
@@ -102,7 +102,6 @@
   <string name="pref_xmpp_resource_summary">Tên của máy trạm này được tự đặt là</string>
   <string name="pref_accept_files">Chấp thuận các tập tin</string>
   <string name="pref_accept_files_summary">Tự động chấp thuận các tập tin nhỏ hơn...</string>
-  <string name="pref_notification_settings">Cài đặt thông báo</string>
   <string name="pref_notifications">Thông báo</string>
   <string name="pref_notifications_summary">Thông báo khi có tin nhắn mới</string>
   <string name="pref_vibrate">Rung</string>
@@ -111,12 +110,10 @@
   <string name="pref_sound_summary">Chơi nhạc chuông cùng với thông báo</string>
   <string name="pref_notification_grace_period">Thời gian gia hạn thông báo</string>
   <string name="pref_notification_grace_period_summary">Tắt thông báo trong một thời gian ngắn sau khi nhận được bản sao giấy than</string>
-  <string name="pref_advanced_options">Tuỳ chọn nâng cao</string>
   <string name="pref_never_send_crash">Không bao giờ gửi báo cáo dừng chạy</string>
   <string name="pref_never_send_crash_summary">Bằng việc gửi báo cáo hoạt động, bạn đang hỗ trợ nhóm phát triển của Conversations</string>
   <string name="pref_confirm_messages">Xác nhận tin nhắn</string>
   <string name="pref_confirm_messages_summary">Báo cho liên hệ của bạn biết khi bạn đã nhận và đọc tin nhắn</string>
-  <string name="pref_ui_options">Tuỳ chọn UI</string>
   <string name="openpgp_error">OpenKeychain đã báo cáo một lỗi</string>
   <string name="error_decrypting_file">Tập tin giải mã lỗi I/O</string>
   <string name="accept">Chấp thuận</string>
@@ -274,12 +271,10 @@
   <string name="sure_delete_fingerprint">Có chắc là bạn muốn xoá dấu vân tay này?</string>
   <string name="ignore">Bỏ qua</string>
   <string name="without_mutual_presence_updates"><b>Cảnh báo:</b> Gửi mà không có cập nhật hiện diện của nhau có thể gây ra vấn đề khó lường.\n\n<small>Vào chi tiết liên hệ để xác minh đăng ký hiện diện của bạn.</small></string>
-  <string name="pref_encryption_settings">Cài đặt mã hoá</string>
   <string name="pref_force_encryption">Bắt buộc mã hoá hai đầu</string>
   <string name="pref_force_encryption_summary">Luôn gửi tin nhắn được mã hoá (ngoại trừ trong diễn đàn)</string>
   <string name="pref_dont_save_encrypted">Đừng lưu tin nhắn được mã hoá</string>
   <string name="pref_dont_save_encrypted_summary">Cảnh báo: Có thể làm mất tin nhắn</string>
-  <string name="pref_expert_options">Tuỳ chọn chuyên sâu</string>
   <string name="pref_expert_options_summary">Xin hãy cẩn trọng với chúng</string>
   <string name="title_activity_about">Thông tin về Conversations</string>
   <string name="pref_about_conversations_summary">Thông tin bản dựng và giấy phép</string>
@@ -427,7 +422,6 @@
   <string name="two_hours">2 tiếng</string>
   <string name="eight_hours">8 tiếng</string>
   <string name="until_further_notice">Cho đến thông báo tiếp theo</string>
-  <string name="pref_input_options">Tuỳ chọn nhập liệu</string>
   <string name="pref_enter_is_send">Bấm Enter để gửi</string>
   <string name="pref_enter_is_send_summary">Bấm nút Enter để gửi tin nhắn</string>
   <string name="pref_display_enter_key">Hiện nút Enter</string>
@@ -489,7 +483,6 @@
   <string name="pref_use_white_background_summary">Hiện các tin nhắn nhận được dưới dạng chữ đen trên nền trắng</string>
   <string name="account_status_tor_unavailable">Mạng Tor chưa sẵn sàng</string>
   <string name="server_info_broken">Bị hỏng</string>
-  <string name="pref_presence_settings">Cài đặt sự hiện diện</string>
   <string name="pref_away_when_screen_off">Vắng mặt khi màn hình tắt</string>
   <string name="pref_away_when_screen_off_summary">Hiện ứng dụng là \'vắng mặt\' khi màn hình tắt</string>
   <string name="pref_xa_on_silent_mode">Không sẵn sàng trong chế độ yên lặng</string>
@@ -506,7 +499,6 @@
   <string name="error_fetching_omemo_key">Lỗi nhập khoá OMEMO!</string>
   <string name="verified_omemo_key_with_certificate">Khoá OMEMO đã xác minh với chứng nhận!</string>
   <string name="device_does_not_support_certificates">Thiết bị không hỗ trợ chọn lựa các chứng chỉ của máy trạm!</string>
-  <string name="pref_connection_options">Tuỳ chọn hội thoại</string>
   <string name="pref_use_tor">Kết nối đến Tor</string>
   <string name="pref_use_tor_summary">Chuyển toàn bộ kết nối thông qua mạng Tor. Cần có Orbot</string>
   <string name="account_settings_hostname">Tên máy chủ</string>
@@ -528,7 +520,6 @@
   <string name="certificate_issuer">Nhà phát hành</string>
   <string name="certificate_cn">Tên thường</string>
   <string name="certificate_o">Tổ chức</string>
-  <string name="certificate_sha1">SHA-1</string>
   <string name="certicate_info_not_available">(Không sẵn sàng)</string>
   <string name="certificate_not_found">Không thấy chứng nhận nào</string>
   <string name="notify_on_all_messages">Thông báo tất cả tin nhắn</string>
@@ -536,7 +527,6 @@
   <string name="notify_never">Đã tắt thông báo</string>
   <string name="notify_paused">Đã dừng thông báo</string>
   <string name="pref_picture_compression">Nén hình ảnh</string>
-  <string name="pref_picture_compression_summary">Sửa kích cỡ và các hình ảnh đã nén</string>
   <string name="always">Luôn luôn</string>
   <string name="automatically">Tự động</string>
   <string name="battery_optimizations_enabled">Đã bật tối ưu pin</string>
diff --git a/src/main/res/values-zh-rCN/strings.xml b/src/main/res/values-zh-rCN/strings.xml
index 7214d5fc..9c6d66f5 100644
--- a/src/main/res/values-zh-rCN/strings.xml
+++ b/src/main/res/values-zh-rCN/strings.xml
@@ -102,7 +102,6 @@
   <string name="pref_xmpp_resource_summary">客户端标识名称</string>
   <string name="pref_accept_files">接收文件</string>
   <string name="pref_accept_files_summary">自动接收小于 … 的文件</string>
-  <string name="pref_notification_settings">通知设置</string>
   <string name="pref_notifications">通知</string>
   <string name="pref_notifications_summary">收到新消息时通知</string>
   <string name="pref_vibrate">震动</string>
@@ -111,12 +110,10 @@
   <string name="pref_sound_summary">收到新消息时的铃声</string>
   <string name="pref_notification_grace_period">通知限期</string>
   <string name="pref_notification_grace_period_summary">接收副本短时间内关闭通知</string>
-  <string name="pref_advanced_options">高级选项</string>
   <string name="pref_never_send_crash">总不发送崩溃报告</string>
   <string name="pref_never_send_crash_summary">发送堆栈跟踪帮助 Conversations 开发人员</string>
   <string name="pref_confirm_messages">确认消息</string>
   <string name="pref_confirm_messages_summary">当你已收到消息并且已阅时通知好友</string>
-  <string name="pref_ui_options">UI 选项</string>
   <string name="openpgp_error">OpenKeychain 报告了一个错误</string>
   <string name="error_decrypting_file">解密文件时出现 I/O 错误</string>
   <string name="accept">接受</string>
@@ -275,12 +272,10 @@
   <string name="sure_delete_fingerprint">是否确定删除该指纹?</string>
   <string name="ignore">忽略</string>
   <string name="without_mutual_presence_updates"><b>警告:</b>在没有相互更新在线联系人的情况下发送将会出现未知问题。\n\n<small>前往联系人详情以验证您订阅的在线联系人。</small></string>
-  <string name="pref_encryption_settings">加密设置</string>
   <string name="pref_force_encryption">强制要求端对端加密</string>
   <string name="pref_force_encryption_summary"> 总是发送加密信息(讨论组信息除外)</string>
   <string name="pref_dont_save_encrypted">不保存加密信息</string>
   <string name="pref_dont_save_encrypted_summary">警告:此操作将会导致信息丢失</string>
-  <string name="pref_expert_options">专家选项</string>
   <string name="pref_expert_options_summary">请谨慎使用</string>
   <string name="title_activity_about">关于 Conversations</string>
   <string name="pref_about_conversations_summary">编译及许可证信息</string>
@@ -430,7 +425,6 @@
   <string name="two_hours">2 个小时</string>
   <string name="eight_hours">8 个小时</string>
   <string name="until_further_notice">直到新的通知</string>
-  <string name="pref_input_options">输入选项</string>
   <string name="pref_enter_is_send">回车是发送</string>
   <string name="pref_enter_is_send_summary">用回车键来发送消息</string>
   <string name="pref_display_enter_key">显示回车键</string>
@@ -492,20 +486,14 @@
   <string name="pref_use_white_background_summary">收到的消息将显示为白底黑字</string>
   <string name="account_status_tor_unavailable">Tor network 不可用</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="pref_show_connection_options">扩展的连接选项</string>
-  <string name="pref_show_connection_options_summary">设置账户时显示主机名和端口选项</string>
   <string name="hostname_example">xmpp.example.com</string>
   <string name="action_add_account_with_certificate">使用证书添加账户</string>
   <string name="unable_to_parse_certificate">无法解析证书</string>
   <string name="authenticate_with_certificate">留空以认证 w/ 证书</string>
-  <string name="mam_prefs">正在存档配置</string>
-  <string name="fetching_mam_prefs">正在获取存档配置。请稍后...</string>
-  <string name="unable_to_fetch_mam_prefs">无法获取存档的配置</string>
   <string name="captcha_ocr">验证码</string>
   <string name="captcha_required">需要验证码</string>
   <string name="captcha_hint">输入图片中的文字</string>
@@ -515,7 +503,6 @@
   <string name="error_fetching_omemo_key">获取 OMEMO 密钥错误！</string>
   <string name="verified_omemo_key_with_certificate">请用证书验证 OMEMO 密钥！</string>
   <string name="device_does_not_support_certificates">您的设备不支持设备证书选择！</string>
-  <string name="pref_connection_options">连接选项</string>
   <string name="pref_use_tor">通过 Tor 连接</string>
   <string name="pref_use_tor_summary">所有连接使用 Tor 网络隧道。需要 Orbot</string>
   <string name="account_settings_hostname">主机名</string>
@@ -538,7 +525,6 @@
   <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>
@@ -546,7 +532,6 @@
   <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>
diff --git a/src/main/res/values-zh-rTW/strings.xml b/src/main/res/values-zh-rTW/strings.xml
index b66c87c7..ce80073b 100644
--- a/src/main/res/values-zh-rTW/strings.xml
+++ b/src/main/res/values-zh-rTW/strings.xml
@@ -77,7 +77,6 @@
   <string name="pref_xmpp_resource_summary">客戶端標示名稱</string>
   <string name="pref_accept_files">接收文件</string>
   <string name="pref_accept_files_summary">自動接收小於 … 的文件</string>
-  <string name="pref_notification_settings">通知設定</string>
   <string name="pref_notifications">通知</string>
   <string name="pref_notifications_summary">收到新訊息時通知</string>
   <string name="pref_vibrate">震動</string>
@@ -86,12 +85,10 @@
   <string name="pref_sound_summary">收到新訊息時播放鈴聲</string>
   <string name="pref_notification_grace_period">通知限期</string>
   <string name="pref_notification_grace_period_summary">收到副本後，關閉通知一小段時間</string>
-  <string name="pref_advanced_options">進階選項</string>
   <string name="pref_never_send_crash">總是不發送故障報告</string>
   <string name="pref_never_send_crash_summary">發送「堆疊追蹤」給 Conversations 的開發人員能幫助改進本程式</string>
   <string name="pref_confirm_messages">確認訊息</string>
   <string name="pref_confirm_messages_summary">讓你的聯絡人知道你已收到及閱讀訊息</string>
-  <string name="pref_ui_options">介面選項</string>
   <string name="openpgp_error">OpenKeychain 回報了一個錯誤</string>
   <string name="error_decrypting_file">解密文件時出現 I/O 錯誤</string>
   <string name="accept">接受</string>
@@ -224,12 +221,10 @@
   <string name="sure_delete_fingerprint">你確定刪除該指紋嗎？</string>
   <string name="ignore">忽略</string>
   <string name="without_mutual_presence_updates"><b>警告:</b> 在沒有互相關注狀態訊息的情況下發送或會引起不能預計的問題。\n\n<small>請檢視聯絡人詳情頁面以確認你們的關注狀態。</small></string>
-  <string name="pref_encryption_settings">加密設定</string>
   <string name="pref_force_encryption">強制要求端到端加密</string>
   <string name="pref_force_encryption_summary">總是發送加密訊息 (群組訊息除外)</string>
   <string name="pref_dont_save_encrypted">不儲存加密訊息</string>
   <string name="pref_dont_save_encrypted_summary">警告: 此操作或會導致訊息丟失</string>
-  <string name="pref_expert_options">專家選項</string>
   <string name="pref_expert_options_summary">請小心設定</string>
   <string name="pref_use_larger_font">增加字體大小</string>
   <string name="pref_use_larger_font_summary">讓整個 app 界面使用更大號的字體</string>