diff --git a/src/main/res/values-bg/strings.xml b/src/main/res/values-bg/strings.xml
index c0c12093d..9644c00d3 100644
--- a/src/main/res/values-bg/strings.xml
+++ b/src/main/res/values-bg/strings.xml
@@ -157,6 +157,7 @@
   <string name="account_status_regis_conflict">Потребителското име е заето</string>
   <string name="account_status_regis_success">Регистрацията е завършена</string>
   <string name="account_status_regis_not_sup">Сървърът не поддържа регистриране</string>
+  <string name="account_status_tls_error">Договарянето чрез TLS беше неуспешно</string>
   <string name="account_status_policy_violation">Нарушение на политиката</string>
   <string name="account_status_incompatible_server">Несъвместим сървър</string>
   <string name="account_status_stream_error">Поточна грешка</string>
@@ -577,7 +578,6 @@
   <string name="certicate_info_not_available">(Няма)</string>
   <string name="certificate_not_found">Няма намерен сертификат</string>
   <string name="notify_on_all_messages">Известяване за всички съобщения</string>
-  <string name="notify_only_when_highlighted">Известяване само на осветените</string>
   <string name="notify_never">Известията са изключени</string>
   <string name="notify_paused">Известията са спрени временно</string>
   <string name="pref_picture_compression">Компресиране на снимките</string>
@@ -714,4 +714,5 @@
   <string name="online_right_now">на линия в момента</string>
   <string name="retry_decryption">Повторен опит за дешифроване</string>
   <string name="session_failure">Грешка в сесията</string>
+  <string name="sasl_downgrade">Механизмът на SASL е понижен</string>
 </resources>
diff --git a/src/main/res/values-cs/strings.xml b/src/main/res/values-cs/strings.xml
index 11efb87be..9f2c8bf30 100644
--- a/src/main/res/values-cs/strings.xml
+++ b/src/main/res/values-cs/strings.xml
@@ -566,7 +566,6 @@
   <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>
-  <string name="notify_only_when_highlighted">Upozorňovat pouze pokud zvýrazněno</string>
   <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>
diff --git a/src/main/res/values-de/strings.xml b/src/main/res/values-de/strings.xml
index bc604153d..83d7e6099 100644
--- a/src/main/res/values-de/strings.xml
+++ b/src/main/res/values-de/strings.xml
@@ -157,6 +157,7 @@
   <string name="account_status_regis_conflict">Benutzername wird bereits verwendet</string>
   <string name="account_status_regis_success">Registrierung abgeschlossen</string>
   <string name="account_status_regis_not_sup">Der Server unterstützt keine Registrierung</string>
+  <string name="account_status_tls_error">TLS-Aushandlung fehlgeschlagen</string>
   <string name="account_status_policy_violation">Verstoß gegen die Richtlinien</string>
   <string name="account_status_incompatible_server">Inkompatibler Server</string>
   <string name="account_status_stream_error">Datenstromfehler</string>
@@ -577,7 +578,6 @@
   <string name="certicate_info_not_available">(Nicht verfügbar)</string>
   <string name="certificate_not_found">Kein Zertifikat gefunden</string>
   <string name="notify_on_all_messages">Bei allen Nachrichten benachrichtigen</string>
-  <string name="notify_only_when_highlighted">Nur benachrichtigen, wenn ich angesprochen werde</string>
   <string name="notify_never">Benachrichtigungen deaktiviert</string>
   <string name="notify_paused">Benachrichtigungen pausiert</string>
   <string name="pref_picture_compression">Bilder komprimieren</string>
@@ -714,4 +714,5 @@
   <string name="online_right_now">aktuell online</string>
   <string name="retry_decryption">Entschlüsseln wiederholen</string>
   <string name="session_failure">Sitzungsfehler</string>
+  <string name="sasl_downgrade">SASL-Mechanismus zurückgestuft</string>
 </resources>
diff --git a/src/main/res/values-es/strings.xml b/src/main/res/values-es/strings.xml
index 1315610ef..af9f74695 100644
--- a/src/main/res/values-es/strings.xml
+++ b/src/main/res/values-es/strings.xml
@@ -157,6 +157,7 @@
   <string name="account_status_regis_conflict">El identificador ya está en uso</string>
   <string name="account_status_regis_success">Registro completado</string>
   <string name="account_status_regis_not_sup">El servidor no soporta registros</string>
+  <string name="account_status_tls_error">Error de negociación TLS</string>
   <string name="account_status_policy_violation">Policy violation</string>
   <string name="account_status_incompatible_server">Servidor incompatible</string>
   <string name="account_status_stream_error">Stream error</string>
@@ -577,7 +578,6 @@
   <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>
-  <string name="notify_only_when_highlighted">Notificar solo cuando se recibe un mensaje resaltado</string>
   <string name="notify_never">Notificaciones deshabilitadas</string>
   <string name="notify_paused">Notificaciones pausadas</string>
   <string name="pref_picture_compression">Comprimir imágenes</string>
diff --git a/src/main/res/values-eu/strings.xml b/src/main/res/values-eu/strings.xml
index 0854c337e..5d522525c 100644
--- a/src/main/res/values-eu/strings.xml
+++ b/src/main/res/values-eu/strings.xml
@@ -577,7 +577,6 @@
   <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>
-  <string name="notify_only_when_highlighted">Jakinarazi nabarmentzerakoan soilik</string>
   <string name="notify_never">Jakinarazpenak ezgaituta</string>
   <string name="notify_paused">Jakinarazpenak gelditu dira</string>
   <string name="pref_picture_compression">Irudiak konprimatu</string>
diff --git a/src/main/res/values-fr/strings.xml b/src/main/res/values-fr/strings.xml
index 01e0964c1..26a3745c8 100644
--- a/src/main/res/values-fr/strings.xml
+++ b/src/main/res/values-fr/strings.xml
@@ -577,7 +577,6 @@
   <string name="certicate_info_not_available">(Non disponible)</string>
   <string name="certificate_not_found">Aucun certificat trouvé</string>
   <string name="notify_on_all_messages">Notifier pour tous les messages</string>
-  <string name="notify_only_when_highlighted">Notifier uniquement quand surligné</string>
   <string name="notify_never">Notifications désactivées</string>
   <string name="notify_paused">Notifications en pause</string>
   <string name="pref_picture_compression">Compresser images</string>
diff --git a/src/main/res/values-hu/strings.xml b/src/main/res/values-hu/strings.xml
index a6ed205dc..630cce479 100644
--- a/src/main/res/values-hu/strings.xml
+++ b/src/main/res/values-hu/strings.xml
@@ -157,6 +157,7 @@
   <string name="account_status_regis_conflict">Ez a felhasználónév már foglalt</string>
   <string name="account_status_regis_success">Sikeres regisztráció</string>
   <string name="account_status_regis_not_sup">A szerver nem támogatja a regisztrációt</string>
+  <string name="account_status_tls_error">A TLS-tárgyalás sikertelen</string>
   <string name="account_status_policy_violation">Irányelv megsértése</string>
   <string name="account_status_incompatible_server">Nem kompatibilis szerver</string>
   <string name="account_status_stream_error">Adatfolyam hiba</string>
@@ -577,7 +578,6 @@
   <string name="certicate_info_not_available">(Nem elérhető)</string>
   <string name="certificate_not_found">Nem talált tanúsítványt</string>
   <string name="notify_on_all_messages">Értesítsen minden üzenetnél</string>
-  <string name="notify_only_when_highlighted">Akkor értesítsen csak ha kiemelt</string>
   <string name="notify_never">Értesítések letiltva</string>
   <string name="notify_paused">Értesítések szüneteltetve</string>
   <string name="pref_picture_compression">Képek tömörítése</string>
@@ -585,8 +585,8 @@
   <string name="always">Mindig</string>
   <string name="automatically">Automatikusan</string>
   <string name="battery_optimizations_enabled">Akkumulátor optimalizációk engedélyezve</string>
-  <string name="battery_optimizations_enabled_explained">A készülék erős akkumulátor optimalizálást végez a Conversations programon, ami késleltetett értesítésekhez, vagy akár üzenetet elvesztéséhet is vezethet.\nJavasolt kikapcsolni ezeket az optimalizálásokat.</string>
-  <string name="battery_optimizations_enabled_dialog">A készülék erős akkumulátor optimalizálást végez a Conversations programon, ami késleltetett értesítésekhez, vagy akár üzenetet elvesztéséhet is vezethet.\nMost meg lesz kérve arra, hogy tiltsa le azokat.</string>
+  <string name="battery_optimizations_enabled_explained">A készülék erős akkumulátor optimalizálást végez a Conversations programon, ami késleltetett értesítésekhez, vagy akár üzenetek elvesztéséhet is vezethet.\nJavasolt kikapcsolni ezt.</string>
+  <string name="battery_optimizations_enabled_dialog">A készülék erős akkumulátor optimalizálást végez a Conversations programon, ami késleltetett értesítésekhez, vagy akár üzenetek elvesztéséhet is vezethet.\nMost meg lesz kérve az optimalizáció letiltására.</string>
   <string name="disable">Letilt</string>
   <string name="selection_too_large">A kiválasztott terület túl nagy</string>
   <string name="no_accounts">(Nincs aktivált fiók)</string>
@@ -714,4 +714,5 @@
   <string name="online_right_now">online most</string>
   <string name="retry_decryption">Próbálja újra a dekódolást</string>
   <string name="session_failure">Munkamenet hiba</string>
+  <string name="sasl_downgrade">Csökkentett SASL mechanizmus</string>
 </resources>
diff --git a/src/main/res/values-it/strings.xml b/src/main/res/values-it/strings.xml
index be698db08..cf4c69964 100644
--- a/src/main/res/values-it/strings.xml
+++ b/src/main/res/values-it/strings.xml
@@ -157,6 +157,7 @@
   <string name="account_status_regis_conflict">Nome utente già in uso</string>
   <string name="account_status_regis_success">Registrazione completata</string>
   <string name="account_status_regis_not_sup">Il Server non supporta la registrazione</string>
+  <string name="account_status_tls_error">Negoziazione TLS fallita</string>
   <string name="account_status_policy_violation">Violazione della policy</string>
   <string name="account_status_incompatible_server">Server non compatibile</string>
   <string name="account_status_stream_error">Errore di stream</string>
@@ -577,7 +578,6 @@
   <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>
-  <string name="notify_only_when_highlighted">Notifica solo quando evidenziato</string>
   <string name="notify_never">Notifiche disabilitate</string>
   <string name="notify_paused">Notifiche in pausa</string>
   <string name="pref_picture_compression">Comprimi immagini</string>
@@ -714,4 +714,5 @@
   <string name="online_right_now">in linea adesso</string>
   <string name="retry_decryption">Ritenta decifrazione</string>
   <string name="session_failure">Sessione fallita</string>
+  <string name="sasl_downgrade">Meccanismo SASL degradato</string>
 </resources>
diff --git a/src/main/res/values-ja/strings.xml b/src/main/res/values-ja/strings.xml
index e5378e253..dd8835312 100644
--- a/src/main/res/values-ja/strings.xml
+++ b/src/main/res/values-ja/strings.xml
@@ -157,6 +157,7 @@
   <string name="account_status_regis_conflict">ユーザー名はすでに使用されています</string>
   <string name="account_status_regis_success">登録が完了しました</string>
   <string name="account_status_regis_not_sup">サーバーが登録をサポートしていません</string>
+  <string name="account_status_tls_error">TLS ネゴシエーションに失敗しました</string>
   <string name="account_status_policy_violation">ポリシー違反</string>
   <string name="account_status_incompatible_server">互換性のないサーバー</string>
   <string name="account_status_stream_error">ストリーム エラー</string>
@@ -574,7 +575,6 @@
   <string name="certicate_info_not_available">(利用不可)</string>
   <string name="certificate_not_found">証明書がありません</string>
   <string name="notify_on_all_messages">すべてのメッセージで通知</string>
-  <string name="notify_only_when_highlighted">ハイライトされたときにのみ通知</string>
   <string name="notify_never">通知は無効</string>
   <string name="notify_paused">通知は一時停止</string>
   <string name="pref_picture_compression">写真を圧縮</string>
@@ -711,4 +711,5 @@
   <string name="online_right_now">今すぐオンライン</string>
   <string name="retry_decryption">復号化を再試行</string>
   <string name="session_failure">セッション失敗</string>
+  <string name="sasl_downgrade">ダウングレードされた SASL メカニズム</string>
 </resources>
diff --git a/src/main/res/values-ko/strings.xml b/src/main/res/values-ko/strings.xml
index cd3b8d55e..acac980bd 100644
--- a/src/main/res/values-ko/strings.xml
+++ b/src/main/res/values-ko/strings.xml
@@ -569,7 +569,6 @@
   <string name="certicate_info_not_available">(사용할 수 없음)</string>
   <string name="certificate_not_found">인증서가 발견되지 않았습니다</string>
   <string name="notify_on_all_messages">모든 메세지를 알림</string>
-  <string name="notify_only_when_highlighted">중요 표시를 했을 때만 알림</string>
   <string name="notify_never">알림 해제됨</string>
   <string name="notify_paused">알림 일시중지됨</string>
   <string name="pref_picture_compression">사진 압축</string>
diff --git a/src/main/res/values-nb-rNO/strings.xml b/src/main/res/values-nb-rNO/strings.xml
index bb2db93d6..a3d70ad32 100644
--- a/src/main/res/values-nb-rNO/strings.xml
+++ b/src/main/res/values-nb-rNO/strings.xml
@@ -577,7 +577,6 @@
   <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>
-  <string name="notify_only_when_highlighted">Varsle bare når fremhevet</string>
   <string name="notify_never">Varslinger deaktivert</string>
   <string name="notify_paused">Varslinger pauset</string>
   <string name="pref_picture_compression">Komprimer bilder</string>
diff --git a/src/main/res/values-nl/strings.xml b/src/main/res/values-nl/strings.xml
index 9fcc0977f..6219fc2e9 100644
--- a/src/main/res/values-nl/strings.xml
+++ b/src/main/res/values-nl/strings.xml
@@ -157,6 +157,7 @@
   <string name="account_status_regis_conflict">Gebruikersnaam is al in gebruik</string>
   <string name="account_status_regis_success">Registratie voltooid</string>
   <string name="account_status_regis_not_sup">Server ondersteunt geen registratie</string>
+  <string name="account_status_tls_error">TLS-onderhandeling mislukt</string>
   <string name="account_status_policy_violation">Beleidsschending</string>
   <string name="account_status_incompatible_server">Incompatibele server</string>
   <string name="account_status_stream_error">Fout bij stream</string>
@@ -577,7 +578,6 @@
   <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>
-  <string name="notify_only_when_highlighted">Melding enkel wanneer je aangesproken wordt</string>
   <string name="notify_never">Meldingen uitgeschakeld</string>
   <string name="notify_paused">Meldingen gepauzeerd</string>
   <string name="pref_picture_compression">Afbeeldingen comprimeren</string>
@@ -714,4 +714,5 @@
   <string name="online_right_now">nu online</string>
   <string name="retry_decryption">Ontsleutelen opnieuw proberen</string>
   <string name="session_failure">Sessiefout</string>
+  <string name="sasl_downgrade">SASL-mechanisme neergewaardeerd</string>
 </resources>
diff --git a/src/main/res/values-pl/strings.xml b/src/main/res/values-pl/strings.xml
index cf6eeba58..40d04bfb4 100644
--- a/src/main/res/values-pl/strings.xml
+++ b/src/main/res/values-pl/strings.xml
@@ -576,7 +576,6 @@
   <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>
-  <string name="notify_only_when_highlighted">Powiadom tylko gdy wspomniano</string>
   <string name="notify_never">Powiadomienia wyłączone</string>
   <string name="notify_paused">Powiadomienia wstrzymane</string>
   <string name="pref_picture_compression">Kompresuj obrazki</string>
diff --git a/src/main/res/values-pt-rBR/strings.xml b/src/main/res/values-pt-rBR/strings.xml
index 10af134b9..774561176 100644
--- a/src/main/res/values-pt-rBR/strings.xml
+++ b/src/main/res/values-pt-rBR/strings.xml
@@ -577,7 +577,6 @@
   <string name="certicate_info_not_available">(Indisponí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>
-  <string name="notify_only_when_highlighted">Notificar somente quando destacado</string>
   <string name="notify_never">Notificações desabilitadas</string>
   <string name="notify_paused">Notificações pausadas</string>
   <string name="pref_picture_compression">Comprimir imagens</string>
diff --git a/src/main/res/values-pt/strings.xml b/src/main/res/values-pt/strings.xml
index 4146b50fc..23ae50b0b 100644
--- a/src/main/res/values-pt/strings.xml
+++ b/src/main/res/values-pt/strings.xml
@@ -546,7 +546,6 @@
   <string name="certicate_info_not_available">(Não disponível)</string>
   <string name="certificate_not_found">Nenhum certificado encontrado</string>
   <string name="notify_on_all_messages">Notificar em todas as mensagens</string>
-  <string name="notify_only_when_highlighted">Notificar apenas quando destacado</string>
   <string name="notify_never">Notificações desativadas</string>
   <string name="notify_paused">Notificações interrompidas</string>
   <string name="pref_picture_compression">Comprimir Imagens</string>
diff --git a/src/main/res/values-ro-rRO/strings.xml b/src/main/res/values-ro-rRO/strings.xml
index f8b5a3702..870f575b6 100644
--- a/src/main/res/values-ro-rRO/strings.xml
+++ b/src/main/res/values-ro-rRO/strings.xml
@@ -157,6 +157,7 @@
   <string name="account_status_regis_conflict">Nume de utilizator deja alocat</string>
   <string name="account_status_regis_success">Înregistrare completă</string>
   <string name="account_status_regis_not_sup">Acest server nu permite înregistrarea</string>
+  <string name="account_status_tls_error">Negociere TLS eşuată</string>
   <string name="account_status_policy_violation">Incălcare condiții serviciu</string>
   <string name="account_status_incompatible_server">Server incompatibil</string>
   <string name="account_status_stream_error">Eroare de date</string>
@@ -581,7 +582,6 @@ Emitent</string>
   <string name="certicate_info_not_available">(Indisponibil)</string>
   <string name="certificate_not_found">Certificat inexistent</string>
   <string name="notify_on_all_messages">Notifica la toate mesajele</string>
-  <string name="notify_only_when_highlighted">Notifica numai la evidentiere</string>
   <string name="notify_never">Notificari dezactivate</string>
   <string name="notify_paused">Notificari suspendate</string>
   <string name="pref_picture_compression">Comprima imaginile</string>
@@ -718,4 +718,5 @@ Emitent</string>
   <string name="online_right_now">online acum</string>
   <string name="retry_decryption">Reîncearcă decriptarea</string>
   <string name="session_failure">Sesiune eșuată</string>
+  <string name="sasl_downgrade">Mecanism SASL degradat</string>
 </resources>
diff --git a/src/main/res/values-ru/strings.xml b/src/main/res/values-ru/strings.xml
index 2ca6e3b21..8e58fc9a3 100644
--- a/src/main/res/values-ru/strings.xml
+++ b/src/main/res/values-ru/strings.xml
@@ -575,7 +575,6 @@
   <string name="certicate_info_not_available">(недоступно)</string>
   <string name="certificate_not_found">Сертификатов не найдено</string>
   <string name="notify_on_all_messages">Все сообщения</string>
-  <string name="notify_only_when_highlighted">При обращении</string>
   <string name="notify_never">Без уведомления</string>
   <string name="notify_paused">Уведомления приостановлены</string>
   <string name="pref_picture_compression">Сжать изображения</string>
diff --git a/src/main/res/values-sr/strings.xml b/src/main/res/values-sr/strings.xml
index b99059df4..39f4f905b 100644
--- a/src/main/res/values-sr/strings.xml
+++ b/src/main/res/values-sr/strings.xml
@@ -577,7 +577,6 @@
   <string name="certicate_info_not_available">(није доступно)</string>
   <string name="certificate_not_found">Сертификат није нађен</string>
   <string name="notify_on_all_messages">Обавештења за све поруке</string>
-  <string name="notify_only_when_highlighted">Обавештења само за означене поруке</string>
   <string name="notify_never">Обавештења искључена</string>
   <string name="notify_paused">Обавештења паузирана</string>
   <string name="pref_picture_compression">Компресуј слике</string>
@@ -705,6 +704,7 @@
   <string name="received_message_from_stranger">Примљена порука од незнанца</string>
   <string name="block_stranger">Блокирај странца</string>
   <string name="block_entire_domain">Блокирај читав домен</string>
+  <string name="online_right_now">на вези сада</string>
   <string name="retry_decryption">Покушај дешифровање поново</string>
   <string name="session_failure">Неуспех сесије</string>
 </resources>
diff --git a/src/main/res/values-sv/strings.xml b/src/main/res/values-sv/strings.xml
index d2a657735..f2122665a 100644
--- a/src/main/res/values-sv/strings.xml
+++ b/src/main/res/values-sv/strings.xml
@@ -577,7 +577,6 @@
   <string name="certicate_info_not_available">(Ej tillgänglig)</string>
   <string name="certificate_not_found">Inget certifikat funnet</string>
   <string name="notify_on_all_messages">Notifiera för alla meddelanden</string>
-  <string name="notify_only_when_highlighted">Notifiera endast vid highlight</string>
   <string name="notify_never">Notifieringar deaktiverade</string>
   <string name="notify_paused">Notifieringar pausade</string>
   <string name="pref_picture_compression">Komprimera bilder</string>
diff --git a/src/main/res/values-tr-rTR/strings.xml b/src/main/res/values-tr-rTR/strings.xml
index 99332bb94..894824b47 100644
--- a/src/main/res/values-tr-rTR/strings.xml
+++ b/src/main/res/values-tr-rTR/strings.xml
@@ -570,7 +570,6 @@
   <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>
-  <string name="notify_only_when_highlighted">Yalnızca vurguluysa uyar</string>
   <string name="notify_never">Uyarılar devre dışı</string>
   <string name="notify_paused">Uyarılar geçici olarak durduruldu</string>
   <string name="pref_picture_compression">Resimleri sıkıştır</string>
diff --git a/src/main/res/values-uk/strings.xml b/src/main/res/values-uk/strings.xml
index 23bf19c9f..e3a8e7c65 100644
--- a/src/main/res/values-uk/strings.xml
+++ b/src/main/res/values-uk/strings.xml
@@ -560,7 +560,6 @@
   <string name="certicate_info_not_available">(Не доступно)</string>
   <string name="certificate_not_found">Не знайдено сертифікатів</string>
   <string name="notify_on_all_messages">Сповіщати про всі повідомлення</string>
-  <string name="notify_only_when_highlighted">Сповіщати, лише коли виділено</string>
   <string name="notify_never">Сповіщення вимкнено</string>
   <string name="notify_paused">Сповіщення призупинено</string>
   <string name="pref_picture_compression">Стискати зображення</string>
diff --git a/src/main/res/values-vi/strings.xml b/src/main/res/values-vi/strings.xml
index a4bce7829..7c232d9d6 100644
--- a/src/main/res/values-vi/strings.xml
+++ b/src/main/res/values-vi/strings.xml
@@ -525,7 +525,6 @@
   <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>
-  <string name="notify_only_when_highlighted">Thông báo chỉ khi được làm nổi bật</string>
   <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>
diff --git a/src/main/res/values-zh-rCN/strings.xml b/src/main/res/values-zh-rCN/strings.xml
index 11bca37de..7dcd29a51 100644
--- a/src/main/res/values-zh-rCN/strings.xml
+++ b/src/main/res/values-zh-rCN/strings.xml
@@ -567,7 +567,6 @@
   <string name="certicate_info_not_available">(不可用）</string>
   <string name="certificate_not_found">未发现证书</string>
   <string name="notify_on_all_messages">为所有信息显示通知</string>
-  <string name="notify_only_when_highlighted">仅当高亮时显示通知</string>
   <string name="notify_never">禁用通知</string>
   <string name="notify_paused">暂停通知</string>
   <string name="pref_picture_compression">压缩图片</string>
diff --git a/src/main/res/values-zh-rTW/strings.xml b/src/main/res/values-zh-rTW/strings.xml
index bd690252a..e3ec79232 100644
--- a/src/main/res/values-zh-rTW/strings.xml
+++ b/src/main/res/values-zh-rTW/strings.xml
@@ -574,7 +574,6 @@
   <string name="certicate_info_not_available">(不可用）</string>
   <string name="certificate_not_found">未發現證書</string>
   <string name="notify_on_all_messages">為所有資訊顯示通知</string>
-  <string name="notify_only_when_highlighted">僅當高亮時顯示通知</string>
   <string name="notify_never">關閉通知</string>
   <string name="notify_paused">暫停通知</string>
   <string name="pref_picture_compression">壓縮圖片</string>
diff --git a/src/main/res/values/strings.xml b/src/main/res/values/strings.xml
index 39e7ba23c..7319f5c89 100644
--- a/src/main/res/values/strings.xml
+++ b/src/main/res/values/strings.xml
@@ -610,7 +610,7 @@
 	<string name="certicate_info_not_available">(Not available)</string>
 	<string name="certificate_not_found">No certificate found</string>
 	<string name="notify_on_all_messages">Notify on all messages</string>
-	<string name="notify_only_when_highlighted">Notify only when highlighted</string>
+	<string name="notify_only_when_highlighted">Notify only when mentioned</string>
 	<string name="notify_never">Notifications disabled</string>
 	<string name="notify_paused">Notifications paused</string>
 	<string name="pref_picture_compression">Compress Pictures</string>