diff --git a/briar-android/src/main/res/values-ast/strings.xml b/briar-android/src/main/res/values-ast/strings.xml
index 7049b97e7..53904023d 100644
--- a/briar-android/src/main/res/values-ast/strings.xml
+++ b/briar-android/src/main/res/values-ast/strings.xml
@@ -19,7 +19,6 @@
   <string name="setup_huawei_button">Protexer Briar</string>
   <string name="warning_dozed">%s nun pudo executase\'n segundu planu</string>
   <!--Login-->
-  <string name="enter_password">Escribi la contraseña</string>
   <string name="try_again">Contraseña enquivocada, tenta otra vuelta</string>
   <string name="sign_in_button">Aniciar sesión</string>
   <string name="forgotten_password">Escaecí la contraseña</string>
diff --git a/briar-android/src/main/res/values-bg/strings.xml b/briar-android/src/main/res/values-bg/strings.xml
index 8eb509346..75da4e717 100644
--- a/briar-android/src/main/res/values-bg/strings.xml
+++ b/briar-android/src/main/res/values-bg/strings.xml
@@ -11,7 +11,7 @@
   <string name="passwords_do_not_match">Паролите не съвпадат</string>
   <string name="create_account_button">Създаване на профил</string>
   <!--Login-->
-  <string name="enter_password">Въведете парола:</string>
+  <string name="enter_password">Парола</string>
   <string name="try_again">Грешна парола, опитайте пак</string>
   <string name="sign_in_button">Вход</string>
   <string name="forgotten_password">Забравена парола</string>
@@ -99,6 +99,7 @@
   <!--Introductions-->
   <string name="introduction_onboarding_title">Представете контактите си</string>
   <string name="introduction_onboarding_text">Можете да представите контактите си един на друг, за да не им се налага да се срещат лично, когато се свързват чрез Briar.</string>
+  <string name="introduction_menu_item">Представи</string>
   <string name="introduction_activity_title">Избери контакт</string>
   <string name="introduction_message_title">Представи контакти</string>
   <string name="introduction_message_hint">Добавете съобщение (незадължително)</string>
@@ -181,8 +182,6 @@
     <item quantity="one">%d публикация</item>
     <item quantity="other">%d публикации</item>
   </plurals>
-  <string name="forum_new_entry_posted">Публикувано</string>
-  <string name="forum_new_message_hint">Нова публикация</string>
   <string name="forum_message_reply_hint">Нов отговор</string>
   <string name="btn_reply">Отговори</string>
   <string name="forum_leave">Напусни форума</string>
@@ -262,9 +261,6 @@
   <!--Settings Security and Panic-->
   <string name="security_settings_title">Сигурност</string>
   <string name="change_password">Промяна на парола</string>
-  <string name="current_password">Въведете сегашната си парола:</string>
-  <string name="choose_new_password">Изберете нова парола:</string>
-  <string name="confirm_new_password">Потвърдете нова парола:</string>
   <string name="password_changed">Паролата е променена.</string>
   <string name="panic_setting">Настройка на паник бутон</string>
   <string name="panic_setting_title">Паник бутон</string>
diff --git a/briar-android/src/main/res/values-br/strings.xml b/briar-android/src/main/res/values-br/strings.xml
index 2d16207e3..482a4408c 100644
--- a/briar-android/src/main/res/values-br/strings.xml
+++ b/briar-android/src/main/res/values-br/strings.xml
@@ -17,7 +17,7 @@
   <string name="don_t_ask_again">Arabat goulenn ganin ken</string>
   <string name="setup_huawei_button">Gwareziñ Briar</string>
   <!--Login-->
-  <string name="enter_password">Ebarzhit ho ker-tremen:</string>
+  <string name="enter_password">Ger-tremen</string>
   <string name="try_again">Ger-tremen fall, klaskit adarre</string>
   <string name="sign_in_button">Kevreañ</string>
   <string name="forgotten_password">Ankoueet em eus ma ger-tremen</string>
@@ -102,6 +102,7 @@
   <string name="camera_error">Fazi Kamera</string>
   <!--Introductions-->
   <string name="introduction_onboarding_title">Degas e-barzh ho tarempredoù</string>
+  <string name="introduction_menu_item">Sevel un digoradur</string>
   <string name="introduction_activity_title">Diuziñ darempred</string>
   <string name="introduction_message_title">Degas e-barzh darempredoù</string>
   <string name="introduction_message_hint">Ouzhpennañ ur gemennadenn (diret)</string>
@@ -161,6 +162,7 @@
   <!--Settings Security and Panic-->
   <string name="security_settings_title">Surentezh</string>
   <string name="change_password">Cheñch ar ger-tremen</string>
+  <string name="confirm_new_password">Kadarnaat ar ger-tremen nevez</string>
   <string name="panic_app_setting_none">Hini ebet</string>
   <string name="lock_setting_title">Digevreañ</string>
   <!--Settings Notifications-->
diff --git a/briar-android/src/main/res/values-ca/strings.xml b/briar-android/src/main/res/values-ca/strings.xml
index fe155d814..f5bf8fc62 100644
--- a/briar-android/src/main/res/values-ca/strings.xml
+++ b/briar-android/src/main/res/values-ca/strings.xml
@@ -24,7 +24,7 @@
   <string name="setup_huawei_help">Si no afegiu Briar a la llista d\'aplicacions protegides, s\'evitarà que Briar s\'executi en segon pla.</string>
   <string name="warning_dozed">%s no s\'ha pogut executar en segon pla</string>
   <!--Login-->
-  <string name="enter_password">Escriviu la vostra contrasenya:</string>
+  <string name="enter_password">Contrasenya</string>
   <string name="try_again">La contrasenya és incorrecta, torneu a escriure-la</string>
   <string name="sign_in_button">Inicia la sessió</string>
   <string name="forgotten_password">No recordo la contrasenya</string>
@@ -62,6 +62,9 @@
   <string name="transport_bt">Bluetooth</string>
   <string name="transport_lan">Wi-Fi</string>
   <!--Notifications-->
+  <string name="reminder_notification_title">Has sortit de Briar</string>
+  <string name="reminder_notification_text">Toqueu per tornar a iniciar sessió o feu lliscar el dit per descartar.</string>
+  <string name="reminder_notification_channel_title">Recordatori d\'inici de sessió de Briar</string>
   <string name="ongoing_notification_title">Sessió iniciada</string>
   <string name="ongoing_notification_text">Toca per a obrir Briar.</string>
   <plurals name="private_message_notification_text">
@@ -133,11 +136,12 @@
   <!--Introductions-->
   <string name="introduction_onboarding_title">Presenteu als vostres contactes</string>
   <string name="introduction_onboarding_text">Podeu presentar als vostres contactes entre si, de manera que no necessitin trobar-se en persona per a relacionar-se a través de Briar.</string>
+  <string name="introduction_menu_item">Presenta-li un altre contacte</string>
   <string name="introduction_activity_title">Trieu un contacte</string>
   <string name="introduction_not_possible">Ja teniu una presentació en marxa entre aquests contactes. Si us plau, primer deixeu que aquesta presentació acabi. Si vós o els contactes presentats sovint esteu desconnectats, la presentació pot trigar temps.</string>
   <string name="introduction_message_title">Presentació de contactes</string>
   <string name="introduction_message_hint">Afegiu una nota (opcional)</string>
-  <string name="introduction_button">Presenta els contactes</string>
+  <string name="introduction_button">Presenta\'ls</string>
   <string name="introduction_sent">S\'ha enviat la vostra presentació.</string>
   <string name="introduction_error">Hi ha hagut un error en presentar els contactes.</string>
   <string name="introduction_response_error">Error en respondre a la presentació</string>
@@ -198,7 +202,7 @@
   </plurals>
   <string name="groups_invitations_response_accepted_sent">Heu acceptat afegir-vos al grup per invitació de %s.</string>
   <string name="groups_invitations_response_declined_sent">Heu refusat afegir-vos al grup per invitació de %s.</string>
-  <string name="groups_invitations_response_accepted_received">%s ha acceptat afegir-se al grup.</string>
+  <string name="groups_invitations_response_accepted_received">%s ha decidit afegir-se al grup.</string>
   <string name="groups_invitations_response_declined_received">%s ha refusat afegir-se al grup.</string>
   <string name="sharing_status_groups">Només el creador del grup pot convidar a nous membres. Tot seguit hi ha la llista dels membres del grup.</string>
   <!--Private Groups Revealing Contacts-->
@@ -220,8 +224,8 @@
     <item quantity="one">%d publicacio</item>
     <item quantity="other">%d apunts</item>
   </plurals>
-  <string name="forum_new_entry_posted">S\'ha publicat un nou apunt al fòrum</string>
-  <string name="forum_new_message_hint">Apunt nou</string>
+  <string name="forum_new_entry_posted">Publicació del fòrum publicada</string>
+  <string name="forum_new_message_hint">Nova publicació</string>
   <string name="forum_message_reply_hint">Resposta nova</string>
   <string name="btn_reply">Respon</string>
   <string name="forum_leave">Abandona el fòrum</string>
@@ -308,6 +312,11 @@
   <string name="pref_language_changed">L\'efecte d\'aquest canvi només l\'apreciareu després de reiniciar Briar. Si us plau, tanqueu la sessió i reinicieu Briar.</string>
   <string name="pref_language_default">Valor per defecte del sistema</string>
   <string name="display_settings_title">Visualització</string>
+  <string name="pref_theme_title">Tema</string>
+  <string name="pref_theme_light">Clar</string>
+  <string name="pref_theme_dark">Fosc</string>
+  <string name="pref_theme_auto">Automàtic (segons l\'hora)</string>
+  <string name="pref_theme_system">Valor per defecte del sistema</string>
   <!--Settings Network-->
   <string name="network_settings_title">Xarxes</string>
   <string name="bluetooth_setting">Connecta via bluetooth</string>
@@ -320,9 +329,9 @@
   <!--Settings Security and Panic-->
   <string name="security_settings_title">Seguretat</string>
   <string name="change_password">Canvia la contrasenya</string>
-  <string name="current_password">Escriviu la contrasenya actual:</string>
-  <string name="choose_new_password">Escriviu la contrasenya nova:</string>
-  <string name="confirm_new_password">Confirmeu la contrasenya nova:</string>
+  <string name="current_password">Contrassenya actual</string>
+  <string name="choose_new_password">Contrassenya nova</string>
+  <string name="confirm_new_password">Confirmació de la contrassenya nova</string>
   <string name="password_changed">Heu canviat la contrasenya.</string>
   <string name="panic_setting">Configuració del botó del pànic</string>
   <string name="panic_setting_title">Botó de pànic</string>
diff --git a/briar-android/src/main/res/values-cs/strings.xml b/briar-android/src/main/res/values-cs/strings.xml
index ceeae6e44..1ae001c6f 100644
--- a/briar-android/src/main/res/values-cs/strings.xml
+++ b/briar-android/src/main/res/values-cs/strings.xml
@@ -24,7 +24,7 @@
   <string name="setup_huawei_help">Pokud nebyl Briar přidán mezi chráněné aplikace, nebude ho možné spustit na pozadí.</string>
   <string name="warning_dozed">%s nebylo možné spustit na pozadí</string>
   <!--Login-->
-  <string name="enter_password">Zadejte své heslo:</string>
+  <string name="enter_password">Heslo</string>
   <string name="try_again">Zadali jste špatné heslo, zkuste to znovu</string>
   <string name="sign_in_button">Přihlásit se</string>
   <string name="forgotten_password">Nepamatuji si své heslo</string>
@@ -143,6 +143,7 @@
   <!--Introductions-->
   <string name="introduction_onboarding_title">Uvést vaše kontakty</string>
   <string name="introduction_onboarding_text">Můžete si navzájem představit své kontakty, takže se následně nemusejí setkat osobně, aby se připojili k Briar.</string>
+  <string name="introduction_menu_item">Vytvořit pozvání</string>
   <string name="introduction_activity_title">Vybrat kontakt</string>
   <string name="introduction_message_title">Pozvat kontakty</string>
   <string name="introduction_message_hint">Přidat zprávu (volitelné)</string>
@@ -236,8 +237,6 @@
     <item quantity="many">%d příspěvků</item>
     <item quantity="other">%d příspěvků</item>
   </plurals>
-  <string name="forum_new_entry_posted">Záznam byl na fóru zveřejněn</string>
-  <string name="forum_new_message_hint">Nový záznam</string>
   <string name="forum_message_reply_hint">Nová odpověď</string>
   <string name="btn_reply">Odpověď</string>
   <string name="forum_leave">Opustit fórum</string>
@@ -322,6 +321,9 @@
   <string name="pref_language_changed">Toto nastavení bude mít efekt když vykonáre restart svého Briar. Prosím odhlaste se a restartujte Briar.</string>
   <string name="pref_language_default">Výchozí systému</string>
   <string name="display_settings_title">Zobrazit</string>
+  <string name="pref_theme_title">Vzhled</string>
+  <string name="pref_theme_light">Světlý</string>
+  <string name="pref_theme_dark">Temný</string>
   <!--Settings Network-->
   <string name="network_settings_title">Sítě</string>
   <string name="bluetooth_setting">Spojení přes Bluetooth</string>
@@ -334,9 +336,6 @@
   <!--Settings Security and Panic-->
   <string name="security_settings_title">Zabezpečení</string>
   <string name="change_password">Změnit heslo</string>
-  <string name="current_password">Zadejte vaše současné heslo:</string>
-  <string name="choose_new_password">Zvolte si nové heslo:</string>
-  <string name="confirm_new_password">Potvrďte nové heslo:</string>
   <string name="password_changed">Heslo bylo změněno.</string>
   <string name="panic_setting">Nastavení tlačítka Paniky</string>
   <string name="panic_setting_title">Tlačítko Paniky</string>
diff --git a/briar-android/src/main/res/values-de/strings.xml b/briar-android/src/main/res/values-de/strings.xml
index 883abf4da..dd2dd7627 100644
--- a/briar-android/src/main/res/values-de/strings.xml
+++ b/briar-android/src/main/res/values-de/strings.xml
@@ -24,7 +24,7 @@
   <string name="setup_huawei_help">Wenn Briar nicht zur Liste der geschützten Apps hinzugefügt wird, kann es nicht im Hintergrund ausgeführt werden.</string>
   <string name="warning_dozed">%s konnte nicht im Hintergrund ausgeführt werden</string>
   <!--Login-->
-  <string name="enter_password">Passwort eingeben:</string>
+  <string name="enter_password">Passwort</string>
   <string name="try_again">Passwort falsch, bitte erneut versuchen</string>
   <string name="sign_in_button">Anmelden</string>
   <string name="forgotten_password">Ich habe mein Passwort vergessen</string>
@@ -62,6 +62,7 @@
   <string name="transport_bt">Bluetooth</string>
   <string name="transport_lan">WLAN</string>
   <!--Notifications-->
+  <string name="reminder_notification_title">Von Briar abgemeldet</string>
   <string name="ongoing_notification_title">In Briar angemeldet</string>
   <string name="ongoing_notification_text">Berühren, um Briar zu öffnen.</string>
   <plurals name="private_message_notification_text">
@@ -133,6 +134,7 @@
   <!--Introductions-->
   <string name="introduction_onboarding_title">Mache deine Kontakte untereinander bekannt</string>
   <string name="introduction_onboarding_text">Du kannst deine Kontakte untereinander bekannt machen. So können sie sich über Briar verbinden, ohne sich persönlich treffen zu müssen.</string>
+  <string name="introduction_menu_item">Kontaktempfehlung abgeben</string>
   <string name="introduction_activity_title">Kontakt auswählen</string>
   <string name="introduction_not_possible">Es wird bereits eine Kontaktempfehlung mit diesen Kontakten verarbeitet. Bitte warte, bis die Verarbeitung abgeschlossen ist. Falls du oder deine Kontakte selten online sind, kann es etwas dauern.</string>
   <string name="introduction_message_title">Kontakte untereinander bekannt machen</string>
@@ -220,8 +222,6 @@
     <item quantity="one">%d Beitrag</item>
     <item quantity="other">%d Beiträge</item>
   </plurals>
-  <string name="forum_new_entry_posted">Forenbeitrag wurde veröffentlicht.</string>
-  <string name="forum_new_message_hint">Neuer Eintrag</string>
   <string name="forum_message_reply_hint">Neue Antwort</string>
   <string name="btn_reply">Antworten</string>
   <string name="forum_leave">Forum verlassen</string>
@@ -303,6 +303,9 @@
   <!--Settings Display-->
   <string name="pref_language_changed">Diese Einstellung wird aktiv sobald Du Briar neu startest. Bitte melde dich ab und starte Briar neu.</string>
   <string name="display_settings_title">Anzeigen</string>
+  <string name="pref_theme_title">Design</string>
+  <string name="pref_theme_light">Hell</string>
+  <string name="pref_theme_dark">Dunkel</string>
   <!--Settings Network-->
   <string name="network_settings_title">Netzwerke</string>
   <string name="bluetooth_setting">Über Bluetooth verbinden</string>
@@ -315,9 +318,8 @@
   <!--Settings Security and Panic-->
   <string name="security_settings_title">Sicherheit</string>
   <string name="change_password">Passwort ändern</string>
-  <string name="current_password">Aktuelles Passwort eingeben:</string>
-  <string name="choose_new_password">Neues Passwort eingeben:</string>
-  <string name="confirm_new_password">Neues Passwort bestätigen:</string>
+  <string name="choose_new_password">Neues Passwort</string>
+  <string name="confirm_new_password">Neues Passwort bestätigen</string>
   <string name="password_changed">Passwort wurde geändert.</string>
   <string name="panic_setting">Panik-Button einrichten</string>
   <string name="panic_setting_title">Panik-Button</string>
diff --git a/briar-android/src/main/res/values-es/strings.xml b/briar-android/src/main/res/values-es/strings.xml
index 316c4a2bc..e8d043e37 100644
--- a/briar-android/src/main/res/values-es/strings.xml
+++ b/briar-android/src/main/res/values-es/strings.xml
@@ -24,7 +24,7 @@
   <string name="setup_huawei_help">Si Briar no se agrega a la lista de aplicaciones protegidas, no podrá ejecutarse en segundo plano.</string>
   <string name="warning_dozed">%s no pudo ejecutarse en proceso de fondo</string>
   <!--Login-->
-  <string name="enter_password">Introduce tu contraseña:</string>
+  <string name="enter_password">Contraseña</string>
   <string name="try_again">Contraseña incorrecta, inténtalo de nuevo</string>
   <string name="sign_in_button">Identificarse</string>
   <string name="forgotten_password">Olvidé mi contraseña</string>
@@ -62,6 +62,7 @@
   <string name="transport_bt">Bluetooth</string>
   <string name="transport_lan">Wi-Fi</string>
   <!--Notifications-->
+  <string name="reminder_notification_title">Desconectado de Briar</string>
   <string name="ongoing_notification_title">Conectado a Briar</string>
   <string name="ongoing_notification_text">Toca para abrir Briar.</string>
   <plurals name="private_message_notification_text">
@@ -132,6 +133,7 @@
   <!--Introductions-->
   <string name="introduction_onboarding_title">Presenta a tus contactos</string>
   <string name="introduction_onboarding_text">Presenta a tus contactos entre sí para ahorrarles encontrarse en persona para poder conectar mediante Briar.</string>
+  <string name="introduction_menu_item">Presentar contactos</string>
   <string name="introduction_activity_title">Seleccionar contacto</string>
   <string name="introduction_not_possible">Usted ya tiene una introducción en curso con estos contactos. Por favor, deje que esto termine primero. Si usted o sus contactos raramente están en línea, esto puede tomar algún tiempo.</string>
   <string name="introduction_message_title">Presentar a dos contactos</string>
@@ -216,8 +218,6 @@
     <item quantity="one">%d publicación</item>
     <item quantity="other">%d publicaciones</item>
   </plurals>
-  <string name="forum_new_entry_posted">Entrada en el foro publicada</string>
-  <string name="forum_new_message_hint">Nueva entrada</string>
   <string name="forum_message_reply_hint">Nueva respuesta</string>
   <string name="btn_reply">Responder</string>
   <string name="forum_leave">Abandonar foro</string>
@@ -298,6 +298,10 @@
   <string name="blogs_rss_feeds_manage_error">Hubo un problema cargando tus canales RSS. Por favor, prueba más tarde.</string>
   <!--Settings Display-->
   <string name="display_settings_title">Mostrar</string>
+  <string name="pref_theme_title">Tema decorativo</string>
+  <string name="pref_theme_light">Claro</string>
+  <string name="pref_theme_dark">Oscuro</string>
+  <string name="pref_theme_system">Sistema por defecto</string>
   <!--Settings Network-->
   <string name="network_settings_title">Redes</string>
   <string name="bluetooth_setting">Conectar mediante Bluetooth</string>
@@ -310,9 +314,8 @@
   <!--Settings Security and Panic-->
   <string name="security_settings_title">Seguridad</string>
   <string name="change_password">Cambiar contraseña</string>
-  <string name="current_password">Introduce tu contraseña actual:</string>
-  <string name="choose_new_password">Elige tu nueva contraseña:</string>
-  <string name="confirm_new_password">Confirma tu nueva contraseña:</string>
+  <string name="choose_new_password">Nueva contraseña</string>
+  <string name="confirm_new_password">Confirme la nueva contraseña</string>
   <string name="password_changed">La contraseña ha sido cambiada.</string>
   <string name="panic_setting">Configuración del botón de pánico</string>
   <string name="panic_setting_title">Botón de pánico</string>
diff --git a/briar-android/src/main/res/values-eu/strings.xml b/briar-android/src/main/res/values-eu/strings.xml
index d1687aa74..f7a6b20ed 100644
--- a/briar-android/src/main/res/values-eu/strings.xml
+++ b/briar-android/src/main/res/values-eu/strings.xml
@@ -24,7 +24,7 @@
   <string name="setup_huawei_help">Briar ez bada babestutako aplikazioen zerrendara gehitu, ezin izango du bigarren planoan ibili.</string>
   <string name="warning_dozed">%s ezin izan da bigarren planoan abiatu</string>
   <!--Login-->
-  <string name="enter_password">Sartu zure pasahitza:</string>
+  <string name="enter_password">Pasahitza</string>
   <string name="try_again">Pasahitz okerra, saiatu berriro</string>
   <string name="sign_in_button">Hasi saioa</string>
   <string name="forgotten_password">Nire pasahitza ahaztu dut</string>
@@ -62,6 +62,9 @@
   <string name="transport_bt">Bluetooth</string>
   <string name="transport_lan">Wi-Fi</string>
   <!--Notifications-->
+  <string name="reminder_notification_title">Briar saioa amaituta</string>
+  <string name="reminder_notification_text">Sakatu saioa berriro hasteko edo pasatu hatza baztertzeko</string>
+  <string name="reminder_notification_channel_title">Briar saioaren oroigarria</string>
   <string name="ongoing_notification_title">Briar saioa hasita</string>
   <string name="ongoing_notification_text">Ukitu Briar irekitzeko</string>
   <plurals name="private_message_notification_text">
@@ -133,6 +136,7 @@
   <!--Introductions-->
   <string name="introduction_onboarding_title">Aurkeztu zure kontaktuak</string>
   <string name="introduction_onboarding_text">Zure kontaktuak bata besteari aurkeztu ditzakezu, horrela ez dute aurrez aurre elkartzeko beharra Briar erabiltzeko.</string>
+  <string name="introduction_menu_item">Egin aurkezpena</string>
   <string name="introduction_activity_title">Hautatu kontaktua</string>
   <string name="introduction_not_possible">Baduzu aurkezpen bat abian kontaktu hauekin. Baimendu hura bukatzea aurretik. Zure kontaktuak gutxitan konektatzen badira honek denbora bat behar lezake.</string>
   <string name="introduction_message_title">Aurkeztu kontaktuak</string>
@@ -220,7 +224,7 @@
     <item quantity="one">Bidalketa %d</item>
     <item quantity="other">%d sarrera</item>
   </plurals>
-  <string name="forum_new_entry_posted">Foroko sarrera bidali da</string>
+  <string name="forum_new_entry_posted">Foroko sarrera argitaratuta</string>
   <string name="forum_new_message_hint">Sarrera berria</string>
   <string name="forum_message_reply_hint">Erantzun berria</string>
   <string name="btn_reply">Erantzun</string>
@@ -308,6 +312,11 @@
   <string name="pref_language_changed">Ezarpen hauek Brfiar berrabiaraztean jarriko dira indarrean. Amaitu saioa eta berrabiarazi Briar.</string>
   <string name="pref_language_default">Sisteman lehenetsia</string>
   <string name="display_settings_title">Erakutsi</string>
+  <string name="pref_theme_title">Azalgaia</string>
+  <string name="pref_theme_light">Argia</string>
+  <string name="pref_theme_dark">Iluna</string>
+  <string name="pref_theme_auto">Automatikoa (Egunez)</string>
+  <string name="pref_theme_system">Sistemak lehenetsia</string>
   <!--Settings Network-->
   <string name="network_settings_title">Sareak</string>
   <string name="bluetooth_setting">Konektatu Bluetooth bidez</string>
@@ -320,9 +329,9 @@
   <!--Settings Security and Panic-->
   <string name="security_settings_title">Segurtasuna</string>
   <string name="change_password">Aldatu pasahitza</string>
-  <string name="current_password">Sartu oraingo pasahitza:</string>
-  <string name="choose_new_password">Hautatu pasahitz berria:</string>
-  <string name="confirm_new_password">Berretsi pasahitz berria:</string>
+  <string name="current_password">Oraingo pasahitza</string>
+  <string name="choose_new_password">Pasahitz berria</string>
+  <string name="confirm_new_password">Berretsi pasahitz berria</string>
   <string name="password_changed">Pasahitza aldatu da.</string>
   <string name="panic_setting">Larrialdi botoiaren ezarpena</string>
   <string name="panic_setting_title">Larrialdi botoia</string>
diff --git a/briar-android/src/main/res/values-fa/strings.xml b/briar-android/src/main/res/values-fa/strings.xml
index 2d93259f4..423e02f06 100644
--- a/briar-android/src/main/res/values-fa/strings.xml
+++ b/briar-android/src/main/res/values-fa/strings.xml
@@ -26,7 +26,7 @@
   <string name="setup_huawei_help">اگر برایر به فهرست برنامه های محافظت شده اضافه نشده، نمی تواند در پس زمینه مشغول به کار باشد.</string>
   <string name="warning_dozed">ناتوانی %s برای اجراء در پس زمینه</string>
   <!--Login-->
-  <string name="enter_password">رمز عبور خود را وارد کنید:</string>
+  <string name="enter_password">رمز عبور</string>
   <string name="try_again">رمز عبور اشتباه است، لطفا دوباره سعی کنید</string>
   <string name="sign_in_button">ورود</string>
   <string name="forgotten_password">رمز عبور را فراموش کرده ام</string>
@@ -68,6 +68,9 @@
   <string name="transport_bt">بلوتوث</string>
   <string name="transport_lan">وای فای</string>
   <!--Notifications-->
+  <string name="reminder_notification_title">از برایر خارج شد</string>
+  <string name="reminder_notification_text">برای اینکه دوباره وارد شوید کلیک کنید و برای رد کردن آن را بکشید</string>
+  <string name="reminder_notification_channel_title">یادآور ورود برایر</string>
   <string name="ongoing_notification_title">وارد برایر شد</string>
   <string name="ongoing_notification_text">برای باز کردن برایر کلیک کنید.</string>
   <plurals name="private_message_notification_text">
@@ -144,6 +147,7 @@
   <!--Introductions-->
   <string name="introduction_onboarding_title">معرفی مخاطبان</string>
   <string name="introduction_onboarding_text">شما می توانید مخاطبان خود را به یکدیگر معرفی کنید، در این صورت دیگر نیازی به دیدار حضوری برای اتصال روی برایر نمی باشد.</string>
+  <string name="introduction_menu_item">معرفی کردن</string>
   <string name="introduction_activity_title">انتخاب مخاطب</string>
   <string name="introduction_not_possible">شما همین الان یک معرفی در مرحله انجام با این مخاطبان دارید. لطفا اجازه دهید تا این معرفی به پایان برسد. اگر شما و یا مخاطبانتان به ندرت آنلاین هستید، ممکن است کمی زمان ببرد.</string>
   <string name="introduction_message_title">معرفی مخاطبین</string>
@@ -241,8 +245,8 @@
     <item quantity="one">%d پست</item>
     <item quantity="other">%d پست</item>
   </plurals>
-  <string name="forum_new_entry_posted">ثبت فروم پست شد</string>
-  <string name="forum_new_message_hint">ثبت جدید</string>
+  <string name="forum_new_entry_posted">پست فروم انتشار یافت</string>
+  <string name="forum_new_message_hint">پست جدید</string>
   <string name="forum_message_reply_hint">پاسخ جدید</string>
   <string name="btn_reply">پاسخ</string>
   <string name="forum_leave">ترک فروم</string>
@@ -345,6 +349,15 @@
 برای وارد کردن خوراک روی آیکون + کلیک کنید</string>
   <string name="blogs_rss_feeds_manage_error">مشکلی با بارگذاری فیدهای شما وجود داشت. لطفا بعدا امتحان کنید.</string>
   <!--Settings Display-->
+  <string name="pref_language_title">زبان و منطقه</string>
+  <string name="pref_language_changed">این تنظیمات زمانی که برایر را ری استارت کنید تاثیر خود را می گذارند. لطفا خارج شوید و برایر را ری استارت کنید.</string>
+  <string name="pref_language_default">پیش فرض سیستم</string>
+  <string name="display_settings_title">نمایش</string>
+  <string name="pref_theme_title">قالب</string>
+  <string name="pref_theme_light">روشن</string>
+  <string name="pref_theme_dark">تاریک</string>
+  <string name="pref_theme_auto">خودکار ( روز)</string>
+  <string name="pref_theme_system">پیش فرض سیستم</string>
   <!--Settings Network-->
   <string name="network_settings_title">شبکه ها</string>
   <string name="bluetooth_setting">اتصال از طریق بلوتوث</string>
@@ -357,9 +370,9 @@
   <!--Settings Security and Panic-->
   <string name="security_settings_title">امنیت</string>
   <string name="change_password">تغییر رمز عبور</string>
-  <string name="current_password">رمز عبور فعلی خود را وارد کنید:</string>
-  <string name="choose_new_password">رمز عبور جدید خود را انتخاب کنید:</string>
-  <string name="confirm_new_password">رمز عبور جدید خود را تأیید کنید:</string>
+  <string name="current_password">رمز عبور فعلی</string>
+  <string name="choose_new_password">رمز عبور جدید</string>
+  <string name="confirm_new_password">تائید رمز جدید</string>
   <string name="password_changed">رمز عبور تغییر کرده است</string>
   <string name="panic_setting">برپایی دکمه هراس</string>
   <string name="panic_setting_title">دکمه هراس</string>
diff --git a/briar-android/src/main/res/values-fi/strings.xml b/briar-android/src/main/res/values-fi/strings.xml
index bdcafae08..9b5982ae4 100644
--- a/briar-android/src/main/res/values-fi/strings.xml
+++ b/briar-android/src/main/res/values-fi/strings.xml
@@ -24,7 +24,7 @@
   <string name="setup_huawei_help">Jos Briaria ei lisätä suojattujen sovellusten listalle, se ei voi toimia taustalla.</string>
   <string name="warning_dozed">%s ei voinut toimia taustalla</string>
   <!--Login-->
-  <string name="enter_password">Syötä salasana:</string>
+  <string name="enter_password">Salasana</string>
   <string name="try_again">Väärä salasana, yritä uudelleen</string>
   <string name="sign_in_button">Kirjaudu sisään</string>
   <string name="forgotten_password">Olen unohtanut salasanani</string>
@@ -133,6 +133,7 @@
   <!--Introductions-->
   <string name="introduction_onboarding_title">Esittele yhteyshenkilösi</string>
   <string name="introduction_onboarding_text">Voit esitellä muita käyttäjiä toisilleen, niin että heidän ei tarvitse tavata kasvokkain ollakseen yhteydessä Briarin kautta.</string>
+  <string name="introduction_menu_item">Tee esittely</string>
   <string name="introduction_activity_title">Valitse yhteystieto</string>
   <string name="introduction_not_possible">Sinulla on jo yksi esittely käynnissä näillä yhteystiedoilla. Odota kunnes se tulee valmiiksi. Tämä voi kestää jonkin aikaa jos sinä tai yhteyshenkilösi ovat harvoin netissä.</string>
   <string name="introduction_message_title">Esittele yhteyshenkilö</string>
@@ -220,8 +221,6 @@
     <item quantity="one">%d viesti</item>
     <item quantity="other">%d viestiä</item>
   </plurals>
-  <string name="forum_new_entry_posted">Foorumikirjoitus julkaistu</string>
-  <string name="forum_new_message_hint">Uusi viesti</string>
   <string name="forum_message_reply_hint">Uusi vastaus</string>
   <string name="btn_reply">Vastaa</string>
   <string name="forum_leave">Lähde foorumista</string>
@@ -308,6 +307,9 @@
   <string name="pref_language_changed">Tämä asetus otetaan käyttöön kun uudelleenkäynnistät Briarin. Kirjaudu ulos ja käynnistä Briar uudelleen.</string>
   <string name="pref_language_default">Järjestelmäoletus</string>
   <string name="display_settings_title">Näytä</string>
+  <string name="pref_theme_title">Teema</string>
+  <string name="pref_theme_light">Vaalea</string>
+  <string name="pref_theme_dark">Tumma</string>
   <!--Settings Network-->
   <string name="network_settings_title">Verkot</string>
   <string name="bluetooth_setting">Yhdistä Bluetoothin kautta</string>
@@ -320,9 +322,8 @@
   <!--Settings Security and Panic-->
   <string name="security_settings_title">Turvallisuus</string>
   <string name="change_password">Vaihda salasana</string>
-  <string name="current_password">Syötä nykyinen salasana:</string>
-  <string name="choose_new_password">Valitse uusi salasana:</string>
-  <string name="confirm_new_password">Vahvista uusi salasana:</string>
+  <string name="choose_new_password">Uusi salasana</string>
+  <string name="confirm_new_password">Vahvista uusi salasana</string>
   <string name="password_changed">Salasana on vaihdettu.</string>
   <string name="panic_setting">Paniikkinapin asetus</string>
   <string name="panic_setting_title">Paniikkinappi</string>
diff --git a/briar-android/src/main/res/values-fr/strings.xml b/briar-android/src/main/res/values-fr/strings.xml
index 1d4aade45..eae5f5829 100644
--- a/briar-android/src/main/res/values-fr/strings.xml
+++ b/briar-android/src/main/res/values-fr/strings.xml
@@ -24,7 +24,7 @@
   <string name="setup_huawei_help">Si Briar n’est pas ajoutée à la liste des applis protégées, elle ne pourra pas fonctionner en arrière-plan.</string>
   <string name="warning_dozed">%s n’a pas pu fonctionner en arrière-plan</string>
   <!--Login-->
-  <string name="enter_password">Saisir votre mot de passe :</string>
+  <string name="enter_password">Mot de passe</string>
   <string name="try_again">Le mot de passe est erroné, ressayez</string>
   <string name="sign_in_button">Connexion</string>
   <string name="forgotten_password">J’ai oublié mon mot de passe</string>
@@ -62,6 +62,9 @@
   <string name="transport_bt">Bluetooth</string>
   <string name="transport_lan">Wi-Fi</string>
   <!--Notifications-->
+  <string name="reminder_notification_title">Déconnecté de Briar</string>
+  <string name="reminder_notification_text">Toucher pour se reconnecter au balayer pour annuler</string>
+  <string name="reminder_notification_channel_title">Rappel de connexion à Briar</string>
   <string name="ongoing_notification_title">Connecté à Briar</string>
   <string name="ongoing_notification_text">Toucher pour ouvrir Briar.</string>
   <plurals name="private_message_notification_text">
@@ -133,6 +136,7 @@
   <!--Introductions-->
   <string name="introduction_onboarding_title">Présenter vos contacts</string>
   <string name="introduction_onboarding_text">Vous pouvez présenter vos contacts mutuellement, afin qu’ils n’aient pas à se rencontrer en personne pour se connecter les uns aux autres avec Briar.</string>
+  <string name="introduction_menu_item">Faire les présentations</string>
   <string name="introduction_activity_title">Sélectionner un contact </string>
   <string name="introduction_not_possible">Une présentation est déjà en cours avec ces contacts. Veuillez d’abord lui permettre de se terminer. Si vous ou vos contacts êtes rarement en ligne, cela peut prendre du temps.</string>
   <string name="introduction_message_title">Présenter des contacts</string>
@@ -220,8 +224,8 @@
     <item quantity="one">%d article</item>
     <item quantity="other">%d articles</item>
   </plurals>
-  <string name="forum_new_entry_posted">L’entrée de forum a été publiée</string>
-  <string name="forum_new_message_hint">Nouvelle entrée</string>
+  <string name="forum_new_entry_posted">Un article de forum a été publié</string>
+  <string name="forum_new_message_hint">Nouvelle article</string>
   <string name="forum_message_reply_hint">Nouvelle réponse</string>
   <string name="btn_reply">Répondre</string>
   <string name="forum_leave">Quitter le forum</string>
@@ -308,6 +312,11 @@
   <string name="pref_language_changed">Ce paramètre prendra effet une fois que vous aurez redémarré Briar. Veuillez vous déconnecter et redémarrer Briar.</string>
   <string name="pref_language_default">Valeur par défaut du système</string>
   <string name="display_settings_title">Affichage</string>
+  <string name="pref_theme_title">Thème</string>
+  <string name="pref_theme_light">Clair</string>
+  <string name="pref_theme_dark">Sombre</string>
+  <string name="pref_theme_auto">Automatique (journée)</string>
+  <string name="pref_theme_system">Valeur par défaut du système</string>
   <!--Settings Network-->
   <string name="network_settings_title">Réseaux</string>
   <string name="bluetooth_setting">Se connecter par Bluetooth</string>
@@ -320,9 +329,9 @@
   <!--Settings Security and Panic-->
   <string name="security_settings_title">Sécurité</string>
   <string name="change_password">Changer le mot de passe</string>
-  <string name="current_password">Saisir votre mot de passe actuel :</string>
-  <string name="choose_new_password">Choisir votre nouveau mot de passe :</string>
-  <string name="confirm_new_password">Confirmer votre nouveau mot de passe :</string>
+  <string name="current_password">Mot de passe actuel</string>
+  <string name="choose_new_password">Nouveau mot de passe</string>
+  <string name="confirm_new_password">Confirmer le nouveau mot de passe</string>
   <string name="password_changed">Le mot de passe a été changé.</string>
   <string name="panic_setting">Paramètres du bouton d’urgence</string>
   <string name="panic_setting_title">Bouton d’urgence</string>
diff --git a/briar-android/src/main/res/values-gl/strings.xml b/briar-android/src/main/res/values-gl/strings.xml
index 50d65839d..cd16ec9f8 100644
--- a/briar-android/src/main/res/values-gl/strings.xml
+++ b/briar-android/src/main/res/values-gl/strings.xml
@@ -24,7 +24,7 @@
   <string name="setup_huawei_help">Si Briar non se engade ao listado de apps protexidas, non poderá funcionar en segundo plano.</string>
   <string name="warning_dozed">%s non foi quen de funcionar en segundo plano</string>
   <!--Login-->
-  <string name="enter_password">Introduce a túa clave:</string>
+  <string name="enter_password">Contrasinal</string>
   <string name="try_again">Clave incorrecta, tenteo de novo</string>
   <string name="sign_in_button">Iniciar sesión</string>
   <string name="forgotten_password">Esquecín a miña clave</string>
@@ -62,6 +62,9 @@
   <string name="transport_bt">Bluetooth</string>
   <string name="transport_lan">Wi-Fi</string>
   <!--Notifications-->
+  <string name="reminder_notification_title">Desconectou de Briar</string>
+  <string name="reminder_notification_text">Toque para voltar a conectar ou desplace para desbotar.</string>
+  <string name="reminder_notification_channel_title">Recordatorio para conectar a Briar</string>
   <string name="ongoing_notification_title">Conectado a Briar</string>
   <string name="ongoing_notification_text">Toque para abrir Briar</string>
   <plurals name="private_message_notification_text">
@@ -133,6 +136,7 @@
   <!--Introductions-->
   <string name="introduction_onboarding_title">Presente os seus contactos</string>
   <string name="introduction_onboarding_text">Pode presentar aos seus contactos, así non precisan encontrarse en persoa para conectar a través de Briar.</string>
+  <string name="introduction_menu_item">Preséntese</string>
   <string name="introduction_activity_title">Escoller contacto</string>
   <string name="introduction_not_possible">Xa ten unha presentación en progreso con estes contactos. Por favor, deixe que remate o proceso. Si vostede ou os contactos se conectan con pouca asiduidade esto podería levar algún tempo.</string>
   <string name="introduction_message_title">Introducir Contactos</string>
@@ -220,8 +224,6 @@
     <item quantity="one">%d publicación</item>
     <item quantity="other">%d publicacións</item>
   </plurals>
-  <string name="forum_new_entry_posted">Entrada ao foro enviada</string>
-  <string name="forum_new_message_hint">Nova Entrada</string>
   <string name="forum_message_reply_hint">Nova Resposta</string>
   <string name="btn_reply">Respostar</string>
   <string name="forum_leave">Deixar foro</string>
@@ -304,6 +306,15 @@
   <string name="blogs_rss_feeds_manage_empty_state">Sen fontes RSS que mostrar\n\nToque na icona + para importar unha fonte</string>
   <string name="blogs_rss_feeds_manage_error">Aconteceu un problema ao cargar as súas fontes. Por favor, inténteo máis tarde.</string>
   <!--Settings Display-->
+  <string name="pref_language_title">Idioma  &amp; rexión</string>
+  <string name="pref_language_changed">Este axuste terá efecto cando reinicie Briar. Por favor desconecte e volte a iniciar Briar.</string>
+  <string name="pref_language_default">Por omisión do sistema</string>
+  <string name="display_settings_title">Pantalla</string>
+  <string name="pref_theme_title">Decorado</string>
+  <string name="pref_theme_light">Claro</string>
+  <string name="pref_theme_dark">Oscuro</string>
+  <string name="pref_theme_auto">Automático (no día)</string>
+  <string name="pref_theme_system">Por omisión do sistema</string>
   <!--Settings Network-->
   <string name="network_settings_title">Redes</string>
   <string name="bluetooth_setting">Conectar vía Bluetooth</string>
@@ -316,9 +327,9 @@
   <!--Settings Security and Panic-->
   <string name="security_settings_title">Seguridade</string>
   <string name="change_password">Cambiar contrasinal</string>
-  <string name="current_password">Introduza o contrasinal actual:</string>
-  <string name="choose_new_password">Novo contrasinal:</string>
-  <string name="confirm_new_password">Confirme o contrasinal:</string>
+  <string name="current_password">Contrasinal actual</string>
+  <string name="choose_new_password">Novo contrasinal</string>
+  <string name="confirm_new_password">Confirme o novo contrasinal</string>
   <string name="password_changed">Cambiou o contrasinal</string>
   <string name="panic_setting">Axustes do botón do pánico</string>
   <string name="panic_setting_title">Botón do pánico</string>
diff --git a/briar-android/src/main/res/values-he/strings.xml b/briar-android/src/main/res/values-he/strings.xml
index 0be0be428..b66d106c5 100644
--- a/briar-android/src/main/res/values-he/strings.xml
+++ b/briar-android/src/main/res/values-he/strings.xml
@@ -10,7 +10,7 @@
   <string name="passwords_do_not_match">הסיסמאות לא תואמות</string>
   <string name="create_account_button">יצירת חשבון</string>
   <!--Login-->
-  <string name="enter_password">הזינו סיסמה:</string>
+  <string name="enter_password">סיסמה</string>
   <string name="try_again">הסיסמה שגוייה, נסו שוב</string>
   <string name="sign_in_button">הכנסו</string>
   <string name="forgotten_password">שכחתי את הסיסמה שלי</string>
@@ -111,6 +111,7 @@
   <!--Introductions-->
   <string name="introduction_onboarding_title">הציגו את אנשי קשר שלכם</string>
   <string name="introduction_onboarding_text">אתם יכולים להציג את אנשי הקשר שלכם אחד לשני, כך שהם לא צריכים להפגש פנים-מול-פנים על מנת להתחבר בבריאר.</string>
+  <string name="introduction_menu_item">הציגו איש קשר</string>
   <string name="introduction_activity_title">בחרו איש קשר</string>
   <string name="introduction_message_title">הציגו אנשי קשר</string>
   <string name="introduction_message_hint">הוסיפו הודעה (לא חובה)</string>
@@ -207,8 +208,6 @@
     <item quantity="many">%d פוסטים</item>
     <item quantity="other">%d פוסטים</item>
   </plurals>
-  <string name="forum_new_entry_posted">הפוסט נוצר</string>
-  <string name="forum_new_message_hint">פוסט חדש</string>
   <string name="forum_message_reply_hint">תגובה חדשה</string>
   <string name="btn_reply">להשיב</string>
   <string name="forum_leave">עזיבת הפורום</string>
@@ -238,6 +237,7 @@
   <!--Settings Network-->
   <!--Settings Security and Panic-->
   <string name="security_settings_title">אבטחה</string>
+  <string name="choose_new_password">סיסמא חדשה</string>
   <string name="panic_app_setting_none">כלום</string>
   <string name="lock_setting_title">יציאה</string>
   <string name="purge_setting_title">מחק חשבון</string>
diff --git a/briar-android/src/main/res/values-hi/strings.xml b/briar-android/src/main/res/values-hi/strings.xml
index 211afaa6d..a91cdf340 100644
--- a/briar-android/src/main/res/values-hi/strings.xml
+++ b/briar-android/src/main/res/values-hi/strings.xml
@@ -24,7 +24,7 @@
   <string name="setup_huawei_help">अगर Briar संरक्षित ऐप्स सूची में नहीं जोड़ा गया है, तो यह पृष्ठभूमि में चलने में असमर्थ होगा।</string>
   <string name="warning_dozed">%sपृष्ठभूमि में चलाने में असमर्थ था</string>
   <!--Login-->
-  <string name="enter_password">अपना पासवर्ड डालें:</string>
+  <string name="enter_password">पासवर्ड</string>
   <string name="try_again">गलत पासवर्ड, फिर से प्रयास करें</string>
   <string name="sign_in_button">साइन इन करें</string>
   <string name="forgotten_password">मुझे अपना पासवर्ड याद नहीं है</string>
@@ -133,6 +133,7 @@
   <!--Introductions-->
   <string name="introduction_onboarding_title">अपने संपर्कों का परिचय दें</string>
   <string name="introduction_onboarding_text">आप अपने संपर्कों को एक दूसरे से जोड़ सकते हैं, इसलिए उन्हें ब्रियर से जुड़ने के लिए व्यक्तिगत रूप से मिलने की जरूरत नहीं है।</string>
+  <string name="introduction_menu_item">परिचय करें</string>
   <string name="introduction_activity_title">संपर्क का चयन करें</string>
   <string name="introduction_not_possible">इन संपर्कों के साथ आपके पास पहले से ही एक परिचय प्रगति है। कृपया इसे पहले खत्म करने की अनुमति दें। यदि आप या आपके संपर्क शायद ही कभी ऑनलाइन हैं, तो इसमें कुछ समय लग सकता है।</string>
   <string name="introduction_message_title">संपर्कों का परिचय</string>
@@ -220,8 +221,6 @@
     <item quantity="one">%dपदों</item>
     <item quantity="other">%dपदों</item>
   </plurals>
-  <string name="forum_new_entry_posted">फ़ोरम प्रविष्टि पोस्ट की गई</string>
-  <string name="forum_new_message_hint">नविन प्रवेश</string>
   <string name="forum_message_reply_hint">नया उत्तर</string>
   <string name="btn_reply">जवाब दें</string>
   <string name="forum_leave">फोरम छोड़ें</string>
@@ -316,9 +315,7 @@
   <!--Settings Security and Panic-->
   <string name="security_settings_title">सुरक्षा</string>
   <string name="change_password">पासवर्ड बदलें</string>
-  <string name="current_password">अपना वर्तमान पासवर्ड दर्ज करें:</string>
-  <string name="choose_new_password">अपना नया पासवर्ड चुनें:</string>
-  <string name="confirm_new_password">अपने नए पासवर्ड की पुष्टि करें:</string>
+  <string name="confirm_new_password">नए पासवर्ड की पुष्टि करें</string>
   <string name="password_changed">पासवर्ड बदला जा चुका है।</string>
   <string name="panic_setting">आतंक बटन सेटअप</string>
   <string name="panic_setting_title">घबराहट होना</string>
diff --git a/briar-android/src/main/res/values-it/strings.xml b/briar-android/src/main/res/values-it/strings.xml
index 6a4a83083..f4f3cc8b0 100644
--- a/briar-android/src/main/res/values-it/strings.xml
+++ b/briar-android/src/main/res/values-it/strings.xml
@@ -24,7 +24,7 @@
   <string name="setup_huawei_help">Se Briar non viene aggiunto nell\'elenco di app protette, non potrà funzionare in background.</string>
   <string name="warning_dozed">%s non ha potuto funzionare in background</string>
   <!--Login-->
-  <string name="enter_password">Inserisci la tua password:</string>
+  <string name="enter_password">Password</string>
   <string name="try_again">Password sbagliata, riprova</string>
   <string name="sign_in_button">Entra</string>
   <string name="forgotten_password">Ho dimenticato la password</string>
@@ -62,6 +62,9 @@
   <string name="transport_bt">Bluetooth</string>
   <string name="transport_lan">Wi-Fi</string>
   <!--Notifications-->
+  <string name="reminder_notification_title">Uscito da Briar</string>
+  <string name="reminder_notification_text">Tocca per riaccedere o scorri per annullare.</string>
+  <string name="reminder_notification_channel_title">Promemoria accesso a Briar</string>
   <string name="ongoing_notification_title">Entrato in Briar</string>
   <string name="ongoing_notification_text">Tocca per aprire Briar.</string>
   <plurals name="private_message_notification_text">
@@ -133,6 +136,7 @@
   <!--Introductions-->
   <string name="introduction_onboarding_title">Introduzione tuoi contatti</string>
   <string name="introduction_onboarding_text">Puoi presentare i tuoi contatti fra di loro, così non hanno bisogno di incontrarsi di persona per connettersi a Briar.</string>
+  <string name="introduction_menu_item">Crea l\'introduzione</string>
   <string name="introduction_activity_title">Seleziona Contatto</string>
   <string name="introduction_not_possible">Hai già un introduzione in corso con questi contatti. Si prega di consentire che prima questo finisca. Se tu o i tuoi contatti sono raramente online, questo potrebbe richiedere un po\' di tempo.</string>
   <string name="introduction_message_title">Introduzione Contatti</string>
@@ -220,8 +224,8 @@
     <item quantity="one">%d post</item>
     <item quantity="other">%d post</item>
   </plurals>
-  <string name="forum_new_entry_posted">Nuova inserzione sul forum</string>
-  <string name="forum_new_message_hint">Nuova inserzione</string>
+  <string name="forum_new_entry_posted">Post pubblicato sul forum</string>
+  <string name="forum_new_message_hint">Nuovo post</string>
   <string name="forum_message_reply_hint">Nuova Risposta</string>
   <string name="btn_reply">Rispondi</string>
   <string name="forum_leave">Lascia Forum</string>
@@ -308,6 +312,11 @@
   <string name="pref_language_changed">Questa impostazione avrà effetto quando riavvierai Briar. Per favore, esci e riavvia Briar.</string>
   <string name="pref_language_default">Default del sistema</string>
   <string name="display_settings_title">Visualizza</string>
+  <string name="pref_theme_title">Tema</string>
+  <string name="pref_theme_light">Chiaro</string>
+  <string name="pref_theme_dark">Scuro</string>
+  <string name="pref_theme_auto">Automatico ( Dì )</string>
+  <string name="pref_theme_system">Predefinito di sistema</string>
   <!--Settings Network-->
   <string name="network_settings_title">Reti</string>
   <string name="bluetooth_setting">Connessione attraverso Bluetooth</string>
@@ -320,9 +329,9 @@
   <!--Settings Security and Panic-->
   <string name="security_settings_title">Sicurezza</string>
   <string name="change_password">Cambia password</string>
-  <string name="current_password">Inserisci la tua password corrente:</string>
-  <string name="choose_new_password">Scegli la tua password:</string>
-  <string name="confirm_new_password">Conferma la tua nuova password:</string>
+  <string name="current_password">Password attuale</string>
+  <string name="choose_new_password">Nuova password</string>
+  <string name="confirm_new_password">Confermare nuova password</string>
   <string name="password_changed">La password è stata cambiata.</string>
   <string name="panic_setting">Impostazione pulsante panico</string>
   <string name="panic_setting_title">Pulsante panico</string>
diff --git a/briar-android/src/main/res/values-ja/strings.xml b/briar-android/src/main/res/values-ja/strings.xml
index 3fe520f1c..ac467e713 100644
--- a/briar-android/src/main/res/values-ja/strings.xml
+++ b/briar-android/src/main/res/values-ja/strings.xml
@@ -10,7 +10,7 @@
   <string name="passwords_do_not_match">パスワードが一致しません。</string>
   <string name="create_account_button">アカウントを作成</string>
   <!--Login-->
-  <string name="enter_password">パスワード入力</string>
+  <string name="enter_password">パスワード</string>
   <string name="try_again">パスワードが間違っています。もう一度入力してください。</string>
   <string name="sign_in_button">Sign In</string>
   <string name="forgotten_password">パスワードを忘れました。</string>
@@ -103,11 +103,16 @@
   <string name="blogs_rss_remove_feed_ok">解除</string>
   <!--Settings Display-->
   <string name="display_settings_title">表示</string>
+  <string name="pref_theme_title">テーマ</string>
+  <string name="pref_theme_light">ライト</string>
+  <string name="pref_theme_dark">ダーク</string>
+  <string name="pref_theme_system">システムデフォルト</string>
   <!--Settings Network-->
   <string name="tor_network_setting_never">二度としない</string>
   <!--Settings Security and Panic-->
   <string name="security_settings_title">セキュリティ</string>
   <string name="change_password">パスワードの変更</string>
+  <string name="confirm_new_password">新しいパスワードの確認</string>
   <string name="panic_app_setting_none">なし</string>
   <string name="lock_setting_title">サインアウト</string>
   <string name="purge_setting_title">アカウントを削除</string>
diff --git a/briar-android/src/main/res/values-nb/strings.xml b/briar-android/src/main/res/values-nb/strings.xml
index a07fd3aef..700819d26 100644
--- a/briar-android/src/main/res/values-nb/strings.xml
+++ b/briar-android/src/main/res/values-nb/strings.xml
@@ -24,7 +24,7 @@
   <string name="setup_huawei_help">Hvis Briar ikke er lagt til i listen over beskyttede programmer, vil det ikke kunne kjøre i bakgrunnen.</string>
   <string name="warning_dozed">%s klarte ikke å kjøre i bakgrunnen</string>
   <!--Login-->
-  <string name="enter_password">Skriv inn passord:</string>
+  <string name="enter_password">Passord</string>
   <string name="try_again">Feil passord, prøv igjen</string>
   <string name="sign_in_button">Logg inn</string>
   <string name="forgotten_password">Jeg har glemt passordet mitt</string>
@@ -120,6 +120,7 @@
   <!--Introductions-->
   <string name="introduction_onboarding_title">Introduser kontaktene dine</string>
   <string name="introduction_onboarding_text">Du kan introdusere dine kontakter til hverandre, slik at de ikke trenger å møtes personlig for å treffes på Briar.</string>
+  <string name="introduction_menu_item">Introduser ovenfor hverandre</string>
   <string name="introduction_activity_title">Velg kontakt</string>
   <string name="introduction_message_title">Introduser kontakter</string>
   <string name="introduction_message_hint">Legg til melding (valgfritt)</string>
@@ -202,8 +203,6 @@
     <item quantity="one">%d post</item>
     <item quantity="other">%d poster</item>
   </plurals>
-  <string name="forum_new_entry_posted">Forumoppføring postet</string>
-  <string name="forum_new_message_hint">Ny oppføring</string>
   <string name="forum_message_reply_hint">Nytt svar</string>
   <string name="btn_reply">Svar</string>
   <string name="forum_leave">Forlat forum</string>
@@ -272,6 +271,7 @@
   <string name="blogs_rss_feeds_manage_error">Feil ved lasting av dine strømmer. Prøv igjen senere.</string>
   <!--Settings Display-->
   <string name="display_settings_title">Vis</string>
+  <string name="pref_theme_system">Systemforvalg</string>
   <!--Settings Network-->
   <string name="network_settings_title">Nettverk</string>
   <string name="bluetooth_setting">Koble til via Blåtann</string>
@@ -284,9 +284,8 @@
   <!--Settings Security and Panic-->
   <string name="security_settings_title">Sikkerhet</string>
   <string name="change_password">Endre passord</string>
-  <string name="current_password">Skriv inn nåværende passord:</string>
-  <string name="choose_new_password">Velg ditt nye passord:</string>
-  <string name="confirm_new_password">Bekreft ditt nye passord:</string>
+  <string name="choose_new_password">Nytt passord</string>
+  <string name="confirm_new_password">Bekreft nytt passord</string>
   <string name="password_changed">Passordet har blitt endret.</string>
   <string name="panic_setting">Oppsett av panikk-knapp</string>
   <string name="panic_setting_title">Panikk-knapp</string>
diff --git a/briar-android/src/main/res/values-nl/strings.xml b/briar-android/src/main/res/values-nl/strings.xml
index a9c9d207a..36ca9b2df 100644
--- a/briar-android/src/main/res/values-nl/strings.xml
+++ b/briar-android/src/main/res/values-nl/strings.xml
@@ -24,7 +24,7 @@
   <string name="setup_huawei_help">Als Briar niet is toegevoegd aan de beschermde apps, is het niet mogelijk om het in de achtergrond te runnen.</string>
   <string name="warning_dozed">%s kon niet in de achtergrond runnen</string>
   <!--Login-->
-  <string name="enter_password">Voer je wachtwoord in:</string>
+  <string name="enter_password">Wachtwoord</string>
   <string name="try_again">Verkeerd wachtwoord, probeer het nog een keer</string>
   <string name="sign_in_button">Log in</string>
   <string name="forgotten_password">Ik ben mijn wachtwoord vergeten</string>
@@ -62,6 +62,7 @@
   <string name="transport_bt">Bluetooth</string>
   <string name="transport_lan">Wifi</string>
   <!--Notifications-->
+  <string name="reminder_notification_title">Uitgelogd van Briar</string>
   <string name="ongoing_notification_title">Ingelogd op Briar</string>
   <string name="ongoing_notification_text">Raak aan om Briar te openen.</string>
   <plurals name="private_message_notification_text">
@@ -133,6 +134,7 @@
   <!--Introductions-->
   <string name="introduction_onboarding_title">Introduceer je contacten</string>
   <string name="introduction_onboarding_text">Je kan je contacten aan elkaar introduceren zodat ze niet in levenden lijve elkaar te hoeven ontmoeten om op Briar in contact te komen.</string>
+  <string name="introduction_menu_item">Introduceer</string>
   <string name="introduction_activity_title">Selecteer contact</string>
   <string name="introduction_not_possible">Je bent al met een introductie bezig met deze contacten. Laat dit a.u.b. eerst voltooien. Als jij of je contact weinig online zijn, kan dit even duren.</string>
   <string name="introduction_message_title">Intoduceer contacten</string>
@@ -220,8 +222,6 @@
     <item quantity="one">%d post</item>
     <item quantity="other">%d posts</item>
   </plurals>
-  <string name="forum_new_entry_posted">Forumonderwerp is gepost</string>
-  <string name="forum_new_message_hint">Nieuw onderwerp</string>
   <string name="forum_message_reply_hint">Nieuwe reactie</string>
   <string name="btn_reply">Antwoord</string>
   <string name="forum_leave">Verlaat forum</string>
@@ -305,6 +305,9 @@
   <string name="blogs_rss_feeds_manage_error">Er was een probleem met het laden van je feeds. Probeer het later nog een keer.</string>
   <!--Settings Display-->
   <string name="display_settings_title">Weergeven</string>
+  <string name="pref_theme_title">Thema</string>
+  <string name="pref_theme_light">Licht</string>
+  <string name="pref_theme_dark">Donker</string>
   <!--Settings Network-->
   <string name="network_settings_title">Netwerken</string>
   <string name="bluetooth_setting">Verbind via Bluetooth</string>
@@ -317,9 +320,8 @@
   <!--Settings Security and Panic-->
   <string name="security_settings_title">Beveiliging</string>
   <string name="change_password">Wijzig wachtwoord</string>
-  <string name="current_password">Voer je huidige wachtwoord in:</string>
-  <string name="choose_new_password">Voer je nieuwe wachtwoord in:</string>
-  <string name="confirm_new_password">Bevestig je nieuwe wachtwoord:</string>
+  <string name="choose_new_password">Nieuw wachtwoord</string>
+  <string name="confirm_new_password">Nieuw wachtwoord bevestigen</string>
   <string name="password_changed">Wachtwoord is gewijzigd</string>
   <string name="panic_setting">Paniekknopinstellingen</string>
   <string name="panic_setting_title">Paniekknop</string>
diff --git a/briar-android/src/main/res/values-oc/strings.xml b/briar-android/src/main/res/values-oc/strings.xml
index 9cfa95cd4..6f1766e7a 100644
--- a/briar-android/src/main/res/values-oc/strings.xml
+++ b/briar-android/src/main/res/values-oc/strings.xml
@@ -2,8 +2,10 @@
 <resources>
   <!--Setup-->
   <string name="setup_title">La benvenguda a Briar</string>
+  <string name="setup_name_explanation">Vòstre escais-nom serà mostrat al costat de cada de vòstra publicacion. Poiretz pas lo cambiar aprèp la creacion del compte.</string>
   <string name="setup_next">Seguent</string>
   <string name="setup_password_intro">Causissètz un senhal</string>
+  <string name="setup_doze_button">Autorizar las connexions</string>
   <string name="choose_nickname">Causir un escais-nom</string>
   <string name="choose_password">Causir un senhal</string>
   <string name="confirm_password">Confirmar lo senhal</string>
@@ -14,8 +16,10 @@
   <string name="more_info">Mai d’informacions</string>
   <string name="don_t_ask_again">Demandar pas mai</string>
   <string name="setup_huawei_button">Projècte Briar</string>
+  <string name="setup_huawei_help">Se Briar es pas ajustat a la lista de las aplicacion protegidas poirà pas s’executar en rèire plan.</string>
+  <string name="warning_dozed">%s a pas pogut s’executar en rèire plan</string>
   <!--Login-->
-  <string name="enter_password">Picatz vòstre senhal :</string>
+  <string name="enter_password">Senhal</string>
   <string name="try_again">Senhal incorècte, tornatz ensajar</string>
   <string name="sign_in_button">Se connectar</string>
   <string name="forgotten_password">Senhal oblidat</string>
@@ -26,8 +30,10 @@ Volètz suprimir vòstre compte e ne crear un nòu ?\n
   <string name="startup_failed_notification_title">Briar a pas pogut aviar</string>
   <string name="startup_failed_notification_text">Tocatz per mai d’informacions.</string>
   <string name="startup_failed_activity_title">Fracàs de l’aviada de Briar.</string>
+  <string name="startup_failed_data_too_new_error">Aquesta version de l’aplicacion es tròp anciana. Mercés de la metre al nivèl de la darrièra e de tornar ensajar.</string>
   <string name="startup_failed_service_error">Briar a pas pogut aviar un modul necessari. Tornar installar Briar pòt resolver aquò. Que aquò siá dich : perdretz vòstre compte e totas las donadas ligadas a aqueste. Briar utiliza pas de servidor centralizat per salvar sas donadas.</string>
   <string name="expiry_date_reached">Vòstre logicial s’acabèt.\nMercés d’aver ensajat !</string>
+  <string name="download_briar">Per téner d’utilizar Briar mercés de telecargar la version 1.0.</string>
   <string name="create_new_account">Vos caldrà crear un nòu compte, mas podètz emplegar lo meteis escais-nom.</string>
   <string name="download_briar_button">Telecargar Briar 1.0</string>
   <string name="startup_open_database">Deschirament de la basa de donadas…</string>
@@ -46,6 +52,7 @@ Volètz suprimir vòstre compte e ne crear un nòu ?\n
   <string name="transport_bt">Bluetooth</string>
   <string name="transport_lan">Wifi</string>
   <!--Notifications-->
+  <string name="reminder_notification_title">Desconnectat de Briar</string>
   <string name="ongoing_notification_title">Connectat a Briar</string>
   <string name="ongoing_notification_text">Tocatz per dobrir</string>
   <plurals name="private_message_notification_text">
@@ -84,8 +91,11 @@ Volètz suprimir vòstre compte e ne crear un nòu ?\n
   <string name="ellipsis">...</string>
   <string name="text_too_long">Lo tèxte picat es tròp long</string>
   <string name="show_onboarding">Mostrar l’ajuda</string>
+  <string name="fix">Correccion</string>
   <string name="help">Ajuda</string>
+  <string name="sorry">O planhèm</string>
   <!--Contacts and Private Conversations-->
+  <string name="no_contacts">Cap de contactes de mostrar\n\nTocatz l’icòna + per ajustar un contacte</string>
   <string name="date_no_private_messages">Cap messatge</string>
   <string name="no_private_messages">Cap de messatge de mostrar</string>
   <string name="message_hint">Picatz lo messatge</string>
@@ -108,10 +118,12 @@ Volètz suprimir vòstre compte e ne crear un nòu ?\n
   <string name="camera_error">Error de camèra</string>
   <string name="connecting_to_device">Connexion a l’aparelh\u2026</string>
   <string name="authenticating_with_device">Autentificacion amb l’aparelh\u2026</string>
+  <string name="connection_aborted_local">Avèm copat la connexion ! Poiriá arribar que qualqu’un ensage d’interferir amb vòstra connexion</string>
   <string name="connection_aborted_remote">Vòstre contacte a copat la connexion ! Poiriá arribar que qualqu’un ensage d’interferir amb aquela</string>
   <!--Introductions-->
   <string name="introduction_onboarding_title">Presentatz vòstres contactes</string>
   <string name="introduction_onboarding_text">Podètz presentar vòstres contactes, lor caldrà pas se veire per s’apondre e se connectar a Briar.</string>
+  <string name="introduction_menu_item">Escafar l’introduccion</string>
   <string name="introduction_activity_title">Seleccionar contacte</string>
   <string name="introduction_message_title">Presentar de contactes</string>
   <string name="introduction_message_hint">Apondre un messatge (opcional)</string>
@@ -194,8 +206,6 @@ Volètz suprimir vòstre compte e ne crear un nòu ?\n
     <item quantity="one">%d publicacion</item>
     <item quantity="other">%d publicacions</item>
   </plurals>
-  <string name="forum_new_entry_posted">Publicacions enviadas</string>
-  <string name="forum_new_message_hint">Nòva publicacion</string>
   <string name="forum_message_reply_hint">Nòva responsa</string>
   <string name="btn_reply">Respondre</string>
   <string name="forum_leave">Quitar lo fòrum</string>
@@ -235,6 +245,7 @@ Volètz suprimir vòstre compte e ne crear un nòu ?\n
   <string name="blogs_blog_post_scroll_to">Anar a</string>
   <string name="blogs_remove_blog">Suprimir lo blòg</string>
   <string name="blogs_remove_blog_ok">Suprimir</string>
+  <string name="blogs_blog_removed">Blòg tirat</string>
   <string name="blogs_reblog_comment_hint">Apondre un comentari (opcional)</string>
   <string name="blogs_reblog_button">Partejar</string>
   <!--Blog Sharing-->
@@ -249,6 +260,7 @@ Volètz suprimir vòstre compte e ne crear un nòu ?\n
   <string name="blogs_sharing_invitation_received">%1$s a partejat lo blòg « %2$s » amb vos.</string>
   <string name="blogs_sharing_invitation_sent">Avètz partejat lo blòg « %1$s » amb %2$s.</string>
   <string name="blogs_sharing_invitations_title">Convidacion al blòg</string>
+  <string name="blogs_sharing_joined_toast">S’abonar al blòg</string>
   <string name="sharing_status_blog">Qual que siá seguidor d’un blòg pòt lo partejar amb sos contactes. Partejatz lo blòg amb los contactes seguents. I a benlèu mai de monde qu’o seguen que vesètz pas.</string>
   <!--RSS Feeds-->
   <string name="blogs_rss_feeds_import">Importar de fluxes RSS</string>
@@ -264,6 +276,14 @@ Volètz suprimir vòstre compte e ne crear un nòu ?\n
   <string name="blogs_rss_feeds_manage_delete_error">Impossible de suprimir lo flux !</string>
   <string name="blogs_rss_feeds_manage_error">Error en cargar vòstres fluxes. Ensajatz mai tard.</string>
   <!--Settings Display-->
+  <string name="pref_language_title">Lenga &amp; region</string>
+  <string name="pref_language_default">Sistèma per defaut</string>
+  <string name="display_settings_title">Afichatge</string>
+  <string name="pref_theme_title">Tèma</string>
+  <string name="pref_theme_light">Clar</string>
+  <string name="pref_theme_dark">Escur</string>
+  <string name="pref_theme_auto">Automatic (Segon l’ora)</string>
+  <string name="pref_theme_system">Per defaut sistèma</string>
   <!--Settings Network-->
   <string name="network_settings_title">Ret</string>
   <string name="bluetooth_setting">Se connectar per Bluetooth</string>
@@ -276,9 +296,9 @@ Volètz suprimir vòstre compte e ne crear un nòu ?\n
   <!--Settings Security and Panic-->
   <string name="security_settings_title">Seguretat</string>
   <string name="change_password">Modificar lo senhal</string>
-  <string name="current_password">Marcatz lo senhal actual :</string>
-  <string name="choose_new_password">Causissètz lo novèl senhal :</string>
-  <string name="confirm_new_password">Confirmatz lo novèl senhal :</string>
+  <string name="current_password">Senhal actual</string>
+  <string name="choose_new_password">Nòu senhal</string>
+  <string name="confirm_new_password">Confirmatz lo senhal</string>
   <string name="password_changed">Lo senhal a cambiat</string>
   <string name="panic_setting">Paramètres del boton urgéncia</string>
   <string name="panic_setting_title">Boton urgéncia</string>
@@ -299,8 +319,10 @@ Volètz suprimir vòstre compte e ne crear un nòu ?\n
   <string name="notification_settings_title">Notificacions</string>
   <string name="notify_private_messages_setting_title">Messatges privats</string>
   <string name="notify_private_messages_setting_summary">Notificar los messatges privats</string>
+  <string name="notify_private_messages_setting_summary_26">Configuratz las alèrtas pels messatges privats</string>
   <string name="notify_group_messages_setting_title">Messatges gropats</string>
   <string name="notify_group_messages_setting_summary">Notificar los messatges gropats</string>
+  <string name="notify_group_messages_setting_summary_26">Configuratz las alèrtas pels messatges de grop</string>
   <string name="notify_forum_posts_setting_title">Publicacions al fòrum</string>
   <string name="notify_forum_posts_setting_summary">Notificar las publicacions al fòrum</string>
   <string name="notify_blog_posts_setting_title">Articles de blòg</string>
@@ -312,6 +334,7 @@ Volètz suprimir vòstre compte e ne crear un nòu ?\n
   <string name="notify_sound_setting_default">Sonariá per defaut</string>
   <string name="notify_sound_setting_disabled">Cap</string>
   <string name="choose_ringtone_title">Causir la sonariá</string>
+  <string name="cannot_load_ringtone">Cargament impossible de las sonariás</string>
   <!--Settings Feedback-->
   <string name="feedback_settings_title">Comentaris</string>
   <string name="send_feedback">Enviar vòstres comentaris</string>
@@ -343,6 +366,8 @@ Volètz suprimir vòstre compte e ne crear un nòu ?\n
   <!--Permission Requests-->
   <string name="permission_camera_title">Permission de la camèra</string>
   <string name="permission_camera_request_body">Per numerizar lo còdi QR cal que Briar aja l’accès a la camèra.</string>
+  <string name="permission_camera_denied_body">Avètz regetat l’accès a la camèra, mas per ajustar de contacte cal utilizar la camèra.\n\n Mercés de li donar l’accès</string>
   <string name="permission_camera_denied_toast">La permission a la camèra es pas estada donada</string>
   <string name="qr_code">Còdi QR</string>
+  <string name="show_qr_code_fullscreen">Mostrar lo còdi QR en ecran complèt</string>
 </resources>
diff --git a/briar-android/src/main/res/values-pl/strings.xml b/briar-android/src/main/res/values-pl/strings.xml
index 7a4670a3a..4e4e97a29 100644
--- a/briar-android/src/main/res/values-pl/strings.xml
+++ b/briar-android/src/main/res/values-pl/strings.xml
@@ -24,7 +24,7 @@
   <string name="setup_huawei_help">Jeśli Briar nie będzie na liście chronionych aplikacji nie będzie miał możliwości aby działać w tle.</string>
   <string name="warning_dozed">%s nie był wstanie działać w tle</string>
   <!--Login-->
-  <string name="enter_password">Wpisz swoje hasło:</string>
+  <string name="enter_password">Hasło</string>
   <string name="try_again">Złe hasło, spróbuj ponownie</string>
   <string name="sign_in_button">Zaloguj Się</string>
   <string name="forgotten_password">Przypomnij hasło</string>
@@ -64,6 +64,9 @@
   <string name="transport_bt">Bluetooth</string>
   <string name="transport_lan">Wi-Fi</string>
   <!--Notifications-->
+  <string name="reminder_notification_title">Wylogowano z Briar</string>
+  <string name="reminder_notification_text">Dotknij aby zalogować się z powrotem lub przesuń aby pominąć.</string>
+  <string name="reminder_notification_channel_title">Przypomnienie o zalogowaniu</string>
   <string name="ongoing_notification_title">Zalogowany w Briar</string>
   <string name="ongoing_notification_text">Dotknij aby otworzyć Briar</string>
   <plurals name="private_message_notification_text">
@@ -143,6 +146,7 @@
   <!--Introductions-->
   <string name="introduction_onboarding_title">Udostępnij swoje kontakty.</string>
   <string name="introduction_onboarding_text">Możesz udostępniać kontakty, tak aby osoby nie musiały spotykać się osobiście.</string>
+  <string name="introduction_menu_item">Udostępnij</string>
   <string name="introduction_activity_title">Wybierz kontakt</string>
   <string name="introduction_not_possible">Masz już jedno udostępnianie w toku. Proszę pozwolić aby proces zakończył się. Jeśli kontakty są rzadko online, może to zabrać trochę czasu.</string>
   <string name="introduction_message_title">Udostępnij kontakty</string>
@@ -238,8 +242,8 @@
     <item quantity="many">%d postów</item>
     <item quantity="other">%d postów</item>
   </plurals>
-  <string name="forum_new_entry_posted">Wejście na forum zapisane</string>
-  <string name="forum_new_message_hint">Nowy Wpis</string>
+  <string name="forum_new_entry_posted">Post na forum opublikowany</string>
+  <string name="forum_new_message_hint">Nowy Post</string>
   <string name="forum_message_reply_hint">Nowa Odpowiedź</string>
   <string name="btn_reply">Odpowiedz</string>
   <string name="forum_leave">Opuść Forum</string>
@@ -328,6 +332,11 @@
   <string name="pref_language_changed">Aby zastosować ustawienia musisz zrestartować Briar. Proszę się wylogować i zrestartować Briar.</string>
   <string name="pref_language_default">Domyślny systemu</string>
   <string name="display_settings_title">Wyświetl</string>
+  <string name="pref_theme_title">Motyw</string>
+  <string name="pref_theme_light">Jasny</string>
+  <string name="pref_theme_dark">Ciemny</string>
+  <string name="pref_theme_auto">Automatycznie (w czasie dnia)</string>
+  <string name="pref_theme_system">Domyślny Systemu</string>
   <!--Settings Network-->
   <string name="network_settings_title">Sieci</string>
   <string name="bluetooth_setting">Połącz przez Bluetooth</string>
@@ -340,9 +349,9 @@
   <!--Settings Security and Panic-->
   <string name="security_settings_title">Bezpieczeństwo</string>
   <string name="change_password">Zmień hasło</string>
-  <string name="current_password">Wprowadź swoje aktualne hasło:</string>
-  <string name="choose_new_password">Wpisz swoje nowe hasło:</string>
-  <string name="confirm_new_password">Potwierdź swoje nowe hasło:</string>
+  <string name="current_password">Obecne hasło</string>
+  <string name="choose_new_password">Nowe hasło</string>
+  <string name="confirm_new_password">Potwierdź nowe hasło</string>
   <string name="password_changed">Hasło zostało zmienione.</string>
   <string name="panic_setting">Konfiguracja przycisku wyjścia awaryjnego</string>
   <string name="panic_setting_title">Przycisk wyjścia awaryjnego</string>
diff --git a/briar-android/src/main/res/values-pt-rBR/strings.xml b/briar-android/src/main/res/values-pt-rBR/strings.xml
index 25c1cdb95..812615bb4 100644
--- a/briar-android/src/main/res/values-pt-rBR/strings.xml
+++ b/briar-android/src/main/res/values-pt-rBR/strings.xml
@@ -24,7 +24,7 @@
   <string name="setup_huawei_help">Se o Briar não for adicionado à lista de aplicativos protegidos ele não poderá ser executado em segundo plano.</string>
   <string name="warning_dozed">%s não pôde ser executado em segundo plano</string>
   <!--Login-->
-  <string name="enter_password">Insira sua senha:</string>
+  <string name="enter_password">Senha</string>
   <string name="try_again">Senha Incorreta, tente novamente</string>
   <string name="sign_in_button">Entrar</string>
   <string name="forgotten_password">Esqueci minha senha</string>
@@ -62,6 +62,7 @@
   <string name="transport_bt">Bluetooth</string>
   <string name="transport_lan">Wi-fi</string>
   <!--Notifications-->
+  <string name="reminder_notification_title">Saiu do Briar</string>
   <string name="ongoing_notification_title">Conectado ao Briar</string>
   <string name="ongoing_notification_text">Toque para abrir o Briar</string>
   <plurals name="private_message_notification_text">
@@ -133,6 +134,7 @@
   <!--Introductions-->
   <string name="introduction_onboarding_title">Apresente seus contatos</string>
   <string name="introduction_onboarding_text">Você pode apresentar seus contatos entre si, assim eles não precisam se encontrar pessoalmente para se comunicar no Briar.</string>
+  <string name="introduction_menu_item">Fazer apresentação</string>
   <string name="introduction_activity_title">Selecionar contato</string>
   <string name="introduction_message_title">Apresentar contatos</string>
   <string name="introduction_message_hint">Adicione uma mensagem (opcional)</string>
@@ -218,8 +220,7 @@
     <item quantity="one">%d Post</item>
     <item quantity="other">%d Posts</item>
   </plurals>
-  <string name="forum_new_entry_posted">postada com sucesso</string>
-  <string name="forum_new_message_hint">Novo tópico</string>
+  <string name="forum_new_message_hint">Nova postagem</string>
   <string name="forum_message_reply_hint">Nova resposta</string>
   <string name="btn_reply">Responder</string>
   <string name="forum_leave">Sair do fórum</string>
@@ -303,6 +304,10 @@
   <string name="blogs_rss_feeds_manage_error">Houve um problema ao carregar seus Feeds. Por favor tente novamente.</string>
   <!--Settings Display-->
   <string name="display_settings_title">Visualização</string>
+  <string name="pref_theme_title">Tema</string>
+  <string name="pref_theme_light">Claro</string>
+  <string name="pref_theme_dark">Escuro</string>
+  <string name="pref_theme_system">Padrão do Sistema</string>
   <!--Settings Network-->
   <string name="network_settings_title">Redes</string>
   <string name="bluetooth_setting">Conectar via Bluetooth</string>
@@ -315,9 +320,8 @@
   <!--Settings Security and Panic-->
   <string name="security_settings_title">Segurança</string>
   <string name="change_password">Mudar Senha</string>
-  <string name="current_password">Digite a senha atual:</string>
-  <string name="choose_new_password">Escolha sua nova senha:</string>
-  <string name="confirm_new_password">Confirme a nova senha:</string>
+  <string name="choose_new_password">Nova senha</string>
+  <string name="confirm_new_password">Confirmar nova senha</string>
   <string name="password_changed">Senha alterada com sucesso.</string>
   <string name="panic_setting">Configurações do botão de pânico</string>
   <string name="panic_setting_title">Botão de pânico</string>
diff --git a/briar-android/src/main/res/values-ro/strings.xml b/briar-android/src/main/res/values-ro/strings.xml
index e57c20fee..62de6d660 100644
--- a/briar-android/src/main/res/values-ro/strings.xml
+++ b/briar-android/src/main/res/values-ro/strings.xml
@@ -24,7 +24,7 @@
   <string name="setup_huawei_help">Dacă Briar nu este adăugat în lista de aplicații protejate, nu v-a fi capabil să ruleze în fundal.</string>
   <string name="warning_dozed">%s nu poate rula în fundal</string>
   <!--Login-->
-  <string name="enter_password">Introduceți parola:</string>
+  <string name="enter_password">Parola</string>
   <string name="try_again">Parolă greșită, reîncercați</string>
   <string name="sign_in_button">Autentificare</string>
   <string name="forgotten_password">Am uitat parola</string>
@@ -63,6 +63,9 @@
   <string name="transport_bt">Bluetooth</string>
   <string name="transport_lan">Wi-Fi</string>
   <!--Notifications-->
+  <string name="reminder_notification_title">Ieșire din Briar</string>
+  <string name="reminder_notification_text">Atingeți pentru autentificare sau glisați pentru anulare.</string>
+  <string name="reminder_notification_channel_title">Reamintire autentificare Briar</string>
   <string name="ongoing_notification_title">Autentificat în Briar</string>
   <string name="ongoing_notification_text">Atingeți pentru a deschide Briar</string>
   <plurals name="private_message_notification_text">
@@ -138,6 +141,7 @@
   <!--Introductions-->
   <string name="introduction_onboarding_title">Recomandați-vă contactele</string>
   <string name="introduction_onboarding_text">Puteți să vă recomandați contactele unele altora, încât sa nu fie nevoie ca să se vadă față în față pentru a se putea conecta la Briar.</string>
+  <string name="introduction_menu_item">Fă o recomandare</string>
   <string name="introduction_activity_title">Alege un contact</string>
   <string name="introduction_not_possible">Ați trimis deja o solicitare la contacte. Așteptați să răspundă. Dacă dvs. sau persoanele persoanele de contact sunteți rareori online, este posibil să dureze ceva timp.</string>
   <string name="introduction_message_title">Recomandă contacte</string>
@@ -230,7 +234,7 @@
     <item quantity="few">%d mesaje</item>
     <item quantity="other">%d de mesaje</item>
   </plurals>
-  <string name="forum_new_entry_posted">Mesajul a fost introdus pe forum</string>
+  <string name="forum_new_entry_posted">Mesajul a fost scris pe forum</string>
   <string name="forum_new_message_hint">Mesaj nou</string>
   <string name="forum_message_reply_hint">Răspuns nou</string>
   <string name="btn_reply">Răspunde</string>
@@ -319,6 +323,11 @@
   <string name="pref_language_changed">Această setare va avea efect după repornirea Briar. Vă rugăm să ieșiți din Briar și să reporniți aplicația.</string>
   <string name="pref_language_default">Implicit sistem</string>
   <string name="display_settings_title">Ecran</string>
+  <string name="pref_theme_title">Temă</string>
+  <string name="pref_theme_light">Deschisă</string>
+  <string name="pref_theme_dark">Închisă</string>
+  <string name="pref_theme_auto">Automat (Zi lumina)</string>
+  <string name="pref_theme_system">Implicit sistem</string>
   <!--Settings Network-->
   <string name="network_settings_title">Rețele</string>
   <string name="bluetooth_setting">Conectare prin Bluetooth</string>
@@ -331,9 +340,9 @@
   <!--Settings Security and Panic-->
   <string name="security_settings_title">Securitate</string>
   <string name="change_password">Schimbă parola</string>
-  <string name="current_password">Introduceți parola curentă:</string>
-  <string name="choose_new_password">Alegeți-vă parola nouă:</string>
-  <string name="confirm_new_password">Confirmați parola nouă:</string>
+  <string name="current_password">Parolă curentă</string>
+  <string name="choose_new_password">Parola nouă</string>
+  <string name="confirm_new_password">Confirmați parola nouă</string>
   <string name="password_changed">Parola a fost schimbată.</string>
   <string name="panic_setting">Setare buton de panică</string>
   <string name="panic_setting_title">Buton de panică</string>
diff --git a/briar-android/src/main/res/values-ru/strings.xml b/briar-android/src/main/res/values-ru/strings.xml
index fb0648295..9d88bfc06 100644
--- a/briar-android/src/main/res/values-ru/strings.xml
+++ b/briar-android/src/main/res/values-ru/strings.xml
@@ -24,7 +24,7 @@
   <string name="setup_huawei_help">Если Briar не добавлен в список защищенных приложений, он не сможет работать в фоновом режиме.</string>
   <string name="warning_dozed">%s не удалось выполнить в фоновом режиме</string>
   <!--Login-->
-  <string name="enter_password">Введите пароль:</string>
+  <string name="enter_password">пароль</string>
   <string name="try_again">Неверный пароль, повторите попытку</string>
   <string name="sign_in_button">Войти</string>
   <string name="forgotten_password">Я забыл свой пароль</string>
@@ -64,6 +64,9 @@
   <string name="transport_bt">Bluetooth</string>
   <string name="transport_lan">Wi-Fi</string>
   <!--Notifications-->
+  <string name="reminder_notification_title">Выход из Briar</string>
+  <string name="reminder_notification_text">Коснитесь, чтобы вернуться или прокрутите, чтобы закрыть.</string>
+  <string name="reminder_notification_channel_title">Briar Напоминание о входе</string>
   <string name="ongoing_notification_title">Выполнен вход в Briar</string>
   <string name="ongoing_notification_text">Коснитесь, чтобы открыть Briar</string>
   <plurals name="private_message_notification_text">
@@ -143,6 +146,7 @@
   <!--Introductions-->
   <string name="introduction_onboarding_title">Знакомство с контактами</string>
   <string name="introduction_onboarding_text">Вы можете представить свои контакты друг другу, поэтому им не нужно встречаться лично, чтобы подключиться к Briar. </string>
+  <string name="introduction_menu_item">Выполнить знакомство</string>
   <string name="introduction_activity_title">Выберите контакт</string>
   <string name="introduction_not_possible">Вы уже отправили запрос контактам. Пожалуйста, подождите пока они ответят на него. Если вы или ваши контакты редко бываете в сети, это может занять некоторое время.</string>
   <string name="introduction_message_title">Познакомить контакты</string>
@@ -328,6 +332,11 @@
   <string name="pref_language_changed">Этот параметр вступит в силу после перезапуска Briar. Пожалуйста, выйдите и перезапустите Briar.</string>
   <string name="pref_language_default">По умолчанию</string>
   <string name="display_settings_title">Отображение</string>
+  <string name="pref_theme_title">Тема</string>
+  <string name="pref_theme_light">Светлая</string>
+  <string name="pref_theme_dark">Тёмная</string>
+  <string name="pref_theme_auto">Автоматический (Дневной)</string>
+  <string name="pref_theme_system">По-умолчанию</string>
   <!--Settings Network-->
   <string name="network_settings_title">Сети</string>
   <string name="bluetooth_setting">Подключение через Bluetooth</string>
@@ -340,9 +349,9 @@
   <!--Settings Security and Panic-->
   <string name="security_settings_title">Безопасность</string>
   <string name="change_password">Изменить пароль</string>
-  <string name="current_password">Введите текущий пароль:</string>
-  <string name="choose_new_password">Придумайте новый пароль:</string>
-  <string name="confirm_new_password">Подтвердите новый пароль:</string>
+  <string name="current_password">Текущий пароль</string>
+  <string name="choose_new_password">Новый пароль</string>
+  <string name="confirm_new_password">Подтвердите новый пароль</string>
   <string name="password_changed">Пароль был изменен.</string>
   <string name="panic_setting">Настройка тревожной кнопки</string>
   <string name="panic_setting_title">Тревожная кнопка</string>
diff --git a/briar-android/src/main/res/values-sq/strings.xml b/briar-android/src/main/res/values-sq/strings.xml
index 27e12221b..ea75da5ac 100644
--- a/briar-android/src/main/res/values-sq/strings.xml
+++ b/briar-android/src/main/res/values-sq/strings.xml
@@ -24,7 +24,7 @@
   <string name="setup_huawei_help">Nëse Briar-i s’është shtuar te lista e aplikacioneve të mbrojtur, s’do të jetë në gjendje të xhirojë në prapaskenë.</string>
   <string name="warning_dozed">%s s’qe në gjendje të xhirojë në prapaskenë</string>
   <!--Login-->
-  <string name="enter_password">Jepni fjalëkalimin tuaj:</string>
+  <string name="enter_password">Fjalëkalim</string>
   <string name="try_again">Fjalëkalim i gabuar, riprovoni</string>
   <string name="sign_in_button">Hyni</string>
   <string name="forgotten_password">Kam harruar fjalëkalimin tim</string>
@@ -62,6 +62,9 @@
   <string name="transport_bt">Bluetooth</string>
   <string name="transport_lan">Wi-Fi</string>
   <!--Notifications-->
+  <string name="reminder_notification_title">U dol nga Briar-i</string>
+  <string name="reminder_notification_text">Që të rifuteni, prekeni, ose fërkojeni për ta hedhur tej.</string>
+  <string name="reminder_notification_channel_title">Kujtues Hyrjeje Briar</string>
   <string name="ongoing_notification_title">Hytë në Briar</string>
   <string name="ongoing_notification_text">Prekeni, që të hapet Briar-i</string>
   <plurals name="private_message_notification_text">
@@ -133,6 +136,7 @@
   <!--Introductions-->
   <string name="introduction_onboarding_title">Prezantoni kontaktet tuaja</string>
   <string name="introduction_onboarding_text">Kontaktet tuaja mund t\’ia prezantoni njëri-tjetrit, që kështu të mos u duhet të takohen realisht për të mundur të lidhen në Briar.</string>
+  <string name="introduction_menu_item">Bëje prezantimin</string>
   <string name="introduction_activity_title">Përzgjidhni Kontakt</string>
   <string name="introduction_not_possible">Keni filluar tashmë një prezantim me këto kontakte. Ju lutemi, lëreni të përfundojë së pari. Nëse ju ose kontaktet tuaja rrallë gjenden <em>online</em>, kjo mund të dojë ca kohë.</string>
   <string name="introduction_message_title">Prezantoni Kontakte</string>
@@ -220,8 +224,8 @@
     <item quantity="one">%d postim</item>
     <item quantity="other">%d postime</item>
   </plurals>
-  <string name="forum_new_entry_posted">U postua zë forumi</string>
-  <string name="forum_new_message_hint">Zë i Ri</string>
+  <string name="forum_new_entry_posted">U botua postim forumi</string>
+  <string name="forum_new_message_hint">Postim i Ri</string>
   <string name="forum_message_reply_hint">Përgjigje e Re</string>
   <string name="btn_reply">Përgjigju</string>
   <string name="forum_leave">Braktiseni Forumin</string>
@@ -308,6 +312,11 @@
   <string name="pref_language_changed">Ky rregullim do të hyjë në fuqi kur të rinisni Briar-in. Ju lutemi, bëni daljen nga llogaria dhe rinisni Briar-in.</string>
   <string name="pref_language_default">Parazgjedhje sistemi</string>
   <string name="display_settings_title">Shfaqje</string>
+  <string name="pref_theme_title">Temë</string>
+  <string name="pref_theme_light">E çelët</string>
+  <string name="pref_theme_dark">E errët</string>
+  <string name="pref_theme_auto">Automatike (Daytime)</string>
+  <string name="pref_theme_system">Parazgjedhje Sistemi</string>
   <!--Settings Network-->
   <string name="network_settings_title">Rrjete</string>
   <string name="bluetooth_setting">Lidhu përmes Bluetooth-i</string>
@@ -320,9 +329,9 @@
   <!--Settings Security and Panic-->
   <string name="security_settings_title">Siguri</string>
   <string name="change_password">Ndryshoni fjalëkalimin</string>
-  <string name="current_password">Jepni fjalëkalimin tuaj të tanishëm:</string>
-  <string name="choose_new_password">Zgjidhni fjalëkalimin tuaj të ri:</string>
-  <string name="confirm_new_password">Ripohoni fjalëkalimin tuaj të ri:</string>
+  <string name="current_password">Fjalëkalimi i tanishëm</string>
+  <string name="choose_new_password">Fjalëkalim i ri</string>
+  <string name="confirm_new_password">Konfirmo fjalëkalimin e ri</string>
   <string name="password_changed">Fjalëkalimi u ndryshua.</string>
   <string name="panic_setting">Rregullimi i butonit të panikut</string>
   <string name="panic_setting_title">Buton paniku</string>
diff --git a/briar-android/src/main/res/values-sr/strings.xml b/briar-android/src/main/res/values-sr/strings.xml
index 7d5e68152..0dcd6cba8 100644
--- a/briar-android/src/main/res/values-sr/strings.xml
+++ b/briar-android/src/main/res/values-sr/strings.xml
@@ -10,7 +10,7 @@
   <string name="passwords_do_not_match">Šifre se ne poklapaju</string>
   <string name="create_account_button">Kreirajte račun</string>
   <!--Login-->
-  <string name="enter_password">Unesite vašu šifru:</string>
+  <string name="enter_password">Лозинка</string>
   <string name="try_again">Pogrešna šifra, probajte opet</string>
   <string name="sign_in_button">Prijavite se</string>
   <string name="forgotten_password">Zaboravio sam šifru</string>
@@ -82,6 +82,7 @@
   <!--Introductions-->
   <string name="introduction_onboarding_title">Upoznajte vaše kontakte</string>
   <string name="introduction_onboarding_text">Vi možete da upoznate vaše kontakte međusobno, da nebi morali da srijeću lice u liceda bi se povezali na Briar.</string>
+  <string name="introduction_menu_item">Izvršite upoznavanje</string>
   <string name="introduction_activity_title">Izaberite kontakt</string>
   <string name="introduction_message_title">Upoznajte kontakte</string>
   <string name="introduction_message_hint">Dodajte poruku (opciono)</string>
@@ -148,8 +149,6 @@
   <string name="create_forum_button">Kreirajte forum</string>
   <string name="forum_created_toast">Forum je kreiran</string>
   <string name="no_posts">Nema postova</string>
-  <string name="forum_new_entry_posted">Forumski zapis postovan</string>
-  <string name="forum_new_message_hint">Novi zapis</string>
   <string name="forum_message_reply_hint">Novi odgovor</string>
   <string name="btn_reply">Odgovor</string>
   <string name="forum_leave">Napustite forum</string>
@@ -213,6 +212,9 @@
   <string name="blogs_rss_feeds_manage_delete_error">Kanal nije bilo moguće ukloniti!</string>
   <string name="blogs_rss_feeds_manage_error">Došlo je do problema pri učitavanju vaših kanala. Probajte opet kasnije.</string>
   <!--Settings Display-->
+  <string name="pref_theme_title">Тема</string>
+  <string name="pref_theme_light">Светла</string>
+  <string name="pref_theme_dark">Тамна</string>
   <!--Settings Network-->
   <string name="network_settings_title">Mreže</string>
   <string name="bluetooth_setting">Povežite se preko Bluetooth-a</string>
@@ -225,9 +227,6 @@
   <!--Settings Security and Panic-->
   <string name="security_settings_title">Sigurnost</string>
   <string name="change_password">Promijeni sifru</string>
-  <string name="current_password">Unesite vašu trenutnu šifru:</string>
-  <string name="choose_new_password">Izaberite vašu novu šifru:</string>
-  <string name="confirm_new_password">Potvrdite vašu novu šifru:</string>
   <string name="password_changed">Šifra je promijenjena</string>
   <string name="panic_setting">Podešavanje panik dugmeta</string>
   <string name="panic_setting_title">Panik dugme</string>
diff --git a/briar-android/src/main/res/values-sv/strings.xml b/briar-android/src/main/res/values-sv/strings.xml
index ae780b893..2463668ad 100644
--- a/briar-android/src/main/res/values-sv/strings.xml
+++ b/briar-android/src/main/res/values-sv/strings.xml
@@ -24,7 +24,7 @@
   <string name="setup_huawei_help">Om Briar inte läggs till listan över skyddade appar kan det inte köras i bakgrunden.</string>
   <string name="warning_dozed">%s kunde inte köras i bakgrunden</string>
   <!--Login-->
-  <string name="enter_password">Ange ditt lösenord:</string>
+  <string name="enter_password">Lösenord</string>
   <string name="try_again">Felaktigt lösenord, försök igen </string>
   <string name="sign_in_button">Logga in</string>
   <string name="forgotten_password">Jag har glömt mitt lösenord </string>
@@ -115,6 +115,9 @@
   <string name="blogs_rss_remove_feed_ok">&amp;Ta bort</string>
   <!--Settings Display-->
   <string name="display_settings_title">Visa</string>
+  <string name="pref_theme_title">Tema</string>
+  <string name="pref_theme_light">Ljus</string>
+  <string name="pref_theme_dark">Mörk</string>
   <!--Settings Network-->
   <string name="network_settings_title">Nätverk</string>
   <string name="bluetooth_setting">Anslut via Bluetooth</string>
@@ -123,6 +126,8 @@
   <!--Settings Security and Panic-->
   <string name="security_settings_title">Säkerhet</string>
   <string name="change_password">Ändra lösenord</string>
+  <string name="choose_new_password">Nytt lösenord</string>
+  <string name="confirm_new_password">Bekräfta nytt lösenord</string>
   <string name="panic_app_setting_none">Ingen</string>
   <string name="lock_setting_title">Logga ut</string>
   <string name="lock_setting_summary">Logga ut från Briar om panikknappen tryckts</string>
diff --git a/briar-android/src/main/res/values-tr/strings.xml b/briar-android/src/main/res/values-tr/strings.xml
index eafa62ef8..e93212819 100644
--- a/briar-android/src/main/res/values-tr/strings.xml
+++ b/briar-android/src/main/res/values-tr/strings.xml
@@ -10,7 +10,7 @@
   <string name="passwords_do_not_match">Girdiğiniz iki parola uyuşmuyor</string>
   <string name="create_account_button">Hesabı Oluştur</string>
   <!--Login-->
-  <string name="enter_password">Parolanızı girin</string>
+  <string name="enter_password">Parola</string>
   <string name="try_again">Parola yanlış, tekrar deneyin</string>
   <string name="sign_in_button">Giriş Yap</string>
   <string name="forgotten_password">Parolamı unuttum</string>
@@ -97,6 +97,7 @@
   <!--Introductions-->
   <string name="introduction_onboarding_title">Kişilerinizi tanıştırın</string>
   <string name="introduction_onboarding_text">Kişilerinizi birbirinize tanıtabilirsiniz, bu nedenle Briar\'a bağlanmak için şahsen bir araya gelmeniz gerekmez.</string>
+  <string name="introduction_menu_item">Tanıştır</string>
   <string name="introduction_activity_title">Kişi seç</string>
   <string name="introduction_message_title">Kişileri Tanıştırın</string>
   <string name="introduction_button">Tanıştır</string>
@@ -176,8 +177,6 @@
     <item quantity="one">%d gönderi</item>
     <item quantity="other">%d gönderi</item>
   </plurals>
-  <string name="forum_new_entry_posted">Forum girdisi gönderildi</string>
-  <string name="forum_new_message_hint">Yeni Girdi</string>
   <string name="forum_message_reply_hint">Yeni Cevap</string>
   <string name="btn_reply">Cevapla</string>
   <string name="forum_leave">Forumdan Ayrıl</string>
@@ -254,9 +253,7 @@
   <!--Settings Security and Panic-->
   <string name="security_settings_title">Güvenlik</string>
   <string name="change_password">Parola değiştir</string>
-  <string name="current_password">Geçerli parolanızı girin:</string>
-  <string name="choose_new_password">Yeni parolanızı girin:</string>
-  <string name="confirm_new_password">Yeni parolanızı tekrar girin:</string>
+  <string name="confirm_new_password">Yeni parolayı onaylayın</string>
   <string name="password_changed">Parolanız başarıyla değişti.</string>
   <string name="panic_setting">Panik buton ayarları</string>
   <string name="panic_setting_title">Panik butonu</string>
@@ -281,6 +278,7 @@
   <string name="notify_forum_posts_setting_summary">Forum gönderileri için uyarıları göster</string>
   <string name="notify_blog_posts_setting_summary">Blog gönderileri için uyarıları göster</string>
   <string name="notify_vibration_setting">Titretişim</string>
+  <string name="notify_lock_screen_setting_title">Ekranı Kilitle</string>
   <string name="notify_sound_setting">Ses</string>
   <string name="notify_sound_setting_default">Varsayılan zil sesi</string>
   <string name="notify_sound_setting_disabled">Yok</string>
diff --git a/briar-android/src/main/res/values-zh-rCN/strings.xml b/briar-android/src/main/res/values-zh-rCN/strings.xml
index 01d86c980..0a09e347d 100644
--- a/briar-android/src/main/res/values-zh-rCN/strings.xml
+++ b/briar-android/src/main/res/values-zh-rCN/strings.xml
@@ -24,7 +24,7 @@
   <string name="setup_huawei_help">如果没有将 Briar 加入受保护应用列表，将无法在后台运行。</string>
   <string name="warning_dozed">%s 无法在后台运行。</string>
   <!--Login-->
-  <string name="enter_password">请输入密码：</string>
+  <string name="enter_password">密码</string>
   <string name="try_again">密码不正确，请重试</string>
   <string name="sign_in_button">登录</string>
   <string name="forgotten_password">我忘记了密码</string>
@@ -128,6 +128,7 @@
   <!--Introductions-->
   <string name="introduction_onboarding_title">介绍您的联系人</string>
   <string name="introduction_onboarding_text">您可以互相介绍联系人，这样他们可以直接在 Briar 上建立联系而不必亲自见面。</string>
+  <string name="introduction_menu_item">完成介绍</string>
   <string name="introduction_activity_title">选择联系人</string>
   <string name="introduction_not_possible">您当前正给这些联系人交换名片。请先等待交换完成。如果您或您的好友很少在线，那需要花些时间。</string>
   <string name="introduction_message_title">介绍联系人</string>
@@ -211,8 +212,6 @@
   <plurals name="posts">
     <item quantity="other">%d 条帖子</item>
   </plurals>
-  <string name="forum_new_entry_posted">论坛条目已发布</string>
-  <string name="forum_new_message_hint">新条目</string>
   <string name="forum_message_reply_hint">新回复</string>
   <string name="btn_reply">回复</string>
   <string name="forum_leave">退出论坛</string>
@@ -306,9 +305,6 @@
   <!--Settings Security and Panic-->
   <string name="security_settings_title">安全</string>
   <string name="change_password">更改密码</string>
-  <string name="current_password">输入当前密码：</string>
-  <string name="choose_new_password">键入新密码：</string>
-  <string name="confirm_new_password">确认新密码：</string>
   <string name="password_changed">密码已更改。</string>
   <string name="panic_setting">创建应急开关</string>
   <string name="panic_setting_title">应急开关</string>