From 28ebbbc7d12383d8c51dbffc4424360a103b0ec4 Mon Sep 17 00:00:00 2001
From: Torsten Grote <t@grobox.de>
Date: Mon, 29 Jan 2018 10:41:56 -0200
Subject: [PATCH] Backport translation updates

New translations: br, nl, he, sv, cs, ja
---
 .../invitation_bluetooth_start.xml            |  71 ----
 .../src/main/res/values-bg/strings.xml        |  26 +-
 .../src/main/res/values-br/strings.xml        | 149 +++++++
 .../src/main/res/values-ca/strings.xml        | 102 ++++-
 .../src/main/res/values-cs/strings.xml        | 387 ++++++++++++++++++
 .../src/main/res/values-de/strings.xml        |  86 ++--
 .../src/main/res/values-es/strings.xml        |  50 ++-
 .../src/main/res/values-eu/strings.xml        |  50 ++-
 .../src/main/res/values-fi/strings.xml        |  48 ++-
 .../src/main/res/values-fr/strings.xml        |  28 +-
 .../src/main/res/values-gl/strings.xml        |  17 +-
 .../src/main/res/values-he/strings.xml        | 266 ++++++++++++
 .../src/main/res/values-hi/strings.xml        |  27 +-
 .../src/main/res/values-it/strings.xml        |  58 +--
 .../src/main/res/values-ja/strings.xml        | 124 ++++++
 .../src/main/res/values-ms/strings.xml        |  22 +-
 .../src/main/res/values-nb/strings.xml        |  50 ++-
 .../src/main/res/values-nl/strings.xml        | 377 +++++++++++++++++
 .../src/main/res/values-oc/strings.xml        |  25 +-
 .../src/main/res/values-pt-rBR/strings.xml    |  51 ++-
 .../src/main/res/values-ru/strings.xml        |  60 +--
 .../src/main/res/values-sq/strings.xml        | 119 ++++--
 .../src/main/res/values-sr/strings.xml        |  22 +-
 .../src/main/res/values-sv/strings.xml        | 152 +++++++
 .../src/main/res/values-tr/strings.xml        |  22 +-
 .../src/main/res/values-zh-rCN/strings.xml    |  54 ++-
 briar-android/src/main/res/values/strings.xml |   1 -
 27 files changed, 1948 insertions(+), 496 deletions(-)
 delete mode 100644 briar-android/src/main/res/layout-land/invitation_bluetooth_start.xml
 create mode 100644 briar-android/src/main/res/values-br/strings.xml
 create mode 100644 briar-android/src/main/res/values-cs/strings.xml
 create mode 100644 briar-android/src/main/res/values-he/strings.xml
 create mode 100644 briar-android/src/main/res/values-ja/strings.xml
 create mode 100644 briar-android/src/main/res/values-nl/strings.xml
 create mode 100644 briar-android/src/main/res/values-sv/strings.xml

diff --git a/briar-android/src/main/res/layout-land/invitation_bluetooth_start.xml b/briar-android/src/main/res/layout-land/invitation_bluetooth_start.xml
deleted file mode 100644
index 3eead4f7a..000000000
--- a/briar-android/src/main/res/layout-land/invitation_bluetooth_start.xml
+++ /dev/null
@@ -1,71 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout
-	xmlns:android="http://schemas.android.com/apk/res/android"
-	android:layout_width="match_parent"
-	android:layout_height="match_parent"
-	android:orientation="horizontal"
-	android:paddingBottom="@dimen/margin_activity_vertical"
-	android:paddingEnd="@dimen/margin_activity_horizontal"
-	android:paddingLeft="@dimen/margin_activity_horizontal"
-	android:paddingRight="@dimen/margin_activity_horizontal"
-	android:paddingStart="@dimen/margin_activity_horizontal"
-	android:paddingTop="@dimen/margin_activity_vertical">
-
-	<ImageView
-		android:id="@+id/imageView"
-		android:layout_width="0dp"
-		android:layout_height="wrap_content"
-		android:layout_gravity="center_vertical"
-		android:layout_marginEnd="@dimen/margin_medium"
-		android:layout_marginRight="@dimen/margin_medium"
-		android:layout_weight="1"
-		android:adjustViewBounds="true"
-		android:scaleType="fitCenter"
-		android:src="@drawable/bluetooth"/>
-
-	<ScrollView
-		android:layout_width="0dp"
-		android:layout_height="match_parent"
-		android:layout_weight="1">
-
-		<LinearLayout
-			android:layout_width="match_parent"
-			android:layout_height="wrap_content"
-			android:orientation="vertical">
-
-			<TextView
-				style="@style/BriarTextBody"
-				android:layout_width="match_parent"
-				android:layout_height="wrap_content"
-				android:text="@string/your_nickname"
-				android:visibility="gone"/>
-
-			<Spinner
-				android:id="@+id/spinner"
-				android:layout_width="match_parent"
-				android:layout_height="wrap_content"
-				android:layout_marginTop="@dimen/margin_medium"
-				android:background="@drawable/border_spinner"
-				android:spinnerMode="dropdown"
-				android:visibility="gone"/>
-
-			<TextView
-				style="@style/BriarTextBody"
-				android:layout_width="match_parent"
-				android:layout_height="wrap_content"
-				android:layout_marginTop="@dimen/margin_medium"
-				android:text="@string/face_to_face"/>
-
-			<Button
-				android:id="@+id/continueButton"
-				style="@style/BriarButton.Default"
-				android:layout_width="match_parent"
-				android:layout_height="wrap_content"
-				android:layout_gravity="center_horizontal"
-				android:layout_marginTop="@dimen/margin_medium"
-				android:text="@string/continue_button"/>
-		</LinearLayout>
-
-	</ScrollView>
-
-</LinearLayout>
\ No newline at end of file
diff --git a/briar-android/src/main/res/values-bg/strings.xml b/briar-android/src/main/res/values-bg/strings.xml
index 62169ffce..f69b1f391 100644
--- a/briar-android/src/main/res/values-bg/strings.xml
+++ b/briar-android/src/main/res/values-bg/strings.xml
@@ -1,8 +1,7 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <resources>
   <!--Setup-->
-  <string name="setup_title">Briar регистрация</string>
-  <string name="setup_explanation">Briar профилът се съхранява криптиран във вашето устройство, а не в облака. Ако деинсталирате Briar или забравите паролата си, няма как да възстановите профила и данните си.</string>
+  <string name="setup_next">Следващ</string>
   <string name="choose_nickname">Изберете име</string>
   <string name="choose_password">Изберете парола</string>
   <string name="confirm_password">Потвърдете парола</string>
@@ -20,12 +19,7 @@
   <string name="startup_failed_notification_title">Briar не можа да стартира</string>
   <string name="startup_failed_notification_text">Може да се наложи да преинсталирате Briar.</string>
   <string name="startup_failed_activity_title">Неуспешно стартиране</string>
-  <string name="startup_failed_db_error">Вашата база данни на Briar е повредена непоправимо. Вашият профил, данни и всички контакти са унищожени. За съжаление се налага да преинсталирате Briar и да създадете нов профил.</string>
   <string name="startup_failed_service_error">Briar не успя да стартира задължителен плъгин. Обикновено преинсталирането на Briar решава този проблем. Моля, имайте предвид, че ще изгубите профила си и всички данни, асоциирани с него, тъй като Briar не съхранява данните ви в централни сървъри.</string>
-  <plurals name="expiry_warning">
-    <item quantity="one">Това е бета версия на Briar. Профилът ви ще изгуби валидност след %d ден и не може да бъде подновен.</item>
-    <item quantity="other">Това е бета версия на Briar. Профилът ви ще изгуби валидност след %d дни и не може да бъде подновен.</item>
-  </plurals>
   <string name="expiry_date_reached">Софтуерът е невалиден.\nБлагодарим ви за тестването!</string>
   <!--Navigation Drawer-->
   <string name="nav_drawer_open_description">Отвори навигационно чекмедже</string>
@@ -69,8 +63,7 @@
   <string name="delete">Изтрий</string>
   <string name="accept">Приеми</string>
   <string name="decline">Откажи</string>
-  <string name="options">Опции</string>
-  <string name="online">Онлайн</string>
+	<string name="online">Онлайн</string>
   <string name="offline">Офлайн</string>
   <string name="send">Изпрати</string>
   <string name="allow">Позволи</string>
@@ -79,6 +72,7 @@
   <string name="ellipsis">...</string>
   <string name="text_too_long">Въведеният текст е твърде дълъг</string>
   <string name="show_onboarding">Показване на помощен диалог</string>
+  <string name="help">Помощ</string>
   <!--Contacts and Private Conversations-->
   <string name="no_contacts">Няма добавени контакти.\n\nНатиснете плюса и следвайте инструкциите, за да добавите приятели.\n\nВнимание: Трябва да се срещнете лично с човека, когото искате да добавите в Контакти. По този начин никой не може да се представи за вас или да чете съобщенията ви в бъдеще.</string>
   <string name="date_no_private_messages">Няма съобщения.</string>
@@ -90,31 +84,18 @@
   <string name="contact_deleted_toast">Контактът е изтрит</string>
   <!--Adding Contacts-->
   <string name="add_contact_title">Добавяне на контакт</string>
-  <string name="your_nickname">Изберете профил:</string>
   <string name="face_to_face">Трябва да се срещнете лично с човека, когото искате да добавите в Контакти.\n\nПо този начин никой не може да се представи за вас или да чете съобщенията ви в бъдеще.</string>
   <string name="continue_button">Напред</string>
-  <string name="your_invitation_code">Кодът ви за покана е</string>
-  <string name="enter_invitation_code">Моля, въведете кодът за покана на контакта ви:</string>
-  <string name="searching_format">Търсене на контакт с код за покана %06d\u2026</string>
   <string name="connection_failed">Неуспешна връзка</string>
-  <string name="could_not_find_contact">Briar не можа да открие вашият контакт </string>
   <string name="try_again_button">Опитай пак</string>
-  <string name="connected_to_contact">Свързан с контакт</string>
-  <string name="calculating_confirmation_code">Изчисляване на код за потвърждение\u2026</string>
-  <string name="your_confirmation_code">Кодът ви за потвърждение е</string>
-  <string name="enter_confirmation_code">Моля, въведете кодът за потвърждение на контакта ви</string>
-  <string name="waiting_for_contact">Изчакване на контакта\u2026</string>
   <string name="waiting_for_contact_to_scan">Изчакване контактът да сканира и да се свърже\u2026</string>
   <string name="exchanging_contact_details">Обмен на данни за контакт\u2026</string>
-  <string name="codes_do_not_match">Кодовете не съвпадат</string>
-  <string name="interfering">Това може да значи, че някой се опитва да попречи на свързването.</string>
   <string name="contact_added_toast">Добавен конктакт: %s</string>
   <string name="contact_already_exists">Контактът %s вече съществува</string>
   <string name="contact_exchange_failed">Неуспех при обмен на контакти</string>
   <string name="qr_code_invalid">QR кодът е невалиден</string>
   <string name="connecting_to_device">Свързване с устройство\u2026</string>
   <string name="authenticating_with_device">Удостоверяване с устройство\u2026</string>
-  <string name="connection_aborted_local">Връзката е прекъсната от нас! Това може да значи, че някой се опитва да попречи на свързването</string>
   <string name="connection_aborted_remote">Връзката е прекъсната от контакта ви! Това може да значи, че някой се опитва да попречи на свързването</string>
   <!--Introductions-->
   <string name="introduction_onboarding_title">Представете контактите си</string>
@@ -364,4 +345,5 @@
   <!--Screen Filters & Tapjacking-->
   <string name="screen_filter_title">Открит е овърлей на екрана</string>
   <string name="screen_filter_body">Друго приложение чертае върху Briar. За да защити вашата сигурност, Briar няма да реагира на докосване, докато друго приложение чертае отгоре.\n\nОпитайте да изключите следните приложения, когато използвате Briar:\n\n%1$s</string>
+  <!--Permission Requests-->
 </resources>
diff --git a/briar-android/src/main/res/values-br/strings.xml b/briar-android/src/main/res/values-br/strings.xml
new file mode 100644
index 000000000..98b7c6e2d
--- /dev/null
+++ b/briar-android/src/main/res/values-br/strings.xml
@@ -0,0 +1,149 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<resources>
+  <!--Setup-->
+  <string name="setup_title">Degemer mat war Briar</string>
+  <string name="setup_next">De-heul</string>
+  <string name="setup_password_intro">Dibabit ur ger-tremen</string>
+  <string name="setup_doze_title">Kevreadennoù drek-leur</string>
+  <string name="setup_doze_button">Aotren ar c\'hevreadennoù</string>
+  <string name="choose_nickname">Dibabit ho lezanv</string>
+  <string name="choose_password">Dibabit ho ker-tremen</string>
+  <string name="confirm_password">Kadarnait ho ker-tremen</string>
+  <string name="name_too_long">Re hir eo an anv</string>
+  <string name="password_too_weak">Re wan eo ar ger-kuzh</string>
+  <string name="passwords_do_not_match">Ne glot ket ar gerioù-tremen</string>
+  <string name="create_account_button">Krouiñ ur gont</string>
+  <string name="more_info">Muioc\'h a ditouroù</string>
+  <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="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>
+  <string name="dialog_title_lost_password">Kollet em eus ma ger-tremen</string>
+  <string name="startup_failed_notification_title">N\'hall ket loc\'hañ Briar</string>
+  <string name="startup_failed_notification_text">Rankout a rit staliañ a nevez Briar.</string>
+  <!--Navigation Drawer-->
+  <string name="contact_list_button">Darempredoù</string>
+  <string name="groups_button">Strolladoù prevez</string>
+  <string name="forums_button">Foromoù</string>
+  <string name="blogs_button">Blogoù</string>
+  <string name="settings_button">Arventennoù</string>
+  <string name="sign_out_button">Digevreañ</string>
+  <!--Transports-->
+  <string name="transport_tor">Kenrouedad</string>
+  <string name="transport_bt">Bluetooth</string>
+  <string name="transport_lan">Wi-Fi</string>
+  <!--Notifications-->
+  <string name="ongoing_notification_title">Marilhet e-barzh Briar</string>
+  <string name="ongoing_notification_text">Touchit da zigeriñ Briar.</string>
+  <plurals name="private_message_notification_text">
+    <item quantity="one">Kemennadenn prevez nevez</item>
+    <item quantity="other">%d a gemennadennoù prevez nevez. </item>
+  </plurals>
+  <plurals name="group_message_notification_text">
+    <item quantity="one">Kemennadenn strollad nevez.</item>
+    <item quantity="other">%d a gemennadennoù strollad nevez.</item>
+  </plurals>
+  <plurals name="forum_post_notification_text">
+    <item quantity="one">Postadenn forom nevez.</item>
+    <item quantity="other">%da bostadennoù forom nevez.</item>
+  </plurals>
+  <plurals name="blog_post_notification_text">
+    <item quantity="one">Postadenn blog nevez.</item>
+    <item quantity="other">%d a bostadennoù blog nevez.</item>
+  </plurals>
+  <!--Misc-->
+  <string name="now">bremañ</string>
+  <string name="show">Diskouez</string>
+  <string name="hide">Kuzhaat</string>
+  <string name="ok">MAT EO</string>
+  <string name="cancel">Nullañ</string>
+  <string name="got_it">Deuet eo ganin</string>
+  <string name="delete">Dilemel</string>
+  <string name="accept">Asantiñ</string>
+  <string name="decline">Nac\'hañ</string>
+	<string name="online">Enlinenn</string>
+  <string name="offline">Ezlinenn</string>
+  <string name="send">Kas</string>
+  <string name="allow">Aotren</string>
+  <string name="open">Digeriñ</string>
+  <string name="no_data">Roadenn ebet</string>
+  <string name="ellipsis">…</string>
+  <string name="text_too_long">An destenn ebarzhet a zo re hir</string>
+  <string name="show_onboarding">Diskouez an diviz skoazell</string>
+  <string name="help">Skoazell</string>
+  <!--Contacts and Private Conversations-->
+  <string name="date_no_private_messages">Kemennadenn ebet.</string>
+  <string name="message_hint">Doare kemennadenn</string>
+  <string name="delete_contact">Dilemel an darempred</string>
+  <string name="dialog_title_delete_contact">Kadarnat dilemel darempred</string>
+  <string name="contact_deleted_toast">Darempred dilemet</string>
+  <!--Adding Contacts-->
+  <string name="add_contact_title">Ouzhpennañ un darempred</string>
+  <string name="continue_button">Kenderc\'hel</string>
+  <string name="connection_failed">Kevereadenn c\'hwitet</string>
+  <string name="try_again_button">Klask adarre</string>
+  <string name="contact_added_toast">Darempred ouzhpennet: %s</string>
+  <string name="contact_already_exists">An darempred %s a zo anezhañ endeo</string>
+  <string name="camera_error">Fazi Kamera</string>
+  <!--Introductions-->
+  <string name="introduction_onboarding_title">Degas e-barzh ho tarempredoù</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>
+  <string name="introduction_button">Sevel un digoradur</string>
+  <string name="introduction_sent">Kaset eo bet ho tigoradur.</string>
+  <string name="introduction_error">Ur fazi a zo c\'hoarvezet en ur ober an digoradur.</string>
+  <string name="introduction_response_error">Fazi en ur respont d\'an digoradur</string>
+  <plurals name="introduction_notification_text">
+    <item quantity="one">Darempred nevez ouzhpennet.</item>
+    <item quantity="other">%d a zarempredoù nevez ouzhpennet.</item>
+  </plurals>
+  <!--Private Groups-->
+  <string name="groups_created_by">Graet gant %s</string>
+  <plurals name="messages">
+    <item quantity="one">%d kemennadenn</item>
+    <item quantity="other">%d a gemennadennoù</item>
+  </plurals>
+  <string name="groups_group_is_empty">Leun eo ar strollad-mañ</string>
+  <string name="groups_group_is_dissolved">Divodet eo bet ar strollad-mañ</string>
+  <string name="groups_remove">Dilemel</string>
+  <string name="groups_create_group_title">Krouiñ ur strollad prevez</string>
+  <string name="groups_create_group_button">Krouiñ ur strollad</string>
+  <string name="groups_create_group_invitation_button">Kas pedadennoù</string>
+  <string name="groups_create_group_hint">Dibabit un anv evit ho strollad prevez</string>
+  <string name="groups_invitation_sent">Pedadenn ar strollad a zo bet kaset</string>
+  <string name="groups_message_sent">Kemennadenn kaset</string>
+  <string name="groups_member_list">Listenn an izili</string>
+  <string name="groups_invite_members">Pediñ izili</string>
+  <string name="groups_member_created_you">Krouet ho peus ar strollad</string>
+  <string name="groups_member_created">%s en deus krouet ar strollad</string>
+  <string name="groups_member_joined_you">Emezelet ho peus er strollad</string>
+  <string name="groups_member_joined">%s a zo deuet e-barzh ar strollad</string>
+  <string name="groups_leave">Kuitaat ar strollad</string>
+  <string name="groups_leave_dialog_title">Kadarnaat e kuitait ar strollad</string>
+  <string name="groups_leave_dialog_message">C\'hoant ho peus da guitaat ar strollad-mañ?</string>
+  <string name="groups_dissolve">Divodañ ar strollad</string>
+  <string name="groups_dissolve_dialog_title">Kadarnaat e tivodit ar strollad</string>
+  <string name="groups_dissolve_button">Divodañ</string>
+  <!--Private Group Invitations-->
+  <!--Private Groups Revealing Contacts-->
+  <!--Forums-->
+  <!--Forum Sharing-->
+  <string name="forum_share_message">Ouzhpennañ ur gemennadenn (diret)</string>
+  <!--Blogs-->
+  <!--Blog Sharing-->
+  <!--RSS Feeds-->
+  <!--Settings Network-->
+  <!--Settings Security and Panic-->
+  <string name="lock_setting_title">Digevreañ</string>
+  <!--Settings Notifications-->
+  <!--Settings Feedback-->
+  <!--Link Warning-->
+  <!--Crash Reporter-->
+  <!--Sign Out-->
+  <!--Screen Filters & Tapjacking-->
+  <!--Permission Requests-->
+</resources>
diff --git a/briar-android/src/main/res/values-ca/strings.xml b/briar-android/src/main/res/values-ca/strings.xml
index e10b2fe88..d4ab24160 100644
--- a/briar-android/src/main/res/values-ca/strings.xml
+++ b/briar-android/src/main/res/values-ca/strings.xml
@@ -1,8 +1,15 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <resources>
   <!--Setup-->
-  <string name="setup_title">Configuració de Briar</string>
-  <string name="setup_explanation">El teu compte de Briar està encriptat al teu dispositiu, no al núvol. Si desinstal·les Briar o oblides la contrasenya, no hi ha manera de recuperar el teu compte i les teves dades.</string>
+  <string name="setup_title">Benvingut a Briar</string>
+  <string name="setup_name_explanation">El vostre sobrenom es mostrarà al costat de qualsevol contingut que publiqueu. No podeu canviar-lo després de crear el compte.</string>
+  <string name="setup_next">Següent</string>
+  <string name="setup_password_intro">Trieu una contrasenya</string>
+  <string name="setup_password_explanation">El vostre compte Briar s\'emmagatzema encriptada al vostre dispositiu, no al núvol. Si oblideu la vostra contrasenya o desinstal·leu Briar, no hi ha forma de recuperar el vostre compte.\n\nTrieu una contrasenya llarga que sigui difícil d\'endevinar, com ara quatre paraules aleatòries o deu lletres, números i símbols aleatoris.</string>
+  <string name="setup_doze_title">Connexions de fons</string>
+  <string name="setup_doze_intro">Per rebre missatges, Briar necessita estar connectat en segon pla.</string>
+  <string name="setup_doze_explanation">Per rebre missatges, Briar necessita estar connectat en segon pla. Desactiveu les optimitzacions de la bateria perquè Briar es mantingui connectat.</string>
+  <string name="setup_doze_button">Permet connexions</string>
   <string name="choose_nickname">Trieu el sobrenom</string>
   <string name="choose_password">Trieu la contrasenya</string>
   <string name="confirm_password">Confirmeu la contrasenya</string>
@@ -10,6 +17,12 @@
   <string name="password_too_weak">La contrasenya és dèbil</string>
   <string name="passwords_do_not_match">Les contrasenyes no coincideixen</string>
   <string name="create_account_button">Crear compte</string>
+  <string name="more_info">Més informació</string>
+  <string name="don_t_ask_again">No ho tornis a preguntar</string>
+  <string name="setup_huawei_text">Feu clic al botó següent i assegureu-vos que Briar està protegit a la pantalla «Aplicacions protegides».</string>
+  <string name="setup_huawei_button">Protegeix el Briar</string>
+  <string name="setup_huawei_help">Si Briar no s\'afegeix a la llista d\'aplicacions protegides, no podrà executar-se en segon pla.</string>
+  <string name="warning_dozed">%s no ha pogut executar-se en segon pla</string>
   <!--Login-->
   <string name="enter_password">Introdueix la teva contrasenya:</string>
   <string name="try_again">La contrasenya és incorrecta, torna-ho a provar</string>
@@ -20,12 +33,13 @@
   <string name="startup_failed_notification_title">Briar no s\'ha pogut iniciar</string>
   <string name="startup_failed_notification_text">Potser us caldrà reinstal·lar Briar.</string>
   <string name="startup_failed_activity_title">Error iniciant Briar</string>
-  <string name="startup_failed_db_error">Per algun motiu, la vostra base de dades de Briar s\'ha corromput i no té solució. El vostre compte, les vostres dades i totes les connexions s\'han perdut. Malauradament, haureu de reinstal·lar i configurar un compte nou.</string>
+  <string name="startup_failed_db_error">Per alguna raó, la vostra base de dades de Briar està malmesa més enllà de la reparació. El vostre compte, les vostres dades i tots els vostres contactes es perdran. Malauradament, necessiteu tornar a instal·lar Briar i configurar un compte nou.</string>
   <string name="startup_failed_service_error">Briar no ha pogut engegar un plugin necessari. La sol.lució sol ser reinstal.lar Briar. De tota manera, tingueu en compte que si ho feu perdreu el vostre compte i totes les dades associades, doncs Briar no usa servidors centrals per desar les vostres dades.</string>
   <plurals name="expiry_warning">
-    <item quantity="one">Això és una versió beta de Briar. El teu compte expirarà en %d dia i no pot ser renovat.</item>
-    <item quantity="other">Això és una versió beta de Briar. El teu compte expirarà en %d dies i no pot ser renovat.</item>
+    <item quantity="one">Aquesta és una versió de prova de Briar. El vostre compte expira en %d dia i no es pot renovar.</item>
+    <item quantity="other">Aquesta és una versió de prova de Briar. El vostre compte expira en %d dies i no es pot renovar.</item>
   </plurals>
+  <string name="expiry_update">S\'ha ampliat la data de venciment de la prova. El vostre compte caducarà ara en %d dies.</string>
   <string name="expiry_date_reached">Aquest programa ha caducat.\nGràcies per haver-lo provat!</string>
   <!--Navigation Drawer-->
   <string name="nav_drawer_open_description">Obre el calaix de navegació</string>
@@ -51,6 +65,14 @@
     <item quantity="one">Missatge de grup nou.</item>
     <item quantity="other">1%d missatges de grup nous</item>
   </plurals>
+  <plurals name="forum_post_notification_text">
+    <item quantity="one"> Un nou missatge del fòrum.</item>
+    <item quantity="other">%d nous missatges del fòrum.</item>
+  </plurals>
+  <plurals name="blog_post_notification_text">
+    <item quantity="one">Una nova publicacions al bloc.</item>
+    <item quantity="other">%d noves publicacions al bloc.</item>
+  </plurals>
   <!--Misc-->
   <string name="now">Ara</string>
   <string name="show">Mostrar</string>
@@ -61,8 +83,7 @@
   <string name="delete">Suprimeix</string>
   <string name="accept">Accepta</string>
   <string name="decline">Rebutja</string>
-  <string name="options">Opcions</string>
-  <string name="online">En línia</string>
+	<string name="online">En línia</string>
   <string name="offline">Fora de línia</string>
   <string name="send">Envia</string>
   <string name="allow">Permet</string>
@@ -71,9 +92,12 @@
   <string name="ellipsis">...</string>
   <string name="text_too_long">El text introduït és massa llarg</string>
   <string name="show_onboarding">Mostra el diàleg d\'ajuda.</string>
+  <string name="fix">Corregeix</string>
+  <string name="help">Ajuda</string>
   <!--Contacts and Private Conversations-->
   <string name="no_contacts">Sembla que sou nouvingut i no teniu contactes encara.\n\nToqueu la icona + en la part superior i seguiu les instruccions per a afegir amics a la llista.\n\nRecordeu: afegiu només contactes cara a cara per a evitar que algú es faça passar per vós o pugui llegir els vostres missatges en el futur. </string>
   <string name="date_no_private_messages">Sense missatges.</string>
+  <string name="no_private_messages">Aquesta és la vista de conversa.\n\nSembla que hi manca una part de la conversa.\n\nNomés cal que toqueu el camp d\'entrada a la part inferior per iniciar una conversa.</string>
   <string name="message_hint">Escriu el missatge.</string>
   <string name="delete_contact">Suprimeix contacte</string>
   <string name="dialog_title_delete_contact">Confirma la supressió del contacte</string>
@@ -81,31 +105,20 @@
   <string name="contact_deleted_toast">Contacte suprimit</string>
   <!--Adding Contacts-->
   <string name="add_contact_title">Afegir contacte</string>
-  <string name="your_nickname">Escull la identitat que vols utilitzar:</string>
   <string name="face_to_face">T\'has de trobar amb la persona que vols afegir com a contacte.\n\nAixò evitarà que algú suplanti la teva identitat o llegeixi els teus missatges.</string>
   <string name="continue_button">Continua</string>
-  <string name="your_invitation_code">El teu codi d\'invitació és</string>
-  <string name="enter_invitation_code">Si us plau, entra el codi d\'invitació del teu contacte:</string>
-  <string name="searching_format">Cercant el contacte amb codi d\'invitació %06d\u2026</string>
   <string name="connection_failed">La connexió ha fallat</string>
-  <string name="could_not_find_contact">Briar no ha pogut trobar el teu contacte aprop</string>
   <string name="try_again_button">Torna-ho a provar</string>
-  <string name="connected_to_contact">Connectat amb el contacte</string>
-  <string name="calculating_confirmation_code">Calculant el codi de confirmació\u2026</string>
-  <string name="your_confirmation_code">El teu codi de confirmació és</string>
-  <string name="enter_confirmation_code">Si us plau entra el codi de confirmació del teu contacte:</string>
-  <string name="waiting_for_contact">Esperant el contacte\u2026</string>
   <string name="waiting_for_contact_to_scan">Esperant que el teu contacte escanegi i connecti\u2026</string>
   <string name="exchanging_contact_details">Intercanviant els detalls del contacte\u2026</string>
-  <string name="codes_do_not_match">Els codis no coincideixen</string>
-  <string name="interfering">Això pot significar que algú està intentant interferir la teva connexió</string>
   <string name="contact_added_toast">Contacte afegit: %s</string>
   <string name="contact_already_exists">El contacte %s ja existeix</string>
   <string name="contact_exchange_failed">L\'intercanvi de contactes ha fallat</string>
   <string name="qr_code_invalid">El codi QR és invàlid</string>
+  <string name="camera_error">Error de la càmera</string>
   <string name="connecting_to_device">Connectant al dispositiu\u2026</string>
   <string name="authenticating_with_device">Autenticant-se amb el dispositiu\u2026</string>
-  <string name="connection_aborted_local">Hem avortat la connexió! Això podria significar que algú està provant d\'interferir la vostra connexió</string>
+  <string name="connection_aborted_local">S\'ha avortat la connexió! Això podria significar que algú intenta interferir amb la vostra connexió</string>
   <string name="connection_aborted_remote">El teu contacte ha avortat la connexió! Això podria significar que algú està provant d\'interferir la vostra connexió</string>
   <!--Introductions-->
   <string name="introduction_onboarding_title">Introdueix els teus contactes</string>
@@ -117,7 +130,19 @@
   <string name="introduction_sent">S\'ha enviat la teva presentació.</string>
   <string name="introduction_error">Hi ha hagut un error al fer la presentació de contactes.</string>
   <string name="introduction_response_error">Error en respondre a la presentació</string>
+  <string name="introduction_request_sent">Heu demanat que introduïu %1$s a %2$s.</string>
+  <string name="introduction_request_received">%1$s ha demanat que us presenteu a %2$s. Voleu afegir a%2$s a la vostra llista de contactes?</string>
+  <string name="introduction_request_exists_received">%1$s ha demanat que us presenteu a %2$s, però %2$s ja està a la vostra llista de contactes. Com que %1$s no sap això, encara podeu respondre:</string>
+  <string name="introduction_request_answered_received">%1$s ha demanat que us presenteu a %2$s.</string>
   <string name="introduction_response_accepted_sent">Has acceptat la presentació amb el contacte %1$s.</string>
+  <string name="introduction_response_declined_sent">Heu rebutjat la presentació a %1$s.</string>
+  <string name="introduction_response_accepted_received">%1$s va acceptar la presentació de %2$s.</string>
+  <string name="introduction_response_declined_received">%1$s va rebutjar la presentació a %2$s.</string>
+  <string name="introduction_response_declined_received_by_introducee">%1$s diu que %2$s va rebutjar la presentació.</string>
+  <plurals name="introduction_notification_text">
+    <item quantity="one">S\'ha afegit un nou contacte.</item>
+    <item quantity="other">S\'ha afegit %d nous contactes.</item>
+  </plurals>
   <!--Private Groups-->
   <string name="groups_list_empty">No pertanyeu a cap grup.\n\nToqueu la icona + en la part superior per a crear un grup o demaneu als vostres contactes que us conviden a un grup.</string>
   <string name="groups_created_by">Creat per 1%s</string>
@@ -154,14 +179,26 @@
   <string name="groups_invitations_invitation_sent">Heu convidat a 1%1$s al grup \"%2$s \".</string>
   <string name="groups_invitations_invitation_received">1%1$s us ha convidat a unir-vos al grup \" 2%2$s \".</string>
   <string name="groups_invitations_joined">Us heu unit al grup</string>
+  <string name="groups_invitations_declined">S\'ha rebutjat la invitació al grup</string>
+  <string name="groups_invitations_response_accepted_sent">Heu acceptat la invitació del grup de %s.</string>
+  <string name="groups_invitations_response_declined_sent">Heu rebutjat la invitació del grup de %s.</string>
+  <string name="groups_invitations_response_accepted_received">%s va acceptar la invitació del grup.</string>
+  <string name="groups_invitations_response_declined_received">%s va rebutjar la invitació del 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-->
+  <string name="groups_reveal_contacts">Revela els contactes</string>
+  <string name="groups_reveal_dialog_message">Podeu triar si voleu que es mostrin contactes a tots els membres actuals i futurs d\'aquest grup.\n\nLa revelació dels contactes fa que la vostra connexió al grup sigui més ràpida i més fiable, ja que podeu comunicar-vos amb els contactes revelats, fins i tot quan el creador del grup està fora de línia.</string>
+  <string name="groups_reveal_visible">La relació del contacte és visible per al grup</string>
+  <string name="groups_reveal_visible_revealed_by_us">La relació del contacte és visible per al grup (revelat per vós)</string>
+  <string name="groups_reveal_visible_revealed_by_contact">La relació del contacte és visible per al grup (revelat per %s)</string>
+  <string name="groups_reveal_invisible">La relació del contacte no és visible per al grup</string>
   <!--Forums-->
   <string name="no_forums">No teniu cap fòrum encara.\n\nPer què no en creeu un de nou tocant el + que hi ha a la part superior dreta?\n\nTambé podeu demanar els vostres contactes que us conviden a fòrums.</string>
   <string name="create_forum_title">Crea un fòrum</string>
   <string name="choose_forum_hint">Trieu un nom per al fòrum</string>
   <string name="create_forum_button">Crea el fòrum</string>
   <string name="forum_created_toast">S\'ha creat el fòrum</string>
+  <string name="no_forum_posts">Aquest fòrum està buit.\n\nUtilitzeu la icona de la ploma a la part superior per redactar la primera publicació.\n\nEsteu aquí sol? Compartiu aquest fòrum amb els vostres contactes!</string>
   <string name="no_posts">No hi ha publicacions</string>
   <plurals name="posts">
     <item quantity="one">%d publicacio</item>
@@ -174,9 +211,33 @@
   <string name="forum_leave">Abandona el fòrum</string>
   <string name="dialog_title_leave_forum">Confirmeu la sortida del Forum</string>
   <string name="dialog_message_leave_forum">Esteu segur que voleu sotir del fòrum? Els contactes amb qui heu compartit aquest fòrum podrien deixar de rebre\'n actualitzacions</string>
+  <string name="dialog_button_leave">Abandona</string>
+  <string name="forum_left_toast">Abandona el fòrum</string>
   <!--Forum Sharing-->
+  <string name="forum_share_button">Comparteix el fòrum</string>
+  <string name="contacts_selected">Contactes seleccionats</string>
   <string name="activity_share_toolbar_header">Tria contactes</string>
+  <string name="no_contacts_selector">Sembla que sou nou aquí i no teniu cap contacte.\n\nTorneu aquí després d\'afegir el primer contacte.</string>
+  <string name="forum_shared_snackbar">Fòrum compartit amb els contactes seleccionats</string>
   <string name="forum_share_message">Afegiu un missatge (opcional)</string>
+  <string name="forum_share_error">S\'ha produït un error en compartir aquest fòrum.</string>
+  <string name="forum_invitation_received">%1$s ha compartit el fòrum «%2$s» amb vós.</string>
+  <string name="forum_invitation_sent">Heu compartit el fòrum «%1$s» amb %2$s.</string>
+  <string name="forum_invitations_title">Invitacions al fòrum</string>
+  <string name="forum_invitation_exists">Ja heu acceptat una invitació a aquest fòrum. L\'acceptació de més invitacions augmentarà i enfortirà la comunicació al fòrum.</string>
+  <string name="forum_declined_toast">S\'ha rebutjat la invitació al fòrum</string>
+  <string name="shared_by_format">Compartit per 1%s</string>
+  <string name="forum_invitation_response_accepted_sent">Heu acceptat la invitació del fòrum de %s.</string>
+  <string name="forum_invitation_response_declined_sent">Heu rebutjat la invitació del fòrum de %s.</string>
+  <string name="forum_invitation_response_accepted_received">%s va acceptar la invitació del fòrum.</string>
+  <string name="forum_invitation_response_declined_received">%s va rebutjar la invitació del fòrum.</string>
+  <string name="sharing_status_forum">Qualsevol membre d\'un fòrum pot compartir-lo amb els seus contactes. Esteu compartint aquest fòrum amb els següents contactes. També hi pot haver altres membres que no pugueu veure.</string>
+  <string name="shared_with">Compartit amb %1$d (%2$d en línia)</string>
+  <plurals name="forums_shared">
+    <item quantity="one">%d fòrum compartit per contactes</item>
+    <item quantity="other">%d fòrums compartits per contactes</item>
+  </plurals>
+  <string name="nobody">Ningú</string>
   <!--Blogs-->
   <string name="read_more">llegir més</string>
   <!--Blog Sharing-->
@@ -223,4 +284,5 @@
   <string name="close">Tanca</string>
   <!--Sign Out-->
   <!--Screen Filters & Tapjacking-->
+  <!--Permission Requests-->
 </resources>
diff --git a/briar-android/src/main/res/values-cs/strings.xml b/briar-android/src/main/res/values-cs/strings.xml
new file mode 100644
index 000000000..0c6370b55
--- /dev/null
+++ b/briar-android/src/main/res/values-cs/strings.xml
@@ -0,0 +1,387 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<resources>
+  <!--Setup-->
+  <string name="setup_title">Vítejte v Briar</string>
+  <string name="setup_name_explanation">Vaše uživatelské jméno bude zobrazeno u jakéhokoli obsahu, který zveřejníte. Následná změna již nebude možná.</string>
+  <string name="setup_next">Další</string>
+  <string name="setup_password_intro">Zvolte heslo</string>
+  <string name="setup_password_explanation">Váš Briar účet je šifrován a uložen ve vašem zařízení, nikoli v cloudu. Pokud zapomenete své heslo nebo odinstalujete Briar, obnovit Váš účet již nebude možné.\n\nZvolte si dlouhé heslo, které je těžké uhádnout, například čtyři náhodné fráze nebo deset náhodných písmen, čísel a symbolů.</string>
+  <string name="setup_doze_title">Připojení na pozadí</string>
+  <string name="setup_doze_intro">Pro příjem zpráv je nutné, aby byl Briar stále spuštěn na pozadí.</string>
+  <string name="setup_doze_explanation">Pro příjem zpráv je nutné, aby byl Briar spuštěn na pozadí. Prosím, vypněte optimalizaci baterie, jedině tak bude Briar stále připojen.</string>
+  <string name="setup_doze_button">Povolit připojení</string>
+  <string name="choose_nickname">Zvolte si uživatelské jméno</string>
+  <string name="choose_password">Zvolte si heslo</string>
+  <string name="confirm_password">Potvrďte své heslo</string>
+  <string name="name_too_long">Jméno je příliš dlouhé</string>
+  <string name="password_too_weak">Heslo je příliš slabé</string>
+  <string name="passwords_do_not_match">Zadaná hesla se neshodují</string>
+  <string name="create_account_button">Vytvořit účet</string>
+  <string name="more_info">Další informace</string>
+  <string name="don_t_ask_again">Znovu se již neptat</string>
+  <string name="setup_huawei_text">Klikněte na níže uvedené tlačítko a ujistěte se, že byl Briar zařazen mezi \"Chráněné aplikace\".</string>
+  <string name="setup_huawei_button">Chránit Briar</string>
+  <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="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>
+  <string name="dialog_title_lost_password">Ztracené heslo</string>
+  <string name="dialog_message_lost_password">Váš Briar účet je šifrován a uložen ve vašem zařízení, nikoli v cloudu, z tohoto důvodu není možné obnovit Vaše heslo. Chcete odstranit svůj účet a začít znovu?\n\nUpozornění: Vaše identita, kontakty a zprávy budou permanentně ztraceny.</string>
+  <string name="startup_failed_notification_title">Briar nemohl být spuštěn</string>
+  <string name="startup_failed_notification_text">Můžete zkusit Briar přeinstalovat.</string>
+  <string name="startup_failed_activity_title">Spuštění Briar selhalo.</string>
+  <string name="startup_failed_db_error">Z nějakého důvodu je Briar databáze poškozena a není možná její obnova. Váš účet, data a všechny vaše kontakty jsou ztraceny. Bohužel musíte Briar přeinstalovat a nastavit nový účet.</string>
+  <string name="startup_failed_service_error">Briar nemohl spustit vyžadovaný plugin. Tento problém vyřeší přeinstalování Briar. Mějte prosím na vědomí, že přeinstalováním ztratíte veškerá data pro váš účet, protože Briar nepoužívá centralizované ukládání vašich dat na serverech.</string>
+  <plurals name="expiry_warning">
+    <item quantity="one">Toto je testovací verze Briar. Váš účet a jeho platnost vyprší po %d dnech a není možné ho obnovit.</item>
+    <item quantity="few">Toto je testovací verze Briar. Váš účet a jeho platnost vyprší po %d dnech a není možné ho obnovit.</item>
+    <item quantity="other">Toto je testovací verze Briar. Váš účet a jeho platnost vyprší po %d dnech a není možné ho obnovit.</item>
+  </plurals>
+  <string name="expiry_update">Datum expirace pro testování bylo prodlouženo. Váš účet nyní bude expirovat po %d dnech.</string>
+  <string name="expiry_date_reached">Platnost tohoto software vypršela.\nDěkujeme za jeho otestování!</string>
+  <!--Navigation Drawer-->
+  <string name="nav_drawer_open_description">Otevřít navigační lištu</string>
+  <string name="nav_drawer_close_description">Zavřít navigační lištu</string>
+  <string name="contact_list_button">Kontakty</string>
+  <string name="groups_button">Soukromá skupina</string>
+  <string name="forums_button">Fóra</string>
+  <string name="blogs_button">Blogy</string>
+  <string name="settings_button">Nastavení</string>
+  <string name="sign_out_button">Odhlásit se</string>
+  <!--Transports-->
+  <string name="transport_tor">Internet</string>
+  <string name="transport_bt">Bluetooth</string>
+  <string name="transport_lan">Wi-Fi</string>
+  <!--Notifications-->
+  <string name="ongoing_notification_title">Přihlásit se do Briar</string>
+  <string name="ongoing_notification_text">Kliknutím otevřít Briar</string>
+  <plurals name="private_message_notification_text">
+    <item quantity="one">Nová soukromá zpráva</item>
+    <item quantity="few">%d nových soukromých zpráv.</item>
+    <item quantity="other">%d nových soukromých zpráv.</item>
+  </plurals>
+  <plurals name="group_message_notification_text">
+    <item quantity="one">Nová zpráva ve skupině.</item>
+    <item quantity="few">%d nových zpráv ve skupině. </item>
+    <item quantity="other">%d nových zpráv ve skupině.</item>
+  </plurals>
+  <plurals name="forum_post_notification_text">
+    <item quantity="one">Nový příspěvek ve fóru.</item>
+    <item quantity="few">%dnových příspěvků ve fóru. </item>
+    <item quantity="other">%d nových příspěvků ve fóru.</item>
+  </plurals>
+  <plurals name="blog_post_notification_text">
+    <item quantity="one">Nový příspěvek v blogu.</item>
+    <item quantity="few">%dnových příspěvků v blogu. </item>
+    <item quantity="other">%d nových příspěvků v blogu.</item>
+  </plurals>
+  <!--Misc-->
+  <string name="now">nyní</string>
+  <string name="show">Ukázat</string>
+  <string name="hide">Skrýt</string>
+  <string name="ok">Ok</string>
+  <string name="cancel">Zrušit</string>
+  <string name="got_it">Chápu</string>
+  <string name="delete">Odstranit</string>
+  <string name="accept">Přijmout</string>
+  <string name="decline">Odmítnout</string>
+	<string name="online">Online</string>
+  <string name="offline">Offline</string>
+  <string name="send">Odeslat</string>
+  <string name="allow">Povolit</string>
+  <string name="open">Otevřít</string>
+  <string name="no_data">Žádná data</string>
+  <string name="ellipsis">...</string>
+  <string name="text_too_long">Zadaný text je příliš dlouhý</string>
+  <string name="show_onboarding">Zobrazit dialog pro pomoc</string>
+  <string name="fix">Opravit</string>
+  <string name="help">Pomoc</string>
+  <!--Contacts and Private Conversations-->
+  <string name="no_contacts">Zdá se, že tu jste noví a dosud nemáte žádné kontakty.\n\nKliknětě na + v horní části a sledujte instrukce jak přidat kontakty.\n\n Prosím pamatuj: Můžeš přidat pouze nové kontakty, se kterými jsi tváří-tvář. Je to prevence situacím, kdy se za Tebe bude chtít někdo vydávat, či bude chtít číst Tvé zprávy.</string>
+  <string name="date_no_private_messages">Žádné zprávy</string>
+  <string name="no_private_messages">Toto je konverzace a její náhled.\n\nZdá se, že postrádáte konverzace.\n\nKliknutím na vstupní pole v dolní části zahajte konverzaci.</string>
+  <string name="message_hint">Psát zprávu</string>
+  <string name="delete_contact">Odstranit kontakt</string>
+  <string name="dialog_title_delete_contact">Potvrdit odstranění kontaktu</string>
+  <string name="dialog_message_delete_contact">Jste si jisti, že chcete odstranit kontakt a všechny související zprávy s tímto kontaktem?</string>
+  <string name="contact_deleted_toast">Kontakt odstraněn</string>
+  <!--Adding Contacts-->
+  <string name="add_contact_title">Přidat kontakt</string>
+  <string name="face_to_face">Musíte se osobně setkat s osobou, kterou si chcete přidat jako kontakt.\n\nToto v budoucnu zabrání komukoli, aby se za vás vydával nebo četl Vaše zprávy.</string>
+  <string name="continue_button">Pokračovat</string>
+  <string name="connection_failed">Chyba spojení</string>
+  <string name="try_again_button">Zkusit znovu</string>
+  <string name="waiting_for_contact_to_scan">Čekání na scan kontaktu a spojení\u2026</string>
+  <string name="exchanging_contact_details">Výměna detailů kontaktu\u2026</string>
+  <string name="contact_added_toast">Kontakt byl přidán: %s</string>
+  <string name="contact_already_exists">Kontakt %s již existuje</string>
+  <string name="contact_exchange_failed">Chyba výměny kontaktu</string>
+  <string name="qr_code_invalid">QR kód je neplatný</string>
+  <string name="camera_error">Vyskytla se chyba fotoaparátu</string>
+  <string name="connecting_to_device">Připojování k zařízení\u2026</string>
+  <string name="authenticating_with_device">Ověřování se zařízením\u2026</string>
+  <string name="connection_aborted_local">Spojení bylo přerušeno! To může znamenat, že se někdo pokouší zasáhnout do vašeho spojení.</string>
+  <string name="connection_aborted_remote">Připojení bylo přerušeno vaším kontaktem! To může znamenat, že se někdo pokouší zasahovat do vašeho připojení</string>
+  <!--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_activity_title">Vybrat kontakt</string>
+  <string name="introduction_message_title">Pozvat kontakty</string>
+  <string name="introduction_message_hint">Přidat zprávu (volitelné)</string>
+  <string name="introduction_button">Vytvořit pozvání</string>
+  <string name="introduction_sent">Vaše pozvání bylo odesláno.</string>
+  <string name="introduction_error">Vyskytla se chyba při tvorbě pozvání.</string>
+  <string name="introduction_response_error">Chyba při odpovědi na pozvání.</string>
+  <string name="introduction_request_sent">Požádali jste o pozvání %1$s do %2$s.</string>
+  <string name="introduction_request_received">%1$s vás požádal o uvedení do %2$s. Chcete přidat %2$s mezi vaše kontakty?</string>
+  <string name="introduction_request_exists_received">%1$s vás požádal o představení s %2$s, ale %2$s je již ve vašich kontaktech. Pravděpodobně to %1$s neví, ale stále můžete odpovědět:</string>
+  <string name="introduction_request_answered_received">%1$s vás žádá o pozvání do %2$s.</string>
+  <string name="introduction_response_accepted_sent">Přijali jste pozvání do %1$s.</string>
+  <string name="introduction_response_declined_sent">Odmítli jste představení do %1$s.</string>
+  <string name="introduction_response_accepted_received">%1$s přijal pozvání do %2$s.</string>
+  <string name="introduction_response_declined_received">%1$s odmítl pozvání do %2$s.</string>
+  <string name="introduction_response_declined_received_by_introducee">%1$s řekl, že %2$s odmítl pozvání.</string>
+  <plurals name="introduction_notification_text">
+    <item quantity="one">Nový kontakt byl přidán.</item>
+    <item quantity="few">Bylo přidáno %d nových kontaktů.</item>
+    <item quantity="other">%d nových kontaktů bylo přidáno.</item>
+  </plurals>
+  <!--Private Groups-->
+  <string name="groups_list_empty">Nepodílíte se na žádné skupině.\n\nKlikněte na ikonu + výše pro vytvoření vaší skupiny nebo požádejte některého z vašich kontaktů o pozvání do některých skupin.</string>
+  <string name="groups_created_by">Vytvořeno %s</string>
+  <plurals name="messages">
+    <item quantity="one">%d zpráva</item>
+    <item quantity="few">%d zpráv</item>
+    <item quantity="other">%d zpráv</item>
+  </plurals>
+  <string name="groups_group_is_empty">Tato skupina je prázdná</string>
+  <string name="groups_group_is_dissolved">Tato skupina byla rozpuštěna</string>
+  <string name="groups_remove">Odstranit</string>
+  <string name="groups_create_group_title">Vytvořit soukromou skupinu</string>
+  <string name="groups_create_group_button">Vytvořit skupinu</string>
+  <string name="groups_create_group_invitation_button">Poslat pozvánku</string>
+  <string name="groups_create_group_hint">Vyberte jméno pro vaši soukromou skupinu</string>
+  <string name="groups_invitation_sent">Skupinová pozvánka byla odeslána</string>
+  <string name="groups_message_sent">Zpráva odeslána</string>
+  <string name="groups_member_list">Seznam členů</string>
+  <string name="groups_invite_members">Pozvat členy</string>
+  <string name="groups_member_created_you">Vytvořili jste skupinu</string>
+  <string name="groups_member_created">%s vytvořil skupinu</string>
+  <string name="groups_member_joined_you">Vstoupili jste do skupiny</string>
+  <string name="groups_member_joined">%s se připojil ke skupině</string>
+  <string name="groups_leave">Opustit skupinu</string>
+  <string name="groups_leave_dialog_title">Potvrdit opuštění skupiny</string>
+  <string name="groups_leave_dialog_message">Jste si jisti, že chcete opustit tuto skupinu?</string>
+  <string name="groups_dissolve">Rozpustit skupinu</string>
+  <string name="groups_dissolve_dialog_title">Potvrzení rozpuštění skupiny</string>
+  <string name="groups_dissolve_dialog_message">Jste si jisti, že chcete tuto skupinu rozpustit?\n\nVšichni členové nebudou moci pokračovat v konverzacích a taktéž nebudou schopni přijímat zprávy.</string>
+  <string name="groups_dissolve_button">Rozpuštění</string>
+  <string name="groups_dissolved_dialog_title">Skupina byla rozpuštěna</string>
+  <string name="groups_dissolved_dialog_message">Zakladatel tuto skupinu rozpustil.\n\nV této skupině již nemůžeš psát zprávy a taktéž přijímat příspěvky, které byly napsány.</string>
+  <!--Private Group Invitations-->
+  <string name="groups_invitations_title">Skupinové pozvánky</string>
+  <string name="groups_invitations_invitation_sent">Pozvali jste %1$s k připojení ke skupině \"%2$s\".</string>
+  <string name="groups_invitations_invitation_received">%1$s vás pozval, abyste se připojili ke skupině \"%2$s\".</string>
+  <string name="groups_invitations_joined">Připojení ke skupině</string>
+  <string name="groups_invitations_declined">Pozvání do skupiny bylo odmítnuto</string>
+  <plurals name="groups_invitations_open">
+    <item quantity="one">%d otevřená skupinová pozvánka</item>
+    <item quantity="few">%d otevřených skupinových pozvánek</item>
+    <item quantity="other">%d otevřených skupinových pozvánek</item>
+  </plurals>
+  <string name="groups_invitations_response_accepted_sent">Přijali jste pozvání do skupiny od %s.</string>
+  <string name="groups_invitations_response_declined_sent">Odmítli jste pozvání do skupiny od %s.</string>
+  <string name="groups_invitations_response_accepted_received">%s přijatých pozvání ke skupině.</string>
+  <string name="groups_invitations_response_declined_received">%s odmítnutých pozvání ke skupině.</string>
+  <string name="sharing_status_groups">Pouze zakladatel může pozvat nové členy do skupiny. Níže jsou všichni současní členové skupiny.</string>
+  <!--Private Groups Revealing Contacts-->
+  <string name="groups_reveal_contacts">Odkrýt kontakty</string>
+  <string name="groups_reveal_dialog_message">Můžete si vybrat, zda chcete své kontakty odhalit všem současným i budoucím členům této skupiny.\n\nPřidáním kontaktů je vaše připojení ke skupině rychlejší a spolehlivější, protože můžete komunikovat s odhalenými kontakty i když je tvůrce skupiny offline.</string>
+  <string name="groups_reveal_visible">Vztah s kontaktem je viditelný ve skupině</string>
+  <string name="groups_reveal_visible_revealed_by_us">Vztah s kontaktem je viditelný ve skupině (Tebou odkrytý)</string>
+  <string name="groups_reveal_visible_revealed_by_contact">Vztah s kontaktem je viditelný ve skupině (byl odkrytý %s)</string>
+  <string name="groups_reveal_invisible">Vztah s kontaktem není viditelný ve skupině</string>
+  <!--Forums-->
+  <string name="no_forums">Dosud nemáte žádné fórum.\n\nProč si nějaké své nevytvoříte kliknutím v horní části na symbol +?\n\nMůžete taktéž požádat své kontakty o sdílení některých fór s vámi.</string>
+  <string name="create_forum_title">Vytvořit fórum</string>
+  <string name="choose_forum_hint">Vybrat jméno pro vaše fórum</string>
+  <string name="create_forum_button">Vytvořit fórum</string>
+  <string name="forum_created_toast">Fórum vytvořeno</string>
+  <string name="no_forum_posts">Toto fórum je prázdné.\n\nPoužij ikonu tužky nahoře k vytvoření prvního příspěvku.\n\nCítíš se tu dobře? Sdílej toto fórum s vícero svými kontakty.</string>
+  <string name="no_posts">Žádné příspěvky</string>
+  <plurals name="posts">
+    <item quantity="one">%d příspěvek</item>
+    <item quantity="few">%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>
+  <string name="dialog_title_leave_forum">Potvrdit opuštění fóra</string>
+  <string name="dialog_message_leave_forum">Opravdu chcete opustit toto fórum? Kontakty, které jste sdíleli s tímto fórem, mohou být odebrány z příjmu aktualizací tohoto fóra.</string>
+  <string name="dialog_button_leave">Opustit</string>
+  <string name="forum_left_toast">Opustit fórum</string>
+  <!--Forum Sharing-->
+  <string name="forum_share_button">Sdílet fórum</string>
+  <string name="contacts_selected">Zvolené kontakty</string>
+  <string name="activity_share_toolbar_header">Zvolit kontakty</string>
+  <string name="no_contacts_selector">Zdá se, že jste tu noví a doposud nemáte žádné kontakty.\n\nProsím, vraťte se zpět po přidání svého prvního kontaktu.</string>
+  <string name="forum_shared_snackbar">Fórum sdíleno s vybranými kontakty</string>
+  <string name="forum_share_message">Přidat zprávu (volitelné)</string>
+  <string name="forum_share_error">Při sdílení tohoto fóra nastala chyba.</string>
+  <string name="forum_invitation_received">%1$s sdílel fórum \"%2$s\" s vámi.</string>
+  <string name="forum_invitation_sent">Sdíleli jste fórum \"%1$s\" s %2$s.</string>
+  <string name="forum_invitations_title">Pozvání do fóra</string>
+  <string name="forum_invitation_exists">Již jste přijali pozvání do tohoto fóra. Přijímání dalších pozvánek povede a posílí komunikaci ve fóru.</string>
+  <string name="forum_joined_toast">Vstoupit do fóra</string>
+  <string name="forum_declined_toast">Pozvánka do fóra byla zamítnuta</string>
+  <string name="shared_by_format">Sdíleno %s</string>
+  <string name="forum_invitation_already_sharing">Již sdílené</string>
+  <string name="forum_invitation_response_accepted_sent">Přijali jste pozvání do fóra od %s.</string>
+  <string name="forum_invitation_response_declined_sent">Odmítli jste pozvání do fóra od %s.</string>
+  <string name="forum_invitation_response_accepted_received">%s přijatých pozvání do fóra.</string>
+  <string name="forum_invitation_response_declined_received">%s odmítnutých pozvání do fóra.</string>
+  <string name="sharing_status">Sdílet status</string>
+  <string name="sharing_status_forum">Každý člen fóra to může sdílet se svými kontakty. Vy sdílíte toto fórum s následujícími kontakty. Mohou existovat i další členové, které nevidíte.</string>
+  <string name="shared_with">Sdíleno s %1$d (%2$d online)</string>
+  <plurals name="forums_shared">
+    <item quantity="one">%d fórum sdíleno kontakty</item>
+    <item quantity="few">%d fór sdíleno kontakty </item>
+    <item quantity="other">%d fór sdíleno kontakty</item>
+  </plurals>
+  <string name="nobody">Nikdo</string>
+  <!--Blogs-->
+  <string name="blogs_other_blog_empty_state">Tento blog je momentálně prázdný.\n\nPokud autor nebo osoba, sdílící s vámi tento blog, ještě nic nenapsali, pro synchronizaci příspěvků je tedy nutné, aby byli online.</string>
+  <string name="read_more">Číst dál</string>
+  <string name="blogs_write_blog_post">Napsat příspěvek do Blogu</string>
+  <string name="blogs_write_blog_post_body_hint">Svůj příspěvek do blogu zadejte zde</string>
+  <string name="blogs_publish_blog_post">Publikovat</string>
+  <string name="blogs_blog_post_created">Příspěvek do blogu byl vytvořen</string>
+  <string name="blogs_blog_post_received">Přijatý nový příspěvek v blogu.</string>
+  <string name="blogs_blog_post_scroll_to">Přejít na</string>
+  <string name="blogs_feed_empty_state">Toto je globální kanál blogu.\n\nZdá se, že ještě nikdo neblogoval..\n\nBuďte první, klikněte na ikonu tužky a napište do blogu nový příspěvek.</string>
+  <string name="blogs_remove_blog">Odstranit blog</string>
+  <string name="blogs_remove_blog_dialog_message">Jste si jisti, že chcete odstranit tento blog a všechny příspěvky v něm?\nPamatujte, že blog nebude odstraněn ze zařízení ostatních lidí.</string>
+  <string name="blogs_remove_blog_ok">Odstranit blog</string>
+  <string name="blogs_blog_removed">Blog byl odstraněn</string>
+  <string name="blogs_reblog_comment_hint">Přidat komentář (volitelné)</string>
+  <string name="blogs_reblog_button">Reblog</string>
+  <!--Blog Sharing-->
+  <string name="blogs_sharing_share">Sdílet blog</string>
+  <string name="blogs_sharing_error">Vyskytla se chyba při sdílení tohoto blogu.</string>
+  <string name="blogs_sharing_button">Sdílet blog</string>
+  <string name="blogs_sharing_snackbar">Blog sdílen s vybranými kontakty.</string>
+  <string name="blogs_sharing_response_accepted_sent">Přijali jste pozvání do blogu od %s.</string>
+  <string name="blogs_sharing_response_declined_sent">Odmítli jste pozvání do blogu od %s.</string>
+  <string name="blogs_sharing_response_accepted_received">%s schválených pozvání do blogu.</string>
+  <string name="blogs_sharing_response_declined_received">%s odmítnutých pozvání do blogu.</string>
+  <string name="blogs_sharing_invitation_received">%1$s sdílel blog \"%2$s\" s vámi.</string>
+  <string name="blogs_sharing_invitation_sent">Sdíleli jste blog \"%1$s\" s %2$s.</string>
+  <string name="blogs_sharing_invitations_title">Pozvánky do blogu</string>
+  <string name="blogs_sharing_joined_toast">Přihlásit se k blogu</string>
+  <string name="blogs_sharing_declined_toast">Pozvání do blogu bylo zamítnuto</string>
+  <string name="sharing_status_blog">Kdokoli, kdo odebírá blog ho může sdílet se svými kontakty. Sdílíte tento blog s následujícími kontakty. Mohou existovat i jiní účastníci, které nevidíte.</string>
+  <!--RSS Feeds-->
+  <string name="blogs_rss_feeds_import">Import RSS kanálu</string>
+  <string name="blogs_rss_feeds_import_button">Import</string>
+  <string name="blogs_rss_feeds_import_hint">Zadejte URL adresu RSS kanálu</string>
+  <string name="blogs_rss_feeds_import_error">Omlouváme se! Vyskytla se chyba při importu vašeho kanálu.</string>
+  <string name="blogs_rss_feeds_manage">Správa RSS kanálů</string>
+  <string name="blogs_rss_feeds_manage_imported">Importováno:</string>
+  <string name="blogs_rss_feeds_manage_author">Autor:</string>
+  <string name="blogs_rss_feeds_manage_updated">Naposledy aktualizováno:</string>
+  <string name="blogs_rss_remove_feed">Odstranit kanál</string>
+  <string name="blogs_rss_remove_feed_dialog_message">Skutečně chceš smazat tento kanál a s ním spojené příspěvky?\nVeškeré příspěvky, které jste sdíleli, nebudou odstraněny ze zařízení jiných lidí.</string>
+  <string name="blogs_rss_remove_feed_ok">Odstranit kanál</string>
+  <string name="blogs_rss_feeds_manage_delete_error">Kanál nemohl být odstraněn !</string>
+  <string name="blogs_rss_feeds_manage_empty_state">Nemáte naimportovaný žádný RSS kanál.\n\nProč nekliknete na znak plus v horní části obrazovky, kde můžete přidat svůj první zdroj?</string>
+  <string name="blogs_rss_feeds_manage_error">Vyskytl se problém s načtením vašeho kanálu příspěvků. Zkuste to prosím později.</string>
+  <!--Settings Network-->
+  <string name="network_settings_title">Sítě</string>
+  <string name="bluetooth_setting">Spojení přes Bluetooth</string>
+  <string name="bluetooth_setting_enabled">Vždy, když jsou kontakty v blízkosti</string>
+  <string name="bluetooth_setting_disabled">Jen když přidáte kontakty</string>
+  <string name="tor_network_setting">Spojení přes Tor</string>
+  <string name="tor_network_setting_never">Nikdy</string>
+  <string name="tor_network_setting_wifi">Jen když používáte Wi-Fi</string>
+  <string name="tor_network_setting_always">Když používáte Wi-Fi nebo mobilní data</string>
+  <!--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>
+  <string name="panic_setting_hint">Nastavte, jak bude Briar reagovat, když použijete aplikaci tlačítka paniky</string>
+  <string name="panic_app_setting_title">Aplikace Panik tlačítko</string>
+  <string name="unknown_app">neznámá aplikace</string>
+  <string name="panic_app_setting_summary">Žádná aplikace nebyla nastavena</string>
+  <string name="panic_app_setting_none">Žádný</string>
+  <string name="dialog_title_connect_panic_app">Potvrdit aplikaci Paniky</string>
+  <string name="dialog_message_connect_panic_app">Jste si jisti, že chcete povolit %1$s spustit akci zneškodnění pomocí tlačítka paniky?</string>
+  <string name="lock_setting_title">Odhlásit se</string>
+  <string name="lock_setting_summary">Odhlásit se z Briar, pokud je stisknuto tlačítko paniky</string>
+  <string name="purge_setting_title">Odstranit účet</string>
+  <string name="purge_setting_summary">Vymazat váš Briar účet pokud je stlačeno tlačítko paniky. Upozornění: Toto trvale vymaže vaši identitu, kontakty a zprávy</string>
+  <string name="uninstall_setting_title">Odinstalovat Briar</string>
+  <string name="uninstall_setting_summary">Toto vyžaduje manuální potvrzení v události paniky</string>
+  <!--Settings Notifications-->
+  <string name="notification_settings_title">Oznámení</string>
+  <string name="notify_private_messages_setting_title">Soukromé zprávy</string>
+  <string name="notify_private_messages_setting_summary">Zobrazit upozornění pro soukromé zprávy</string>
+  <string name="notify_group_messages_setting_title">Skupinové zprávy</string>
+  <string name="notify_group_messages_setting_summary">Zobrazit upozornění pro skupinové zprávy</string>
+  <string name="notify_forum_posts_setting_title">Příspěvky fóra</string>
+  <string name="notify_forum_posts_setting_summary">Zobrazit upozornění pro příspěvky fóra</string>
+  <string name="notify_blog_posts_setting_title">Příspěvky v blogu</string>
+  <string name="notify_blog_posts_setting_summary">Zobrazit upozornění pro příspěvky v blogu</string>
+  <string name="notify_vibration_setting">Vibrovat</string>
+  <string name="notify_lock_screen_setting_title">Zamčená obrazovka</string>
+  <string name="notify_lock_screen_setting_summary">Zobrazit oznámení na zamčené obrazovce</string>
+  <string name="notify_sound_setting">Zvuk</string>
+  <string name="notify_sound_setting_default">Výchozí vyzvánění</string>
+  <string name="notify_sound_setting_disabled">Žádný</string>
+  <string name="choose_ringtone_title">Zvolit vyzváněcí tón</string>
+  <string name="cannot_load_ringtone">Nelze načíst vyzváněcí tón</string>
+  <!--Settings Feedback-->
+  <string name="feedback_settings_title">Zpětná vazba</string>
+  <string name="send_feedback">Poslat zpětnou vazbu</string>
+  <!--Link Warning-->
+  <string name="link_warning_title">Odkaz varování</string>
+  <string name="link_warning_intro">Chystáte se otevřít následující odkaz pomocí externí eplikace.</string>
+  <string name="link_warning_text">Toto může být užito pro vaší identifikaci. Přemýšlejte o tom, zda důvěřujete osobě, která vám poslala tento odkaz, a zvažte, zda ho otevřete s aplikací Orfox.</string>
+  <string name="link_warning_open_link">Otevřít odkaz</string>
+  <!--Crash Reporter-->
+  <string name="crash_report_title">Hlášení o pádu Briar</string>
+  <string name="briar_crashed">Promiňte, Briar se zhroutil.</string>
+  <string name="not_your_fault">Toto není vaše chyba.</string>
+  <string name="please_send_report">Vaše pomoc je důležitá. Díky ní můžeme postavit lepší Briar tím, že nám pošlete zprávu o pádu aplikace.</string>
+  <string name="report_is_encrypted">Slibujeme, že hlášení je zašifrováno a bezpečně odesláno.</string>
+  <string name="feedback_title">Zpětná vazba</string>
+  <string name="describe_crash">Popište, co se stalo (nepovinné)</string>
+  <string name="enter_feedback">Vložte svou zpětnou vazbu</string>
+  <string name="optional_contact_email">Vaše emailová adresa (nepovinné)</string>
+  <string name="include_debug_report_crash">Zahrnout anonymní data o tomto selhání</string>
+  <string name="include_debug_report_feedback">Zahrnout anonymní data o tomto zařízení</string>
+  <string name="could_not_load_report_data">Data hlášení nemohla být načtena.</string>
+  <string name="send_report">Odeslat hlášení</string>
+  <string name="close">Zavřít</string>
+  <string name="dev_report_saved">Hlášení uloženo. Odesláno bude při příštím přihlášení do Briar.</string>
+  <!--Sign Out-->
+  <string name="progress_title_logout">Odhlásit se z Briar...</string>
+  <!--Screen Filters & Tapjacking-->
+  <string name="screen_filter_title">Bylo zjištěno překrytí obrazovky</string>
+  <string name="screen_filter_body">Jiná aplikace překrývá Briar. Pro vaši bezpečnost, Briar nebude odpovídat na kliknutí, pokud jej bude jiná aplikace překrývat.\n\nZkuste vypnout následující aplikace, když používáte Briar:\n\n%1$s</string>
+  <!--Permission Requests-->
+  <string name="permission_camera_title">Oprávnění pro přístup k fotoaparátu</string>
+  <string name="permission_camera_request_body">Pro scan QR kódu, Briar vyžaduje přístup k fotoaparátu.</string>
+  <string name="permission_camera_denied_body">Odmítli jste udělit oprávnění přístupu k fotoaparátu, avšak pro přidání kontaktů je nutné použití fotoaparátu.\n\nZvažte prosím, opětovné udělení přístupu.</string>
+  <string name="permission_camera_denied_toast">Oprávnění pro přístup k fotoaparátu nebylo uděleno</string>
+</resources>
diff --git a/briar-android/src/main/res/values-de/strings.xml b/briar-android/src/main/res/values-de/strings.xml
index 9ca13542e..3aee61546 100644
--- a/briar-android/src/main/res/values-de/strings.xml
+++ b/briar-android/src/main/res/values-de/strings.xml
@@ -1,8 +1,15 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <resources>
   <!--Setup-->
-  <string name="setup_title">Briar einrichten</string>
-  <string name="setup_explanation">Dein Briar-Konto wird verschlüsselt auf deinem Gerät gespeichert und nicht mit der \"Cloud\" synchronisiert. Wenn du Briar deinstallierst oder dein Passwort vergisst, können das Konto und deine Daten nicht wiederhergestellt werden.</string>
+  <string name="setup_title">Willkommen bei Briar</string>
+  <string name="setup_name_explanation">Dein Benutzername wird neben deinem geposteten Inhalt angezeigt. Du kannst diesen nicht mehr ändern, nachdem du dein Konto erstellt hast.</string>
+  <string name="setup_next">Weiter</string>
+  <string name="setup_password_intro">Wähle ein Passwort</string>
+  <string name="setup_password_explanation">Dein Briar-Konto wird auf deinem Gerät verschlüsselt und nicht in der Cloud gespeichert. Wenn du dein Passwort vergisst oder Briar deinstallierst, gibt es keine Möglichkeit, dein Konto wiederherzustellen.\n\nWähle ein langes Passwort, das schwer zu erraten ist, z.B. vier zufällige Wörter oder zehn zufällige Buchstaben, Zahlen und Symbole.</string>
+  <string name="setup_doze_title">Hintergrundverbindungen</string>
+  <string name="setup_doze_intro">Um Nachrichten zu empfangen, muss Briar im Hintergrund verbunden bleiben.</string>
+  <string name="setup_doze_explanation">Um Nachrichten zu empfangen, muss Briar im Hintergrund verbunden bleiben. Bitte deaktiviere die Batterieoptimierungen, damit Briar in Verbindung bleiben kann.</string>
+  <string name="setup_doze_button">Erlaube Verbindungen</string>
   <string name="choose_nickname">Wähle deinen Benutzernamen</string>
   <string name="choose_password">Wähle dein Passwort</string>
   <string name="confirm_password">Passwort bestätigen</string>
@@ -10,22 +17,29 @@
   <string name="password_too_weak">Passwort zu schwach</string>
   <string name="passwords_do_not_match">Passwörter stimmen nicht überein</string>
   <string name="create_account_button">Konto anlegen</string>
+  <string name="more_info">Weitere Informationen</string>
+  <string name="don_t_ask_again">Frage nicht noch einmal</string>
+  <string name="setup_huawei_text">Bitte tippe auf die Schaltfläche unten und stelle sicher, dass Briar unter \"Geschützte Apps\" angezeigt wird.</string>
+  <string name="setup_huawei_button">Schütze Briar</string>
+  <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="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>
   <string name="dialog_title_lost_password">Passwort vergessen</string>
-  <string name="dialog_message_lost_password">Dein Briar-Konto ist verschlüsselt auf deinem Gerät gespeichert und nicht mit der \"Cloud\" synchronisiert. Deshalb können wir dein Passwort nicht zurücksetzen. Willst du dein Konto löschen und neu beginnen?\n\nAchtung: Deine bestehenden Identitäten, Kontakte und Nachrichten gehen dann für immer verloren.</string>
+  <string name="dialog_message_lost_password">Dein Briar-Konto ist auf deinem Gerät verschlüsselt und nicht in der Cloud gespeichert, deshalb kannst du dein Passwort nicht zurücksetzen. Willst du dein Konto löschen und neu beginnen?\n\nAchtung: Deine bestehenden Identitäten, Kontakte und Nachrichten gehen dann für immer verloren.</string>
   <string name="startup_failed_notification_title">Briar konnte nicht gestartet werden</string>
   <string name="startup_failed_notification_text">Möglicherweise hilft eine Neuinstallation von Briar.</string>
   <string name="startup_failed_activity_title">Fehler beim Starten von Briar</string>
-  <string name="startup_failed_db_error">Deine Briar-Datenbank ist korrupt. Briar-Konto, Daten und alle Verbindungen zu Kontakten können nicht mehr wiederhergestellt werden. Deinstalliere Briar und erstelle nach Installation der aktuellen Briar-Version ein neues Konto.</string>
-  <string name="startup_failed_service_error">Briar konnte ein benötigtes Plugin nicht starten. Normalerweise kann das Problem durch eine Neuinstallation von Briar gelöst werden. Eine Neuinstallation führt jedoch zum Verlust des Kontos und aller dazugehörigen Daten, da Briar deine Daten nicht auf zentralen Servern speichert.</string>
+  <string name="startup_failed_db_error">Aus irgendeinem Grund ist deine Briar-Datenbank irreparabel beschädigt. Dein Konto, deine Daten und alle deinen Kontakte sind verloren. Leider musst du Briar neu installieren und ein neues Konto einrichten.</string>
+  <string name="startup_failed_service_error">Briar konnte ein benötigtes Plugin nicht starten. Normalerweise kann das Problem durch eine Neuinstallation von Briar gelöst werden. Eine Neuinstallation führt jedoch zum Verlust deines Kontos und aller dazugehörigen Daten, da Briar deine Daten nicht auf zentralen Servern speichert.</string>
   <plurals name="expiry_warning">
-    <item quantity="one">Dies ist eine Beta-Version von Briar. Dein Konto läuft in %d Tag ab und kann nicht verlängert werden.</item>
-    <item quantity="other">Dies ist eine Beta-Version von Briar. Dein Konto läuft in %d Tagen ab und kann nicht verlängert werden.</item>
+    <item quantity="one">Dies ist eine Testversion von Briar. Dein Konto läuft in %d Tag ab und kann nicht verlängert werden.</item>
+    <item quantity="other">Dies ist eine Testversion von Briar. Dein Konto läuft in %d Tagen ab und kann nicht verlängert werden.</item>
   </plurals>
+  <string name="expiry_update">Das Ablaufdatum des Tests wurde verlängert. Dein Konto läuft nun in %d Tagen ab.</string>
   <string name="expiry_date_reached">Diese Software ist abgelaufen.\nDanke dass du Briar getestet hast!</string>
   <!--Navigation Drawer-->
   <string name="nav_drawer_open_description">Navigationsleiste öffnen</string>
@@ -69,8 +83,7 @@
   <string name="delete">Löschen</string>
   <string name="accept">Annehmen</string>
   <string name="decline">Ablehnen</string>
-  <string name="options">Optionen</string>
-  <string name="online">Online</string>
+	<string name="online">Online</string>
   <string name="offline">Offline</string>
   <string name="send">Senden</string>
   <string name="allow">Erlauben</string>
@@ -79,8 +92,10 @@
   <string name="ellipsis">…</string>
   <string name="text_too_long">Der eingegebene Text ist leider zu lang</string>
   <string name="show_onboarding">Hilfe anzeigen</string>
+  <string name="fix">Behoben</string>
+  <string name="help">Hilfe</string>
   <!--Contacts and Private Conversations-->
-  <string name="no_contacts">Du scheinst hier neu zu sein und noch keine Kontakte zu haben.\n\nTippe auf das \"+\"-Symbol am oberen Bildschirmrand an und folge den Anweisungen, um Freunde zu deiner Kontaktliste hinzuzufügen.\n\nDenke daran, dass du neue Kontakte nur dann hinzufügen kannst, wenn du ihnen persönlich begegnest. Das hindert andere daran, sich als deine Person auszugeben oder deine Nachrichten zu lesen.</string>
+  <string name="no_contacts">Du scheinst hier neu zu sein und noch keine Kontakte zu haben.\n\nTippe auf das \"+\"-Symbol am oberen Bildschirmrand und folge den Anweisungen, um Freunde zu deiner Kontaktliste hinzuzufügen.\n\nDenke daran, dass du neue Kontakte nur dann hinzufügen kannst, wenn du ihnen persönlich begegnest. Das hindert andere daran, sich als deine Person auszugeben oder deine Nachrichten zu lesen.</string>
   <string name="date_no_private_messages">Keine Nachrichten.</string>
   <string name="no_private_messages">Das ist die Gesprächsansicht.\n\nEs scheint hier einen Mangel an Gesprächsthemen zu geben.\n\nUm ein neues Gespräch zu beginnen, verwende einfach das Eingabefeld am unteren Bildschirmrand.</string>
   <string name="message_hint">Nachricht eingeben</string>
@@ -90,31 +105,20 @@
   <string name="contact_deleted_toast">Kontakt gelöscht</string>
   <!--Adding Contacts-->
   <string name="add_contact_title">Kontakt hinzufügen</string>
-  <string name="your_nickname">Wähle die zu verwendende Identität:</string>
   <string name="face_to_face">Um einen neuen Kontakt hinzuzufügen, ist es notwendig, dass sich beide Kontakte an einem Ort treffen.\n\nDadurch wird betrügerische Identitätsvortäuschung und unautorisierter Kommunikationszugriff verhindert.</string>
   <string name="continue_button">Weiter</string>
-  <string name="your_invitation_code">Dein Einladungs-Code ist</string>
-  <string name="enter_invitation_code">Bitte gib den Einladungs-Code deines Kontakts an:</string>
-  <string name="searching_format">Suche nach Kontakt mit Einladungs-Code %06d\u2026</string>
   <string name="connection_failed">Verbindung fehlgeschlagen</string>
-  <string name="could_not_find_contact">Briar kann deinen Kontakt nicht innerhalb der Reichweite finden.</string>
   <string name="try_again_button">Noch einmal versuchen</string>
-  <string name="connected_to_contact">Mit Kontakt verbunden</string>
-  <string name="calculating_confirmation_code">Bestätigungscode wird berechnet\u2026</string>
-  <string name="your_confirmation_code">Dein Bestätigungscode ist</string>
-  <string name="enter_confirmation_code">Bitte gib den Bestätigungscode deines Kontakts ein:</string>
-  <string name="waiting_for_contact">Warte auf Kontakt\u2026</string>
   <string name="waiting_for_contact_to_scan">Warte auf Scan und Verbindung mit dem Kontakt\u2026</string>
   <string name="exchanging_contact_details">Kontaktdetails werden ausgetauscht\u2026</string>
-  <string name="codes_do_not_match">Codes stimmen nicht überein</string>
-  <string name="interfering">Möglicherweise stört jemand deine Verbindung.</string>
   <string name="contact_added_toast">Kontakt hinzugefügt: %s</string>
   <string name="contact_already_exists">Kontakt %s existiert bereits</string>
   <string name="contact_exchange_failed">Kontaktaustausch fehlgeschlagen</string>
   <string name="qr_code_invalid">Der QR-Code ist ungültig</string>
+  <string name="camera_error">Kamerafehler</string>
   <string name="connecting_to_device">Verbinde mit Gerät\u2026</string>
   <string name="authenticating_with_device">Authentifiziere Gerät\u2026</string>
-  <string name="connection_aborted_local">Verbindung wurde durch uns abgebrochen! Möglicherweise stört jemand deine Verbindung.</string>
+  <string name="connection_aborted_local">Verbindung abgebrochen! Dies könnte bedeuten, dass jemand versucht, deine Verbindung zu stören.</string>
   <string name="connection_aborted_remote">Verbindung wurde durch deinen Kontakt abgebrochen! Möglicherweise stört jemand deine Verbindung.</string>
   <!--Introductions-->
   <string name="introduction_onboarding_title">Mache deine Kontakte untereinander bekannt</string>
@@ -123,8 +127,8 @@
   <string name="introduction_message_title">Kontakte untereinander bekannt machen</string>
   <string name="introduction_message_hint">Nachricht hinzufügen (optional)</string>
   <string name="introduction_button">Kontaktempfehlung abgeben</string>
-  <string name="introduction_sent">Deine Kontaktempfehlung wurde verschickt</string>
-  <string name="introduction_error">Es gab einen Fehler beim Versuch, die Kontaktempfehlung zu verschicken</string>
+  <string name="introduction_sent">Deine Kontaktempfehlung wurde verschickt.</string>
+  <string name="introduction_error">Es gab einen Fehler beim Versuch, die Kontaktempfehlung zu verschicken.</string>
   <string name="introduction_response_error">Fehler bei Antwort auf Kontaktempfehlung</string>
   <string name="introduction_request_sent">Du wolltest %1$s an %2$s als Kontakt empfehlen</string>
   <string name="introduction_request_received">%1$s schlägt vor, dich als Kontakt an %2$s zu empfehlen. Möchtest du %2$s zu deiner Kontaktliste hinzufügen?</string>
@@ -155,7 +159,7 @@
   <string name="groups_create_group_hint">Wähle einen Namen für deine private Gruppe</string>
   <string name="groups_invitation_sent">Gruppeneinladung versendet</string>
   <string name="groups_message_sent">Nachricht gesendet</string>
-  <string name="groups_member_list">Mitglieder</string>
+  <string name="groups_member_list">Mitgliederliste</string>
   <string name="groups_invite_members">Mitglieder einladen</string>
   <string name="groups_member_created_you">Du hast diese Gruppe erstellt</string>
   <string name="groups_member_created">%s hat diese Gruppe erstellt</string>
@@ -189,16 +193,16 @@
   <string name="groups_reveal_contacts">Kontakte teilen</string>
   <string name="groups_reveal_dialog_message">Kontakte können mit allen derzeitigen und zukünftigen Mitgliedern dieser Gruppe geteilt werden.\n\nDas beschleunigt die Verbindung zu der Gruppe und macht sie zusätzlich zuverlässiger, da Kommunikation mit den Mitgliedern auch dann erfolgen kann, wenn der Ersteller der Gruppe offline ist.</string>
   <string name="groups_reveal_visible">Verbindung zum Kontakt ist für die Gruppe sichtbar</string>
-  <string name="groups_reveal_visible_revealed_by_us">Beziehung zum Kontakt ist für diese Gruppe sichtbar (selbst offengelegt)</string>
-  <string name="groups_reveal_visible_revealed_by_contact">Beziehung zum Kontakt ist für diese Gruppe sichtbar (offengelegt durch %s)</string>
-  <string name="groups_reveal_invisible">Beziehung zum Kontakt ist für diese Gruppe nicht sichtbar</string>
+  <string name="groups_reveal_visible_revealed_by_us">Verbindung zum Kontakt ist für diese Gruppe sichtbar (selbst offengelegt)</string>
+  <string name="groups_reveal_visible_revealed_by_contact">Verbindung zum Kontakt ist für diese Gruppe sichtbar (offengelegt durch %s)</string>
+  <string name="groups_reveal_invisible">Verbindung zum Kontakt ist für diese Gruppe nicht sichtbar</string>
   <!--Forums-->
   <string name="no_forums">Du hast noch keine Foren.\n\nWarum erstellst du nicht einfach selbst ein neues Forum, indem du auf das \"+\"-Symbol am oberen Bildschirmrand tippst?\n\nDu kannst auch deine Kontakte auffordern, Foren mit dir zu teilen.</string>
   <string name="create_forum_title">Forum erstellen</string>
   <string name="choose_forum_hint">Wähle einen Namen für dein Forum</string>
   <string name="create_forum_button">Forum erstellen</string>
   <string name="forum_created_toast">Forum wurde erstellt</string>
-  <string name="no_forum_posts">Dieses Forum ist leer.\n\nBenutze das Stift-Icon am oberen Bildschirmrand um den ersten Beitrag zu verfassen.\n\nFühlst du dich einsam hier? Dann teile das Forum mit weiteren Kontakten!</string>
+  <string name="no_forum_posts">Dieses Forum ist leer.\n\nBenutze das Stift-Symbol am oberen Bildschirmrand, um den ersten Beitrag zu verfassen.\n\nFühlst du dich einsam hier? Dann teile das Forum mit weiteren Kontakten!</string>
   <string name="no_posts">Keine Beiträge</string>
   <plurals name="posts">
     <item quantity="one">%d Beitrag</item>
@@ -233,7 +237,7 @@
   <string name="forum_invitation_response_declined_sent">Du hast die Forumeinladung von %s abgelehnt.</string>
   <string name="forum_invitation_response_accepted_received">%s hat die Forumeinladung akzeptiert.</string>
   <string name="forum_invitation_response_declined_received">%s hat die Forumseinladung abgelehnt.</string>
-  <string name="sharing_status">Sharing Status</string>
+  <string name="sharing_status">Freigabestatus</string>
   <string name="sharing_status_forum">Jedes Mitglied eines Forums kann dieses mit seinen Kontakten teilen. Du teilst dieses Forum mit den folgenden Kontakten. Möglicherweise gibt es Mitglieder die nicht sichtbar sind.</string>
   <string name="shared_with">Geteilt mit %1$d (%2$d online)</string>
   <plurals name="forums_shared">
@@ -242,7 +246,7 @@
   </plurals>
   <string name="nobody">Niemand</string>
   <!--Blogs-->
-  <string name="blogs_other_blog_empty_state">Dieser Blog ist momentan leer.\n\nEntweder hat der Autor noch nichts geschrieben, oder die Person, die diesen Blog mit dir geteilt hat, muss online kommen, sodass Beiträge synchronisiert werden können.</string>
+  <string name="blogs_other_blog_empty_state">Dieser Blog ist momentan leer.\n\nEntweder hat der Autor noch nichts geschrieben, oder die Person, die diesen Blog mit dir geteilt hat, muss online gehen, sodass Beiträge synchronisiert werden können.</string>
   <string name="read_more">weiterlesen</string>
   <string name="blogs_write_blog_post">Blogbeitrag erstellen</string>
   <string name="blogs_write_blog_post_body_hint">Gib hier deinen Blogbeitrag ein</string>
@@ -250,7 +254,7 @@
   <string name="blogs_blog_post_created">Blogbeitrag erstellt</string>
   <string name="blogs_blog_post_received">Neuen Blogbeitrag empfangen</string>
   <string name="blogs_blog_post_scroll_to">Scrolle zu</string>
-  <string name="blogs_feed_empty_state">Dies ist die globale Blog-Zeitleiste.\n\nOffensichtlich hat noch niemand etwas veröffentlicht.\n\nSei die oder der Erste und tippe auf das Stift-Icon, um einen neuen Blogbeitrag zu verfassen.</string>
+  <string name="blogs_feed_empty_state">Dies ist die globale Blog-Zeitleiste.\n\nOffensichtlich hat noch niemand etwas veröffentlicht.\n\nSei die oder der Erste und tippe auf das Stift-Symbol, um einen neuen Blogbeitrag zu verfassen.</string>
   <string name="blogs_remove_blog">Blog entfernen</string>
   <string name="blogs_remove_blog_dialog_message">Bist du sicher, dass du diesen Blog und alle dazugehörigen Beiträge löschen möchtest?\nBeachte, dass dies nicht den Blog auf Geräten anderer Leute löscht.</string>
   <string name="blogs_remove_blog_ok">Blog entfernen</string>
@@ -259,14 +263,14 @@
   <string name="blogs_reblog_button">Rebloggen</string>
   <!--Blog Sharing-->
   <string name="blogs_sharing_share">Blog teilen</string>
-  <string name="blogs_sharing_error">Es gab einen Fehler beim Versuch, dieses Blog zu teilen</string>
+  <string name="blogs_sharing_error">Es gab einen Fehler beim Versuch, diesen Blog zu teilen.</string>
   <string name="blogs_sharing_button">Blog teilen</string>
   <string name="blogs_sharing_snackbar">Blog wurde mit ausgewählten Kontakten geteilt</string>
   <string name="blogs_sharing_response_accepted_sent">Du hast die Blogeinladung von %s akzeptiert.</string>
   <string name="blogs_sharing_response_declined_sent">Du hast die Blogeinladung von %s abgelehnt.</string>
   <string name="blogs_sharing_response_accepted_received">%s hat die Blogeinladung akzeptiert.</string>
   <string name="blogs_sharing_response_declined_received">%s hat die Blogeinladung abgelehnt.</string>
-  <string name="blogs_sharing_invitation_received">%1$shat den Blog \"%2$s\" mit Dir geteilt.</string>
+  <string name="blogs_sharing_invitation_received">%1$shat den Blog \"%2$s\" mit dir geteilt.</string>
   <string name="blogs_sharing_invitation_sent">Du teilst den Blog \"%1$s\" mit %2$s.</string>
   <string name="blogs_sharing_invitations_title">Blogeinladungen</string>
   <string name="blogs_sharing_joined_toast">Blog abonniert</string>
@@ -285,7 +289,7 @@
   <string name="blogs_rss_remove_feed_dialog_message">Soll der Feed mit allen Posts wirklich gelöscht werden?\nGeteilte Posts werden dabei nicht von anderen Geräten gelöscht.</string>
   <string name="blogs_rss_remove_feed_ok">Feed entfernen</string>
   <string name="blogs_rss_feeds_manage_delete_error">Der Feed konnte nicht gelöscht werden!</string>
-  <string name="blogs_rss_feeds_manage_empty_state">Du hast bisher noch keine RSS-Feeds importiert. Tippe auf das \"+\"-Icon am oberen Bildschirmrand, um einen neuen Feed hinzuzufügen.</string>
+  <string name="blogs_rss_feeds_manage_empty_state">Du hast bisher noch keine RSS-Feeds importiert. Tippe auf das \"+\"-Symbol am oberen Bildschirmrand, um einen neuen Feed hinzuzufügen.</string>
   <string name="blogs_rss_feeds_manage_error">Es gab ein Problem beim Laden deiner Feeds. Bitte versuche es später erneut.</string>
   <!--Settings Network-->
   <string name="network_settings_title">Netzwerke</string>
@@ -311,7 +315,7 @@
   <string name="panic_app_setting_summary">Keine App eingerichtet</string>
   <string name="panic_app_setting_none">Keine</string>
   <string name="dialog_title_connect_panic_app">Bestätige Panik-App</string>
-  <string name="dialog_message_connect_panic_app">Bist Du sicher, dass Du %1$s erlauben willst, Panik-Button-Ereignisse auszulösen? Dies kann zum Löschen von Daten führen.</string>
+  <string name="dialog_message_connect_panic_app">Bist du sicher, dass du %1$s erlauben willst, Panik-Button-Ereignisse auszulösen? Dies kann zum Löschen von Daten führen.</string>
   <string name="lock_setting_title">Abmelden</string>
   <string name="lock_setting_summary">Von Briar abmelden, wenn ein Panik-Button aktiviert wird</string>
   <string name="purge_setting_title">Konto löschen</string>
@@ -335,6 +339,7 @@
   <string name="notify_sound_setting_default">Standardklingelton</string>
   <string name="notify_sound_setting_disabled">Keine</string>
   <string name="choose_ringtone_title">Klingelton auswählen</string>
+  <string name="cannot_load_ringtone">Klingelton kann nicht geladen werden</string>
   <!--Settings Feedback-->
   <string name="feedback_settings_title">Feedback</string>
   <string name="send_feedback">Feedback abschicken</string>
@@ -360,8 +365,13 @@
   <string name="close">Schließen</string>
   <string name="dev_report_saved">Der Bericht wurde gespeichert. Er wird verschickt, wenn du dich das nächste Mal bei Briar anmeldest.</string>
   <!--Sign Out-->
-  <string name="progress_title_logout">Von Briar abmelden ...</string>
+  <string name="progress_title_logout">Von Briar abmelden...</string>
   <!--Screen Filters & Tapjacking-->
   <string name="screen_filter_title">Bildschirmüberlagerung erkannt</string>
   <string name="screen_filter_body">Eine andere App überlagert Briar. Um deine Sicherheit zu gewährleisten, reagiert Briar in diesem Fall nicht auf deine Eingaben.\n\nBeende deswegen die folgenden Apps während der Verwendung von Briar:\n\n%1$s</string>
+  <!--Permission Requests-->
+  <string name="permission_camera_title">Berechtigung Kamera</string>
+  <string name="permission_camera_request_body">Um den QR-Code zu scannen, benötigt Briar Zugriff auf die Kamera.</string>
+  <string name="permission_camera_denied_body">Du hast den Zugriff auf die Kamera verweigert, aber das Hinzufügen von Kontakten erfordert die Verwendung der Kamera.\n\nBitte gewähre den Zugriff.</string>
+  <string name="permission_camera_denied_toast">Berechtigung für Kamera wurde nicht gewährt</string>
 </resources>
diff --git a/briar-android/src/main/res/values-es/strings.xml b/briar-android/src/main/res/values-es/strings.xml
index 16de8f81a..7262931d5 100644
--- a/briar-android/src/main/res/values-es/strings.xml
+++ b/briar-android/src/main/res/values-es/strings.xml
@@ -1,8 +1,15 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <resources>
   <!--Setup-->
-  <string name="setup_title">Configuración de Briar</string>
-  <string name="setup_explanation">Tu cuenta de Briar se almacena de manera cifrada en tu dispositivo y no en ninguna nube. Si desinstalas Briar u olvidas tu contraseña, no podrás recuperar ni tu cuenta ni tus datos.</string>
+  <string name="setup_title">Bienvenido a Briar</string>
+  <string name="setup_name_explanation">Tu nombre de usuario aparecerá junto a cualquier contenido que publiques. No puedes cambiarlo después de crear tu cuenta.</string>
+  <string name="setup_next">Siguiente</string>
+  <string name="setup_password_intro">Elija una contraseña</string>
+  <string name="setup_password_explanation">Su cuenta Briar se almacena cifrada en su dispositivo, no en la nube. Si olvida su contraseña o desinstala Briar, no hay manera de recuperar su cuenta.\n\nElija una contraseña larga que sea difícil de adivinar, como cuatro palabras aleatorias o diez letras, números y símbolos al azar.</string>
+  <string name="setup_doze_title">Conexiones de fondo</string>
+  <string name="setup_doze_intro">Para recibir mensajes, Briar necesita mantenerse conectado en segundo plano.</string>
+  <string name="setup_doze_explanation">Para recibir mensajes, Briar necesita mantenerse conectado en segundo plano. Desactive las optimizaciones de la batería para que Briar pueda permanecer conectado.</string>
+  <string name="setup_doze_button">Permitir conexiones</string>
   <string name="choose_nickname">Elige tu nombre de usuario</string>
   <string name="choose_password">Elige tu contraseña</string>
   <string name="confirm_password">Confirma tu contraseña</string>
@@ -10,6 +17,12 @@
   <string name="password_too_weak">La contraseña es demasiado débil</string>
   <string name="passwords_do_not_match">Las contraseñas no coinciden</string>
   <string name="create_account_button">Registrar una nueva cuenta</string>
+  <string name="more_info">Más información</string>
+  <string name="don_t_ask_again">No preguntes de nuevo</string>
+  <string name="setup_huawei_text">Por favor toque el botón de abajo y asegúrese de que Briar está protegido en la pantalla \"Aplicaciones protegidas\".</string>
+  <string name="setup_huawei_button">Proteger Briar</string>
+  <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="try_again">Contraseña incorrecta, inténtalo de nuevo</string>
@@ -20,12 +33,13 @@
   <string name="startup_failed_notification_title">Briar no pudo iniciarse</string>
   <string name="startup_failed_notification_text">Quizá tengas que reinstalar Briar.</string>
   <string name="startup_failed_activity_title">Fallo al iniciar Briar</string>
-  <string name="startup_failed_db_error">Por alguna razón, la base de datos de Briar ha sufrido daños irreparables. Tu cuenta, tus datos y todos tus contactos se han perdido. Desafortunadamente, tendrás que reinstalar Briar y registrar una nueva cuenta.</string>
+  <string name="startup_failed_db_error">Por alguna razón, su base de datos Briar está dañada irreparablemente. Su cuenta, sus datos y todos sus contactos están perdidos. Desafortunadamente, necesita reinstalar Briar y configurar una nueva cuenta.</string>
   <string name="startup_failed_service_error">Briar no pudo iniciar un complemento necesario. Reinstalar Briar suele solucionar el problema. Sin embargo, ten en cuenta que perderás tu cuenta y todos los datos asociados ya que Briar no almacena esta información en ningún servidor central.</string>
   <plurals name="expiry_warning">
-    <item quantity="one">Esta es una versión preliminar de Briar. Tu cuenta caducará en %d día y no podrá renovarse.</item>
-    <item quantity="other">Esta es una versión preliminar de Briar. Tu cuenta caducará en %d días y no podrá renovarse.</item>
+    <item quantity="one">Esta es una versión de prueba de Briar. Su cuenta expirará en %d día y no podrá ser renovada.</item>
+    <item quantity="other">Esta es una versión de prueba de Briar. Su cuenta expirará en %d días y no podrá ser renovada.</item>
   </plurals>
+  <string name="expiry_update">La fecha de caducidad de las pruebas se ha ampliado. Su cuenta expirará en  %d días.</string>
   <string name="expiry_date_reached">Esta versión ha caducado.\n¡Gracias por probarla!</string>
   <!--Navigation Drawer-->
   <string name="nav_drawer_open_description">Abrir el panel de navegación</string>
@@ -69,8 +83,7 @@
   <string name="delete">Borrar</string>
   <string name="accept">Aceptar</string>
   <string name="decline">Rechazar</string>
-  <string name="options">Configuración</string>
-  <string name="online">En línea</string>
+	<string name="online">En línea</string>
   <string name="offline">Desconectado</string>
   <string name="send">Enviar</string>
   <string name="allow">Permitir</string>
@@ -79,6 +92,8 @@
   <string name="ellipsis">…</string>
   <string name="text_too_long">El texto es demasiado largo</string>
   <string name="show_onboarding">Mostrar diálogo de ayuda</string>
+  <string name="fix">Reparar</string>
+  <string name="help">Ayuda</string>
   <!--Contacts and Private Conversations-->
   <string name="no_contacts">Parece que eres nuevo por aquí y no tienes aún contactos.\n\nPulsa el signo + en la parte superior y sigue las instrucciones para añadir amigos a tu lista.\n\nPor favor, recuerda: sólo puedes añadir nuevos contactos cara a cara para evitar que nadie suplante tu identidad o lea tus mensajes en el futuro. </string>
   <string name="date_no_private_messages">Sin mensajes.</string>
@@ -90,31 +105,20 @@
   <string name="contact_deleted_toast">Contacto eliminado</string>
   <!--Adding Contacts-->
   <string name="add_contact_title">Añadir un contacto</string>
-  <string name="your_nickname">Elige la identidad que quieres utilizar:</string>
   <string name="face_to_face">Debes reunirte con la persona a la que quieras añadir como contacto.\n\nHaciéndolo así prevendrás que nadie te suplante o pueda leer tus mensajes en el futuro.</string>
   <string name="continue_button">Continuar</string>
-  <string name="your_invitation_code">Tu código de invitación es</string>
-  <string name="enter_invitation_code">Por favor, introduce el código de invitación de tu contacto:</string>
-  <string name="searching_format">Buscando el contacto con el código de invitación %06d\u2026</string>
   <string name="connection_failed">La conexión falló</string>
-  <string name="could_not_find_contact">Briar no pudo encontrar a tu contacto cerca</string>
   <string name="try_again_button">Prueba de nuevo</string>
-  <string name="connected_to_contact">Conectado con el contacto</string>
-  <string name="calculating_confirmation_code">Calculando código de confirmación\u2026</string>
-  <string name="your_confirmation_code">Tu código de confirmación es</string>
-  <string name="enter_confirmation_code">Por favor, introduce el código de confirmación de tu contacto:</string>
-  <string name="waiting_for_contact">Esperando al contacto\u2026</string>
   <string name="waiting_for_contact_to_scan">Esperando a que el contacto escanee y conecte contigo\u2026</string>
   <string name="exchanging_contact_details">Intercambiando información de contacto\u2026</string>
-  <string name="codes_do_not_match">Los códigos no coinciden</string>
-  <string name="interfering">Esto podría significar que alguien está intentando interceptar la conexión</string>
   <string name="contact_added_toast">Contacto añadido: %s</string>
   <string name="contact_already_exists">El contacto %s ya existe</string>
   <string name="contact_exchange_failed">El intercambio del contacto falló</string>
   <string name="qr_code_invalid">El código QR no es válido</string>
+  <string name="camera_error">Error de cámara</string>
   <string name="connecting_to_device">Conectando al dispositivo\u2026</string>
   <string name="authenticating_with_device">Autentificándose con el dispositivo\u2026</string>
-  <string name="connection_aborted_local">¡Hemos interumpido la conexión! Esto podría significar que alguien está intentando interceptar la conexión</string>
+  <string name="connection_aborted_local">¡Conexión interrumpida! Esto podría significar que alguien está intentando interferir con su conexión</string>
   <string name="connection_aborted_remote">¡La conexión ha sido interrumpida por tu contacto! Esto podría significar que alguien está intentando interceptar la conexión</string>
   <!--Introductions-->
   <string name="introduction_onboarding_title">Presenta a tus contactos</string>
@@ -335,6 +339,7 @@
   <string name="notify_sound_setting_default">Tono de notificación predeterminado</string>
   <string name="notify_sound_setting_disabled">Ninguna</string>
   <string name="choose_ringtone_title">Elegir alerta sonora</string>
+  <string name="cannot_load_ringtone">No se puede cargar el timbre</string>
   <!--Settings Feedback-->
   <string name="feedback_settings_title">Retroalimentación</string>
   <string name="send_feedback">Enviar comentario</string>
@@ -364,4 +369,9 @@
   <!--Screen Filters & Tapjacking-->
   <string name="screen_filter_title">Superposición de pantalla detectada</string>
   <string name="screen_filter_body">Otra aplicación se está mostrando encima de Briar. Por seguridad, Briar no responderá a los toques mientras se muestre otra aplicación encima.\n\nIntenta apagar las siguientes aplicaciones cuando uses Briar:\n\n%1$s</string>
+  <!--Permission Requests-->
+  <string name="permission_camera_title">Permiso de cámara</string>
+  <string name="permission_camera_request_body">Para escanear el código QR, Briar necesita acceso a la cámara.</string>
+  <string name="permission_camera_denied_body">Ha denegado el acceso a la cámara, pero para añadir contactos se requiere el uso de la cámara.\n\nPor favor considere la posibilidad de conceder el acceso.</string>
+  <string name="permission_camera_denied_toast">No se concedió el permiso de cámara</string>
 </resources>
diff --git a/briar-android/src/main/res/values-eu/strings.xml b/briar-android/src/main/res/values-eu/strings.xml
index 9e188e369..d400debb8 100644
--- a/briar-android/src/main/res/values-eu/strings.xml
+++ b/briar-android/src/main/res/values-eu/strings.xml
@@ -1,8 +1,15 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <resources>
   <!--Setup-->
-  <string name="setup_title">Briar ezarpena</string>
-  <string name="setup_explanation">Zure Briar kontua zure gailuan zifratuta gordetzen da, ez hodeian. Briar desinstalatzen baduzu edo pasahitza ahazten baduzu, ez dago zure kontua eta datuak berreskuratzeko modurik.</string>
+  <string name="setup_title">Ongi etorri Briar-era</string>
+  <string name="setup_name_explanation">Zure ezizena argitaratzen dituzun eduki guztien ondoan agertuko da. Ezin dezakezu aldatu kontua sortu eta gero.</string>
+  <string name="setup_next">Hurrengoa</string>
+  <string name="setup_password_intro">Aukeratu pasahitz bat</string>
+  <string name="setup_password_explanation">Zure Briar kontua zure gailuan zifratuta gordetzen da, ez hodeian. Briar desinstalatzen baduzu edo pasahitza ahazten baduzu, ez dago zure kontua eta datuak berreskuratzeko modurik.\n\nAukeratu asmatzeko zaila den pasahitz luze bat, adibidez ausazko lau hitz edo ausazko hamar letra, zenbaki eta ikur.</string>
+  <string name="setup_doze_title">Atzeko planoko konexioak</string>
+  <string name="setup_doze_intro">Mezuak jasotzeko, Briar bigarren planoak konektatuta mantendu behar da.</string>
+  <string name="setup_doze_explanation">Mezuak jasotzeko, Briar bigarren planoak konektatuta mantendu behar da. Mesedez desgaitu bateria optimizazioak Briar konektatuta mantendu dadin.</string>
+  <string name="setup_doze_button">Baimendu konexioak</string>
   <string name="choose_nickname">Hautatu zure ezizena</string>
   <string name="choose_password">Hautatu zure pasahitza</string>
   <string name="confirm_password">Berretsi zure pasahitza</string>
@@ -10,6 +17,12 @@
   <string name="password_too_weak">Pasahitza ahulegia da</string>
   <string name="passwords_do_not_match">Pasahitzak ez datoz bat</string>
   <string name="create_account_button">Sortu kontua</string>
+  <string name="more_info">Informazio gehiago</string>
+  <string name="don_t_ask_again">Ez galdetu berriro</string>
+  <string name="setup_huawei_text">Sakatu beheko botoia eta ziurtatu Briar babestuta dagoela \"Babestutako aplikazioak\" pantailan.</string>
+  <string name="setup_huawei_button">Babestu Briar</string>
+  <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="try_again">Pasahitz okerra, saiatu berriro</string>
@@ -20,12 +33,13 @@
   <string name="startup_failed_notification_title">Ezin izan da Briar abiatu</string>
   <string name="startup_failed_notification_text">Agian Briar berrinstalatu behar duzu.</string>
   <string name="startup_failed_activity_title">Briar abio-hutsegitea</string>
-  <string name="startup_failed_db_error">Arrazoiren bategatik, zure Briar datubasea hondatuta dago eta ezin da konpondu. Zure kontua, datuak eta kontaktuekin konexioak galdu dira. Zoritxarrez Briar berrinstalatu behar duzu kontu berria sortzeko.</string>
+  <string name="startup_failed_db_error">Dena delakoagatik, zure Briar datu-basea hondatuta dago eta ezin da konpondu. Zure kontua, zure datuak eta zure kontaktuak galdu dira. Zoritxarrez Briar berrinstalatu behar duzu eta kontu berria sortu.</string>
   <string name="startup_failed_service_error">Briar aplikazioak ezin izan du ezinbesteko plugin bat abiatu. Briar berrinstalatzeak arazoa konpondu ohi du. Hala ere, jakin zure kontua eta datuak galduko dituzula Briar aplikazioak ez baititu zerbitzari zentralak erabiltzen zure datuak gordetzeko.</string>
   <plurals name="expiry_warning">
-    <item quantity="one">Hau Briar aplikazioaren beta bertsio bat da. Zure kontua egun %d barru iraungitu da eta ezin da berritu.</item>
-    <item quantity="other">Hau Briar aplikazioaren beta bertsio bat da. Zure kontua  %d egun barru iraungitu da eta ezin da berritu.</item>
+    <item quantity="one">Hau Briar-en probetarako bertsio bat da. Zure kontua egun %d barru iraungituko da eta ezin da berriztu.</item>
+    <item quantity="other">Hau Briar-en probetarako bertsio bat da. Zure kontua %d egun barru iraungituko da eta ezin da berriztu.</item>
   </plurals>
+  <string name="expiry_update">Probetarako iraungitze data luzatu da. Zure kontua %d egun barru iraungituko da.</string>
   <string name="expiry_date_reached">Programa hau iraungitu da.\nEskerrik asko probatzeagatik!</string>
   <!--Navigation Drawer-->
   <string name="nav_drawer_open_description">Ireki nabigazio tiradera</string>
@@ -69,8 +83,7 @@
   <string name="delete">Ezabatu</string>
   <string name="accept">Onartu</string>
   <string name="decline">Ukatu</string>
-  <string name="options">Aukerak</string>
-  <string name="online">Konektatuta</string>
+	<string name="online">Konektatuta</string>
   <string name="offline">Deskonektatuta</string>
   <string name="send">Bidali</string>
   <string name="allow">Baimendu</string>
@@ -79,6 +92,8 @@
   <string name="ellipsis">…</string>
   <string name="text_too_long">Sartutako testua luzeegia da</string>
   <string name="show_onboarding">Erakutsi laguntza elkarrizketa-koadroa</string>
+  <string name="fix">Konpondu</string>
+  <string name="help">Laguntza</string>
   <!--Contacts and Private Conversations-->
   <string name="no_contacts">Badirudi heldu berria zarela eta ez duzula kontakturik hemen oraindik.\n\nSakatu goiko + ikonoa eta jarraitu argibideak lagunak zure zerrendara gehitzeko.\nGogoratu: Kontaktu berriak aurrez aurre besterik ezin dira gehitu beste inork zure itxurak ez egiteko edo zure mezuak ez irakurtzeko.</string>
   <string name="date_no_private_messages">Mezurik ez.</string>
@@ -90,31 +105,20 @@
   <string name="contact_deleted_toast">Kontaktua ezabatuta</string>
   <!--Adding Contacts-->
   <string name="add_contact_title">Gehitu kontaktua</string>
-  <string name="your_nickname">Hautatu erabili nahi duzun identitatea:</string>
   <string name="face_to_face">Aurrez aurre aurkitu behar zara pertsonarekin kontaktua gehitzeko.\n\nHonek inork zure itxurak egitea edo zure mezuak irakurtzea eragotziko du.</string>
   <string name="continue_button">Jarraitu</string>
-  <string name="your_invitation_code">Zure gonbidapen kodea hau da</string>
-  <string name="enter_invitation_code">Sartu zure gonbidapen kodea:</string>
-  <string name="searching_format">%06d gonbidapen kodea duen erabiltzailea bilatzen\u2026</string>
   <string name="connection_failed">Konexioak huts egin du</string>
-  <string name="could_not_find_contact">Briar aplikazioak ezin izan du zure kontaktua inguruan aurkitu</string>
   <string name="try_again_button">Saiatu berriro</string>
-  <string name="connected_to_contact">Kontaktura konektatuta</string>
-  <string name="calculating_confirmation_code">Berreste kode kalkulatzen\u2026</string>
-  <string name="your_confirmation_code">Zure berreste kodea hau da:</string>
-  <string name="enter_confirmation_code">Sartu zure kontaktuaren berreste kodea:</string>
-  <string name="waiting_for_contact">Kontaktuaren zain\u2026</string>
   <string name="waiting_for_contact_to_scan">Kontaktuak eskaneatu dezan eta konektatu dadin zain\u2026</string>
   <string name="exchanging_contact_details">Kontaktu-xehetasunak trukatzen\u2016</string>
-  <string name="codes_do_not_match">Kodeak ez datoz bat</string>
-  <string name="interfering">Norbait zure konexioan interferentziak sortzen saiatzen ari dela esan nahi lezake</string>
   <string name="contact_added_toast">Kontaktua gehituta: %s</string>
   <string name="contact_already_exists">%s kontaktua badago aurretik</string>
   <string name="contact_exchange_failed">Kontaktuen trukeak huts egin du</string>
   <string name="qr_code_invalid">QR kodea baliogabea da</string>
+  <string name="camera_error">Kameraren errorea</string>
   <string name="connecting_to_device">Gailura konektatzen\u2026</string>
   <string name="authenticating_with_device">Gailuarekin autentifikatzen\u2026</string>
-  <string name="connection_aborted_local">Guk eten dugu konexioa! Norbait zure konexioan interferentziak sortzen saiatzen ari dela esan nahi lezake</string>
+  <string name="connection_aborted_local">Konexioa eten da! Honek norbait konexioan interferentziak sortzen ari dela esan nahi lezake.</string>
   <string name="connection_aborted_remote">Zure kontaktuak eten du konexioa! Norbait zure konexioan interferentziak sortzen saiatzen ari dela esan nahi lezake</string>
   <!--Introductions-->
   <string name="introduction_onboarding_title">Aurkeztu zure kontaktuak</string>
@@ -335,6 +339,7 @@
   <string name="notify_sound_setting_default">Lehenetsitako dei-doinua</string>
   <string name="notify_sound_setting_disabled">Bat ere ez</string>
   <string name="choose_ringtone_title">Hautatu dei-doinua</string>
+  <string name="cannot_load_ringtone">Ezin izan da dei-doinua kargatu</string>
   <!--Settings Feedback-->
   <string name="feedback_settings_title">Iruzkinak</string>
   <string name="send_feedback">Bidali iruzkinak</string>
@@ -364,4 +369,9 @@
   <!--Screen Filters & Tapjacking-->
   <string name="screen_filter_title">Pantaila gainjartzea antzeman da</string>
   <string name="screen_filter_body">Briar aplikazioaren gainean marrazten ari den beste aplikazio bat dago. Zure segurtasuna babesteko Briar aplikazioak ez dio ukimenari erantzungo beste aplikazio bat gainean marrazten dagoen bitartean.\n\nSaiatu honako aplikazioak ixten Briar erabiltzean:\n\n%1$s</string>
+  <!--Permission Requests-->
+  <string name="permission_camera_title">Kamera baimena</string>
+  <string name="permission_camera_request_body">QR kodea eskaneatzeko Briar-ek kamera atzitu behar du.</string>
+  <string name="permission_camera_denied_body">Kameraatzitzeko baimena ukatu duzu, baina kontaktuak gehitzeko kamera behar da.\n\nMesedez baimendu sarbidea.</string>
+  <string name="permission_camera_denied_toast">Eza kameraren baimenik eman</string>
 </resources>
diff --git a/briar-android/src/main/res/values-fi/strings.xml b/briar-android/src/main/res/values-fi/strings.xml
index b45fcb161..c82e6bab5 100644
--- a/briar-android/src/main/res/values-fi/strings.xml
+++ b/briar-android/src/main/res/values-fi/strings.xml
@@ -1,8 +1,15 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <resources>
   <!--Setup-->
-  <string name="setup_title">Briarin asetus</string>
-  <string name="setup_explanation">Sinun Briar tili on tallennettu salattuna sinun laitteelle, ei pilvipalvelimelle. Jos poistat Briarin asennuksen tai unohdat salasanasi, ei ole mitään keinoa jolla tilisi tai dataasi voisi palauttaa.</string>
+  <string name="setup_title">Tervetuloa Briariin</string>
+  <string name="setup_name_explanation">Nimimerkkisi tulee näkymään julkaisemasi sisällön yhteydessä. Et voi muuttaa nimimerkkiä sen jälkeen kun olet luonut tilin.</string>
+  <string name="setup_next">Seuraava</string>
+  <string name="setup_password_intro">Valitse salasana</string>
+  <string name="setup_password_explanation">Sinun Briar tili on tallennettu salattuna sinun laitteelle, ei pilvipalvelimelle. Jos unohdat salasanasi tai poistat Briarin asennuksen, ei ole mitään keinoa jolla tilisi voisi palauttaa.\n\nValitse pitkä salasana, joka on vaikea arvata, esimerkiksi neljä sattumanvaraista sanaa tai kymmenen sattumanvaraista kirjainta, numeroa ja symbolia.</string>
+  <string name="setup_doze_title">Taustayhteydet</string>
+  <string name="setup_doze_intro">Vastaanottaakseen viestejä, Briarin täytyy pitää yhteyttä yllä taustalla.</string>
+  <string name="setup_doze_explanation">Vastaanottaakseen viestejä, Briarin täytyy pitää yhteyttä yllä taustalla. Ole hyvä ja kytke pois akun optimisaatiot, jotta Briar voisi pitää yhteyden yllä.</string>
+  <string name="setup_doze_button">Salli yhteydet</string>
   <string name="choose_nickname">Valitse nimimerkki</string>
   <string name="choose_password">Valitse salasana</string>
   <string name="confirm_password">Vahvista salasana</string>
@@ -10,6 +17,12 @@
   <string name="password_too_weak">Salasana on liian heikko</string>
   <string name="passwords_do_not_match">Salasanat eivät täsmää</string>
   <string name="create_account_button">Luo tili</string>
+  <string name="more_info">Lisätietoja</string>
+  <string name="don_t_ask_again">Älä kysy uudelleen</string>
+  <string name="setup_huawei_text">Napsauta alla olevaa nappia varmistaaksesi, että Briar on suojattu \"Suojatut sovellukset\" -näkymässä.</string>
+  <string name="setup_huawei_button">Suojaa Briar</string>
+  <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="try_again">Väärä salasana, yritä uudelleen</string>
@@ -23,9 +36,10 @@
   <string name="startup_failed_db_error">Jostain syystä sinun Briar tietokanta on korruptoitunut korjauskelvottomaksi. Tilisi, tietosi ja kaikki yhteystietosi on menetetty. Valitettavasti, sinun täytyy asentaa Briar uudelleen ja luoda uusi tili.</string>
   <string name="startup_failed_service_error">Briar ei kyennyt käynnistämään vaadittua liitännäistä. Briarin uudelleenasennus yleensä korjaa ongelman. Huomaa kuitenkin, että tulet menettämään tilisi ja kaikki siihen liittyvä data koska Briar ei käytä palvelimia sinun tietojesi säilyttämiseen.</string>
   <plurals name="expiry_warning">
-    <item quantity="one">Tämä on Briarin beeta versio. Sinun tilisi tulee vanhentumaan %d päivän päästä eikä sitä voi uusia.</item>
-    <item quantity="other">Tämä on Briarin beeta versio. Sinun tilisi tulee vanhentumaan %d päivän päästä eikä sitä voi uusia.</item>
+    <item quantity="one">Tämä on Briarin testiversio. Sinun tilisi tulee vanhentumaan %d päivän päästä eikä sitä voi uusia.</item>
+    <item quantity="other">Tämä on Briarin testiversio. Sinun tilisi tulee vanhentumaan %d päivän päästä eikä sitä voi uusia.</item>
   </plurals>
+  <string name="expiry_update">Testiaikaa on pidennetty. Tilisi tulee nyt vanhentumaan %d päivän kuluttua.</string>
   <string name="expiry_date_reached">Tämä sovellus on vanhentunut.\nKiitos testaamisesta!</string>
   <!--Navigation Drawer-->
   <string name="nav_drawer_open_description">Avaa navigointilaatikko</string>
@@ -69,8 +83,7 @@
   <string name="delete">Poista</string>
   <string name="accept">Hyväksy</string>
   <string name="decline">Kieltäydy</string>
-  <string name="options">Valitsimet</string>
-  <string name="online">Verkossa</string>
+	<string name="online">Verkossa</string>
   <string name="offline">Poissa verkosta</string>
   <string name="send">Lähetä</string>
   <string name="allow">Salli</string>
@@ -79,6 +92,8 @@
   <string name="ellipsis">…</string>
   <string name="text_too_long">Kirjoitettu teksti on liian pitkä</string>
   <string name="show_onboarding">Näytä apudialogi</string>
+  <string name="fix">Korjaa</string>
+  <string name="help">Ohje</string>
   <!--Contacts and Private Conversations-->
   <string name="no_contacts">Näyttää siltä, että olet uusi täällä, eikä sinulla vielä ole yhteyshenkilöitä.\n\nNapauta yllä olevaa + -kuvaketta ja seuraa ohjeita lisätäksesi kavereita luetteloon.\n\nMuista: Voit ainoastaan lisätä uusia yhteyshenkilöitä tapaamalla heidät kasvokkain. Tämä estää sen, että joku voisi esittää olevansa sinä tai lukea viestejäsi tulevaisuudessa.</string>
   <string name="date_no_private_messages">Ei viestejä.</string>
@@ -90,31 +105,20 @@
   <string name="contact_deleted_toast">Yhteystieto poistettu</string>
   <!--Adding Contacts-->
   <string name="add_contact_title">Lisää yhteystieto</string>
-  <string name="your_nickname">Valitse tunnus jota haluat käyttää:</string>
   <string name="face_to_face">Sinun täytyy tavata käyttäjä, jonka haluat lisätä yhteystietoihisi.\n\nTämä estää sen, että joku voisi esittää olevansa sinä tai lukea viestejäsi tulevaisuudessa</string>
   <string name="continue_button">Jatka</string>
-  <string name="your_invitation_code">Sinun kutsukoodi on</string>
-  <string name="enter_invitation_code">Syötä yhteyshenkilösi kutsukoodi:</string>
-  <string name="searching_format">Etsitään yhteyshenkilöä jolla on kutsukoodi %06d\u2026</string>
   <string name="connection_failed">Yhteys epäonnistui</string>
-  <string name="could_not_find_contact">Briar ei löytänyt yhteyshenkilöä lähistöltä</string>
   <string name="try_again_button">Yritä uudelleen</string>
-  <string name="connected_to_contact">Yhdistetty yhteyshenkilöön</string>
-  <string name="calculating_confirmation_code">Luodaan varmennuskoodi\u2026</string>
-  <string name="your_confirmation_code">Sinun varmennuskoodi on</string>
-  <string name="enter_confirmation_code">Syötä yhteyshenkilösi varmennuskoodi:</string>
-  <string name="waiting_for_contact">Odotetaan yhteyshenkilöä\u2026</string>
   <string name="waiting_for_contact_to_scan">Odotetaan, että käyttäjä skannaa ja saa yhteyden\u2026</string>
   <string name="exchanging_contact_details">Yhteystietoja vaihdetaan\u2026</string>
-  <string name="codes_do_not_match">Koodit eivät täsmää</string>
-  <string name="interfering">Tämä voi tarkoittaa, että joku yrittää häiritä sinun ja toisen käyttäjän välistä yhteyttä</string>
   <string name="contact_added_toast">Yhteystieto lisätty: %s</string>
   <string name="contact_already_exists">Yhteystieto %s on jo olemassa</string>
   <string name="contact_exchange_failed">Yhteystietojen vaihto epäonnistui</string>
   <string name="qr_code_invalid">QR koodi on virheellinen</string>
+  <string name="camera_error">Kameravirhe</string>
   <string name="connecting_to_device">Yhdistetään laitteeseen\u2026</string>
   <string name="authenticating_with_device">Tunnistaudutaan laitteen kanssa\u2026</string>
-  <string name="connection_aborted_local">Katkaisimme sinun ja toisen käyttäjän välisen yhteyden! Tämä voi tarkoittaa, että joku muu yrittää häiritä sinun ja toisen käyttäjän välistä yhteyttä</string>
+  <string name="connection_aborted_local">Yhteys katkaistu! Tämä voi tarkoittaa, että joku muu yrittää häiritä sinun ja toisen käyttäjän välistä yhteyttä</string>
   <string name="connection_aborted_remote">Toinen käyttäjä katkaisi yhteyden! Tämä voi tarkoittaa, että joku muu yrittää häiritä sinun ja toisen käyttäjän välistä yhteyttä</string>
   <!--Introductions-->
   <string name="introduction_onboarding_title">Esittele yhteyshenkilösi</string>
@@ -335,6 +339,7 @@
   <string name="notify_sound_setting_default">Oletussoittoääni</string>
   <string name="notify_sound_setting_disabled">Ei mikään</string>
   <string name="choose_ringtone_title">Valitse soittoääni</string>
+  <string name="cannot_load_ringtone">Soittoäänen lataaminen epäonnistui</string>
   <!--Settings Feedback-->
   <string name="feedback_settings_title">Palaute</string>
   <string name="send_feedback">Lähetä palautetta</string>
@@ -364,4 +369,9 @@
   <!--Screen Filters & Tapjacking-->
   <string name="screen_filter_title">Näyttökerros havaittu</string>
   <string name="screen_filter_body">Toinen sovellus on piirtämässä Briarin päälle. Suojellakseen sinun turvallisuutta, Briar ei tule vastaamaan kosketuksiin silloin kun toinen sovellus on piirtämässä Briarin päälle.\n\nYritä sulkea seuraavat sovellukset silloin kun käytät Briaria:\n\n%1$s</string>
+  <!--Permission Requests-->
+  <string name="permission_camera_title">Kameralupa</string>
+  <string name="permission_camera_request_body">Skannatakseen QR koodin, Briar tarvitsee luvan käyttää kameraa.</string>
+  <string name="permission_camera_denied_body">Olet kieltänyt käyttämästä kameraa, mutta yhteyshenkilöiden lisääminen vaatii kameran käyttöä.\n\nOle hyvä ja harkitse kameraluvan myöntämistä.</string>
+  <string name="permission_camera_denied_toast">Kameralupaa ei myönnetty</string>
 </resources>
diff --git a/briar-android/src/main/res/values-fr/strings.xml b/briar-android/src/main/res/values-fr/strings.xml
index 8046f385f..2d5c45ce8 100644
--- a/briar-android/src/main/res/values-fr/strings.xml
+++ b/briar-android/src/main/res/values-fr/strings.xml
@@ -2,8 +2,7 @@
 <resources>
   <!--Setup-->
   <string name="setup_title">Configuration de Briar</string>
-  <string name="setup_explanation">Votre compte Briar est enregistré chiffré sur votre appareil et non sur le nuage. Si vous désinstallez Briar ou oubliez votre mot de passe, votre compte et vos données sont irrécupérables.</string>
-  <string name="choose_nickname">Choisir votre pseudonyme</string>
+	<string name="choose_nickname">Choisir votre pseudonyme</string>
   <string name="choose_password">Choisir votre mot de passe</string>
   <string name="confirm_password">Confirmer votre mot de passe</string>
   <string name="name_too_long">Le nom est trop long</string>
@@ -69,8 +68,7 @@
   <string name="delete">Supprimer</string>
   <string name="accept">Accepter</string>
   <string name="decline">Refuser</string>
-  <string name="options">Options</string>
-  <string name="online">En ligne</string>
+	<string name="online">En ligne</string>
   <string name="offline">Hors ligne</string>
   <string name="send">Envoyer</string>
   <string name="allow">Autoriser</string>
@@ -90,25 +88,13 @@
   <string name="contact_deleted_toast">Le contact a été supprimé</string>
   <!--Adding Contacts-->
   <string name="add_contact_title">Ajouter un contact</string>
-  <string name="your_nickname">Choisir l’identité que vous souhaitez utiliser :</string>
-  <string name="face_to_face">Vous devez rencontrer la personne que vous voulez ajouter comme contact, afin d’éviter que quelqu’un se fasse passer pour vous et puisse lire vos messages à l’avenir.</string>
+	<string name="face_to_face">Vous devez rencontrer la personne que vous voulez ajouter comme contact, afin d’éviter que quelqu’un se fasse passer pour vous et puisse lire vos messages à l’avenir.</string>
   <string name="continue_button">Continuer</string>
-  <string name="your_invitation_code">Votre code d’invitation est</string>
-  <string name="enter_invitation_code">Veuillez saisir le code d’invitation de votre contact :</string>
-  <string name="searching_format">Recherche de contacts avec le code d’invitation %06d\u2026</string>
-  <string name="connection_failed">Échec de connexion</string>
-  <string name="could_not_find_contact">Briar n’a pas trouvé votre contact à proximité</string>
-  <string name="try_again_button">Ressayer</string>
-  <string name="connected_to_contact">Connecté au contact</string>
-  <string name="calculating_confirmation_code">Calcul du code de confirmation\u2026</string>
-  <string name="your_confirmation_code">Votre code de confirmation est</string>
-  <string name="enter_confirmation_code">Veuillez saisir le code de confirmation de votre contact :</string>
-  <string name="waiting_for_contact">En attente du contact\u2026</string>
-  <string name="waiting_for_contact_to_scan">En attente de lecture du code QR par le contact et de sa connexion\u2026</string>
+	<string name="connection_failed">Échec de connexion</string>
+	<string name="try_again_button">Ressayer</string>
+	<string name="waiting_for_contact_to_scan">En attente de lecture du code QR par le contact et de sa connexion\u2026</string>
   <string name="exchanging_contact_details">Échange des renseignements de contact\u2026</string>
-  <string name="codes_do_not_match">Les codes ne correspondent pas</string>
-  <string name="interfering">Cela pourrait signifier que quelqu’un tente d’interférer avec votre connexion</string>
-  <string name="contact_added_toast">Contact ajouté : %s</string>
+	<string name="contact_added_toast">Contact ajouté : %s</string>
   <string name="contact_already_exists">Le contact %s existe déjà</string>
   <string name="contact_exchange_failed">Échec d’échange de contacts</string>
   <string name="qr_code_invalid">Le code QR est invalide</string>
diff --git a/briar-android/src/main/res/values-gl/strings.xml b/briar-android/src/main/res/values-gl/strings.xml
index 163112a9f..033433530 100644
--- a/briar-android/src/main/res/values-gl/strings.xml
+++ b/briar-android/src/main/res/values-gl/strings.xml
@@ -1,8 +1,7 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <resources>
   <!--Setup-->
-  <string name="setup_title">Configuración de Briar</string>
-  <string name="setup_explanation">Briar almacena a súa configuración encriptada no dispositivo, non na nube. Se desinstala Briar ou esquece a súa clave, non hai forma de recuperar a súa conta e datos.</string>
+  <string name="setup_next">Seguinte</string>
   <string name="choose_nickname">Escolle o teu alcume</string>
   <string name="choose_password">Escolle a túa clave</string>
   <string name="confirm_password">Confirma a túa clave</string>
@@ -20,7 +19,6 @@
   <string name="startup_failed_notification_title">Briar non puido iniciarse</string>
   <string name="startup_failed_notification_text">Pode que precises instalar Briar de novo</string>
   <string name="startup_failed_activity_title">Fallo de Inicio de Briar</string>
-  <string name="startup_failed_db_error">A súa base de datos de Briar está corrompida ate o punto que é irreparábel. Perdeuse a súa conta, os seus datos e todos os contactos conectados. Por desgraza debes instalar de novo Briar e configurar unha nova conta.</string>
   <string name="startup_failed_service_error"> Briar non puido iniciar un complemento necesario. Xeralmente reinstalar Briar resolve este problema. Teña en conta que entón perderá a súa conta e todos os datos asociados a esta pois Briar non está a utilizar servidores centrais para almacenar os seus datos.</string>
   <string name="expiry_date_reached">Este software caducou.\nGrazas por probalo!</string>
   <!--Navigation Drawer-->
@@ -49,8 +47,7 @@
   <string name="delete">Eliminar</string>
   <string name="accept">Aceptar</string>
   <string name="decline">Rexeitar</string>
-  <string name="options">Opcións</string>
-  <string name="online">Conectado</string>
+	<string name="online">Conectado</string>
   <string name="offline">Desconectado</string>
   <string name="send">Enviar</string>
   <string name="allow">Permitir</string>
@@ -59,6 +56,7 @@
   <string name="ellipsis">...</string>
   <string name="text_too_long">O texto inserido e demasiado longo</string>
   <string name="show_onboarding">Amosar xanela de axuda</string>
+  <string name="help">Axuda</string>
   <!--Contacts and Private Conversations-->
   <string name="date_no_private_messages">Sen mensaxes</string>
   <string name="message_hint">Esciba unha mensaxe</string>
@@ -67,15 +65,9 @@
   <string name="contact_deleted_toast">Contacto eliminado</string>
   <!--Adding Contacts-->
   <string name="add_contact_title">Engada un contacto</string>
-  <string name="your_nickname">Escolla a identidade que quere usar:</string>
   <string name="continue_button">Continuar</string>
-  <string name="your_invitation_code">O seu código de convite é</string>
-  <string name="enter_invitation_code">Por favor, insira o código de convite do seu contacto</string>
   <string name="connection_failed">Fallou a conexión</string>
   <string name="try_again_button">Tenteo de novo</string>
-  <string name="connected_to_contact">Conectado ao contacto</string>
-  <string name="your_confirmation_code">O seu código de confirmación é</string>
-  <string name="codes_do_not_match">Os códigos non coinciden</string>
   <string name="qr_code_invalid">O código QR non é válido</string>
   <!--Introductions-->
   <string name="introduction_activity_title">Escoller contacto</string>
@@ -117,10 +109,12 @@
   <string name="blogs_publish_blog_post">Publicar</string>
   <!--Blog Sharing-->
   <!--RSS Feeds-->
+  <string name="blogs_rss_feeds_import_button">Importar</string>
   <string name="blogs_rss_feeds_manage_author">Autor/a:</string>
   <string name="blogs_rss_feeds_manage_updated">Última actualización:</string>
   <!--Settings Network-->
   <!--Settings Security and Panic-->
+  <string name="change_password">Cambiar contrasinal</string>
   <string name="panic_app_setting_none">Ningún</string>
   <string name="lock_setting_title">Finalizar sesión</string>
   <!--Settings Notifications-->
@@ -131,4 +125,5 @@
   <string name="close">Pechar</string>
   <!--Sign Out-->
   <!--Screen Filters & Tapjacking-->
+  <!--Permission Requests-->
 </resources>
diff --git a/briar-android/src/main/res/values-he/strings.xml b/briar-android/src/main/res/values-he/strings.xml
new file mode 100644
index 000000000..437f9dc89
--- /dev/null
+++ b/briar-android/src/main/res/values-he/strings.xml
@@ -0,0 +1,266 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<resources>
+  <!--Setup-->
+  <string name="setup_next">הבא</string>
+  <string name="choose_nickname">בחרו כינוי</string>
+  <string name="choose_password">בחרו סיסמה</string>
+  <string name="confirm_password">אשרו את הסיסמה</string>
+  <string name="name_too_long">השם ארוך מדי</string>
+  <string name="password_too_weak">הסיסמה חלשה מדי</string>
+  <string name="passwords_do_not_match">הסיסמאות לא תואמות</string>
+  <string name="create_account_button">יצירת חשבון</string>
+  <!--Login-->
+  <string name="enter_password">הזינו סיסמה:</string>
+  <string name="try_again">הסיסמה שגוייה, נסו שוב</string>
+  <string name="sign_in_button">הכנסו</string>
+  <string name="forgotten_password">שכחתי את הסיסמה שלי</string>
+  <string name="dialog_title_lost_password">הסיסמה נאבדה</string>
+  <string name="dialog_message_lost_password">חשבון הבריאר שלכם שמור ומוצפן על המכשיר, לא בענן, כך שלא נוכל לשחזר את הסיסמה שלכם. למחוק את החשבון שלכם ולהתחיל מחדש?
+
+זהירות: הזהויות שלכם, אנשי הקשר וההודעות יאבדו לצמיתות.</string>
+  <string name="startup_failed_notification_title">אפליקציית בריאר נכשלה באיתחול</string>
+  <string name="startup_failed_notification_text">יכול להיות שתאלצו להתקין מחדש את אפליקציית בריאר.</string>
+  <string name="startup_failed_activity_title">איתחול בריאר נכשל</string>
+  <string name="startup_failed_service_error">בריאר לא הצליח לאתחל תוסף הכרחי. התקנת בריאר מחדש לרוב פותרת בעייה זו. שימו לב שאז תאבדו את חשבונכם וכל המידע המשוייך אליו כיוון שבריאר לא משתמש בשרתים מרכזיים לשמירת המידע שלכם עליהם.</string>
+  <string name="expiry_date_reached">פג תוקפה של תוכנה זו.
+תודה לכם שבדקתם.</string>
+  <!--Navigation Drawer-->
+  <string name="nav_drawer_open_description">פתחו את סרגל הניווט</string>
+  <string name="nav_drawer_close_description">סגרו את סרגל הניווט</string>
+  <string name="contact_list_button">אנשי קשר</string>
+  <string name="groups_button">קבוצות פרטיות</string>
+  <string name="forums_button">פורומים</string>
+  <string name="blogs_button">בלוגים</string>
+  <string name="settings_button">הגדרות</string>
+  <string name="sign_out_button">יציאה</string>
+  <!--Transports-->
+  <string name="transport_tor">אינטרנט</string>
+  <string name="transport_bt">בלוטות\'</string>
+  <string name="transport_lan">Wi-Fi</string>
+  <!--Notifications-->
+  <string name="ongoing_notification_title">מחוברים לבריאר</string>
+  <string name="ongoing_notification_text">לחצו על מנת לפתוח את בריאר</string>
+  <plurals name="private_message_notification_text">
+    <item quantity="one">הודעה פרטית חדשה.</item>
+    <item quantity="other">%d הודעות פריטות חדשות.</item>
+  </plurals>
+  <plurals name="group_message_notification_text">
+    <item quantity="one">הודעה קבוצתית חדשה.</item>
+    <item quantity="other">%d הודעות קבוצתיות חדשות.</item>
+  </plurals>
+  <plurals name="forum_post_notification_text">
+    <item quantity="one">פוסט חדש בפורומים.</item>
+    <item quantity="other">%d פוסטים חדשים בפורומים.</item>
+  </plurals>
+  <plurals name="blog_post_notification_text">
+    <item quantity="one">פוסט חדש בבלוגים.</item>
+    <item quantity="other">%d פוסטים חדשים בבלוגים.</item>
+  </plurals>
+  <!--Misc-->
+  <string name="now">עכשיו</string>
+  <string name="show">הצג</string>
+  <string name="hide">הסתר</string>
+  <string name="ok">אישור</string>
+  <string name="cancel">ביטול</string>
+  <string name="got_it">הבנתי</string>
+  <string name="delete">מחק</string>
+  <string name="accept">קבל</string>
+  <string name="decline">סרב</string>
+	<string name="online">מחובר</string>
+  <string name="offline">לא מחובר</string>
+  <string name="send">שלח</string>
+  <string name="allow">להתיר</string>
+  <string name="open">פתח</string>
+  <string name="no_data">לא נמצא מידע</string>
+  <string name="ellipsis">...</string>
+  <string name="text_too_long">הטקסט שהזנתם ארוך מדי</string>
+  <string name="show_onboarding">הצג עזרה</string>
+  <string name="help">עזרה</string>
+  <!--Contacts and Private Conversations-->
+  <string name="no_contacts">נראה שאתם חדשים כאן ועדיין אין לכם אנשי קשר.
+
+לחצו על האייקון&amp;#160+ למעלה ועקבו אחר ההוראות להוספת חברים לרשימה.
+
+אנא זכרו: אתם יכולים להוסיף אנשי קשר רק פנים-מול-פנים, זאת על מנת למנוע מאנשים להתחזות לכם או לקרוא את הודעותיכם בעתיד.</string>
+  <string name="date_no_private_messages">אין הודעות.</string>
+  <string name="no_private_messages">זהו מסך השיחה.
+
+נראה שאין שיחה.
+
+פשוט לחצו על השדה הטקסט בתחתית בשביל להתחיל שיחה.</string>
+  <string name="message_hint">כתבו הודעה</string>
+  <string name="delete_contact">מחיקת איש קשר</string>
+  <string name="dialog_title_delete_contact">אישור מחיקת איש קשר</string>
+  <string name="dialog_message_delete_contact">האם אתם בטוחים שאתם רוצים למחוק את איש הקשר וכל ההתכתבות איתו?</string>
+  <string name="contact_deleted_toast">איש הקשר נמחק</string>
+  <!--Adding Contacts-->
+  <string name="add_contact_title">הוספת איש קשר</string>
+  <string name="face_to_face">אתם חייבים להפגש עם האדם שאותו תרצו להוסיף כאיש קשר.
+
+זאת על מנת למנוע מצב שבו מתחזים אליכם או קוראים הודעות שלכם בעתיד.</string>
+  <string name="continue_button">המשך</string>
+  <string name="connection_failed">חיבור נכשל</string>
+  <string name="try_again_button">נסו שוב</string>
+  <string name="waiting_for_contact_to_scan">ממתין שאיש הקשר יסרוק ויתחבר\u2026</string>
+  <string name="exchanging_contact_details">מחליף פרטים של איש קשר\u2026</string>
+  <string name="contact_added_toast">איש קשר נוסף: %s</string>
+  <string name="contact_already_exists">איש קשר %s קיים כבר</string>
+  <string name="contact_exchange_failed">החלפת אנשי קשר נכשלה</string>
+  <string name="qr_code_invalid">קוד ה- QR אינו תקף</string>
+  <string name="connecting_to_device">מתחבר למכשיר\u2026</string>
+  <string name="authenticating_with_device">מזדהה מול המכשיר\u2026</string>
+  <string name="connection_aborted_remote">החיבור בוטל על ידי איש הקשר! זה עלול לומר שמישהו מנסה להפריע לחיבור שלכם</string>
+  <!--Introductions-->
+  <string name="introduction_onboarding_title">הציגו את אנשי קשר שלכם</string>
+  <string name="introduction_onboarding_text">אתם יכולים להציג את אנשי הקשר שלכם אחד לשני, כך שהם לא צריכים להפגש פנים-מול-פנים על מנת להתחבר בבריאר.</string>
+  <string name="introduction_activity_title">בחרו איש קשר</string>
+  <string name="introduction_message_title">הציגו אנשי קשר</string>
+  <string name="introduction_message_hint">הוסיפו הודעה (לא חובה)</string>
+  <string name="introduction_button">הציגו איש קשר</string>
+  <string name="introduction_sent">הצגת איש קשר נשלחה.</string>
+  <string name="introduction_error">הייתה שגיאה בעת הצגת איש קשר.</string>
+  <string name="introduction_response_error">שגיאה בעת התגובה להצגת איש קשר</string>
+  <string name="introduction_request_sent">ביקשתם להציג את %1$s ל- %2$s.</string>
+  <string name="introduction_request_received">%1$s ביקש להציג אתכם ל- %2$s. האם תרצו להוסיף את %2$s לאנשי הקשר שלכם?</string>
+  <string name="introduction_request_exists_received">%1$s ביקשו להציג אתכם ל- %2$s, אבל %2$s עדיין ברשימת אנשי הקשר שלכם. מכיוון ש- %1$s עשוי לא לדעת זאת, אתם עדיין מוזמנים להגיב:</string>
+  <string name="introduction_request_answered_received">%1$s ביקשו להציג אתכם בפני %2$s.</string>
+  <string name="introduction_response_accepted_sent">הסכמתם להיות מוצגים בפני %1$s.</string>
+  <string name="introduction_response_declined_sent">סירבתם להיות מוצגים בפני %1$s.</string>
+  <string name="introduction_response_accepted_received">%1$s הסכימו להיות מוצגים בפני %2$s.</string>
+  <string name="introduction_response_declined_received">%1$s סירבו להיות מוצגים בפני %2$s.</string>
+  <string name="introduction_response_declined_received_by_introducee">%1$s אומרים ש- %2$s סירבו להיות מוצגים בפניהם.</string>
+  <plurals name="introduction_notification_text">
+    <item quantity="one">נוסף איש קשר חדש.</item>
+    <item quantity="other">נוספו %d אנשי קשר חדשים.</item>
+  </plurals>
+  <!--Private Groups-->
+  <string name="groups_list_empty">אתם לא משתתפים באף קבוצה.
+
+לחצו על אייקון + בראש המסך על מנת ליצור קבוצה בעצמכם או ביקשו מאנשי הקשר שלכם להוסיף אתכם לאחת הקבוצות שלהם.</string>
+  <string name="groups_created_by">נוצר על ידי %s</string>
+  <plurals name="messages">
+    <item quantity="one">הודעה %d</item>
+    <item quantity="other">%d הודעות</item>
+  </plurals>
+  <string name="groups_group_is_empty">קבוצה זו הינה ריקה</string>
+  <string name="groups_group_is_dissolved">קבוצה זו התפזרה</string>
+  <string name="groups_remove">להסיר</string>
+  <string name="groups_create_group_title">יצירת קבוצה פרטית</string>
+  <string name="groups_create_group_button">יצירת קבוצה</string>
+  <string name="groups_create_group_invitation_button">שליחת הזמנה</string>
+  <string name="groups_create_group_hint">בחרו שם לקבוצה הפרטית שלכם</string>
+  <string name="groups_invitation_sent">הזמנה קבוצתית נשלחה</string>
+  <string name="groups_message_sent">ההודעה נשלחה</string>
+  <string name="groups_member_list">רשימת משתתפים</string>
+  <string name="groups_invite_members">הזמנת משתתפים</string>
+  <string name="groups_member_created_you">יצרתם את הקבוצה</string>
+  <string name="groups_member_created">%s יצר את הקבוצה</string>
+  <string name="groups_member_joined_you">הצטרפתם לקבוצה</string>
+  <string name="groups_member_joined">%s הצטרפו לקבוצה</string>
+  <string name="groups_leave">עזיבת הקבוצה</string>
+  <string name="groups_leave_dialog_title">אשרו את עזיבת הקבוצה</string>
+  <string name="groups_leave_dialog_message">האם אתם בטוחים שתרצו לעזוב את הקבוצה?</string>
+  <string name="groups_dissolve">פיזור הקבוצה</string>
+  <string name="groups_dissolve_dialog_title">אשרו פיזור הקבוצה</string>
+  <string name="groups_dissolve_dialog_message">האם אתם בטוחים שתרצו לפזר את הקבוצה?
+
+כל המשתתפים לא יוכלו להמשיך את השיחה ועלולים לא לקבל את ההודעות האחרונות.</string>
+  <string name="groups_dissolve_button">פיזור</string>
+  <string name="groups_dissolved_dialog_title">הקבוצה פוזרה</string>
+  <string name="groups_dissolved_dialog_message">יוצר הקבוצה פיזר אותה.
+
+לא תוכלו יותר לכתוב הודעות לקבוצה ואולי אף לא תקבלו את כל ההודעות שנכתבו.</string>
+  <!--Private Group Invitations-->
+  <string name="groups_invitations_title">הזמנות קבוצתיות</string>
+  <string name="groups_invitations_invitation_sent">הזמנתם את %1$s להצטרף לקבוצה \"%2$s\".</string>
+  <string name="groups_invitations_invitation_received">%1$s הזמינו אתכם להצטרף לקבוצה \"%2$s\".</string>
+  <string name="groups_invitations_joined">הצטרפתם לקבוצה</string>
+  <string name="groups_invitations_declined">הזמנה קבוצתית נדחתה</string>
+  <plurals name="groups_invitations_open">
+    <item quantity="one">הזמנה קבוצתית פתוחה %d</item>
+    <item quantity="other">%dהזמנות קבוצתית פתוחות </item>
+  </plurals>
+  <string name="groups_invitations_response_accepted_sent">הסכמתם להזמנה הקבוצתית מ- %s.</string>
+  <string name="groups_invitations_response_declined_sent">סירבתם להזמנה הקבוצתית מ- %s.</string>
+  <string name="groups_invitations_response_accepted_received">%s הסכימו להזמנה הקבוצתית.</string>
+  <string name="groups_invitations_response_declined_received">%s סרבו להזמנה הקבוצתית.</string>
+  <string name="sharing_status_groups">רק היוצר יכול להזמין משתתפים חדשים לקבוצה. להלן כל המשתתפים הנוכחיים של הקבוצה.</string>
+  <!--Private Groups Revealing Contacts-->
+  <string name="groups_reveal_contacts">הצגת אנשי קשר</string>
+  <string name="groups_reveal_dialog_message">אתם יכולים לבחור אם לחשוף את אנשי הקשר שלכם למשתתפים הנוכחיים והעתידיים של קבוצה זו.
+
+חשיפת אנשי הקשר תגרום לחיבור עם הקבוצה להיות מהיר ואמין יותר, כי תוכלו לתקשר עם אנשי הקשר שנחשפו גם אם יוצר הקבוצה אינו מחובר.</string>
+  <string name="groups_reveal_visible">היחסים עם האיש קשר גלויים לקבוצה</string>
+  <string name="groups_reveal_visible_revealed_by_us">היחסים עם האיש קשר גלויים לקבוצה (נחשפו על ידיכם)</string>
+  <string name="groups_reveal_visible_revealed_by_contact">היחסים עם האיש קשר גלויים לקבוצה (נחשפו על %s)</string>
+  <string name="groups_reveal_invisible">היחסים עם האיש קשר אינם גלויים לקבוצה</string>
+  <!--Forums-->
+  <string name="no_forums">עדיין אין לכם פורומים.
+
+למה שלא תיצרו אחד חדש בעצמכם על ידי לחיצה על האייקון&amp;#160+ למעלה?
+
+ביכולתכם גם לבקש מאנשי הקשר לשתף אתכם בפורומים.</string>
+  <string name="create_forum_title">יצירת פורום</string>
+  <string name="choose_forum_hint">בחרו שם לפורום שלכם</string>
+  <string name="create_forum_button">יצירת פורום</string>
+  <string name="forum_created_toast">הפורום נוצר</string>
+  <string name="no_forum_posts">הפורום הזה ריק.
+
+לחצו על אייקון העט למעלה על מנת לכתוב את הפוסט הראשון.
+
+מרגישים בודדים כאן? שתפו את הפורום עם עוד אנשי קשר!</string>
+  <string name="no_posts">אין פוסטים</string>
+  <plurals name="posts">
+    <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>
+  <string name="dialog_title_leave_forum">אשרו את עזיבת הפורום</string>
+  <string name="dialog_message_leave_forum">האם אתם בטוחים שברצונכם לעזוב את הפורום הזה? אנשי הקשר ששיתפתם בפורום עלולים לא לקבל יותר עדכונים מהפורום.</string>
+  <string name="dialog_button_leave">לעזוב</string>
+  <string name="forum_left_toast">עזבתם את הפורום</string>
+  <!--Forum Sharing-->
+  <string name="forum_share_button">שיתוף הפורום</string>
+  <string name="contacts_selected">אנשי קשר נבחרו</string>
+  <string name="activity_share_toolbar_header">בחרו אנשי קשר</string>
+  <string name="no_contacts_selector">נראה שאתם חדשים כאן ושעדיין אין לכם אנשי קשר.
+
+אנא חזרו הנה אחרי שתוסיפו את איש הקשר הראשון שלכם.</string>
+  <string name="forum_shared_snackbar">שיתפתם את הפורום עם אנשי הקשר שנבחרו</string>
+  <string name="forum_share_message">הוסיפו הודעה (לא חובה)</string>
+  <string name="forum_share_error">הייתה שגיאה בעת שיתוף הפורום.</string>
+  <string name="forum_invitation_received">%1$s שיתפו את הפורום \"%2$s\" איתכם.</string>
+  <string name="forum_invitation_sent">שיתפתם את הפורום \"%1$s\" עם %2$s.</string>
+  <string name="forum_invitations_title">הזמנות לפורום</string>
+  <string name="forum_invitation_exists">אישרתם כבר את ההזמנה לפורום הזה. אישור הזמנות נוספות יגדיל ויחזק את התקשורת בפורום.</string>
+  <string name="forum_joined_toast">הצטרפתם לפורום</string>
+  <string name="forum_declined_toast">הזמנה לפורום נדחתה</string>
+  <string name="shared_by_format">שותף  על ידי %s</string>
+  <!--Blogs-->
+  <!--Blog Sharing-->
+  <!--RSS Feeds-->
+  <string name="blogs_rss_feeds_import_button">ייבא</string>
+  <string name="blogs_rss_feeds_manage_author">מחבר:</string>
+  <string name="blogs_rss_feeds_manage_updated">עודכן לאחרונה:</string>
+  <!--Settings Network-->
+  <!--Settings Security and Panic-->
+  <string name="security_settings_title">אבטחה</string>
+  <string name="panic_app_setting_none">כלום</string>
+  <string name="lock_setting_title">יציאה</string>
+  <string name="purge_setting_title">מחק חשבון</string>
+  <!--Settings Notifications-->
+  <string name="notification_settings_title">הודעות מערכת</string>
+  <string name="notify_private_messages_setting_title">הודעות פרטיות</string>
+  <string name="notify_sound_setting_disabled">כלום</string>
+  <!--Settings Feedback-->
+  <!--Link Warning-->
+  <!--Crash Reporter-->
+  <string name="close">סגור</string>
+  <!--Sign Out-->
+  <!--Screen Filters & Tapjacking-->
+  <!--Permission Requests-->
+</resources>
diff --git a/briar-android/src/main/res/values-hi/strings.xml b/briar-android/src/main/res/values-hi/strings.xml
index 75a65240b..cd3123976 100644
--- a/briar-android/src/main/res/values-hi/strings.xml
+++ b/briar-android/src/main/res/values-hi/strings.xml
@@ -1,8 +1,7 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <resources>
   <!--Setup-->
-  <string name="setup_title">ब्रियर सेटअप</string>
-  <string name="setup_explanation">आपका ब्रियर खाता आपके डिवाइस पर एन्क्रिप्ट किया गया है, न कि क्लाउड में। यदि आप बिअर की स्थापना रद्द करते हैं या अपना पासवर्ड भूल जाते हैं, तो आपके खाता और आपके डेटा को पुनर्प्राप्त करने का कोई तरीका नहीं है।</string>
+  <string name="setup_next">अगला</string>
   <string name="choose_nickname">आपका मुंहबोला नाम चुनें</string>
   <string name="choose_password">अपना पासवर्ड चुनें</string>
   <string name="confirm_password">अपने पासवर्ड की पुष्टि करें</string>
@@ -10,6 +9,7 @@
   <string name="password_too_weak">पासवर्ड बहुत कमजोर है</string>
   <string name="passwords_do_not_match">पासवर्ड मेल नहीं खाते</string>
   <string name="create_account_button">खाता बनाएं</string>
+  <string name="more_info">अधिक जानकारी</string>
   <!--Login-->
   <string name="enter_password">अपना पासवर्ड डालें:</string>
   <string name="try_again">गलत पासवर्ड, फिर से प्रयास करें</string>
@@ -20,12 +20,7 @@
   <string name="startup_failed_notification_title">बियर शुरू नहीं हो सका</string>
   <string name="startup_failed_notification_text">आपको ब्रियर को पुनर्स्थापित करने की आवश्यकता हो सकती है</string>
   <string name="startup_failed_activity_title">ब्रियर स्टार्टअप विफलता</string>
-  <string name="startup_failed_db_error">किसी कारण से, आपके ब्रियर डेटाबेस की मरम्मत से परे भ्रष्ट है। आपका खाता, आपका डेटा और आपके सभी संपर्क कनेक्शन खो जाते हैं। दुर्भाग्य से, आपको ब्रियर को पुनर्स्थापित करना होगा और एक नया खाता सेट अप करना होगा।</string>
   <string name="startup_failed_service_error">ब्रियर एक आवश्यक प्लगइन प्रारंभ करने में असमर्थ था बरिअर को पुनः स्थापित करना आमतौर पर इस समस्या को हल करता है हालांकि, कृपया ध्यान दें कि बियर आपके डेटा को स्टोर करने के लिए केंद्रीय सर्वर का उपयोग नहीं कर रहा है, इसके बाद आप अपने खाता और उसके साथ जुड़े सभी डेटा खो देंगे।</string>
-  <plurals name="expiry_warning">
-    <item quantity="one">यह बियर का बीटा संस्करण है आपका खाता%d दिनों में समाप्त हो जाएगा और नवीनीकरण नहीं किया जा सकता है।</item>
-    <item quantity="other">यह बियर का बीटा संस्करण है आपका खाता%d दिनों में समाप्त हो जाएगा और नवीनीकरण नहीं किया जा सकता है।</item>
-  </plurals>
   <string name="expiry_date_reached">यह सॉफ्टवेयर समाप्त हो गया है। \n परीक्षण के लिए धन्यवाद!</string>
   <!--Navigation Drawer-->
   <string name="nav_drawer_open_description">नेविगेशन ड्रॉवर खोलें</string>
@@ -69,8 +64,7 @@
   <string name="delete">हटाना</string>
   <string name="accept">स्वीकारें</string>
   <string name="decline">पतन</string>
-  <string name="options">विकल्प</string>
-  <string name="online">ऑनलाइन</string>
+	<string name="online">ऑनलाइन</string>
   <string name="offline">ऑफलाइन</string>
   <string name="send">भेजना</string>
   <string name="allow">अनुमति दें</string>
@@ -79,6 +73,7 @@
   <string name="ellipsis">…</string>
   <string name="text_too_long">प्रवेश किया हुआ पाठ बहुत लंबा है</string>
   <string name="show_onboarding">सहायता संवाद दिखाएं</string>
+  <string name="help">सहायता</string>
   <!--Contacts and Private Conversations-->
   <string name="no_contacts">ऐसा लगता है कि आप यहां नए हैं और अभी तक कोई संपर्क नहीं है। \ N \ n शीर्ष पर + आइकन टैप करें और कुछ मित्रों को अपनी सूची में जोड़ने के लिए निर्देशों का पालन करें। \ N \ n कृपया याद रखें: आप केवल नए संपर्कों को आमने-सामने जोड़ सकते हैं किसी भी व्यक्ति को भविष्य में आपके प्रतिरूपण या पढ़ने से रोकने के लिए -फाइल</string>
   <string name="date_no_private_messages">कोई संदेश नहीं।</string>
@@ -90,31 +85,18 @@
   <string name="contact_deleted_toast">संपर्क हटा दिया गया</string>
   <!--Adding Contacts-->
   <string name="add_contact_title">संपर्क जोड़ना</string>
-  <string name="your_nickname">वह पहचान चुनें जिसे आप उपयोग करना चाहते हैं:</string>
   <string name="face_to_face">आपको उस व्यक्ति के साथ मिलना चाहिए जिसे आप संपर्क के रूप में जोड़ना चाहते हैं। \ N \ n यह किसी को भविष्य में आपके प्रतिरूपण या पढ़ने के बाद से किसी को भी रोकेगा।</string>
   <string name="continue_button">जारी रहना</string>
-  <string name="your_invitation_code">आपका निमंत्रण कोड है</string>
-  <string name="enter_invitation_code">कृपया अपने संपर्क के निमंत्रण कोड को दर्ज करें:</string>
-  <string name="searching_format">निमंत्रण कोड%06d\ u2026 के साथ संपर्क के लिए खोज रहे हैं</string>
   <string name="connection_failed">कनेक्शन विफल</string>
-  <string name="could_not_find_contact">ब्रियर आपके संपर्क के पास नहीं मिल सका</string>
   <string name="try_again_button">पुनः प्रयास करें</string>
-  <string name="connected_to_contact">संपर्क से कनेक्ट किया गया</string>
-  <string name="calculating_confirmation_code">पुष्टि कोड की गणना \ u2026</string>
-  <string name="your_confirmation_code">आपका पुष्टिकरण कोड है</string>
-  <string name="enter_confirmation_code">कृपया अपने संपर्क का पुष्टिकरण कोड दर्ज करें:</string>
-  <string name="waiting_for_contact">संपर्क की प्रतीक्षा कर रहा है \ u2026</string>
   <string name="waiting_for_contact_to_scan">स्कैन करने और कनेक्ट करने के लिए संपर्क की प्रतीक्षा कर रहा है \ u2026</string>
   <string name="exchanging_contact_details">संपर्क विवरणों का आदान-प्रदान करें \ u2026</string>
-  <string name="codes_do_not_match">कोड मेल नहीं खाते हैं</string>
-  <string name="interfering">इसका मतलब यह हो सकता है कि कोई आपके कनेक्शन में हस्तक्षेप करने का प्रयास कर रहा है</string>
   <string name="contact_added_toast">संपर्क जोड़ा गया:%s</string>
   <string name="contact_already_exists">संपर्क%s पहले से मौजूद है</string>
   <string name="contact_exchange_failed">संपर्क विनिमय विफल</string>
   <string name="qr_code_invalid">QR कोड अमान्य है</string>
   <string name="connecting_to_device">उपकरण \ u2026 से कनेक्ट हो रहा है</string>
   <string name="authenticating_with_device">डिवाइस के साथ प्रमाणीकरण \ u2026</string>
-  <string name="connection_aborted_local">कनेक्शन हमारे द्वारा निरस्त कर दिया! इसका मतलब यह हो सकता है कि कोई आपके कनेक्शन में हस्तक्षेप करने का प्रयास कर रहा है</string>
   <string name="connection_aborted_remote">आपके संपर्क से कनेक्शन निरस्त! इसका मतलब यह हो सकता है कि कोई आपके कनेक्शन में हस्तक्षेप करने का प्रयास कर रहा है</string>
   <!--Introductions-->
   <string name="introduction_onboarding_title">अपने संपर्कों का परिचय दें</string>
@@ -364,4 +346,5 @@
   <!--Screen Filters & Tapjacking-->
   <string name="screen_filter_title">स्क्रीन ओवरले का पता लगाया</string>
   <string name="screen_filter_body">एक और ऐप ब्रियर के शीर्ष पर है। आपकी सुरक्षा की सुरक्षा के लिए, ब्रियर किसी अन्य ऐप को शीर्ष पर खींचने पर स्पर्श का जवाब नहीं देगा। \ N \ n बरिआर का उपयोग करते समय निम्नलिखित ऐप्स बंद कर दें: \ n \ n%1$s</string>
+  <!--Permission Requests-->
 </resources>
diff --git a/briar-android/src/main/res/values-it/strings.xml b/briar-android/src/main/res/values-it/strings.xml
index 55bbdec45..5648b9a0a 100644
--- a/briar-android/src/main/res/values-it/strings.xml
+++ b/briar-android/src/main/res/values-it/strings.xml
@@ -1,8 +1,15 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <resources>
   <!--Setup-->
-  <string name="setup_title">Impostazione Briar</string>
-  <string name="setup_explanation">Il tuo account Briar si trova criptato sul tuo dispositivo e non nel cloud. Se disinstalli Briar o dimentichi la tua password, non c\'è modo di recuperare il tuo account o i tuoi dati.</string>
+  <string name="setup_title">Benvenuti su Briar</string>
+  <string name="setup_name_explanation">Il tuo nickname verrà mostrato accanto ad ogni contenuto pubblicato. Non puoi cambiarlo dopo averlo creato.</string>
+  <string name="setup_next">Avanti</string>
+  <string name="setup_password_intro">Scegli una password</string>
+  <string name="setup_password_explanation">Il tuo account Briar resta memorizzato cifrato nel tuo dispositivo, non nel cloud. Se dimentichi la password o disinstalli Briar, non c\'è modo di ripristinare l\'account.\n\nScegli una password lunga difficile da indovinare, come quattro parole casuali o dieci lettere, numeri e simboli a caso.</string>
+  <string name="setup_doze_title">Connessioni in background</string>
+  <string name="setup_doze_intro">Per ricevere messaggi, Briar deve restare connesso in background.</string>
+  <string name="setup_doze_explanation">Per ricevere messaggi, Briar deve restare connesso in background. Disattiva le ottimizzazioni della batteria per mantenere Briar connesso.</string>
+  <string name="setup_doze_button">Permetti le connessioni</string>
   <string name="choose_nickname">Scegli il tuo nickname</string>
   <string name="choose_password">Scegli la tua password</string>
   <string name="confirm_password">Conferma la tua password</string>
@@ -10,6 +17,12 @@
   <string name="password_too_weak">La password è troppo debole</string>
   <string name="passwords_do_not_match">La password non corrisponde</string>
   <string name="create_account_button">Creare Account</string>
+  <string name="more_info">Ulteriori Informazioni</string>
+  <string name="don_t_ask_again">Non chiedere più</string>
+  <string name="setup_huawei_text">Tocca il pulsante qua sotto e assicurati che Briar sia protetto nella schermata \"App protette\"</string>
+  <string name="setup_huawei_button">Proteggi Briar</string>
+  <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="try_again">Password sbagliata, riprova</string>
@@ -20,12 +33,13 @@
   <string name="startup_failed_notification_title">Briar non è riuscito a partire</string>
   <string name="startup_failed_notification_text">Potresti dover reinstallare Briar</string>
   <string name="startup_failed_activity_title">Fallimento Avvio Briar</string>
-  <string name="startup_failed_db_error">Per alcune reagioni, il tuo database Briar si è corrotto in modo irreparabile. Il tuo account, i tuoi dati e tutte le connessioni ai tuoi contatti sono andati persi. Sfortunatamente, devi reinstallare Briar per creare un nuovo account.</string>
+  <string name="startup_failed_db_error">Per qualche motivo il tuo database di Briar è danneggiato in modo irreversibile. Il tuo account, i tuoi dati e tutti i contatti sono persi. Sfortunatamente devi reinstallare Briar e creare un nuovo account.</string>
   <string name="startup_failed_service_error">Briar non è stato in grado di caricare un plugin richiesto. Reinstallare Briar di solito sistema questo problema. Però ricorda che perderai il tuo account e tutti i dati ad esso associati poichè Briar non usa server centralizzati per mantenere i tuoi dati.</string>
   <plurals name="expiry_warning">
-    <item quantity="one">Questa è una versione beta di Briar. Il tuo account scadrà in %d giorno e non può essere rinnovato.</item>
-    <item quantity="other">Questa è una versione beta di Briar. Il tuo account scadrà in %d giorni e non può essere rinnovato.</item>
+    <item quantity="one">Questa è una versione di prova di Briar. Il tuo account scadrà fra %d giorno e non può essere rinnovato.</item>
+    <item quantity="other">Questa è una versione di prova di Briar. Il tuo account scadrà fra %d giorni e non può essere rinnovato.</item>
   </plurals>
+  <string name="expiry_update">La scadenza della versione di prova è stata prorogata. Il tuo account ora scadrà fra %d giorni.</string>
   <string name="expiry_date_reached">Questo software è scaduto.\nGrazie per il test!</string>
   <!--Navigation Drawer-->
   <string name="nav_drawer_open_description">Apri la barra di navigazione</string>
@@ -69,8 +83,7 @@
   <string name="delete">Cancella</string>
   <string name="accept">Accetta</string>
   <string name="decline">Declina</string>
-  <string name="options">Opzioni</string>
-  <string name="online">Connesso</string>
+	<string name="online">Connesso</string>
   <string name="offline">Disconnesso</string>
   <string name="send">Invia</string>
   <string name="allow">Abilita</string>
@@ -79,8 +92,10 @@
   <string name="ellipsis">...</string>
   <string name="text_too_long">Il testo inserito è troppo lungo</string>
   <string name="show_onboarding">Mostra l\'aiuto</string>
+  <string name="fix">Correggi</string>
+  <string name="help">Aiuto</string>
   <!--Contacts and Private Conversations-->
-  <string name="no_contacts">Sembra che tu sia nuovo qui e non hai ancora contatti.\n\nPremi l\' icona in alto e segui le istruzioni per aggiungere qualche amico alla tua lista.\n\nPer favore ricorda: Puoi solo aggiungere nuovi contatti faccia-a-faccia per evitare che altri ti impersonino o leggano i tuoi messaggi in futuro.</string>
+  <string name="no_contacts">Sembra che tu sia nuovo qui e non hai ancora contatti.\n\nPremi l\'icona in alto e segui le istruzioni per aggiungere qualche amico alla tua lista.\n\nPer favore ricorda: puoi solo aggiungere nuovi contatti faccia-a-faccia per evitare che altri ti impersonino o leggano i tuoi messaggi in futuro.</string>
   <string name="date_no_private_messages">Nessun messaggio.</string>
   <string name="no_private_messages">Questa è la vista conversazione\n\n\Sembra che ci sia una mancanza di conversazione.\n\nPremi il campo di immissione in basso per iniziare una conversazione.</string>
   <string name="message_hint">Scrivi un messaggio</string>
@@ -90,31 +105,20 @@
   <string name="contact_deleted_toast">Contatto cancellato</string>
   <!--Adding Contacts-->
   <string name="add_contact_title">Aggiungi un Contatto</string>
-  <string name="your_nickname">Scegli l\'identità che vuoi usare:</string>
   <string name="face_to_face">Devi incontrarti con la persona che vuoi aggiungere come contatto.\n\nQuesto evita che qualcuno ti impersoni o legga i tuoi messaggi in futuro.</string>
   <string name="continue_button">Continua</string>
-  <string name="your_invitation_code">Il tuo codice di invito è</string>
-  <string name="enter_invitation_code">Si prega di inserire il vostro codice di invito di contatto:</string>
-  <string name="searching_format">Sto cercando i contatti con codice di invito %06d\u2026</string>
   <string name="connection_failed">Connessione fallita</string>
-  <string name="could_not_find_contact">Briar non è stato in grado di trovare il vostro contatto vicino</string>
   <string name="try_again_button">Riprova</string>
-  <string name="connected_to_contact">Connesso al contatto</string>
-  <string name="calculating_confirmation_code">Calcolazione codice di conferma\u2026</string>
-  <string name="your_confirmation_code">Il tuo codice di conferma è</string>
-  <string name="enter_confirmation_code">Si prega di inserire il vostro codice di conferma di contatto:</string>
-  <string name="waiting_for_contact">In attesa del contatto\u2026</string>
   <string name="waiting_for_contact_to_scan">Aspettando il contatto per la scansione ed il collegamento\u2026</string>
   <string name="exchanging_contact_details">Scambio dettagli contatto\u2026</string>
-  <string name="codes_do_not_match">I codici non corrispondono</string>
-  <string name="interfering">Questo può voler dire che qualcuno sta cercando di interferire con la tua conessione</string>
   <string name="contact_added_toast">Contatto aggiunto: %s</string>
   <string name="contact_already_exists">Il contatto %s esiste già</string>
   <string name="contact_exchange_failed">Scambio di contatto fallito</string>
   <string name="qr_code_invalid">Il codice QR non è valido</string>
+  <string name="camera_error">Errore fotocamera</string>
   <string name="connecting_to_device">Connessione al dispositivo\u2026</string>
   <string name="authenticating_with_device">Autenticazione con il dispositivo\u2026</string>
-  <string name="connection_aborted_local">Connessione abortita da noi!Questo può voler dire che qualcuno sta cercando di interferire con la tua connessione</string>
+  <string name="connection_aborted_local">Connessione annullata! Potrebbe significare che qualcuno stia interferendo con la tua connessione</string>
   <string name="connection_aborted_remote">Connessione abortita dal tuo contatto!Questo può voler dire che qualcuno sta cercando di interferire con la tua connessione</string>
   <!--Introductions-->
   <string name="introduction_onboarding_title">Introduzione tuoi contatti</string>
@@ -140,7 +144,7 @@
     <item quantity="other">Aggiunti %d nuovi contatti.</item>
   </plurals>
   <!--Private Groups-->
-  <string name="groups_list_empty">Non stai partecipando a nessun gruppo.\n\nClicca l\' icona + in alto per creare un tuo gruppo o chiedi ai tuoi contatti di essere invitato in uno dei loro gruppi.</string>
+  <string name="groups_list_empty">Non stai partecipando ad alcun gruppo.\n\nClicca l\'icona + in alto per creare un tuo gruppo o chiedi ai tuoi contatti di essere invitato in uno dei loro gruppi.</string>
   <string name="groups_created_by">Creato da %s</string>
   <plurals name="messages">
     <item quantity="one">%d messaggio</item>
@@ -193,12 +197,12 @@
   <string name="groups_reveal_visible_revealed_by_contact">La relazione fra i contatti è visibile al gruppo (rivelata da %s)</string>
   <string name="groups_reveal_invisible">La relazione fra i contatti non è visibile al gruppo</string>
   <!--Forums-->
-  <string name="no_forums">Non hai ancora alcun forum.\n\nPerchè non ne crei uno nuovo tu premendo l\' icona + in alto?\n\nPuoi anche chiedere ai tuoi contatti di condividere forums con te.</string>
+  <string name="no_forums">Non hai ancora alcun forum.\n\nPerchè non ne crei uno nuovo tu premendo l\'icona + in alto?\n\nPuoi anche chiedere ai tuoi contatti di condividere forum con te.</string>
   <string name="create_forum_title">Crea Forum</string>
   <string name="choose_forum_hint">Scegli un nome per il tuo forum</string>
   <string name="create_forum_button">Crea Forum</string>
   <string name="forum_created_toast">Forum creato</string>
-  <string name="no_forum_posts">Questo forum è vuoto.\n\nUsa l\' icona penna in alto per comporre il primo post.\n\nTi senti solo qui? Condividi questo forum con i tuoi contatti!</string>
+  <string name="no_forum_posts">Questo forum è vuoto.\n\nUsa l\'icona penna in alto per comporre il primo post.\n\nTi senti solo qui? Condividi questo forum con i tuoi contatti!</string>
   <string name="no_posts">Nessun post.</string>
   <plurals name="posts">
     <item quantity="one">%d post</item>
@@ -335,6 +339,7 @@
   <string name="notify_sound_setting_default">Suoneria di default</string>
   <string name="notify_sound_setting_disabled">Nessuno</string>
   <string name="choose_ringtone_title">Scegli suoneria</string>
+  <string name="cannot_load_ringtone">Impossibile caricare la suoneria</string>
   <!--Settings Feedback-->
   <string name="feedback_settings_title">Feedback</string>
   <string name="send_feedback">Invia feedback</string>
@@ -364,4 +369,9 @@
   <!--Screen Filters & Tapjacking-->
   <string name="screen_filter_title">È stata rilevata un\'overlay sullo schermo</string>
   <string name="screen_filter_body">Un\'altra app sta disegnando sopra a Briar. Per proteggere la tua sicurezza, Briar non risponderà ai tocchi quando un\'altra app vi starà disegnando sopra.\n\nProva a spegnere le seguenti app mentre usi Briar:\n\n%1$s</string>
+  <!--Permission Requests-->
+  <string name="permission_camera_title">Autorizzazione fotocamera</string>
+  <string name="permission_camera_request_body">Per scansionare il codice QR, Briar deve accedere alla fotocamera.</string>
+  <string name="permission_camera_denied_body">Hai negato l\'accesso alla fotocamera, ma questa serve per aggiungere i contatti.\n\nConsidera la possibilità di concedere l\'accesso.</string>
+  <string name="permission_camera_denied_toast">Autorizzazione fotocamera non concessa</string>
 </resources>
diff --git a/briar-android/src/main/res/values-ja/strings.xml b/briar-android/src/main/res/values-ja/strings.xml
new file mode 100644
index 000000000..18ebff4f0
--- /dev/null
+++ b/briar-android/src/main/res/values-ja/strings.xml
@@ -0,0 +1,124 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<resources>
+  <!--Setup-->
+  <string name="setup_next">次へ</string>
+  <string name="choose_nickname">ニックネームを入力</string>
+  <string name="choose_password">パスワードを入力</string>
+  <string name="confirm_password">確認のため再度パスワードを入力</string>
+  <string name="name_too_long">名前が長過ぎます。</string>
+  <string name="password_too_weak">パスワードが弱すぎます。</string>
+  <string name="passwords_do_not_match">パスワードが一致しません。</string>
+  <string name="create_account_button">アカウントを作成</string>
+  <!--Login-->
+  <string name="enter_password">パスワード入力</string>
+  <string name="try_again">パスワードが間違っています。もう一度入力してください。</string>
+  <string name="sign_in_button">Sign In</string>
+  <string name="forgotten_password">パスワードを忘れました。</string>
+  <string name="dialog_title_lost_password">パスワードを紛失</string>
+  <string name="dialog_message_lost_password">あなたのBriarアカウントはクラウド上ではなく、暗号化さた上であなたのデバイスに保存さています。したがってBriarはパスワードをリセットできません。アカウントを削除しはじめからやりなおしますか？注意！あなたのID、連絡先、メッセージは永久に削除されます。</string>
+  <string name="startup_failed_notification_title">Briarを起動できません。</string>
+  <string name="startup_failed_notification_text">Briarを再インストールする必要があります。</string>
+  <string name="startup_failed_activity_title">起動に失敗</string>
+  <string name="startup_failed_service_error">プラグインの起動に失敗しました。Briarを再インストールすることで通常は直ります。Briarは中央サーバにデータを保存していないため、アカウントとそれに関連する情報は全て失われることに注意してください。</string>
+  <string name="expiry_date_reached">このソフトの有効期限が切れました。テストに参加してくださりありがとうございます！</string>
+  <!--Navigation Drawer-->
+  <string name="nav_drawer_open_description">ナビゲーションを開く</string>
+  <string name="nav_drawer_close_description">ナビゲーションを閉じる</string>
+  <string name="contact_list_button">連絡先</string>
+  <string name="groups_button">Private Groups</string>
+  <string name="forums_button">フォーラム</string>
+  <string name="blogs_button">Blogs</string>
+  <string name="settings_button">Settings</string>
+  <string name="sign_out_button">サインアウト</string>
+  <!--Transports-->
+  <string name="transport_tor">インターネット</string>
+  <string name="transport_bt">Bluetooth</string>
+  <string name="transport_lan">Wi-Fi</string>
+  <!--Notifications-->
+  <string name="ongoing_notification_title">Briarにサインイン</string>
+  <string name="ongoing_notification_text">Briarを開く</string>
+  <plurals name="private_message_notification_text">
+    <item quantity="other">%d件の新規プライベートメッセージ</item>
+  </plurals>
+  <plurals name="group_message_notification_text">
+    <item quantity="other">%d件の新規グループメッセージ</item>
+  </plurals>
+  <plurals name="forum_post_notification_text">
+    <item quantity="other">%d件の新規フォーラム投稿</item>
+  </plurals>
+  <plurals name="blog_post_notification_text">
+    <item quantity="other">%d件の新規ブログポスト</item>
+  </plurals>
+  <!--Misc-->
+  <string name="now">現在</string>
+  <string name="show">表示</string>
+  <string name="hide">非表示</string>
+  <string name="ok">OK</string>
+  <string name="cancel">キャンセル</string>
+  <string name="got_it">了解</string>
+  <string name="delete">削除</string>
+  <string name="accept">承認</string>
+  <string name="decline">却下</string>
+	<string name="online">オプション</string>
+  <string name="offline">オフライン</string>
+  <string name="send">送信</string>
+  <string name="allow">許可</string>
+  <string name="open">開く</string>
+  <string name="no_data">データなし</string>
+  <string name="ellipsis">...</string>
+  <string name="text_too_long">入力された文章が長すぎます。</string>
+  <string name="show_onboarding">ヘルプを表示</string>
+  <string name="help">ヘルプ</string>
+  <!--Contacts and Private Conversations-->
+  <string name="no_contacts">まだ連絡先がないようです。
+追加するには+アイコンをタップし、説明にしたがってください。
+なりすましやのぞき見を防ぐため、新しい連絡先は対面でしか追加できません。</string>
+  <string name="date_no_private_messages">メッセージがありません。</string>
+  <string name="message_hint">メッセージ入力</string>
+  <string name="delete_contact">連絡先を削除</string>
+  <string name="contact_deleted_toast">連絡先の削除完了</string>
+  <!--Adding Contacts-->
+  <string name="add_contact_title">連絡先を追加</string>
+  <string name="continue_button">続ける</string>
+  <string name="connection_failed">接続失敗</string>
+  <string name="try_again_button">もう一度やり直してください</string>
+  <!--Introductions-->
+  <!--Private Groups-->
+  <string name="groups_remove">削除</string>
+  <string name="groups_create_group_title">プライベートグループ作成</string>
+  <string name="groups_create_group_button">グループ作成</string>
+  <string name="groups_create_group_invitation_button">招待する</string>
+  <string name="groups_create_group_hint">プライベートグループに名前をつける</string>
+  <string name="groups_member_list">メンバー一覧</string>
+  <!--Private Group Invitations-->
+  <!--Private Groups Revealing Contacts-->
+  <!--Forums-->
+  <string name="btn_reply">返信</string>
+  <!--Forum Sharing-->
+  <!--Blogs-->
+  <string name="blogs_publish_blog_post">公開</string>
+  <!--Blog Sharing-->
+  <!--RSS Feeds-->
+  <string name="blogs_rss_feeds_import_button">インポート</string>
+  <string name="blogs_rss_feeds_manage_author">著者:</string>
+  <string name="blogs_rss_feeds_manage_updated">最終更新:</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="panic_app_setting_none">なし</string>
+  <string name="lock_setting_title">サインアウト</string>
+  <string name="purge_setting_title">アカウントを削除</string>
+  <!--Settings Notifications-->
+  <string name="notification_settings_title">通知</string>
+  <string name="notify_private_messages_setting_title">プライベート・メッセージ</string>
+  <string name="notify_sound_setting_disabled">なし</string>
+  <!--Settings Feedback-->
+  <!--Link Warning-->
+  <!--Crash Reporter-->
+  <string name="close">閉じる</string>
+  <!--Sign Out-->
+  <!--Screen Filters & Tapjacking-->
+  <!--Permission Requests-->
+</resources>
diff --git a/briar-android/src/main/res/values-ms/strings.xml b/briar-android/src/main/res/values-ms/strings.xml
index 305294f28..52a6fa4bc 100644
--- a/briar-android/src/main/res/values-ms/strings.xml
+++ b/briar-android/src/main/res/values-ms/strings.xml
@@ -34,27 +34,16 @@
   <!--Adding Contacts-->
   <string name="add_contact_title">Tambah kenalan</string>
   <string name="continue_button">Teruskan</string>
-  <string name="your_invitation_code">Kod jemputan anda adalah</string>
-  <string name="enter_invitation_code">Sila masukkan kod jemputan kenalan anda:</string>
-  <string name="connection_failed">Sambungan gagal</string>
-  <string name="could_not_find_contact">Briar tidak dapat mencari kenalan anda berhampiran</string>
-  <string name="connected_to_contact">Tersambung dengan kenalan</string>
-  <string name="calculating_confirmation_code">Sedang mencuba kod pengesahan\u2026</string>
-  <string name="your_confirmation_code">Kod pengesahan anda adalah</string>
-  <string name="enter_confirmation_code">Sila masukkan kod pengesahan kenalan anda:</string>
-  <string name="waiting_for_contact">Sedang menunggu kenalan\u2026</string>
-  <string name="exchanging_contact_details">Sedang bertukar butiran kenalan\u2026</string>
-  <string name="codes_do_not_match">Kod tidak sepadan</string>
-  <string name="interfering">Ini menunjukkan bahawa seseorang sedang mengganggu sambungan anda</string>
-  <string name="contact_added_toast">Kenalan telah ditambah: %s</string>
+	<string name="connection_failed">Sambungan gagal</string>
+	<string name="exchanging_contact_details">Sedang bertukar butiran kenalan\u2026</string>
+	<string name="contact_added_toast">Kenalan telah ditambah: %s</string>
   <!--Introductions-->
   <!--Private Groups-->
   <!--Private Group Invitations-->
   <!--Private Groups Revealing Contacts-->
   <!--Forums-->
   <string name="create_forum_title">Cipta forum baru</string>
-  <string name="choose_forum_name">Pilih nama untuk forum anda:</string>
-  <string name="forum_created_toast">Forum telah dicipta</string>
+	<string name="forum_created_toast">Forum telah dicipta</string>
   <!--Forum Sharing-->
   <!--Blogs-->
   <!--Blog Sharing-->
@@ -63,8 +52,7 @@
   <string name="bluetooth_setting_disabled">Hanya ketika menambah kenalan</string>
   <!--Settings Security and Panic-->
   <!--Settings Notifications-->
-  <string name="notify_private_messages_setting">Papar notifikasi untuk mesej peribadi</string>
-  <string name="notify_vibration_setting">Getar</string>
+	<string name="notify_vibration_setting">Getar</string>
   <string name="notify_sound_setting">Bunyi</string>
   <string name="notify_sound_setting_default">Nada bunyi asal</string>
   <string name="notify_sound_setting_disabled">Tiada</string>
diff --git a/briar-android/src/main/res/values-nb/strings.xml b/briar-android/src/main/res/values-nb/strings.xml
index e0bea86d8..f65935d02 100644
--- a/briar-android/src/main/res/values-nb/strings.xml
+++ b/briar-android/src/main/res/values-nb/strings.xml
@@ -1,8 +1,15 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <resources>
   <!--Setup-->
-  <string name="setup_title">Oppsett av Briar</string>
-  <string name="setup_explanation">Din Briar-konto er lagret kryptert på din enhet, ikke i skyen. Hvis du avinstallerer Briar eller glemmer passordet ditt, går det ikke an å gjenopprette kontoen og dataen din.</string>
+  <string name="setup_title">Velkommen til Briar</string>
+  <string name="setup_name_explanation">Ditt kallenavn vil bli vist ved siden av innhold du poster. Du kan endre det etter at du har opprettet kontoen din.</string>
+  <string name="setup_next">Neste</string>
+  <string name="setup_password_intro">Velg et passord</string>
+  <string name="setup_password_explanation">Din Briar-konto er lagret kryptert på din enhet, ikke i skyen. Hvis du avinstallerer Briar eller glemmer passordet ditt, går det ikke an å gjenopprette kontoen din..\n\nVelg et langt passord som er vanskelig å gjette, som fire tilfeldige ord, eller ti tilfeldige bokstaver, tall og symboler.</string>
+  <string name="setup_doze_title">Bakgrunnstilkoblinger</string>
+  <string name="setup_doze_intro">For å motta meldinger, må Briar forbli tilkoblet i bakgrunnen.</string>
+  <string name="setup_doze_explanation">For å motta meldinger, må Briar forbli tilkoblet i bakgrunnen. Skru av batterioptimiseringer slik at Briar kan forbli tilkoblet.</string>
+  <string name="setup_doze_button">Tillat tilkoblinger</string>
   <string name="choose_nickname">Velg kallenavn</string>
   <string name="choose_password">Velg passord</string>
   <string name="confirm_password">Bekreft passord</string>
@@ -10,6 +17,12 @@
   <string name="password_too_weak">Passordet er for svakt</string>
   <string name="passwords_do_not_match">Passordene samsvarer ikke</string>
   <string name="create_account_button">Opprett konto</string>
+  <string name="more_info">Ytterligere informasjon</string>
+  <string name="don_t_ask_again">Ikke spør igjen</string>
+  <string name="setup_huawei_text">Trykk på knappen nedenfor for å forsikre at Briar er beskyttet i \"Beskyttede programmer\".</string>
+  <string name="setup_huawei_button">Beskytt Briar</string>
+  <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="try_again">Feil passord, prøv igjen</string>
@@ -20,12 +33,13 @@
   <string name="startup_failed_notification_title">Briar kunne ikke starte</string>
   <string name="startup_failed_notification_text">Det kan hende du må reinstallere Briar.</string>
   <string name="startup_failed_activity_title">Oppstartsfeil med Briar</string>
-  <string name="startup_failed_db_error">Av ukjent grunn, er din Briar-database skadet og kan ikke repareres. Kontoen din, alle data, og din kontakter har gått tapt for alltid. Beklageligvis må du reinstallere Briar og sette opp en ny konto.</string>
+  <string name="startup_failed_db_error">Hvis din Briar-database av noen grunn skulle bli skadet uten mulighet for reparasjon, vil din konto, din data, og alle dine kontakter gå tapt. Uheldigvis, må du da reinstallere Briar og sett opp en ny konto.</string>
   <string name="startup_failed_service_error">Briar kunne ikke starte det nødvendige programtillegget. Reinstallasjon av Briar fikser vanligvis dette problemet. Merk deg dog at kontoen og all data tilknyttet den vil gå tapt for godt siden Briar ikke bruker sentrale tjenere å lagre dataen din på.</string>
   <plurals name="expiry_warning">
-    <item quantity="one">Dette er en betaversjon av Briar. Din konto vil utløpe om %d dag og kan ikke fornyes.</item>
-    <item quantity="other">Dette er en betaversjon av Briar. Din konto vil utløpe om %d dager og kan ikke fornyes.</item>
+    <item quantity="one">Dette er en test-versjon av Briar. Din konto vil utløpe om %d dag, og kan ikke fornyes.</item>
+    <item quantity="other">Dette er en test-versjon av Briar. Din konto vil utløpe om %d dager og kan ikke fornyes.</item>
   </plurals>
+  <string name="expiry_update">Utløpsdatoen for testing har blitt forskjøvet. Kontoen din vil nå utløpe om %d dager.</string>
   <string name="expiry_date_reached">Denne programvaren har utløpt.\nTakk for at du testet den.</string>
   <!--Navigation Drawer-->
   <string name="nav_drawer_open_description">Åpne navigasjonsskuffen</string>
@@ -69,8 +83,7 @@
   <string name="delete">Slett</string>
   <string name="accept">Godta</string>
   <string name="decline">Avslå</string>
-  <string name="options">Valg</string>
-  <string name="online">Pålogget</string>
+	<string name="online">Pålogget</string>
   <string name="offline">Frakoblet</string>
   <string name="send">Send</string>
   <string name="allow">Tillat</string>
@@ -79,6 +92,8 @@
   <string name="ellipsis">…</string>
   <string name="text_too_long">Innskrevet tekst er for lang</string>
   <string name="show_onboarding">Vis hjelpedialogvindu</string>
+  <string name="fix">Fiks</string>
+  <string name="help">Hjelp</string>
   <!--Contacts and Private Conversations-->
   <string name="no_contacts">Det later til at du er ny her og ikke har noen kontakter enda.\n\nTrykk på \"+\"-ikonet på toppen og følg instruksjonene for å legge til noen venner på listen din.\n\nHusk: Du kan bare legge til nye kontakter ansikt-til-ansikt for å forhindre noen fra å etterligne deg eller fra å lese meldingene dine i framtiden.</string>
   <string name="date_no_private_messages">Ingen meldinger.</string>
@@ -90,31 +105,20 @@
   <string name="contact_deleted_toast">Kontakt slettet</string>
   <!--Adding Contacts-->
   <string name="add_contact_title">Legg til en kontakt</string>
-  <string name="your_nickname">Velg identiteten du ønsker å bruke:</string>
   <string name="face_to_face">Du må møte personen du ønsker å legge til som kontakt.\n\nDette vil forhindre folk fra å etterligne deg eller lese meldingene dine i fremtiden.</string>
   <string name="continue_button">Fortsett</string>
-  <string name="your_invitation_code">Din invitasjonskode er</string>
-  <string name="enter_invitation_code">Skriv inn invitasjonskoden fra din kontakt:</string>
-  <string name="searching_format">Søker etter kontakt med invitasjonskode %06d\u2026</string>
   <string name="connection_failed">Tilkobling mislyktes</string>
-  <string name="could_not_find_contact">Briar kunne ikke finne kontakten din nærheten</string>
   <string name="try_again_button">Prøv igjen</string>
-  <string name="connected_to_contact">Tilkoblet kontakt</string>
-  <string name="calculating_confirmation_code">Regner ut bekreftelseskode\u2026</string>
-  <string name="your_confirmation_code">Din bekreftelseskode er</string>
-  <string name="enter_confirmation_code">Skriv inn din kontakts bekreftelseskode:</string>
-  <string name="waiting_for_contact">Venter på kontakt\u2026</string>
   <string name="waiting_for_contact_to_scan">Venter på at kontakten skal skanne og koble til\u2026</string>
   <string name="exchanging_contact_details">Utveksler kontaktdetaljer\u2026</string>
-  <string name="codes_do_not_match">Kodene samsvarer ikke</string>
-  <string name="interfering">Dette kan bety at noen prøver å tukle med tilkoblingen</string>
   <string name="contact_added_toast">Kontakt lagt til: %s</string>
   <string name="contact_already_exists">Kontakten %s finnes allerede</string>
   <string name="contact_exchange_failed">Kontaktutveksling mislyktes</string>
   <string name="qr_code_invalid">QR-koden er ugyldig</string>
+  <string name="camera_error">Kamerafeil</string>
   <string name="connecting_to_device">Kobler til enhet\u2026</string>
   <string name="authenticating_with_device">Autentiserer med enhet\u2026</string>
-  <string name="connection_aborted_local">Tilkoblingen ble avbrutt på din side! Dette kan bety at noen prøver å tukle med tilkoblingen din</string>
+  <string name="connection_aborted_local">Tilkobling avbrutt! Dette kan bety at noen prøver å tukle med tilkoblingen din</string>
   <string name="connection_aborted_remote">Tilkobling avbrutt av din kontakt! Dette kan bety at noen prøver å tukle med vedkommendes tilkobling</string>
   <!--Introductions-->
   <string name="introduction_onboarding_title">Introduser kontaktene dine</string>
@@ -335,6 +339,7 @@
   <string name="notify_sound_setting_default">Forvalgt ringetone</string>
   <string name="notify_sound_setting_disabled">Ingen</string>
   <string name="choose_ringtone_title">Velg ringetone</string>
+  <string name="cannot_load_ringtone">Kan ikke laste inn ringetone</string>
   <!--Settings Feedback-->
   <string name="feedback_settings_title">Tilbakemelding</string>
   <string name="send_feedback">Send tilbakemelding</string>
@@ -364,4 +369,9 @@
   <!--Screen Filters & Tapjacking-->
   <string name="screen_filter_title">Skjermoverlag oppdaget</string>
   <string name="screen_filter_body">Et annet program tegner på toppen av Briar. For å beskytte din sikkerhet, vil Briar ikke reagere på trykk når et annet program tegner over det.\n\nPrøv å skru av følgende programmer når du bruker Briar.\n\n%1$s</string>
+  <!--Permission Requests-->
+  <string name="permission_camera_title">Kameratilgang</string>
+  <string name="permission_camera_request_body">For å skanne QR-koden, trenger Briar tilgang til kameraet.</string>
+  <string name="permission_camera_denied_body">Du har nektet tilgang til kameraet, men tillegg av kontakter krever bruk av kameraet.\n\nOvervei å innvilge tilgang.</string>
+  <string name="permission_camera_denied_toast">Kameratilgang ble ikke innvilget</string>
 </resources>
diff --git a/briar-android/src/main/res/values-nl/strings.xml b/briar-android/src/main/res/values-nl/strings.xml
new file mode 100644
index 000000000..d3c8e2ba5
--- /dev/null
+++ b/briar-android/src/main/res/values-nl/strings.xml
@@ -0,0 +1,377 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<resources>
+  <!--Setup-->
+  <string name="setup_title">Welkom bij Briar</string>
+  <string name="setup_name_explanation">Je bijnaam wordt getoond bij alle content die je post. Nadat je account is aangemaakt is het niet mogelijk je bijnaam te wijzigen.</string>
+  <string name="setup_next">Volgende</string>
+  <string name="setup_password_intro">Voer een wachtwoord in</string>
+  <string name="setup_password_explanation">Je Briar-account is versleuteld opgeslagen op je apparaat, niet in de cloud. Als je je wachtwoord vergeet of Briar deïnstalleert is er geen manier om je account te herstellen.\n\nKies een lang wachtwoord dat moeilijk is om te raden , bijvoorbeeld vier willekeurige woorden of tien willekeurige letters, cijfers en symbolen.</string>
+  <string name="setup_doze_title">Achtergrondverbindingen</string>
+  <string name="setup_doze_intro">Om berichten te ontvangen dient Briar in de achtergrond verbonden te blijven.</string>
+  <string name="setup_doze_explanation">Briar moet in de achtergrond verbonden blijven om berichten te ontvangen. Schakel batterij-optimalisaties a.u.b. uit zodat Briar verbonden kan blijven.</string>
+  <string name="setup_doze_button">Sta verbindingen toe</string>
+  <string name="choose_nickname">Voer je bijnaam in</string>
+  <string name="choose_password">Voer je wachtwoord in</string>
+  <string name="confirm_password">Bevestig je wachtwoord</string>
+  <string name="name_too_long">Naam is te lang</string>
+  <string name="password_too_weak">Wachtwoord is te zwak</string>
+  <string name="passwords_do_not_match">Wachtwoorden komen niet overeen</string>
+  <string name="create_account_button">Maak account aan</string>
+  <string name="more_info">Meer informatie</string>
+  <string name="don_t_ask_again">Vraag niet nog een keer</string>
+  <string name="setup_huawei_text">Tap a.u.b. op de knop hieronder en ga na dat Briar is beschermd op het scherm \"Beveiligde apps\".</string>
+  <string name="setup_huawei_button">Protect Briar</string>
+  <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="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>
+  <string name="dialog_title_lost_password">Wachtwoord vergeten</string>
+  <string name="dialog_message_lost_password">Je Briar-account is versleuteld opgeslagen op je apparaat, niet in de cloud, dus kunnen we je wachtwoord niet resetten. Wil je je account verwijderen en opnieuw beginnen?\n\nLet op: Je identiteiten, contacten en berichten zullen permanent verloren gaan.</string>
+  <string name="startup_failed_notification_title">Briar kon niet opstarten</string>
+  <string name="startup_failed_notification_text">Misschien moet je Briar opnieuw installeren</string>
+  <string name="startup_failed_activity_title">Opstarten Briar mislukt</string>
+  <string name="startup_failed_db_error">Om de een of andere andere reden is je Briar-database corrupt geworden en niet meer te herstellen. Je account, je gegevens en al je contacten zijn verloren. Helaas dien je Briar opnieuw te installeren en een nieuw account aan te maken.</string>
+  <string name="startup_failed_service_error">Briar kon de vereiste plug-in niet starten. Herinstalleren van Briar lost dit probleem meestal op. Let op dat je al je je account en alle gegevens die daaraan vast zitten zal verliezen omdat Briar geen centrale servers gebruikt om gegevens op te slaan.</string>
+  <plurals name="expiry_warning">
+    <item quantity="one">Dit is een testversie van Briar. Je account verloopt binnen %d dag en kan niet worden vernieuwd.</item>
+    <item quantity="other">Dit is een testversie van Briar. Je account verloopt binnen %d dagen en kan niet worden vernieuwd.</item>
+  </plurals>
+  <string name="expiry_update">De verloopdatum voor de test is vooruitgeschoven. Je account verloopt nu binnen %d dagen.</string>
+  <string name="expiry_date_reached">Deze software is verlopen.\nBedankt vor het testen!</string>
+  <!--Navigation Drawer-->
+  <string name="nav_drawer_open_description">Open de navigatielade</string>
+  <string name="nav_drawer_close_description">Sluit de navigatielade</string>
+  <string name="contact_list_button">Contacten</string>
+  <string name="groups_button">Privégroepen</string>
+  <string name="forums_button">Fora</string>
+  <string name="blogs_button">Blogs</string>
+  <string name="settings_button">Instellingen</string>
+  <string name="sign_out_button">Log uit</string>
+  <!--Transports-->
+  <string name="transport_tor">Internet</string>
+  <string name="transport_bt">Bluetooth</string>
+  <string name="transport_lan">Wifi</string>
+  <!--Notifications-->
+  <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">
+    <item quantity="one">Nieuwe privéberichten.</item>
+    <item quantity="other">%d nieuwe privéberichten.</item>
+  </plurals>
+  <plurals name="group_message_notification_text">
+    <item quantity="one">Nieuw groepsbericht.</item>
+    <item quantity="other">%d nieuwe groepsberichten.</item>
+  </plurals>
+  <plurals name="forum_post_notification_text">
+    <item quantity="one">Nieuwe forumpost.</item>
+    <item quantity="other">%d nieuww forumposts.</item>
+  </plurals>
+  <plurals name="blog_post_notification_text">
+    <item quantity="one">Nieuwe blogpost.</item>
+    <item quantity="other">%d nieuwe blogposts.</item>
+  </plurals>
+  <!--Misc-->
+  <string name="now">nu</string>
+  <string name="show">Toon</string>
+  <string name="hide">Verberg</string>
+  <string name="ok">Oké</string>
+  <string name="cancel">Annuleer</string>
+  <string name="got_it">Begrepen</string>
+  <string name="delete">Verwijder</string>
+  <string name="accept">Accepteer</string>
+  <string name="decline">Wijs af</string>
+	<string name="online">Online</string>
+  <string name="offline">Offline</string>
+  <string name="send">Verstuur</string>
+  <string name="allow">Sta toe</string>
+  <string name="open">Open</string>
+  <string name="no_data">Geen gegevens</string>
+  <string name="ellipsis">…</string>
+  <string name="text_too_long">De ingevoerde tekst is te lang</string>
+  <string name="show_onboarding">Toon helpdialoog</string>
+  <string name="fix">Fiks</string>
+  <string name="help">Help</string>
+  <!--Contacts and Private Conversations-->
+  <string name="no_contacts">Zo te zien ben je nieuw hier en heb je nog geen contacten.\n\nTap op het +-icoon bovenaan en volg de instructies om een aantal vrienden aan je list toe te voegen.\n\nHerinner a.u.b.: Je kan alleen in levenden lijve nieuwe contacten toevoevoegen om te voorkomen dat anderen zich als jou voor kunnen doen of in de toekomst je berichten kunnen lezen.</string>
+  <string name="date_no_private_messages">Geen berichten.</string>
+  <string name="no_private_messages">Dit is de het gespreksscherm.\n\nHet ziet ernaar uit dat er nog geen gesprek heeft plaatsgevonden.\n\nEenvoudigweg tap op het invoerveld onderaan om een gesprek te starten.</string>
+  <string name="message_hint">Typ een bericht</string>
+  <string name="delete_contact">Verwijder bericht</string>
+  <string name="dialog_title_delete_contact">Bevestig verwijderen contact</string>
+  <string name="dialog_message_delete_contact">Weet je zeker dat je dit contact en alle berichten die met dit contact zijn uitgewisseld wil verwijderen?</string>
+  <string name="contact_deleted_toast">Contact is verwijderd</string>
+  <!--Adding Contacts-->
+  <string name="add_contact_title">Voed contact toe</string>
+  <string name="face_to_face">Je moet een persoon in levenden lijve ontmoeten om die als contact toe te voegen.\n\nDit voortkomt dat anderen zich als jou voor kunnen doen of in de toekomst je berichten kunnen lezen.</string>
+  <string name="continue_button">Ga verder</string>
+  <string name="connection_failed">Connectie is mislukt</string>
+  <string name="try_again_button">Probeer nog een keer</string>
+  <string name="waiting_for_contact_to_scan">Wacht op contact om te scannen en te verbinden\u2026</string>
+  <string name="exchanging_contact_details">Contactdetails aan het uitwisselen\u2026</string>
+  <string name="contact_added_toast">Contact toegevoegd: %s</string>
+  <string name="contact_already_exists">Contact %s bestaat al</string>
+  <string name="contact_exchange_failed">Uitwisselen contact is mislukt</string>
+  <string name="qr_code_invalid">De QR-code is ongeldig</string>
+  <string name="camera_error">Camerafout</string>
+  <string name="connecting_to_device">Aan het verbinden met apparaat\u2026</string>
+  <string name="authenticating_with_device">Aan het authentificeren met apparaat\u2026</string>
+  <string name="connection_aborted_local">Verbinding is verbroken! Dit kan betekenen dat iemand probeert te met je verbinding probeert te bemoeien</string>
+  <string name="connection_aborted_remote">Verbinding is door je contact verbroken! Dit kan betekenen dat iemand met je verbinding probeert te bemoeien</string>
+  <!--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_activity_title">Selecteer contact</string>
+  <string name="introduction_message_title">Intoduceer contacten</string>
+  <string name="introduction_message_hint">Voeg een bericht toe (optioneel)</string>
+  <string name="introduction_button">Introduceer</string>
+  <string name="introduction_sent">Je introductie is verzonden</string>
+  <string name="introduction_error">Er trad een fout op tijdens het aanmaken van de introductie.</string>
+  <string name="introduction_response_error">Fout tijdens reageren op een introductie</string>
+  <string name="introduction_request_sent">Je hebt gevraagd om %1$s te introduceren aan %2$s.</string>
+  <string name="introduction_request_received">%1$s heeft voorgesteld om je te introduceren aan %2$s. Wil je %2$s toevoegen aan je contactenlijst?</string>
+  <string name="introduction_request_exists_received">%1$s heeft gevraagd om je te introduceren aan %2$s, maar %2$s staat al in je contactenlijst. Omdat %1$s dit niet mag weten kun je nog steeds antwoorden:</string>
+  <string name="introduction_request_answered_received">%1$s heeft gevraagd om je te introduceren aan %2$s.</string>
+  <string name="introduction_response_accepted_sent">Je hebt de introductie aan %1$s geaccepteerd.</string>
+  <string name="introduction_response_declined_sent">Je hebt de introductie aan %1$s afgewezen.</string>
+  <string name="introduction_response_accepted_received">%1$s heeft de introductie aan %2$sgeaccepteerd.</string>
+  <string name="introduction_response_declined_received">%1$s heeft de introductie aan %2$s afgewezen.</string>
+  <string name="introduction_response_declined_received_by_introducee">%1$s zegt dat %2$s je introductie heeft afgewezen.</string>
+  <plurals name="introduction_notification_text">
+    <item quantity="one">Nieuw contact is toegevoegd.</item>
+    <item quantity="other">%d nieuwe contacten zijn toegevoegd.</item>
+  </plurals>
+  <!--Private Groups-->
+  <string name="groups_list_empty">Je hebt nog geen groepen gebruikt.\n\nTap op het +-icoon om zelf een groep aan te maken of vraag je contacten of ze je voor een van hun groepen willen uitnodigen.</string>
+  <string name="groups_created_by">Is aangemaakt door %s</string>
+  <plurals name="messages">
+    <item quantity="one">%d bericht</item>
+    <item quantity="other">%d berichten</item>
+  </plurals>
+  <string name="groups_group_is_empty">Deze groep is leeg</string>
+  <string name="groups_group_is_dissolved">Deze groep is opgeheven</string>
+  <string name="groups_remove">Verwijder</string>
+  <string name="groups_create_group_title">Maak privégroep aan</string>
+  <string name="groups_create_group_button">Maak groep aan</string>
+  <string name="groups_create_group_invitation_button">Verstuur uitnodiging</string>
+  <string name="groups_create_group_hint">Voer een naam in voor je privégroep</string>
+  <string name="groups_invitation_sent">Groepsuitnodiging is verstuurd</string>
+  <string name="groups_message_sent">Bericht is verstuurd</string>
+  <string name="groups_member_list">Ledenlijst</string>
+  <string name="groups_invite_members">Nodig leden uit</string>
+  <string name="groups_member_created_you">Je hebt de groep aangemaakt</string>
+  <string name="groups_member_created">%s heeft de groep aangemaakt</string>
+  <string name="groups_member_joined_you">Je hebt lid geworden van de groep</string>
+  <string name="groups_member_joined">%s is lid geworden van de groep</string>
+  <string name="groups_leave">Verlaat groep</string>
+  <string name="groups_leave_dialog_title">Bevestig verlaten groep</string>
+  <string name="groups_leave_dialog_message">Weet je zeker dat je deze groep wil verlaten? </string>
+  <string name="groups_dissolve">Hef groep op</string>
+  <string name="groups_dissolve_dialog_title">Bevestig opheffen groep</string>
+  <string name="groups_dissolve_dialog_message">Weet je zeker dat je deze groep wil opheffen?\n\nAlle andere leden zullen dan niet meer hun gesprek voort kunnen zetten en het zou kunnen dat ze de laatste berichten niet ontvangen.</string>
+  <string name="groups_dissolve_button">Hef op</string>
+  <string name="groups_dissolved_dialog_title">Groep is opgeheven</string>
+  <string name="groups_dissolved_dialog_message">De maker van deze groep heeft deze opgeheven.\n\nJe kan niet langer berichten aan de groep sturen en het zou kunnen dat je niet alle posts hebt ontvangen die aan deze groep zijn verstuurd.</string>
+  <!--Private Group Invitations-->
+  <string name="groups_invitations_title">Groepsuitnodigingen</string>
+  <string name="groups_invitations_invitation_sent">Je hebt %1$s uitgenodigd om lid te worden van de groep \"%2$s\".</string>
+  <string name="groups_invitations_invitation_received">%1$s heeft je uitgenodigd om lid te worden van de groep \"%2$s\".</string>
+  <string name="groups_invitations_joined">Lid geworden van groep</string>
+  <string name="groups_invitations_declined">Groepsuitnodiging is afgewezen</string>
+  <plurals name="groups_invitations_open">
+    <item quantity="one">%d openstaande groepsuitnodiging</item>
+    <item quantity="other">%d openstaande groepsuitnodigingen</item>
+  </plurals>
+  <string name="groups_invitations_response_accepted_sent">Je hebt de groepsuitnodiging van %s geaccepteerd.</string>
+  <string name="groups_invitations_response_declined_sent">Je hebt de groepsuitnodiging van %s afgewezen.</string>
+  <string name="groups_invitations_response_accepted_received">%s heeft de groepsuitnodiging geaccepteerd.</string>
+  <string name="groups_invitations_response_declined_received">%s heeft de groepsuitnodiging afgewezen.</string>
+  <string name="sharing_status_groups">Alleen degene die een groep heeft aangemaakt kan nieuwe leden voor die groep uitnodigen. Hieronder staan alle huidige leden van de groep.</string>
+  <!--Private Groups Revealing Contacts-->
+  <string name="groups_reveal_contacts">Openbaar contacten</string>
+  <string name="groups_reveal_dialog_message">Je kan ervoor kiezen om contacten te openbaren aan alle huidige en toekomstige leden van deze groep.\n\nOpenbaren van contacten maakt je verbinding met de groep sneller en meer betrouwbaar omdat je kan communiceren met geopenbaarde contacten, zelfs als degene die de groep heeft aangemaakt offline is.</string>
+  <string name="groups_reveal_visible">Contactrelatie is zichtbaar voor de groep</string>
+  <string name="groups_reveal_visible_revealed_by_us">Contactrelatie is zichtbaar voor de groep (door jou geopenbaard)</string>
+  <string name="groups_reveal_visible_revealed_by_contact">Contactrelaties zijn zichtbaar voor de groep (geopenbaard door %s)</string>
+  <string name="groups_reveal_invisible">Contactrelatie is niet zichtbaar voor de groep</string>
+  <!--Forums-->
+  <string name="no_forums">Je hebt nog heen fora.\n\nWaarom maak je er zelf geen aan door te tappen op het +-icoon bovenin?\n\nJe kan ook je contacten vragen om fora met je te delen.</string>
+  <string name="create_forum_title">Maak forum aan</string>
+  <string name="choose_forum_hint">Voer een naam in voor je forum</string>
+  <string name="create_forum_button">Maak forum aan</string>
+  <string name="forum_created_toast">Forum aangemaakt</string>
+  <string name="no_forum_posts">Dit forum is leeg.\n\nGebruik het penicoon bovenin om om de eerste post op te stellen.\n\nVoel je je hier eenzaam? Deel dit forum met meerdere van je contacten.</string>
+  <string name="no_posts">Geen posts</string>
+  <plurals name="posts">
+    <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>
+  <string name="dialog_title_leave_forum">Bevestig verlaten forum</string>
+  <string name="dialog_message_leave_forum">Weet je zeker dat je dit forum wil verlaten? Contacten die je via dit forum hebt gedeeld kunnen afgesloten worden van het ontvangen van updates van dit forum.</string>
+  <string name="dialog_button_leave">Verlaat</string>
+  <string name="forum_left_toast">Forum verlaten</string>
+  <!--Forum Sharing-->
+  <string name="forum_share_button">Deel forum</string>
+  <string name="contacts_selected">Contacten geselecteerd</string>
+  <string name="activity_share_toolbar_header">Kies contacten</string>
+  <string name="no_contacts_selector">Het ziet eruit dat je hier nieuw bent en nog geen contacten hebt.\n\nKom a.u.b. later hier terug om je eerste contact toe te voegen.</string>
+  <string name="forum_shared_snackbar">Forum is gedeeld met uitgekozen contacten</string>
+  <string name="forum_share_message">Voeg een bericht toe (optioneel)</string>
+  <string name="forum_share_error">Er trad een fout op bij het delen van dit forum.</string>
+  <string name="forum_invitation_received">%1$s heeft het forum \"%2$s\" met je gedeeld.</string>
+  <string name="forum_invitation_sent">Jij hebt het forum \"%1$s\" gedeeld met %2$s.</string>
+  <string name="forum_invitations_title">Forumuitnodigingen</string>
+  <string name="forum_invitation_exists">Je hebt al een uitnodiging van dit forum geaccepteerd. Het accepteren van meer uitnodigingen zal de communicatie in het forum laten groeien en versterken.</string>
+  <string name="forum_joined_toast">Forum lid geworden</string>
+  <string name="forum_declined_toast">Forumuitnodiging afgewezen</string>
+  <string name="shared_by_format">Is gedeeld door %s</string>
+  <string name="forum_invitation_already_sharing">Reeds gedeeld</string>
+  <string name="forum_invitation_response_accepted_sent">Je hebt een forumuitnodiging geaccepteerd van %s.</string>
+  <string name="forum_invitation_response_declined_sent">Je hebt een forumuitnodiging afgewezen van %s.</string>
+  <string name="forum_invitation_response_accepted_received">%s heeft de forumuitnodiging geaccepteerd.</string>
+  <string name="forum_invitation_response_declined_received">%s heeft de forumuitnodiging afgewezen.</string>
+  <string name="sharing_status">Deelstatus</string>
+  <string name="sharing_status_forum">Alle leden van een forum kunnen dat forum delen met hun contacten. Momenteel deel je dit forum met de volgende contacten. Er kunnen ook andere leden zijn die je niet kan zien.</string>
+  <string name="shared_with">Is gedeeld met %1$d (%2$d online)</string>
+  <plurals name="forums_shared">
+    <item quantity="one">%d forum is gedeeld door contacten.</item>
+    <item quantity="other">%d fora zijn gedeeld door contacten.</item>
+  </plurals>
+  <string name="nobody">Niemand</string>
+  <!--Blogs-->
+  <string name="blogs_other_blog_empty_state">Deze blog is momenteel leeg.\n\nNog de auteur heeft iets geschreven, nog de personen met wie deze blog met je hebben gedeeld moeten nog online komen zodat posts gesynchroniseerd kunnen worden.</string>
+  <string name="read_more">lees meer</string>
+  <string name="blogs_write_blog_post">Schrijf blogpost</string>
+  <string name="blogs_write_blog_post_body_hint">Typ hier je blogpost</string>
+  <string name="blogs_publish_blog_post">Publiceer</string>
+  <string name="blogs_blog_post_created">Blogpost aangemaakt</string>
+  <string name="blogs_blog_post_received">Nieuwe blogpost ontvangen</string>
+  <string name="blogs_blog_post_scroll_to">Scroll naar</string>
+  <string name="blogs_feed_empty_state">Dit is de globale blogfeed.\n\nHet ziet ernaar uit dat nog niemand iets geblogd heeft.\n\nWees de eerste en tap op de pen om een nieuwe blogpost te schrijven.</string>
+  <string name="blogs_remove_blog">Verwijder bblog</string>
+  <string name="blogs_remove_blog_dialog_message">Weet je zeker dat je deze blog en alle bijbehorende posts wil verwijderen?\n\nMerk op dat deze blog niet van apparaten van andere mensen wordt verwijderd?</string>
+  <string name="blogs_remove_blog_ok">Verwijder blog</string>
+  <string name="blogs_blog_removed">Blog is verwijderd</string>
+  <string name="blogs_reblog_comment_hint">Voeg commentaar toe (optioneel)</string>
+  <string name="blogs_reblog_button">Reblog</string>
+  <!--Blog Sharing-->
+  <string name="blogs_sharing_share">Deel blog</string>
+  <string name="blogs_sharing_error">Er was een fout tijdens het delen van deze blog.</string>
+  <string name="blogs_sharing_button">Deel blog</string>
+  <string name="blogs_sharing_snackbar">Blog is gedeeld met gekozen contacten</string>
+  <string name="blogs_sharing_response_accepted_sent">Je hebt de bloguitnodiging van %s geaccepteerd.</string>
+  <string name="blogs_sharing_response_declined_sent">Je hebt de bloguitnodiging van %s afgewezen.</string>
+  <string name="blogs_sharing_response_accepted_received">%s heeft de bloguitnodiging geaccepteerd.</string>
+  <string name="blogs_sharing_response_declined_received">%s heeft de bloguitnodiging afgewezen.</string>
+  <string name="blogs_sharing_invitation_received">%1$s heeft de blog \"%2$s\" met je gedeeld.</string>
+  <string name="blogs_sharing_invitation_sent">Je hebt de blog \"%1$s\" gedeeld met %2$s.</string>
+  <string name="blogs_sharing_invitations_title">Bloguitnodigingen</string>
+  <string name="blogs_sharing_joined_toast">Lid geworden van blog</string>
+  <string name="blogs_sharing_declined_toast">Bloguitnodiging afgewezen</string>
+  <string name="sharing_status_blog">Alle leden die lid worden van een blog kunnen deze blog delen met hun contacten. Je deelt deze blog al met de volgende contacten. Er kunnen ook andere leden zijn die je niet kan zien.</string>
+  <!--RSS Feeds-->
+  <string name="blogs_rss_feeds_import">Importeer RSS-feed</string>
+  <string name="blogs_rss_feeds_import_button">Importeer</string>
+  <string name="blogs_rss_feeds_import_hint">Voer de URL van de RSS-feed in</string>
+  <string name="blogs_rss_feeds_import_error">Excuses! Er trad een fout op bij het importeren van je feed.</string>
+  <string name="blogs_rss_feeds_manage">Beheer RSS-feeds</string>
+  <string name="blogs_rss_feeds_manage_imported">Geïmporteerd:</string>
+  <string name="blogs_rss_feeds_manage_author">Auteur:</string>
+  <string name="blogs_rss_feeds_manage_updated">Laatst bijgewerkt:</string>
+  <string name="blogs_rss_remove_feed">Verwijder feed</string>
+  <string name="blogs_rss_remove_feed_dialog_message">Weet je zeker dat je deze feed en alle bijbehorende posts wil verwijderen?\nPosts die je hebt gedeeld worden niet van apparaten van anderen verwijderd.</string>
+  <string name="blogs_rss_remove_feed_ok">Verwijder feed</string>
+  <string name="blogs_rss_feeds_manage_delete_error">De feed kon niet worden verwijderd.</string>
+  <string name="blogs_rss_feeds_manage_empty_state">Je hebt nog geen RSS-feeds geïmporteerd.\n\nWaarom klik je niet op de plus in de rechterbovenhoek van het scherm om de eerste toe te voegen?</string>
+  <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 Network-->
+  <string name="network_settings_title">Netwerken</string>
+  <string name="bluetooth_setting">Verbind via Bluetooth</string>
+  <string name="bluetooth_setting_enabled">Alleen als contacten dichtbij zijn</string>
+  <string name="bluetooth_setting_disabled">Alleen tijdens toevoegen van contacten</string>
+  <string name="tor_network_setting">Verbind via Tor</string>
+  <string name="tor_network_setting_never">Nooit</string>
+  <string name="tor_network_setting_wifi">Alleen tijdens gebruik van wifi</string>
+  <string name="tor_network_setting_always">Tijdens gebruik van wifi of mobiele dataverbinding</string>
+  <!--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="password_changed">Wachtwoord is gewijzigd</string>
+  <string name="panic_setting">Paniekknopinstellingen</string>
+  <string name="panic_setting_title">Paniekknop</string>
+  <string name="panic_setting_hint">Configureer hoe Briar reageert als je  paniekknopapp gebruikt.</string>
+  <string name="panic_app_setting_title">Paniekknopapp</string>
+  <string name="unknown_app">een onbekende app</string>
+  <string name="panic_app_setting_summary">Er is geen app ingesteld</string>
+  <string name="panic_app_setting_none">Geen</string>
+  <string name="dialog_title_connect_panic_app">Bevestig paniekapp</string>
+  <string name="dialog_message_connect_panic_app">Weet je zeker dat je wil toestaan dat %1$s destructieve paniekknopacties mag veroorzaken?</string>
+  <string name="lock_setting_title">Log uit</string>
+  <string name="lock_setting_summary">Log uit op Briar als de paniekknop wordt ingedrukt.</string>
+  <string name="purge_setting_title">Verwijder account</string>
+  <string name="purge_setting_summary">Verwijder je Briar-account als een paniekknop wordt ingedrukt. Let op: Dit zal permanent je identiteit, contacten en berichten verwijderen.</string>
+  <string name="uninstall_setting_title">Deïnstalleer Briar</string>
+  <string name="uninstall_setting_summary">Dit vereist een handmatige bevestiging op een paniekmoment</string>
+  <!--Settings Notifications-->
+  <string name="notification_settings_title">Meldingen</string>
+  <string name="notify_private_messages_setting_title">Privéberichten</string>
+  <string name="notify_private_messages_setting_summary">Toon meldingen voor privéberichten</string>
+  <string name="notify_group_messages_setting_title">Groepsberichten</string>
+  <string name="notify_group_messages_setting_summary">Toon meldingen voor groepsberichten</string>
+  <string name="notify_forum_posts_setting_title">Forumposts</string>
+  <string name="notify_forum_posts_setting_summary">Toon meldingen voor forumposts</string>
+  <string name="notify_blog_posts_setting_title">Blogposts</string>
+  <string name="notify_blog_posts_setting_summary">Toon meldingen voor blogposts</string>
+  <string name="notify_vibration_setting">Tril</string>
+  <string name="notify_lock_screen_setting_title">Schermvergrendeling</string>
+  <string name="notify_lock_screen_setting_summary">Toon notificaties over de schermvergrendeling</string>
+  <string name="notify_sound_setting">Geluid</string>
+  <string name="notify_sound_setting_default">Standaardringtoon</string>
+  <string name="notify_sound_setting_disabled">Geen</string>
+  <string name="choose_ringtone_title">Kies ringtoon</string>
+  <string name="cannot_load_ringtone">Kan ringtoon niet laden</string>
+  <!--Settings Feedback-->
+  <string name="feedback_settings_title">Terugkoppeling</string>
+  <string name="send_feedback">Verstuur terugkoppeling</string>
+  <!--Link Warning-->
+  <string name="link_warning_title">Linkwaarschuwing</string>
+  <string name="link_warning_intro">Je staat op het punt om de volgende link te open met een externe app.</string>
+  <string name="link_warning_text">Dit kan gebruikt worden om te achterhalen wie jij bent. Denk na of je de persoon vertrouwd die je deze link heeft gestuurd en overweeg deze link te openen met Orfox.</string>
+  <string name="link_warning_open_link">Open link</string>
+  <!--Crash Reporter-->
+  <string name="crash_report_title">Crashrapport Briar</string>
+  <string name="briar_crashed">Excuses, Briar is gecrashed.</string>
+  <string name="not_your_fault">Dit is niet je schuld</string>
+  <string name="please_send_report">Help ons a.u.b. om Briar te verbeteren door crashrapporten naar ons te sturen.</string>
+  <string name="report_is_encrypted">We beloven dat het rapport is versleuteld en veilig wordt verzonden.</string>
+  <string name="feedback_title">Terugkoppeling</string>
+  <string name="describe_crash">Beschrijf wat er is gebeurd (optioneel)</string>
+  <string name="enter_feedback">Voer je terugkoppeling in</string>
+  <string name="optional_contact_email">Je e-mailadres (optioneel)</string>
+  <string name="include_debug_report_crash">Voeg geanonimiseerde gegevens toe over de crash.</string>
+  <string name="include_debug_report_feedback">Voeg geanonimiseerde gegevens over dit apparaat toe.</string>
+  <string name="could_not_load_report_data">Kon rapportgegevens niet laden.</string>
+  <string name="send_report">Verstuur rapport</string>
+  <string name="close">Sluit</string>
+  <string name="dev_report_saved">Rapport is opgeslagen. Het zal worden verstuurd als je de volgende keer inlogt op Briar </string>
+  <!--Sign Out-->
+  <string name="progress_title_logout">Uitloggen van Briar…</string>
+  <!--Screen Filters & Tapjacking-->
+  <string name="screen_filter_title">Schermoverlay detecteerd</string>
+  <string name="screen_filter_body">Een andere app ligt boven Briar. Om je veiligheid te beschermen zal Briar niet reageren op aanrakingen als er een andere app boven ligt.\n\nProbeer de volgende apps uit te schakelen als je Briar gebruikt:\n\n%1$s</string>
+  <!--Permission Requests-->
+  <string name="permission_camera_title">Cameratoestemming</string>
+  <string name="permission_camera_request_body">Om de QR-code te scannen moet Briar toegang hebben tot de camera.</string>
+  <string name="permission_camera_denied_body">Je hebt toegang tot de camera niet vrijgegeven, terwijl het toevoegen van contacten de camera nodig heeft.\n\nOverweeg a.u.b. toegang vrij te geven.</string>
+  <string name="permission_camera_denied_toast">Cameratoegang niet vrijgegeven</string>
+</resources>
diff --git a/briar-android/src/main/res/values-oc/strings.xml b/briar-android/src/main/res/values-oc/strings.xml
index 506da45b3..5ceeb7be4 100644
--- a/briar-android/src/main/res/values-oc/strings.xml
+++ b/briar-android/src/main/res/values-oc/strings.xml
@@ -1,8 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <resources>
   <!--Setup-->
-  <string name="setup_title">Configuracion de Briar</string>
-  <string name="setup_explanation">Vòstre compte Briar es salvat e chifrat sus vòstre aparelh, non pas sus un servidor alonhat \"cloud\". Se desinstalletz Briar o oblidetz vòstre senhal, vòstre compte e vòstras donadas serà pas possible de los recuperar.</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>
@@ -22,12 +20,7 @@ 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">Benlèu que vos cal tornar installar Briar.</string>
   <string name="startup_failed_activity_title">Fracàs de l’aviada de Briar.</string>
-  <string name="startup_failed_db_error">Per una rason desconeguda vòstra basa de donadas Briar es pas utilizabla nimai recuperabla. Vòstres comptes, donadas e contactes son perduts. Per malastre vos cal tornar installar Briar e configurar un compte nòu.</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>
-  <plurals name="expiry_warning">
-    <item quantity="one">Aquò es una version Beta de Briar. Vòstre compte s’acabarà dins %d jorn e poirà pas èsser renovat.</item>
-    <item quantity="other">Aquò es una version Beta de Briar. Vòstre compte s’acabarà dins %d jorns e poirà pas èsser renovat.</item>
-  </plurals>
   <string name="expiry_date_reached">Vòstre logicial s’acabèt.\nMercés d’aver ensajat !</string>
   <!--Navigation Drawer-->
   <string name="nav_drawer_open_description">Dobrir lo panèl de navigacion</string>
@@ -71,8 +64,7 @@ Volètz suprimir vòstre compte e ne crear un nòu ?\n
   <string name="delete">Suprimir</string>
   <string name="accept">Acceptar</string>
   <string name="decline">Refusar</string>
-  <string name="options">Opcions</string>
-  <string name="online">En linha</string>
+	<string name="online">En linha</string>
   <string name="offline">Fòra linha</string>
   <string name="send">Mandar</string>
   <string name="allow">Autorizar</string>
@@ -81,6 +73,7 @@ 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="help">Ajuda</string>
   <!--Contacts and Private Conversations-->
   <string name="no_contacts">Sembla que sètz novèl aquí e qu’avètz pas cap de contacte.\n\nQuichatz l’icòna ennaut e seguètz las instruccions per n’apondre. Informacion : podètz pas qu’apondre lo monde se se tròban en fàcia de vos, aquò per evitar qu’òm vos raube l’identitat e que vòstres messatges sián legits per d’autres.</string>
   <string name="date_no_private_messages">Cap messatge</string>
@@ -92,31 +85,18 @@ Volètz suprimir vòstre compte e ne crear un nòu ?\n
   <string name="contact_deleted_toast">Contacte suprimit</string>
   <!--Adding Contacts-->
   <string name="add_contact_title">Ajustar un contacte</string>
-  <string name="your_nickname">Triatz l’identitat que volètz utilizar</string>
   <string name="face_to_face">Vos cal vos amassar amb la persona que volètz apondre als contactes.\n\n Aquò es fach per evitar qu’òm vos raube l’identitat e que vòstres messatges sián legits per d’autres.</string>
   <string name="continue_button">Contunhar</string>
-  <string name="your_invitation_code">Vòstre còdi de convidacion es</string>
-  <string name="enter_invitation_code">Mercés de marcar lo còdi de convidacion de vòstre contacte :</string>
-  <string name="searching_format">Recercar de contactes amb lo còdi de convidacion %06d\u2026</string>
   <string name="connection_failed">Fracàs de la connexion</string>
-  <string name="could_not_find_contact">Briar a pas trobar degun a proximitat</string>
   <string name="try_again_button">Tornar ensajar</string>
-  <string name="connected_to_contact">Connectat al contacte</string>
-  <string name="calculating_confirmation_code">Calcul del còdi de confirmacion\u2026</string>
-  <string name="your_confirmation_code">Vòstre còdi de confirmacion es </string>
-  <string name="enter_confirmation_code">Mercés de marcar lo còdi de confirmacion de vòstre contacte :</string>
-  <string name="waiting_for_contact">En espèra del contacte\u2026</string>
   <string name="waiting_for_contact_to_scan">En espèra de la numerizacion e de la connexion al contacte\u2026</string>
   <string name="exchanging_contact_details">Escambi dels detalhs del contacte\u2026</string>
-  <string name="codes_do_not_match">Los còdis correspondon pas</string>
-  <string name="interfering">Poriá arribar que qualqu’un ensajar d’interferir dins la connexion</string>
   <string name="contact_added_toast">Contacte apondut : %s</string>
   <string name="contact_already_exists">Lo contacte %s existís ja</string>
   <string name="contact_exchange_failed">L’escambi de contacte a fracassat</string>
   <string name="qr_code_invalid">Lo QR còdi es invalid</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 aquela</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>
@@ -366,4 +346,5 @@ Volètz suprimir vòstre compte e ne crear un nòu ?\n
   <!--Screen Filters & Tapjacking-->
   <string name="screen_filter_title">Superposicion detectada</string>
   <string name="screen_filter_body">Una autra aplicacion s’aficha per dessús Briar. Per protegir vòstre seguretat Briar respond pas quand una autra aplicacion s’aficha par dessús.\n\nEnsajatz de tampar las aplicacions seguentas quand utilizatz Briar : \n\n%1$s</string>
+  <!--Permission Requests-->
 </resources>
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 3dc461fb0..d384e7a59 100644
--- a/briar-android/src/main/res/values-pt-rBR/strings.xml
+++ b/briar-android/src/main/res/values-pt-rBR/strings.xml
@@ -1,8 +1,15 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <resources>
   <!--Setup-->
-  <string name="setup_title">Configuração de Briar</string>
-  <string name="setup_explanation">Sua conta Briar é armazenada criptografada apenas no seu dispositivo, não na nuvem. Se você Desinstalar o Briar ou esquecer sua senha, não será possível recuperar sua conta e seus dados.</string>
+  <string name="setup_title">Bem-vindo ao Briar</string>
+  <string name="setup_name_explanation">Seu nome de usuária será mostrado próximo a qualquer conteúdo que você publicar. Você não pode mudá-lo depois que criar sua conta,</string>
+  <string name="setup_next">Próximo</string>
+  <string name="setup_password_intro">Escolha uma senha</string>
+  <string name="setup_password_explanation">A sua conta do Briar está salva de modo criptografado no seu dispositivo, não na nuvem. Se você esquecer sua senha nou desinstalar o Briar não há como recuperar sua conta.\n\nEscolha uma senha longa que seja difícil de ser adivinhada, como cinco palavras aleatórias ou dez letras, números e símbolos aleatórios.</string>
+  <string name="setup_doze_title">Conexões em segundo plano</string>
+  <string name="setup_doze_intro">Para receber mensagens, o Briar precisa permanecer conectado em segundo plano.</string>
+  <string name="setup_doze_explanation">Para receber mensagens, o Briar precisa permanecer conectado em segundo plano. Por favor, desative as otimizações da bateria para que o Briar possa permanecer conectado.</string>
+  <string name="setup_doze_button">Pemitir conexões</string>
   <string name="choose_nickname">Escolha seu apelido</string>
   <string name="choose_password">Escolha sua senha</string>
   <string name="confirm_password">Confirme sua senha</string>
@@ -10,6 +17,12 @@
   <string name="password_too_weak">A senha está muito fraca</string>
   <string name="passwords_do_not_match">As senhas não conferem</string>
   <string name="create_account_button">Criar conta</string>
+  <string name="more_info">Informações adicionais</string>
+  <string name="don_t_ask_again">Não perguntar novamente</string>
+  <string name="setup_huawei_text">Toque no botão abaixo e verifique se o Briar está protegido na tela \"Aplicativos Protegidos\"</string>
+  <string name="setup_huawei_button">Proteger o Briar</string>
+  <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="try_again">Senha Incorreta, tente novamente</string>
@@ -20,12 +33,13 @@
   <string name="startup_failed_notification_title">Briar não pode iniciar</string>
   <string name="startup_failed_notification_text">Você pode precisar reinstalar o Briar.</string>
   <string name="startup_failed_activity_title">Inicialização do Briar falhou</string>
-  <string name="startup_failed_db_error">Por alguma razão, seus dados do Briar estão corrompidos e não podem ser reparados. Sua conta, seus dados e todas suas conexões com contatos estão perdidas. Infelizmente você terá que resintalar o Briar e criar uma nova conta.</string>
+  <string name="startup_failed_db_error">Por algum motivo, seu banco de dados do Briar foi corrompido enão pode ser reparado. Sua conta, seus dados e todos seus contatos estão perdidos. Infelizmente, você precisa reinstalar o Briar e criar uma nova conta.</string>
   <string name="startup_failed_service_error">O Briar não pode iniciar devido a um plugin. Reinstalar o Briar geralmente resolve esse problema. Porém, note que ao fazer isso você perderá sua conta e todos os dados associados a ela,  já que o Briar não usa um servidor central para armazenar seus dados.</string>
   <plurals name="expiry_warning">
-    <item quantity="one">Esta é uma versão beta do Briar. Sua conta irá expirar em %d dias e não poderá ser renovada.</item>
-    <item quantity="other">Esta é uma versão beta do Briar. Sua conta irá expirar em %d dias e não poderá ser renovada.</item>
+    <item quantity="one">Esta é uma versão de teste do Briar. Sua conta irá expirar em %d dia e não poderá ser renovada.</item>
+    <item quantity="other">Esta é uma versão de teste do Briar. Sua conta irá expirar em %d dias e não poderá ser renovada.</item>
   </plurals>
+  <string name="expiry_update">O prazo de validade da versão de teste foi extendido. Agora sua conta irá expirar em %d dias.</string>
   <string name="expiry_date_reached">Este software expirou.\nObrigado por testar!</string>
   <!--Navigation Drawer-->
   <string name="nav_drawer_open_description">Abrir aba de navegação</string>
@@ -69,8 +83,7 @@
   <string name="delete">Deletar</string>
   <string name="accept">Aceitar</string>
   <string name="decline">Recusar</string>
-  <string name="options">Opções</string>
-  <string name="online">Online</string>
+	<string name="online">Online</string>
   <string name="offline">Offline</string>
   <string name="send">Enviar</string>
   <string name="allow">Permitir</string>
@@ -79,6 +92,8 @@
   <string name="ellipsis">…</string>
   <string name="text_too_long">O texto entrado é muito grande</string>
   <string name="show_onboarding">Mostrar dialogo de ajuda</string>
+  <string name="fix">Consertar</string>
+  <string name="help">Ajuda</string>
   <!--Contacts and Private Conversations-->
   <string name="no_contacts">Parece que você é novo aqui e ainda não tem contatos.\nClique no ícone + no topo e siga as instruções para adicionar alguns amigos para sua lista.\nPor favor lembre: você só pode adicionar contatos pessoalmente para prevenir alguém se passar por você ou ler suas mensagens no futuro. </string>
   <string name="date_no_private_messages">Sem Mensagens</string>
@@ -90,31 +105,20 @@
   <string name="contact_deleted_toast">Contato apagado</string>
   <!--Adding Contacts-->
   <string name="add_contact_title">Adicionar um contato</string>
-  <string name="your_nickname">Escolha a identidade que você quer usar:</string>
   <string name="face_to_face">Você deve estar frente-a-frente com a pessoa que deseja adicionar como contato.\n\nIsso evita que alguém se passe por você ou leia suas mensagens no futuro.</string>
   <string name="continue_button">Continuar</string>
-  <string name="your_invitation_code">Seu código do convite é</string>
-  <string name="enter_invitation_code">Insira o código do convite do contato:</string>
-  <string name="searching_format">Procurando por contato com código de convite %06d\u2026</string>
   <string name="connection_failed">Conexão incompleta</string>
-  <string name="could_not_find_contact">Briar não conseguiu achar nenhum contato por perto</string>
   <string name="try_again_button">Tente novamente</string>
-  <string name="connected_to_contact">Conectado ao contato</string>
-  <string name="calculating_confirmation_code">Calculando código de confirmação\u2026</string>
-  <string name="your_confirmation_code">Seu código de confirmação é</string>
-  <string name="enter_confirmation_code">Insira o código de confirmação do contato:</string>
-  <string name="waiting_for_contact">Esperando pelo contato\u2026</string>
   <string name="waiting_for_contact_to_scan">Esperando pelo contato escanear e conectar\u2026</string>
   <string name="exchanging_contact_details">Transferindo detalhes do contato\u2026</string>
-  <string name="codes_do_not_match">Códigos não conferem</string>
-  <string name="interfering">Isto pode significar que algúem está tentando interferir em sua conexão</string>
   <string name="contact_added_toast">Contato adicionado: %s</string>
   <string name="contact_already_exists">Contato %s já existe</string>
   <string name="contact_exchange_failed">Troca de contatos falhou</string>
   <string name="qr_code_invalid">O QR code é inválido</string>
+  <string name="camera_error">Erro da câmera</string>
   <string name="connecting_to_device">Conectando a device\u2026</string>
   <string name="authenticating_with_device">Autenticando com o dispositivo\u2026</string>
-  <string name="connection_aborted_local">Conexão interrompida por nós! Isso pode disgnificar que alguém está tentando interferir na sua conexão</string>
+  <string name="connection_aborted_local">Conexão abortada! Isso pode significar que alguém está tentando interferir na sua conexão.</string>
   <string name="connection_aborted_remote">Conexão interrompida pelo seu contato! Isto pode significar que algúem está tentando interferir em sua conexão</string>
   <!--Introductions-->
   <string name="introduction_onboarding_title">Apresente seus contatos</string>
@@ -335,6 +339,7 @@
   <string name="notify_sound_setting_default">Toque padrão</string>
   <string name="notify_sound_setting_disabled">Nenhum</string>
   <string name="choose_ringtone_title">Escolher toque</string>
+  <string name="cannot_load_ringtone">Não foi possível carregar o toque</string>
   <!--Settings Feedback-->
   <string name="feedback_settings_title">Feedback</string>
   <string name="send_feedback">Enviar feedback</string>
@@ -362,5 +367,11 @@
   <!--Sign Out-->
   <string name="progress_title_logout">Saindo do Briar…</string>
   <!--Screen Filters & Tapjacking-->
+  <string name="screen_filter_title">Sobreposição de tela detectada</string>
   <string name="screen_filter_body">Outro aplicativo está rodando por cima do Briar. Para proteger sua segurança, o Briar não irá responder por toques quando outro aplicativo estiver por cima.\n\nTente desligar os seguintes aplicativos quando for usar o Briar:\n\n %1$s</string>
+  <!--Permission Requests-->
+  <string name="permission_camera_title">Permissão da câmera</string>
+  <string name="permission_camera_request_body">O Briar precisa acessar a câmera para pode escanear o QR code.</string>
+  <string name="permission_camera_denied_body">Você negou acesso à câmera, mas adicionar contatos requer que você use a câmera.\n\nPor favor, considere a concessão de acesso a ela.</string>
+  <string name="permission_camera_denied_toast">A permissão da câmera não foi concedida</string>
 </resources>
diff --git a/briar-android/src/main/res/values-ru/strings.xml b/briar-android/src/main/res/values-ru/strings.xml
index 9e2c749a5..6e14e520d 100644
--- a/briar-android/src/main/res/values-ru/strings.xml
+++ b/briar-android/src/main/res/values-ru/strings.xml
@@ -1,8 +1,15 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <resources>
   <!--Setup-->
-  <string name="setup_title">Настройка Briar</string>
-  <string name="setup_explanation">Ваша учетная запись Briar хранится в зашифрованном виде только на устройстве. Если вы удалите Briar или забудете пароль, то не сможете восстановить свою учетную запись и данные.</string>
+  <string name="setup_title">Добро пожаловать в Briar</string>
+  <string name="setup_name_explanation">Ваш ник будет показан рядом с любым контентом, который вы публикуете. Вы не сможете изменить его после создания аккаунта.</string>
+  <string name="setup_next">Вперед</string>
+  <string name="setup_password_intro">Выберите пароль</string>
+  <string name="setup_password_explanation">Ваша учетная запись Briar хранится в зашифрованном виде только на устройстве. Если вы забудете свой пароль или удалите Briar, вы не сможете восстановить свою учетную запись.\n\nВыберите длинный пароль, который трудно угадать, например четыре случайных слова или десять случайных букв, цифр и символов.</string>
+  <string name="setup_doze_title">Фоновые подключения</string>
+  <string name="setup_doze_intro">Для получения сообщений, Briar должен работать в фоновом режиме.</string>
+  <string name="setup_doze_explanation">Для получения сообщений, Briar должен работать в фоновом режиме. Отключите оптимизацию электропитания для Briar.</string>
+  <string name="setup_doze_button">Разрешить подключения</string>
   <string name="choose_nickname">Выберите псевдоним</string>
   <string name="choose_password">Выберите пароль</string>
   <string name="confirm_password">Подтвердите пароль</string>
@@ -10,6 +17,12 @@
   <string name="password_too_weak">Пароль слишком слабый</string>
   <string name="passwords_do_not_match">Пароли не совпадают</string>
   <string name="create_account_button">Создать учетную запись</string>
+  <string name="more_info">Дополнительная информация</string>
+  <string name="don_t_ask_again">Больше не спрашивать</string>
+  <string name="setup_huawei_text">Нажмите кнопку ниже и убедитесь, что Briar отображается на экране защищенных приложений.</string>
+  <string name="setup_huawei_button">Защитить Briar</string>
+  <string name="setup_huawei_help">Если Briar не добавлен в список защищенных приложений, он не сможет работать в фоновом режиме.</string>
+  <string name="warning_dozed">%s не удалось выполнить в фоновом режиме</string>
   <!--Login-->
   <string name="enter_password">Введите пароль:</string>
   <string name="try_again">Неверный пароль, повторите попытку</string>
@@ -20,14 +33,15 @@
   <string name="startup_failed_notification_title">Не удалось запустить Briar</string>
   <string name="startup_failed_notification_text">Возможно, потребуется переустановить Briar.</string>
   <string name="startup_failed_activity_title">Сбой при запуске Briar</string>
-  <string name="startup_failed_db_error">По какой-то причине, ваша база данных Briar повреждена без возможности восстановления. Ваша учетная запись, ваши данные и все ваши связи с контактами потеряны. К сожалению, необходимо переустановить Briar и настроить новую учетную запись.</string>
+  <string name="startup_failed_db_error">По какой-то причине, ваша база данных Briar повреждена без возможности восстановления. Ваша учетная запись, ваши данные и все ваши контакты потеряны. К сожалению, вам придется переустановить Briar и создать новую учетную запись.</string>
   <string name="startup_failed_service_error">Briar не смог запустить требуемый подключаемый модуль. Переустановка Briar обычно решает эту проблему. Однако обратите внимание, что после этого вы потеряете свою учетную запись и все связанные с ней данные, поскольку Briar не использует центральных серверов для хранения данных.</string>
   <plurals name="expiry_warning">
-    <item quantity="one">Это бета-версия Briar. Срок действия вашей учетной записи истекает через %d день и не может быть продлен.</item>
-    <item quantity="few">Это бета-версия Briar. Срок действия вашей учетной записи истекает через %d дней и не может быть продлен.</item>
-    <item quantity="many">Это бета-версия Briar. Срок действия вашей учетной записи истекает через %d дней и не может быть продлен.</item>
+    <item quantity="one">Это бета-версия Briar. Срок действия вашей учетной записи истечет через %d день и не может быть продлен.</item>
+    <item quantity="few">Это бета-версия Briar. Срок действия вашей учетной записи истечет через %d дней и не может быть продлен.</item>
+    <item quantity="many">Это бета-версия Briar. Срок действия вашей учетной записи истечет через %d дней и не может быть продлен.</item>
     <item quantity="other">Это бета-версия Briar. Срок действия вашей учетной записи истечет через %d дней и не может быть продлен.</item>
   </plurals>
+  <string name="expiry_update">Дата окончания тестирования была продлена. Срок действия вашей учетной записи истечет через %d дней.</string>
   <string name="expiry_date_reached">Срок действия этого программного обеспечения истек.\nСпасибо за тестирование!</string>
   <!--Navigation Drawer-->
   <string name="nav_drawer_open_description">Открыть навигационное меню</string>
@@ -75,12 +89,11 @@
   <string name="hide">Скрыть</string>
   <string name="ok">OK</string>
   <string name="cancel">Отмена</string>
-  <string name="got_it">Получено</string>
+  <string name="got_it">Понятно</string>
   <string name="delete">Удалить</string>
   <string name="accept">Принять</string>
   <string name="decline">Отклонить</string>
-  <string name="options">Опции</string>
-  <string name="online">В сети</string>
+	<string name="online">В сети</string>
   <string name="offline">Не в сети</string>
   <string name="send">Отправить</string>
   <string name="allow">Разрешить</string>
@@ -89,6 +102,8 @@
   <string name="ellipsis">…</string>
   <string name="text_too_long">Введенный текст слишком длинный</string>
   <string name="show_onboarding">Показать справку</string>
+  <string name="fix">Исправить</string>
+  <string name="help">Помощь</string>
   <!--Contacts and Private Conversations-->
   <string name="no_contacts">Кажется, вы здесь новенький и у вас нет контактов.\n\nКоснитесь значка + вверху и следуйте инструкциям, чтобы добавить друзей в список.\n\nПомните: вы можете добавлять новые контакты только лично, чтобы никто не выдал себя за вас и не мог читать ваши сообщения.</string>
   <string name="date_no_private_messages">Нет сообщений.</string>
@@ -100,31 +115,20 @@
   <string name="contact_deleted_toast">Контакт удален</string>
   <!--Adding Contacts-->
   <string name="add_contact_title">Добавить контакт</string>
-  <string name="your_nickname">Выберите идентификатор, который хотите использовать:</string>
   <string name="face_to_face">Вы должны встретиться с человеком, которого хотите добавить в контакты.\n\nЭто не позволит кому-либо выдать себя за вас или читать ваши сообщения.</string>
   <string name="continue_button">Продолжить</string>
-  <string name="your_invitation_code">Ваш код приглашения</string>
-  <string name="enter_invitation_code">Введите код приглашения вашего контакта:</string>
-  <string name="searching_format">Поиск контакта с кодом приглашения  %06d\u2026</string>
   <string name="connection_failed">Ошибка подключения</string>
-  <string name="could_not_find_contact">Briar не смог найти ваш контакт поблизости</string>
   <string name="try_again_button">Попробовать снова</string>
-  <string name="connected_to_contact">Подключено к контакту</string>
-  <string name="calculating_confirmation_code">Вычисление кода подтверждения\u2026</string>
-  <string name="your_confirmation_code">Ваш код подтвержения</string>
-  <string name="enter_confirmation_code">Введите код подтверждения контакта:</string>
-  <string name="waiting_for_contact">Ожидание контакта\u2026</string>
   <string name="waiting_for_contact_to_scan">Ожидание контакта для сканирования и подключения\u2026</string>
   <string name="exchanging_contact_details">Обмен контактными данными\u2026</string>
-  <string name="codes_do_not_match">Коды не совпадают</string>
-  <string name="interfering">Это может означать, что кто-то пытается вмешаться в ваше подключение</string>
   <string name="contact_added_toast">Контакт добавлен: %s</string>
   <string name="contact_already_exists">Контакт %s уже существует</string>
   <string name="contact_exchange_failed">Обмен контактами не удался</string>
   <string name="qr_code_invalid">Неверный QR-код</string>
+  <string name="camera_error">Ошибка камеры</string>
   <string name="connecting_to_device">Подключение к устройству\u2026</string>
   <string name="authenticating_with_device">Аутентификация с устройством\u2026</string>
-  <string name="connection_aborted_local">Соединение прервано нами! Это может означать, что кто-то пытается вмешаться в ваше подключение</string>
+  <string name="connection_aborted_local">Подключение прервано! Это может означать, что кто-то пытается вмешаться в ваше соединение</string>
   <string name="connection_aborted_remote">Соединение прервано вашим контактом! Это может означать, что кто-то пытается вмешаться в ваше подключение</string>
   <!--Introductions-->
   <string name="introduction_onboarding_title">Знакомство с контактами</string>
@@ -355,13 +359,14 @@
   <string name="notify_sound_setting_default">Мелодия по умолчанию</string>
   <string name="notify_sound_setting_disabled">Нет</string>
   <string name="choose_ringtone_title">Выберите мелодию звонка</string>
+  <string name="cannot_load_ringtone">Не удается загрузить мелодию звонка</string>
   <!--Settings Feedback-->
   <string name="feedback_settings_title">Обратная связь</string>
   <string name="send_feedback">Отправить отзыв</string>
   <!--Link Warning-->
-  <string name="link_warning_title">Ссылка-предупреждение</string>
-  <string name="link_warning_intro">Вы собираетесь открыть следующую ссылку с внешним приложением.</string>
-  <string name="link_warning_text">Это может быть использовано для идентификации вас. Подумайте о том, доверяете ли вы человеку, который прислал вам эту ссылку, и рассмотрите возможность его открытия в Orfox.</string>
+  <string name="link_warning_title">Внимание</string>
+  <string name="link_warning_intro">Вы собираетесь открыть следующую ссылку в стороннем приложении.</string>
+  <string name="link_warning_text">Возможно вас хотят идентифицировать. Подумайте, доверяете ли вы человеку, который прислал вам эту ссылку и рассмотрите возможность ее открытия в Orfox.</string>
   <string name="link_warning_open_link">Открыть ссылку</string>
   <!--Crash Reporter-->
   <string name="crash_report_title">Отчет о сбое Briar</string>
@@ -384,4 +389,9 @@
   <!--Screen Filters & Tapjacking-->
   <string name="screen_filter_title">Обнаружено наложение экрана</string>
   <string name="screen_filter_body">Другое приложение рисуется поверх Briar. Чтобы защитить вашу безопасность, Briar не будет реагировать на прикосновения, когда другое приложение рисует сверху.\n\nПопробуйте отключить следующие приложения при использовании Briar:\n\n%1$s</string>
+  <!--Permission Requests-->
+  <string name="permission_camera_title">Разрешение камеры</string>
+  <string name="permission_camera_request_body">Для сканирования QR-кода Briar необходим доступ к камере.</string>
+  <string name="permission_camera_denied_body">Доступ к камере запрещен, но для добавления контактов требуется доступ к камере.\n\nРассмотрите возможность предоставления доступа.</string>
+  <string name="permission_camera_denied_toast">Доступ к камере не был предоставлен</string>
 </resources>
diff --git a/briar-android/src/main/res/values-sq/strings.xml b/briar-android/src/main/res/values-sq/strings.xml
index 792c5f7c0..1911e9321 100644
--- a/briar-android/src/main/res/values-sq/strings.xml
+++ b/briar-android/src/main/res/values-sq/strings.xml
@@ -2,7 +2,14 @@
 <resources>
   <!--Setup-->
   <string name="setup_title">Rregullimi i Briar-it</string>
-  <string name="setup_explanation">Llogaria juaj Briar depozitohet e fshehtëzuar në pajisjen tuaj, jo në re. Nëse e çinstaloni Briar-in ose harroni fjalëkalimin tuaj, nuk ka rrugë për ta rimarrë llogarinë tuaj dhe të dhënat tuaja.</string>
+  <string name="setup_name_explanation">Nofka juaj do të shfaqet në krah të çfarëdo gjëje që postoni. S\’mund ta ndryshoni më, pas krijimit të llogarisë tuaj.</string>
+  <string name="setup_next">Pasuesi</string>
+  <string name="setup_password_intro">Zgjidhni një Fjalëkalim</string>
+  <string name="setup_password_explanation">Llogaria juaj Briar depozitohet e fshehtëzuar në pajisjen tuaj, jo në re. Nëse harroni fjalëkalimin tuaj apo e çinstaloni Briar-in, nuk ka ndonjë mënyrë për të ringjallur llogarinë tuaj.\n\nZgjidhni një fjalëkalim të gjatë, që është i vështirë për t\’u marrë me mend, f.v., katër fjalë kuturu, ose dhjetë shkronja, numra dhe shenja kuturu.</string>
+  <string name="setup_doze_title">Lidhje Në Prapaskenë</string>
+  <string name="setup_doze_intro">Për të marrë mesazhe, Briar-i lypset të qëndrojë i lidhur në prapaskenë.</string>
+  <string name="setup_doze_explanation">Për të marrë mesazhe, Briar-i lypset të mbetet i lidhur në prapaskenë. Ju lutemi, çaktivizoni optimizime baterie, që kështu Briar-i të mund të qëndrojë i lidhur.</string>
+  <string name="setup_doze_button">Lejo Lidhje</string>
   <string name="choose_nickname">Zgjidhni nofkën tuaj</string>
   <string name="choose_password">Zgjidhni fjalëkalimin tuaj</string>
   <string name="confirm_password">Ripohoni fjalëkalimin tuaj</string>
@@ -10,18 +17,30 @@
   <string name="password_too_weak">Fjalëkalimi është shumë i dobët</string>
   <string name="passwords_do_not_match">Fjalëkalimet nuk përputhen</string>
   <string name="create_account_button">Krijoje Llogarinë</string>
+  <string name="more_info">Më Tepër të Dhëna</string>
+  <string name="don_t_ask_again">Mos pyet sërish</string>
+  <string name="setup_huawei_text">Ju lutemi, prekni butoni më poshtë dhe sigurohuni që Briar-i të jetë i mbrojtur, te skena \"Aplikacione të Mbrojtur\".</string>
+  <string name="setup_huawei_button">Mbroje Briar-in</string>
+  <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="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>
   <string name="dialog_title_lost_password">U humb Fjalëkalimi</string>
-  <string name="dialog_message_lost_password">Llogaria juaj Briar depozitohet e fshehtëzuar në pajisjen tuaj, jo në re, ndaj s’mund ta ricaktojmë fjalëkalimin tuaj. Do të donit ta fshini llogarinë tuaj dhe t’ia filloni nga e para?\n\nKujdes: Identitetet, kontaktet dhe mesazhet tuaja do të humbin përgjithnjë.</string>
-  <string name="startup_failed_notification_title">Briar-i s’u nis dot</string>
+  <string name="dialog_message_lost_password">Llogaria juaj Briar depozitohet e fshehtëzuar në pajisjen tuaj, jo në re, ndaj s\’mund ta ricaktojmë fjalëkalimin tuaj. Do të donit ta fshini llogarinë tuaj dhe t\’ia filloni nga e para?\n\nKujdes: Identitetet, kontaktet dhe mesazhet tuaja do të humbin përgjithnjë.</string>
+  <string name="startup_failed_notification_title">Briar-i s\’u nis dot</string>
   <string name="startup_failed_notification_text">Mund të keni nevojë të ri-instaloni Briar-in.</string>
   <string name="startup_failed_activity_title">Dështim Nisjeje i Briar-it</string>
-  <string name="startup_failed_db_error">Për ndonjë arsye, baza e të dhënave e Briar-it tuaj është aq e dëmtuar, sa s’mund të ndreqet. Llogaria juaj, të dhënat tuaja dhe krejt lidhjet tuaja me kontaktet kanë humbur. Mjerisht lypset të ri-instaloni Briar-in dhe të rregulloni një llogari të re.</string>
-  <string name="startup_failed_service_error">Briar-i s’arriti të nisë një shtojcë të domosdoshme. Ri-instalimi i Briar-it zakonisht e zgjidh këtë problem. Por, ju lutemi, kini parasysh se me të do të humbni llogarinë tuaj dhe krejt të dhënat e lidhura me të, ngaqë Briar nuk përdor shërbyes qendrorë për të depozituar në ta të dhënat tuaja.</string>
+  <string name="startup_failed_db_error">Për ndonjë arsye, baza e të dhënave e Briar-it tuaj është aq e dëmtuar, sa s\’mund të ndreqet. Llogaria juaj, të dhënat tuaja dhe krejt lidhjet tuaja me kontaktet kanë humbur. Mjerisht lypset të ri-instaloni Briar-in dhe të rregulloni një llogari të re.</string>
+  <string name="startup_failed_service_error">Briar-i s\’arriti të nisë një shtojcë të domosdoshme. Ri-instalimi i Briar-it zakonisht e zgjidh këtë problem. Por, ju lutemi, kini parasysh se me të do të humbni llogarinë tuaj dhe krejt të dhënat e lidhura me të, ngaqë Briar nuk përdor shërbyes qendrorë për të depozituar në ta të dhënat tuaja.</string>
+  <plurals name="expiry_warning">
+    <item quantity="one">Ky është një version beta i Briar-it. Llogaria juaj do të skadojë për %d ditë dhe s\’mund të rinovohet.</item>
+    <item quantity="other">Ky është një version beta i Briar-it. Llogaria juaj do të skadojë për %d ditë dhe s\’mund të rinovohet.</item>
+  </plurals>
+  <string name="expiry_update">Data e skadimit të periudhës së testimit është shtyrë më tej. Tani llogaria juaj do të skadojë për %d ditë.</string>
+  <string name="expiry_date_reached">Ky software ka skaduar.\nFaleminderit që e provuat!</string>
   <!--Navigation Drawer-->
   <string name="nav_drawer_open_description">Hap sirtarin e lëvizjeve</string>
   <string name="nav_drawer_close_description">Mbylle sirtarin e lëvizjeve</string>
@@ -64,19 +83,20 @@
   <string name="delete">Fshije</string>
   <string name="accept">Pranoje</string>
   <string name="decline">Hidhe poshtë</string>
-  <string name="options">Mundësi</string>
-  <string name="online">Në linjë</string>
+	<string name="online">Në linjë</string>
   <string name="offline">Jo në linjë</string>
   <string name="send">Dërgoje</string>
   <string name="allow">Lejoje</string>
   <string name="open">Hape</string>
-  <string name="no_data">S’ka të dhëna</string>
+  <string name="no_data">S\’ka të dhëna</string>
   <string name="ellipsis">…</string>
   <string name="text_too_long">Teksti i dhënë është shumë i gjatë</string>
   <string name="show_onboarding">Shfaq Dialog Ndihme</string>
+  <string name="fix">Ndreqeni</string>
+  <string name="help">Ndihmë</string>
   <!--Contacts and Private Conversations-->
-  <string name="no_contacts">Duket se jeni i ri këtu dhe ende s’keni kontakte.\n\nPrekni ikonën + në krye dhe ndiqni udhëzimet që të shtoni ca shokë e miq te lista juaj.\n\nJu lutemi, mbani mend: Mundeni të shtoni kontakte të rinj vetëm duke qenë ballë për ballë me ta. që kështu të pengoni cilindo të hiqet si ju ose të lexojë në të ardhmen mesazhet tuaj.</string>
-  <string name="date_no_private_messages">S’ka mesazhe.</string>
+  <string name="no_contacts">Duket se jeni i ri këtu dhe ende s\’keni kontakte.\n\nPrekni ikonën + në krye dhe ndiqni udhëzimet që të shtoni ca shokë e miq te lista juaj.\n\nJu lutemi, mbani mend: Mundeni të shtoni kontakte të rinj vetëm duke qenë ballë për ballë me ta. që kështu të pengoni cilindo të hiqet si ju ose të lexojë në të ardhmen mesazhet tuaj.</string>
+  <string name="date_no_private_messages">S\’ka mesazhe.</string>
   <string name="no_private_messages">Kjo është pamja e bisedave.\n\nDuket se ka mungesë bisedash.\n\nQë të filloni një bisedë, thjesht prekni fushën e teksteve në fund.</string>
   <string name="message_hint">Shtypni mesazhin</string>
   <string name="delete_contact">Fshije kontaktin</string>
@@ -85,45 +105,35 @@
   <string name="contact_deleted_toast">Kontakti u fshi</string>
   <!--Adding Contacts-->
   <string name="add_contact_title">Shtoni një Kontakt</string>
-  <string name="your_nickname">Zgjidhni identitetin që doni të përdoret:</string>
   <string name="face_to_face">Duhet të takoheni me personin që doni ta shtoni si kontakt.\n\nKjo do të pengojë cilindo të hiqet si ju ose të lexojë në të ardhmen mesazhet tuaj.</string>
   <string name="continue_button">Vazhdo</string>
-  <string name="your_invitation_code">Kodi juaj i ftesës është</string>
-  <string name="enter_invitation_code">Ju lutemi, jepni kodin e ftesës së kontaktit tuaj:</string>
-  <string name="searching_format">Po kërkohet për kontakt me kod ftese %06d\u2026</string>
   <string name="connection_failed">Lidhja dështoi</string>
-  <string name="could_not_find_contact">Briar-i s’e gjeti dot kontaktin tuaj këtej pari</string>
   <string name="try_again_button">Riprovoni</string>
-  <string name="connected_to_contact">U lidh me kontaktin</string>
-  <string name="calculating_confirmation_code">Po përllogaritet kodi i ripohimit\u2026</string>
-  <string name="your_confirmation_code">Kodi juaj i ripohimit është</string>
-  <string name="enter_confirmation_code">Ju lutemi, jepni kodin e ripohimit të kontaktit tuaj:</string>
-  <string name="waiting_for_contact">Po pritet për kontaktin\u2026</string>
   <string name="waiting_for_contact_to_scan">Po pritet që kontakti ta skanojë dhe të lidhet\u2026</string>
   <string name="exchanging_contact_details">Po shkëmbehen hollësi kontaktesh\u2026</string>
-  <string name="codes_do_not_match">Kodet nuk përputhen</string>
-  <string name="interfering">Kjo do të thotë se dikush tjetër po përpiqet të fusë hundët në kontaktin tuaj</string>
   <string name="contact_added_toast">Kontakti u shtua: %s</string>
   <string name="contact_already_exists">Kontakti %s ekziston tashmë</string>
   <string name="contact_exchange_failed">Shkëmbimi i kontaktit dështoi</string>
   <string name="qr_code_invalid">Kodi QR është i pavlefshëm</string>
+  <string name="camera_error">Gabim kamere</string>
   <string name="connecting_to_device">Po lidhet me pajisjen\u2026</string>
   <string name="authenticating_with_device">Po bëhet mirëfilltësimi me pajisjen\u2026</string>
   <string name="connection_aborted_local">Lidhje e ndërprerë nga ne! Kjo mund të jetë shenjë se dikush po përpiqet të fusë hundët në lidhjen tuaj</string>
   <string name="connection_aborted_remote">Lidhje e ndërprerë nga kontakti juaj! Kjo mund të jetë shenjë se dikush po përpiqet të fusë hundët në lidhjen tuaj</string>
   <!--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_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_activity_title">Përzgjidhni Kontakt</string>
   <string name="introduction_message_title">Prezantoni Kontakte</string>
+  <string name="introduction_message_hint">Shtoni një mesazh (në daçi)</string>
   <string name="introduction_button">Bëje prezantimin</string>
   <string name="introduction_sent">Prezantimi juaj u dërgua.</string>
   <string name="introduction_error">Pati një gabim me bërjen e prezantimit.</string>
   <string name="introduction_response_error">Gabim në përgjigjen ndaj prezantimit</string>
   <string name="introduction_request_sent">Keni kërkuar të prezantoni %1$s te %2$s.</string>
-  <string name="introduction_request_received">%1$s ka kërkuar t’ju prezantojë te %2$s. Doni të shtohet %2$s te lista juaj e kontakteve?</string>
-  <string name="introduction_request_exists_received">%1$s ka kërkuar t’ju prezantojë te %2$s, por %2$s gjendet tashmë te lista juaj e kontakteve. Meqë %1$s mund të mos ta dijë këtë gjë, mundeni prapëseprapë t’i përgjigjeni:</string>
-  <string name="introduction_request_answered_received">%1$s ka kërkuar t’ju prezantojë te %2$s.</string>
+  <string name="introduction_request_received">%1$s ka kërkuar t\’ju prezantojë te %2$s. Doni të shtohet %2$s te lista juaj e kontakteve?</string>
+  <string name="introduction_request_exists_received">%1$s ka kërkuar t\’ju prezantojë te %2$s, por %2$s gjendet tashmë te lista juaj e kontakteve. Meqë %1$s mund të mos ta dijë këtë gjë, mundeni prapëseprapë t\’i përgjigjeni:</string>
+  <string name="introduction_request_answered_received">%1$s ka kërkuar t\’ju prezantojë te %2$s.</string>
   <string name="introduction_response_accepted_sent">Pranuat prezantimin te %1$s.</string>
   <string name="introduction_response_declined_sent">Hodhët poshtë prezantimin te %1$s.</string>
   <string name="introduction_response_accepted_received">%1$s pranoi prezantimin te %2$s.</string>
@@ -134,7 +144,7 @@
     <item quantity="other">U shtuan %d kontakte të rinj.</item>
   </plurals>
   <!--Private Groups-->
-  <string name="groups_list_empty">S’merrni pjesë në ndonjë grup.\n\nPrekni ikonën + në krye që të krijoni një grup ose kërkojuni kontakteve tuaj t’ju ftojnë në një prej grupeve të tyre.</string>
+  <string name="groups_list_empty">S\’merrni pjesë në ndonjë grup.\n\nPrekni ikonën + në krye që të krijoni një grup ose kërkojuni kontakteve tuaj t\’ju ftojnë në një prej grupeve të tyre.</string>
   <string name="groups_created_by">Krijuar nga %s</string>
   <plurals name="messages">
     <item quantity="one">%d mesazh</item>
@@ -146,6 +156,7 @@
   <string name="groups_create_group_title">Krijoni Grup Privat</string>
   <string name="groups_create_group_button">Krijoje Grupin</string>
   <string name="groups_create_group_invitation_button">Dërgoje Ftesën</string>
+  <string name="groups_create_group_hint">Zgjidhni një emër për grupin tuaj privat</string>
   <string name="groups_invitation_sent">Ftesa e grupit u dërgua</string>
   <string name="groups_message_sent">Mesazhi u dërgua</string>
   <string name="groups_member_list">Listë Anëtarësh</string>
@@ -159,10 +170,10 @@
   <string name="groups_leave_dialog_message">Jeni i sigurt se doni ta braktisni këtë grup?</string>
   <string name="groups_dissolve">Shkrijeni Grupin</string>
   <string name="groups_dissolve_dialog_title">Ripohoni Shkrirjen e Grupit</string>
-  <string name="groups_dissolve_dialog_message">Jeni i sigurt se doni të shkrihet ky grup?\n\nKrejt anëtarët e tjerë s’do të jenë në gjendje të vazhdojnë bisedat e tyre dhe mundet të mos i marrin mesazhet më të rinj.</string>
+  <string name="groups_dissolve_dialog_message">Jeni i sigurt se doni të shkrihet ky grup?\n\nKrejt anëtarët e tjerë s\’do të jenë në gjendje të vazhdojnë bisedat e tyre dhe mundet të mos i marrin mesazhet më të rinj.</string>
   <string name="groups_dissolve_button">Shkrije</string>
   <string name="groups_dissolved_dialog_title">Grupi u Shkri</string>
-  <string name="groups_dissolved_dialog_message">Krijuesi i këtij grupi e ka shkrirë atë.\n\nS’mund të shkruani më mesazhe për grupin dhe mundet të mos i merrni krejt postimet që janë shkruar.</string>
+  <string name="groups_dissolved_dialog_message">Krijuesi i këtij grupi e ka shkrirë atë.\n\nS\’mund të shkruani më mesazhe për grupin dhe mundet të mos i merrni krejt postimet që janë shkruar.</string>
   <!--Private Group Invitations-->
   <string name="groups_invitations_title">Ftesa Grupi</string>
   <string name="groups_invitations_invitation_sent">Keni ftuar %1$s të bëhet pjesë e grupit \"%2$s\".</string>
@@ -180,18 +191,19 @@
   <string name="sharing_status_groups">Vetëm krijuesi mund të ftojë anëtarë të rinj në grup. Më poshtë gjenden tërë anëtarët e tanishëm të grupit.</string>
   <!--Private Groups Revealing Contacts-->
   <string name="groups_reveal_contacts">Shfaqua Kontaktet</string>
-  <string name="groups_reveal_dialog_message">Mund të zgjidhni t’ua shfaqni ose jo kontaktet krejt anëtarëve të tanishëm dhe të ardhshëm të këtij grupi.\n\nShfaqja e kontakteve e bën lidhjen tuaj me grupin më të shpejtë dhe më të besueshme, ngaqë mund të komunikoni me kontaktet e shfaqura edhe kur krijuesi i grupit s’është në linjë.</string>
+  <string name="groups_reveal_dialog_message">Mund të zgjidhni t\’ua shfaqni ose jo kontaktet krejt anëtarëve të tanishëm dhe të ardhshëm të këtij grupi.\n\nShfaqja e kontakteve e bën lidhjen tuaj me grupin më të shpejtë dhe më të besueshme, ngaqë mund të komunikoni me kontaktet e shfaqura edhe kur krijuesi i grupit s\’është në linjë.</string>
   <string name="groups_reveal_visible">Marrëdhënia e kontaktit është e dukshme për grupin</string>
   <string name="groups_reveal_visible_revealed_by_us">Marrëdhënia e kontaktit është e dukshme për grupin (shfaqur nga ju)</string>
   <string name="groups_reveal_visible_revealed_by_contact">Marrëdhënia e kontaktit është e dukshme për grupin (shfaqur nga %s)</string>
-  <string name="groups_reveal_invisible">Marrëdhënia e kontaktit s’është e dukshme për grupin</string>
+  <string name="groups_reveal_invisible">Marrëdhënia e kontaktit s\’është e dukshme për grupin</string>
   <!--Forums-->
-  <string name="no_forums">Ende s’keni forume.\n\nPse nuk krijoni vetë një të tillë duke prekur ikonën + në krye?\n\nMund edhe t’u kërkoni kontakteve tuaj të ndajnë me ju forume.</string>
+  <string name="no_forums">Ende s\’keni forume.\n\nPse nuk krijoni vetë një të tillë duke prekur ikonën + në krye?\n\nMund edhe t\’u kërkoni kontakteve tuaj të ndajnë me ju forume.</string>
   <string name="create_forum_title">Krijoje Forumin</string>
+  <string name="choose_forum_hint">Zgjidhni një emër për forumin tuaj</string>
   <string name="create_forum_button">Krijoje Forumin</string>
   <string name="forum_created_toast">Forumi u krijua</string>
   <string name="no_forum_posts">Ky forum është i zbrazët.\n\nPërdorni ikonën penë që të hartoni postimin tuaj të parë.\n\nNdiheni vetëm? Ndajeni këtë forum me kontaktet tuaj!</string>
-  <string name="no_posts">S’ka postime</string>
+  <string name="no_posts">S\’ka postime</string>
   <plurals name="posts">
     <item quantity="one">%d postim</item>
     <item quantity="other">%d postime</item>
@@ -209,8 +221,9 @@
   <string name="forum_share_button">Ndajeni Forumin Me të Tjerë</string>
   <string name="contacts_selected">Kontaktet u përzgjodhën</string>
   <string name="activity_share_toolbar_header">Zgjidhni Kontakte</string>
-  <string name="no_contacts_selector">Duket se jeni i ri këtu dhe s’keni ende kontakte.\n\nJu lutemi, rikthehuni këtu pasi të keni shtuar kontaktin tuaj të parë.</string>
+  <string name="no_contacts_selector">Duket se jeni i ri këtu dhe s\’keni ende kontakte.\n\nJu lutemi, rikthehuni këtu pasi të keni shtuar kontaktin tuaj të parë.</string>
   <string name="forum_shared_snackbar">Forumi u nda me kontaktet e zgjedhur</string>
+  <string name="forum_share_message">Shtoni një mesazh (në daçi)</string>
   <string name="forum_share_error">Pati një gabim në ndarjen e këtij forumi me të tjerët.</string>
   <string name="forum_invitation_received">%1$s ndau me ju forumin \"%2$s\".</string>
   <string name="forum_invitation_sent">Ndatë me \"%2$s\" forumin %1$s.</string>
@@ -225,7 +238,7 @@
   <string name="forum_invitation_response_accepted_received">%s pranoi ftesën e forumit.</string>
   <string name="forum_invitation_response_declined_received">%s e hodhi poshtë ftesën e forumit.</string>
   <string name="sharing_status">Gjendje Ndarjeje Me të Tjerë</string>
-  <string name="sharing_status_forum">Cilido anëtar i grupit mund ta ndajë me të tjerët. Këtë forum po e ndani me kontaktet vijuese. Mund të ketë edhe anëtarë të tjerët, të cilët s’mund t’i shihni.</string>
+  <string name="sharing_status_forum">Cilido anëtar i grupit mund ta ndajë me të tjerët. Këtë forum po e ndani me kontaktet vijuese. Mund të ketë edhe anëtarë të tjerët, të cilët s\’mund t\’i shihni.</string>
   <string name="shared_with">E ndarë me %1$d (%2$d në linjë)</string>
   <plurals name="forums_shared">
     <item quantity="one">%d forum ndarë nga kontakte</item>
@@ -233,7 +246,7 @@
   </plurals>
   <string name="nobody">Askush</string>
   <!--Blogs-->
-  <string name="blogs_other_blog_empty_state">Hëpërhë ky blog është i zbrazët.\n\nOse autori s’ka shkruar gjë ende, ose personi që ndau blogun me ju lypset të jetë në linjë, që të mund të njëkohësohen postimet.</string>
+  <string name="blogs_other_blog_empty_state">Hëpërhë ky blog është i zbrazët.\n\nOse autori s\’ka shkruar gjë ende, ose personi që ndau blogun me ju lypset të jetë në linjë, që të mund të njëkohësohen postimet.</string>
   <string name="read_more">lexoni më tepër</string>
   <string name="blogs_write_blog_post">Shkruani Postim Blogu</string>
   <string name="blogs_write_blog_post_body_hint">Shtypni këtu postimin tuaj të blogut</string>
@@ -241,11 +254,12 @@
   <string name="blogs_blog_post_created">Postimi i Blogut u Krijua</string>
   <string name="blogs_blog_post_received">U morën Postime të Reja Blogu</string>
   <string name="blogs_blog_post_scroll_to">Kalo Te</string>
-  <string name="blogs_feed_empty_state">Kjo është prurja globale e blogjeve.\n\nDuket se askush s’ka shkruar gjë në ndonjë blog.\n\nBëhuni ju i pari dhe prekni ikonën penë që të shkruani postimin e parë të një blogu të ri.</string>
+  <string name="blogs_feed_empty_state">Kjo është prurja globale e blogjeve.\n\nDuket se askush s\’ka shkruar gjë në ndonjë blog.\n\nBëhuni ju i pari dhe prekni ikonën penë që të shkruani postimin e parë të një blogu të ri.</string>
   <string name="blogs_remove_blog">hiqe Blogun</string>
   <string name="blogs_remove_blog_dialog_message">Jeni i sigurt se doni të hiqet ky blog dhe krejt postimet?\nMbani parasysh që kjo nuk do ta heqë blogun nga pajisjet e personave të tjerë.</string>
   <string name="blogs_remove_blog_ok">Hiqe Blogun</string>
   <string name="blogs_blog_removed">Blogu u Hoq</string>
+  <string name="blogs_reblog_comment_hint">Shtoni një koment (në daçi)</string>
   <string name="blogs_reblog_button">Riblogojeni</string>
   <!--Blog Sharing-->
   <string name="blogs_sharing_share">Ndajeni Blogun Me të Tjerë</string>
@@ -256,10 +270,12 @@
   <string name="blogs_sharing_response_declined_sent">Hodhët poshtë ftesën e blogut nga %s.</string>
   <string name="blogs_sharing_response_accepted_received">%s pranoi ftesën e blogut.</string>
   <string name="blogs_sharing_response_declined_received">%s hodhi poshtë ftesën e blogut.</string>
+  <string name="blogs_sharing_invitation_received">%1$s ndau me ju \"%2$s\".</string>
+  <string name="blogs_sharing_invitation_sent">Ndatë blogun \"%1$s\" me %2$s.</string>
   <string name="blogs_sharing_invitations_title">Ftesa Blogu</string>
   <string name="blogs_sharing_joined_toast">U pajtuat te Blogu</string>
   <string name="blogs_sharing_declined_toast">Ftesa e Blogut u Hodh Poshtë</string>
-  <string name="sharing_status_blog">Cilido që pajtohet te një blog mund ta ndajë atë me kontaktet e veta. Këtë blog po e ndani me kontaktet vijuese. Mund të ketë edhe pajtimtarë të tjerë, të cilët s’mund t’i shihni.</string>
+  <string name="sharing_status_blog">Cilido që pajtohet te një blog mund ta ndajë atë me kontaktet e veta. Këtë blog po e ndani me kontaktet vijuese. Mund të ketë edhe pajtimtarë të tjerë, të cilët s\’mund t\’i shihni.</string>
   <!--RSS Feeds-->
   <string name="blogs_rss_feeds_import">Importoni Prurje RSS</string>
   <string name="blogs_rss_feeds_import_button">Importo</string>
@@ -272,8 +288,8 @@
   <string name="blogs_rss_remove_feed">Hiqe Prurjen</string>
   <string name="blogs_rss_remove_feed_dialog_message">Jeni i sigurt se doni të hiqet kjo prurje dhe krejt postimet e saj?\nÇfarëdo postimi që keni ndarë me të tjerët, nuk do të hiqet nga pajisjet e personave të tjerë.</string>
   <string name="blogs_rss_remove_feed_ok">Hiqe Prurjen</string>
-  <string name="blogs_rss_feeds_manage_delete_error">S’u fshi dot prurja!</string>
-  <string name="blogs_rss_feeds_manage_empty_state">S’keni importuar ende ndonjë prurje RSS.\n\nPse nuk klikoni mbi shenjën plus në cepin e sipërm djathtas që të shtoni të parën tuaj?</string>
+  <string name="blogs_rss_feeds_manage_delete_error">S\’u fshi dot prurja!</string>
+  <string name="blogs_rss_feeds_manage_empty_state">S\’keni importuar ende ndonjë prurje RSS.\n\nPse nuk klikoni mbi shenjën plus në cepin e sipërm djathtas që të shtoni të parën tuaj?</string>
   <string name="blogs_rss_feeds_manage_error">Pati një problem me ngarkimin e prurjeve tuaja. Ju lutemi, riprovoni më vonë.</string>
   <!--Settings Network-->
   <string name="network_settings_title">Rrjete</string>
@@ -296,7 +312,7 @@
   <string name="panic_setting_hint">Formësoni si do të reagojë Briar-i kur përdorni aplikacion butoni paniku</string>
   <string name="panic_app_setting_title">Aplikacion Butoni Paniku</string>
   <string name="unknown_app">aplikacion i panjohur</string>
-  <string name="panic_app_setting_summary">S’është rregulluar ndonjë aplikacion</string>
+  <string name="panic_app_setting_summary">S\’është rregulluar ndonjë aplikacion</string>
   <string name="panic_app_setting_none">Asnjë</string>
   <string name="dialog_title_connect_panic_app">Ripohoni Aplikacion Paniku</string>
   <string name="dialog_message_connect_panic_app">Jeni i sigurt se doni të lejohet %1$s të prodhojë veprime shkatërruese butoni paniku?</string>
@@ -310,39 +326,52 @@
   <string name="notification_settings_title">Njoftime</string>
   <string name="notify_private_messages_setting_title">Mesazhe private</string>
   <string name="notify_private_messages_setting_summary">Shfaq sinjalizime për mesazhe private</string>
+  <string name="notify_group_messages_setting_title">Mesazhe grupi</string>
   <string name="notify_group_messages_setting_summary">Shfaq sinjalizime për mesazhe grupi</string>
+  <string name="notify_forum_posts_setting_title">Postime forumi</string>
   <string name="notify_forum_posts_setting_summary">Shfaq sinjalizime për postime forumi</string>
+  <string name="notify_blog_posts_setting_title">Postime blogu</string>
   <string name="notify_blog_posts_setting_summary">Shfaq sinjalizime për postime blogu</string>
   <string name="notify_vibration_setting">Dridhu</string>
+  <string name="notify_lock_screen_setting_title">Kyçe Ekranin</string>
+  <string name="notify_lock_screen_setting_summary">Shfaqi njoftimet edhe me ekran të kyçur</string>
   <string name="notify_sound_setting">Tingull</string>
   <string name="notify_sound_setting_default">Zilja parazgjedhje</string>
   <string name="notify_sound_setting_disabled">Asnjë</string>
   <string name="choose_ringtone_title">Zgjidhni zile</string>
+  <string name="cannot_load_ringtone">S\’ngarkohet dot zile</string>
   <!--Settings Feedback-->
   <string name="feedback_settings_title">Përshtypje</string>
   <string name="send_feedback">Dërgoji përshtypjet</string>
   <!--Link Warning-->
   <string name="link_warning_title">Sinjalizim Lidhjeje</string>
   <string name="link_warning_intro">Ju ndan një hap nga hapja e lidhjes vijuese me një aplikacion të jashtëm.</string>
-  <string name="link_warning_text">Kjo mund të përdoret për t’ju identifikuar. Mendohuni nëse e besoni apo jo personin që ju dërgoi këtë lidhje dhe shihni mundësinë e hapjes së sja me Orfox</string>
+  <string name="link_warning_text">Kjo mund të përdoret për t\’ju identifikuar. Mendohuni nëse e besoni apo jo personin që ju dërgoi këtë lidhje dhe shihni mundësinë e hapjes së sja me Orfox</string>
   <string name="link_warning_open_link">Hape Lidhjen</string>
   <!--Crash Reporter-->
   <string name="crash_report_title">Njoftim Vithisjesh Briar</string>
   <string name="briar_crashed">Na ndjeni, Briar-i u vithis.</string>
-  <string name="not_your_fault">S’është faji juaj.</string>
+  <string name="not_your_fault">S\’është faji juaj.</string>
   <string name="please_send_report">Ju lutemi, na ndihmoni të ndërtojmë një Briar më të mirë, duke na dërguar një njoftim vithisjeje.</string>
   <string name="report_is_encrypted">Premtojmë që njoftimi fshehtëzohet dhe dërgohet në mënyrë të sigurt.</string>
   <string name="feedback_title">Përshtypje</string>
-  <string name="describe_crash">Përshkruani se ç’ndodhi (në daçi)</string>
+  <string name="describe_crash">Përshkruani se ç\’ndodhi (në daçi)</string>
   <string name="enter_feedback">Jepni përshtypjet tuaja</string>
   <string name="optional_contact_email">Adresa juaj email (në daçi)</string>
   <string name="include_debug_report_crash">Përfshi të dhëna anonime rreth vithisjes</string>
   <string name="include_debug_report_feedback">Përfshi të dhëna anonime rreth kësaj pajisjeje</string>
-  <string name="could_not_load_report_data">S’u ngarkuan dot të dhëna njoftimi.</string>
+  <string name="could_not_load_report_data">S\’u ngarkuan dot të dhëna njoftimi.</string>
   <string name="send_report">Dërgoje njoftimin</string>
   <string name="close">Mbylle</string>
   <string name="dev_report_saved">Njoftimi u ruajt. Do të dërgohet herën tjetër që do të hyni në Briar.</string>
   <!--Sign Out-->
   <string name="progress_title_logout">Po dilet nga Briar-i…</string>
   <!--Screen Filters & Tapjacking-->
+  <string name="screen_filter_title">U kap dalje jashtë ekrani</string>
+  <string name="screen_filter_body">Përsipër Briar-it po vizatohet nga një aplikacion tjetër. Që të mbrohet siguria juaj, Briar-i nuk do t\’u përgjigjet prekjeve kur përsipër vizatohet nga një aplikacion tjetër.\n\nProvoni të mbyllni aplikacionet vijuese, kur përdorni Briar-in:\n\n%1$s</string>
+  <!--Permission Requests-->
+  <string name="permission_camera_title">Leje mbi kamerën</string>
+  <string name="permission_camera_request_body">Që të skanojë kodin QR, Briar-i lypset të hyjë te kamera.</string>
+  <string name="permission_camera_denied_body">Keni mohuar hyrjen në kamera, por shtimi i kontakteve lyp përdorimin e kamerës.\n\nJu lutemi, shihni mundësinë e akordimit të hyrjes.</string>
+  <string name="permission_camera_denied_toast">S\’u dhanë leje mbi kamerën</string>
 </resources>
diff --git a/briar-android/src/main/res/values-sr/strings.xml b/briar-android/src/main/res/values-sr/strings.xml
index 86f1fa3e7..24fa6381d 100644
--- a/briar-android/src/main/res/values-sr/strings.xml
+++ b/briar-android/src/main/res/values-sr/strings.xml
@@ -1,8 +1,7 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <resources>
   <!--Setup-->
-  <string name="setup_title">Briar Podešavanje</string>
-  <string name="setup_explanation">Vaš Briar račun je kriptovan i sačuvan na vašem uređaju, ne u server-oblaku. Ako deinstalirate Briar ili zaboravite šifru, nema načina da povratite vaš račun ili vaše podatke.</string>
+  <string name="setup_next">Следећи</string>
   <string name="choose_nickname">Izaberite vaš nadimak</string>
   <string name="choose_password">Izaberite vašu šifru</string>
   <string name="confirm_password">Potvrdite vašu šifru</string>
@@ -20,7 +19,6 @@
   <string name="startup_failed_notification_title">Brirar nije mogao da startuje</string>
   <string name="startup_failed_notification_text">Možda ćete morati da reinstalirate Briar</string>
   <string name="startup_failed_activity_title">Briar neuspješno startovanje</string>
-  <string name="startup_failed_db_error">Iz nekog razloga, Briar baza podataka je nepovratno korumpirana. Vaš račun, vaši podaci i svi kontakti su izgubljeni. Nažalost, morate reinstalirati Briar i podesiti novi račun.</string>
   <string name="startup_failed_service_error">Briar nije mogao da startuje potreban plugin. Reinstaliranje Briara obično riješi problem. Međutim, imajte na umu da ćete izgubiti vaš račun i sve podatke vezane za njega pošto Briar ne koristi centralne servere da sačuva vaše podatke.</string>
   <string name="expiry_date_reached">Ovaj softver je istekao.\nHvala na testiranju!</string>
   <!--Navigation Drawer-->
@@ -49,8 +47,7 @@
   <string name="delete">Briši</string>
   <string name="accept">Prihvati</string>
   <string name="decline">Odbij</string>
-  <string name="options">Opcije</string>
-  <string name="online">Na vezi</string>
+	<string name="online">Na vezi</string>
   <string name="offline">Iskljucen</string>
   <string name="send">Šalji</string>
   <string name="allow">Dozvoli</string>
@@ -59,6 +56,7 @@
   <string name="ellipsis">...</string>
   <string name="text_too_long">Uneti tekst je predugačak</string>
   <string name="show_onboarding">Pokazi Pomoc dijalog </string>
+  <string name="help">Помоћ</string>
   <!--Contacts and Private Conversations-->
   <string name="no_contacts">Čini se da ste ovdje novi i da nemate još kontakata.\n\nTaknite + ikonu na vrhu i pratite instrukcije da bi dodali neke prijatelje na listu.\n\nMolimo da upamtite: Mozete samo dodati nove kontakte postupkom lice-u-lice kako bi se spriječili pokušaji lažnog predstavljanja ili da bi pročitali poruke upućene vama.</string>
   <string name="date_no_private_messages">Nema poruka.</string>
@@ -70,31 +68,18 @@
   <string name="contact_deleted_toast">Kontakt izbrisan</string>
   <!--Adding Contacts-->
   <string name="add_contact_title">Dodaj kontakt</string>
-  <string name="your_nickname">Izaberite identitet koji želite da koristite</string>
   <string name="face_to_face">Morate se sresti sa osobom koju želite da dodate kao kontakt.\n\nOvo će spriječiti bilo koga da se predstavi kao vi ili da ubuduće čita poruke.</string>
   <string name="continue_button">Dalje</string>
-  <string name="your_invitation_code">Vaš kod za poziv je</string>
-  <string name="enter_invitation_code">Unesite kod pozivnice vašeg kontakta:</string>
-  <string name="searching_format">Tražim kontakt sa kodom pozivnice %06d\u2026</string>
   <string name="connection_failed">Veza je pukla</string>
-  <string name="could_not_find_contact">Briar nije mogao naći vaš kontakt u blizini</string>
   <string name="try_again_button">Probajte opet</string>
-  <string name="connected_to_contact">Povezite se sa kontaktom</string>
-  <string name="calculating_confirmation_code">Kalkulisanje koda konfirmacije\u2026</string>
-  <string name="your_confirmation_code">Vaš konfirmacioni kod je</string>
-  <string name="enter_confirmation_code">Unesite konfirmacioni kod vašeg kontakta:</string>
-  <string name="waiting_for_contact">Čekam kontakt\u2026</string>
   <string name="waiting_for_contact_to_scan">Čekam da kontakt skenira i poveže se\u2026</string>
   <string name="exchanging_contact_details">Razmjenjujem detalje kontakta\u2026</string>
-  <string name="codes_do_not_match">Kodovi se nijesu poklopili</string>
-  <string name="interfering">Ovo može značiti da neko pokušava da se umiješa u vašu vezu</string>
   <string name="contact_added_toast">Kontakt dodat: %s</string>
   <string name="contact_already_exists">Kontakt %s već postoji</string>
   <string name="contact_exchange_failed">Razmjena kontakata nije uspjela</string>
   <string name="qr_code_invalid">QR kod nije validan</string>
   <string name="connecting_to_device">Povezujem se sa uređajem\u2026</string>
   <string name="authenticating_with_device">Autentikacija sa uređajem\u2026</string>
-  <string name="connection_aborted_local">Konekcija prekinuta sa naše strane! Ovo može značiti da neko pokušava da se umiješa u vašu vezu</string>
   <string name="connection_aborted_remote">Konekcija prekinuta sa od strane kontakta! Ovo može značiti da neko pokušava da se umiješa u vašu vezu</string>
   <!--Introductions-->
   <string name="introduction_onboarding_title">Upoznajte vaše kontakte</string>
@@ -324,4 +309,5 @@
   <!--Screen Filters & Tapjacking-->
   <string name="screen_filter_title">Detektovano je prekrivanje ekrana</string>
   <string name="screen_filter_body">Neka druga aplikacija crta interfejs preko Briara. Kako bi vas zaštitili, Briar neće reagovati na dodir kada druga aplikacija ispisuje preko njega.\n\nProbajte da ugasite slijedeće aplikacije kad koristite Briar:\n\n%1$s</string>
+  <!--Permission Requests-->
 </resources>
diff --git a/briar-android/src/main/res/values-sv/strings.xml b/briar-android/src/main/res/values-sv/strings.xml
new file mode 100644
index 000000000..41dcc5e35
--- /dev/null
+++ b/briar-android/src/main/res/values-sv/strings.xml
@@ -0,0 +1,152 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<resources>
+  <!--Setup-->
+  <string name="setup_title">Välkommen till Briar</string>
+  <string name="setup_name_explanation">Ditt användarnamn kommer att visas bredvid allt innehåll som du lägger upp. Du kan inte ändra ditt användarnamn efter att ditt konto skapats.</string>
+  <string name="setup_next">Nästa</string>
+  <string name="setup_password_intro">Skapa lösenord</string>
+  <string name="setup_password_explanation">Ditt Briar-konto lagras krypterat på din mobil eller läsplatta, inte hos en molntjänst. Om du glömmer ditt lösenord eller avinstallerar Briar är det därför inte möjligt att återställa ditt konto.\n\nSkapa ett långt lösenord som är svårgissat, till exempel fyra slumpvalda ord eller en kombination av tio slumpvalda bokstäver, siffror och andra tecken.</string>
+  <string name="setup_doze_title">Dataanslutningar i bakgrunden</string>
+  <string name="setup_doze_intro">För att kunna ta emot meddelanden måste Briar vara anslutet i bakgrunden.</string>
+  <string name="setup_doze_explanation">För att kunna ta emot meddelanden måste Briar vara anslutet i bakgrunden. Avaktivera batterioptimering så att Briar kan hålla sig anslutet.</string>
+  <string name="setup_doze_button">Tillåt dataanslutningar</string>
+  <string name="choose_nickname">Skapa användarnamn </string>
+  <string name="choose_password">Skapa lösenord</string>
+  <string name="confirm_password">Bekräfta lösenordet</string>
+  <string name="name_too_long">Namnet har för många tecken </string>
+  <string name="password_too_weak">Lösenordet är för svagt</string>
+  <string name="passwords_do_not_match">Lösenorden överensstämmer inte </string>
+  <string name="create_account_button">Skapa konto </string>
+  <string name="more_info">Mer information</string>
+  <string name="don_t_ask_again">Fråga inte igen</string>
+  <string name="setup_huawei_text">Tryck på knappen längre ner för att lägga till Briar till listan över \"skyddade appar\".</string>
+  <string name="setup_huawei_button">Skydda Briar</string>
+  <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="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>
+  <string name="dialog_title_lost_password">Glömt lösenord?</string>
+  <string name="dialog_message_lost_password">Eftersom ditt Briar-konto lagras krypterat på din mobil eller läsplatta och inte hos en molntjänst kan vi inte återställa ditt lösenord. Vill du radera ditt konto och skapa ett nytt?\n\nCaution: Du kommer att förlora din profil, dina kontakter och dina meddelanden.</string>
+  <string name="startup_failed_notification_title">Briar kunde inte startas </string>
+  <string name="startup_failed_notification_text">Du kan behöva återinstallera Briar.</string>
+  <string name="startup_failed_db_error">Av någon anledning är din Briar-databas korrumperad och kan inte repareras. Ditt konto, dina data och alla dina kontakter har förlorats. Du behöver tyvärr återinstallera Briar och skapa ett nytt konto.</string>
+  <string name="startup_failed_service_error">Briar kunde inte starta ett nödvändigt insticksprogram. Att återinstallera Briar brukar lösa problemet, men eftersom dina data inte lagras på en central server innebär detta att du kommer att förlora ditt konto och alla dess tillhörande data.</string>
+  <string name="expiry_date_reached">Mjukvaran har gått ut.\nTack för att du bidragit till att testa!</string>
+  <!--Navigation Drawer-->
+  <string name="nav_drawer_open_description">Öppna navigeringsfacket</string>
+  <string name="nav_drawer_close_description">Stäng navigeringsfacket</string>
+  <string name="contact_list_button">Kontakter</string>
+  <string name="groups_button">Privatgrupper</string>
+  <string name="forums_button">Forum</string>
+  <string name="blogs_button">Bloggar</string>
+  <string name="settings_button">Inställningar</string>
+  <string name="sign_out_button">Logga ut</string>
+  <!--Transports-->
+  <string name="transport_tor">Internet</string>
+  <string name="transport_bt">Bluetooth</string>
+  <string name="transport_lan">wifi</string>
+  <!--Notifications-->
+  <string name="ongoing_notification_title">Inloggad på Briar</string>
+  <string name="ongoing_notification_text">Tryck för att öppna Briar</string>
+  <!--Misc-->
+  <string name="now">nu</string>
+  <string name="show">Visa</string>
+  <string name="hide">Göm</string>
+  <string name="ok">OK</string>
+  <string name="cancel">Avbryt</string>
+  <string name="got_it">Förstått</string>
+  <string name="delete">Radera</string>
+  <string name="accept">Acceptera</string>
+  <string name="decline">Neka</string>
+	<string name="online">Uppkopplad</string>
+  <string name="offline">Nedkopplad</string>
+  <string name="send">Skicka</string>
+  <string name="allow">Tillåt</string>
+  <string name="open">Öppen</string>
+  <string name="text_too_long">Texten innehåller för många tecken</string>
+  <string name="show_onboarding">Visa hjälprutan</string>
+  <string name="fix">Laga</string>
+  <string name="help">Hjälp</string>
+  <!--Contacts and Private Conversations-->
+  <string name="no_contacts">Det verkar som att du är ny här och inte hara några kontakter än.\n\nTryck på +-ikonen längre upp och följ anvisningarna för att lägga till några vänner till din lista.\n\nKom ihåg: Du kan bara lägga till nya kontakter då ni setts i verkligheten. Detta gör att ingen kan utge sig för att vara du från ett annat konto.</string>
+  <string name="date_no_private_messages">Inga meddelanden</string>
+  <string name="message_hint">Skriv ett meddelande</string>
+  <string name="delete_contact">Radera kontakt</string>
+  <string name="dialog_title_delete_contact">Bekräfta radering av kontakt</string>
+  <string name="dialog_message_delete_contact">Är du säker att du vill radera denna kontakt och alla meddelanden?</string>
+  <string name="contact_deleted_toast">Kontakt raderad</string>
+  <!--Adding Contacts-->
+  <string name="add_contact_title">Lägg till en kontakt</string>
+  <string name="continue_button">Fortsätt</string>
+  <string name="connection_failed">Anslutning misslyckats</string>
+  <string name="try_again_button">Försök igen</string>
+  <!--Introductions-->
+  <string name="introduction_onboarding_text">Du kan presentera dina kontakter för varandra, på så sätt behöver de inte ses i verkligheten för att kunna lägga till varandra på Briar.</string>
+  <string name="introduction_activity_title">Välj kontakt</string>
+  <!--Private Groups-->
+  <string name="groups_list_empty">Du är inte medlem i några grupper.\n\nTryck på +-ikonen högst upp för att skapa en grupp eller för att be om att gå med i en grupp.</string>
+  <string name="groups_group_is_empty">Denna grupp har inga medlemmar</string>
+  <string name="groups_group_is_dissolved">Denna grupp har raderats</string>
+  <string name="groups_remove">Ta bort</string>
+  <string name="groups_create_group_title">Skapa privatgrupp</string>
+  <string name="groups_create_group_button">Skapa grupp</string>
+  <string name="groups_create_group_invitation_button">Skicka inbjudan</string>
+  <string name="groups_create_group_hint">Skapa ett namn för din privatgrupp</string>
+  <string name="groups_invitation_sent">Gruppinbjudan har skickats</string>
+  <string name="groups_message_sent">Meddelandet har skickats</string>
+  <string name="groups_member_list">Medlemmar</string>
+  <string name="groups_invite_members">Bjuda in medlem</string>
+  <string name="groups_member_created_you">Du har skapat en grupp</string>
+  <string name="groups_member_joined_you">Du har gått med i en grupp</string>
+  <string name="groups_leave">Lämna grupp</string>
+  <!--Private Group Invitations-->
+  <!--Private Groups Revealing Contacts-->
+  <!--Forums-->
+  <string name="btn_reply">Svara</string>
+  <string name="dialog_button_leave">Tillbaka</string>
+  <!--Forum Sharing-->
+  <!--Blogs-->
+  <!--Blog Sharing-->
+  <!--RSS Feeds-->
+  <string name="blogs_rss_feeds_import_button">Importera</string>
+  <string name="blogs_rss_feeds_manage_author">Författare:</string>
+  <string name="blogs_rss_feeds_manage_updated">Senast uppdaterad:</string>
+  <!--Settings Network-->
+  <string name="network_settings_title">Nätverk</string>
+  <string name="bluetooth_setting">Anslut via Bluetooth</string>
+  <string name="tor_network_setting">Anslut via Tor</string>
+  <string name="tor_network_setting_never">Aldrig</string>
+  <!--Settings Security and Panic-->
+  <string name="security_settings_title">Säkerhet</string>
+  <string name="change_password">Ändra 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>
+  <string name="purge_setting_title">Radera kontot</string>
+  <string name="uninstall_setting_title">Avinstallera Briar</string>
+  <!--Settings Notifications-->
+  <string name="notification_settings_title">Aviseringar</string>
+  <string name="notify_private_messages_setting_title">Privata meddelanden</string>
+  <string name="notify_lock_screen_setting_title">Lås skärmen</string>
+  <string name="notify_lock_screen_setting_summary">Visa meddelanden på låsskärmen</string>
+  <string name="notify_sound_setting">Ljud</string>
+  <string name="notify_sound_setting_disabled">Ingen</string>
+  <!--Settings Feedback-->
+  <string name="feedback_settings_title">Feedback</string>
+  <!--Link Warning-->
+  <string name="link_warning_open_link">Öppna länk</string>
+  <!--Crash Reporter-->
+  <string name="crash_report_title">Briar-felrapport</string>
+  <string name="not_your_fault">Detta är inte ditt fel.</string>
+  <string name="please_send_report">Hjälp oss att förbättra Briar genom att skicka en felrapport.</string>
+  <string name="report_is_encrypted">Vi lovar att felrapporten är krypterad och skickas säkert.</string>
+  <string name="feedback_title">Feedback</string>
+  <string name="describe_crash">Beskriv vad som hänt (valfritt)</string>
+  <string name="close">Stäng</string>
+  <!--Sign Out-->
+  <!--Screen Filters & Tapjacking-->
+  <!--Permission Requests-->
+</resources>
diff --git a/briar-android/src/main/res/values-tr/strings.xml b/briar-android/src/main/res/values-tr/strings.xml
index 19b78908a..56d98493c 100644
--- a/briar-android/src/main/res/values-tr/strings.xml
+++ b/briar-android/src/main/res/values-tr/strings.xml
@@ -1,8 +1,7 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <resources>
   <!--Setup-->
-  <string name="setup_title">Briar Kurulum</string>
-  <string name="setup_explanation">Briar hesabınız bulutta değil, cihazınızda şifreli olarak saklanır. Briar\'ı kaldırırsanız veya şifrenizi unutursanız, hesabınızı ve verilerinizi kurtarmanın bir yolu yoktur.</string>
+  <string name="setup_next">Sonraki</string>
   <string name="choose_nickname">Kullanıcı adınızı belirleyin</string>
   <string name="choose_password">Parolanızı belirleyin</string>
   <string name="confirm_password">Parolanızı doğrulayın</string>
@@ -20,7 +19,6 @@
   <string name="startup_failed_notification_title">Briar başlayamadı</string>
   <string name="startup_failed_notification_text">Briar\'ı tekrar kurmanız gerekli.</string>
   <string name="startup_failed_activity_title">Briar Başlangıç Hatası</string>
-  <string name="startup_failed_db_error">Bazı nedenlerden dolayı, Briar veritabanınız onarılamayacak kadar bozuk. Hesabınız, verileriniz ve tüm iletişim bağlantılarınız kayboldu. Ne yazık ki, Briar\'ı yeniden yükleyip yeni bir hesap oluşturmanız gerekiyor.</string>
   <string name="startup_failed_service_error">Briar gerekli bir eklentiyi başlatamadı. Briar\'ı yeniden yüklemek genellikle bu sorunu çözer. Bununla birlikte, lütfen Briar\'ın verilerinizi depolamak için merkezi sunucuları kullanmadığından hesabınızı ve onunla ilişkili tüm verileri kaybedeceğinizi unutmayın.</string>
   <!--Navigation Drawer-->
   <string name="nav_drawer_open_description">Gezinme çekmecesini aç</string>
@@ -64,8 +62,7 @@
   <string name="delete">Sil</string>
   <string name="accept">Onayla</string>
   <string name="decline">Reddet</string>
-  <string name="options">Seçenekler</string>
-  <string name="online">Çevrimiçi</string>
+	<string name="online">Çevrimiçi</string>
   <string name="offline">Çevrimdışı</string>
   <string name="send">Gönder</string>
   <string name="allow">İzin ver</string>
@@ -74,6 +71,7 @@
   <string name="ellipsis">…</string>
   <string name="text_too_long">Girilen metin çok uzun</string>
   <string name="show_onboarding">Yardım Penceresini Göster</string>
+  <string name="help">Yardım</string>
   <!--Contacts and Private Conversations-->
   <string name="no_contacts">Görünüşe göre burada yeni başladınız ve henüz bir iletişim kurmadınız.\n\n en üstte bulunan + simgesine dokunun ve talimatları izleyerek listenize bazı arkadaşlar ekleyin.\n\nLütfen unutmayın: Gelecekte başkalarının kimliğinize bürünmesini veya mesajlarınızı okumasını önlemek için yeni kişileri sadece yüz yüze ekleyebilirsiniz.</string>
   <string name="date_no_private_messages">Hiç mesaj yok.</string>
@@ -85,31 +83,18 @@
   <string name="contact_deleted_toast">Kişi silindi</string>
   <!--Adding Contacts-->
   <string name="add_contact_title">Kişi ekle</string>
-  <string name="your_nickname">Kullanmak istediğiniz kimliğinizi seçin:</string>
   <string name="face_to_face">Kişi olarak eklemek istediğiniz kişiyle buluşmanız gerekir.\n\nBu, gelecekte başkalarının sizin kimliğinize bürünmesini veya mesajlarınızı okumasını engelleyecektir.</string>
   <string name="continue_button">Devam et</string>
-  <string name="your_invitation_code">Davetiye kodunuz</string>
-  <string name="enter_invitation_code">Lütfen kişinizin davetiye kodunu girin:</string>
-  <string name="searching_format">Davet kodu ile kişi arama %06d\u2026</string>
   <string name="connection_failed">Bağlantı hatası</string>
-  <string name="could_not_find_contact">Briar yakınınızda bulunduğunuz kişiyi bulamadı.</string>
   <string name="try_again_button">Tekrar deneyin</string>
-  <string name="connected_to_contact">Kişiye bağlanıldı</string>
-  <string name="calculating_confirmation_code">Doğrulama kodu hesaplanıyor\u2026</string>
-  <string name="your_confirmation_code">Doğrulama kodunuz</string>
-  <string name="enter_confirmation_code">Lütfen kişinizin doğrulama kodunu girin:</string>
-  <string name="waiting_for_contact">Şu kişi için bekleniyor:\u2026</string>
   <string name="waiting_for_contact_to_scan">Kişinin QR kodu taraması ve bağlantı kurması bekleniyor\u2026</string>
   <string name="exchanging_contact_details">Kişi ayrıntıları karşılıklı paylaşılıyor\u2026</string>
-  <string name="codes_do_not_match">Kodlar uyuşmadı</string>
-  <string name="interfering">Bu, birisinin bağlantınızı kesmeye çalıştığı anlamına gelebilir</string>
   <string name="contact_added_toast">Kişi eklendi: %s</string>
   <string name="contact_already_exists"> %s kişisi zaten var</string>
   <string name="contact_exchange_failed">Kişi değişimi hatası</string>
   <string name="qr_code_invalid">QR kod hatalı</string>
   <string name="connecting_to_device">Cihaza bağlanıyor\u2026</string>
   <string name="authenticating_with_device">Cihazla kimlik doğrulama\u2026</string>
-  <string name="connection_aborted_local">Bağlantı bizim tarafımızca iptal edildi! Bu, birisinin bağlantınızı kesmeye çalıştığı anlamına gelebilir</string>
   <string name="connection_aborted_remote">Bağlantı kişi tarafından kesildi! Bu, birisinin bağlantınızı kesmeye çalıştığı anlamına gelebilir</string>
   <!--Introductions-->
   <string name="introduction_onboarding_title">Kişilerinizi tanıştırın</string>
@@ -345,4 +330,5 @@
   <!--Sign Out-->
   <string name="progress_title_logout">Briar\'dan çıkılıyor...</string>
   <!--Screen Filters & Tapjacking-->
+  <!--Permission Requests-->
 </resources>
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 f99ebc279..12853ed46 100644
--- a/briar-android/src/main/res/values-zh-rCN/strings.xml
+++ b/briar-android/src/main/res/values-zh-rCN/strings.xml
@@ -1,8 +1,15 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <resources>
   <!--Setup-->
-  <string name="setup_title">安装 Briar</string>
-  <string name="setup_explanation">您的 Briar 账号只会被加密储存在您的设备上，不会被上传。如果您卸载了 Briar 或忘记了密码，将无法恢复您的账号和数据。</string>
+  <string name="setup_title">欢迎来到 Briar</string>
+  <string name="setup_name_explanation">您的昵称将显示在您发布的任何内容旁。昵称在创建帐户后无法更改。</string>
+  <string name="setup_next">下一步</string>
+  <string name="setup_password_intro">设置一个密码</string>
+  <string name="setup_password_explanation">您的 Briar 账号将被加密储存在您的设备上，而非云端，卸载 Briar 或忘记密码，账号将无法恢复。请设置难以猜出的长密码，比如四个随意的单词，或是十个随机字母、数字和符号。</string>
+  <string name="setup_doze_title">后台连接</string>
+  <string name="setup_doze_intro">为了收到消息，Briar 需要保持后台连接。</string>
+  <string name="setup_doze_explanation">为了收到消息，Briar 需要保持后台连接。请禁用电量优化选项以使 Briar 保持连接。</string>
+  <string name="setup_doze_button">允许连接。</string>
   <string name="choose_nickname">设置昵称</string>
   <string name="choose_password">设置密码</string>
   <string name="confirm_password">确认密码</string>
@@ -10,6 +17,12 @@
   <string name="password_too_weak">密码强度过弱</string>
   <string name="passwords_do_not_match">两次键入密码不一致</string>
   <string name="create_account_button">创建账号</string>
+  <string name="more_info">更多信息</string>
+  <string name="don_t_ask_again">不再询问</string>
+  <string name="setup_huawei_text">轻触下方的按钮以保证 Briar 加入“受保护的应用”。</string>
+  <string name="setup_huawei_button">保护 Briar</string>
+  <string name="setup_huawei_help">如果没有将 Briar 加入受保护应用列表，将无法在后台运行。</string>
+  <string name="warning_dozed">%s 无法在后台运行。</string>
   <!--Login-->
   <string name="enter_password">请输入密码：</string>
   <string name="try_again">密码不正确，请重试</string>
@@ -20,11 +33,12 @@
   <string name="startup_failed_notification_title">Briar 无法启动</string>
   <string name="startup_failed_notification_text">你可能需要重新安装 Briar</string>
   <string name="startup_failed_activity_title">Briar 启动失败</string>
-  <string name="startup_failed_db_error">由于某些原因，您的 Briar 数据库损坏并无法修复。您的账号、数据和一切联系人关系均已遗失。我们遗憾地告诉您，您需要重新安装 Briar 并建立新帐号。</string>
+  <string name="startup_failed_db_error">由于某种原因，您的 Briar 数据库损坏且无法修复。您的帐户、数据和所有联系人已经丢失。不幸的是，您需要重新安装 Briar 并建立新帐户。</string>
   <string name="startup_failed_service_error">Briar 无法开启一个必要插件。通常情况下，重新安装 Briar 可以解决这个问题。但是由于 Briar 并不采用中央服务器来储存您的数据，您将丢失您的账号和与您的账号相关的一切数据。</string>
   <plurals name="expiry_warning">
-    <item quantity="other">这是 Briar 的一个测试版本。您的账号将在 %d 天后失效，并且无法恢复。</item>
+    <item quantity="other">这是 Briar 的一个测试版本。您的帐户将在 %d 天后过期，且无法继续使用。</item>
   </plurals>
+  <string name="expiry_update">测试到期时间延长，您的帐户将在 %d 天后过期。</string>
   <string name="expiry_date_reached">本软件已过期。\n感谢您的测试！</string>
   <!--Navigation Drawer-->
   <string name="nav_drawer_open_description">打开抽屉式导航栏</string>
@@ -58,14 +72,13 @@
   <string name="now">现在</string>
   <string name="show">显示</string>
   <string name="hide">隐藏</string>
-  <string name="ok">好</string>
+  <string name="ok">确定</string>
   <string name="cancel">取消</string>
   <string name="got_it">知道了</string>
   <string name="delete">删除</string>
   <string name="accept">接受</string>
   <string name="decline">拒绝</string>
-  <string name="options">选项</string>
-  <string name="online">在线</string>
+	<string name="online">在线</string>
   <string name="offline">离线</string>
   <string name="send">发送</string>
   <string name="allow">允许</string>
@@ -74,10 +87,12 @@
   <string name="ellipsis">…</string>
   <string name="text_too_long">输入的文本过长</string>
   <string name="show_onboarding">显示帮助对话</string>
+  <string name="fix">修复</string>
+  <string name="help">帮助</string>
   <!--Contacts and Private Conversations-->
-  <string name="no_contacts">似乎你是新来的，目前还没有联系人。\n\n点击上方的 + 按钮并根据提示添加联系人。\n\n请牢记：您只能通过面对面的方式添加新联系人，以防止未来他人冒充您的身份并查看您的信息。</string>
+  <string name="no_contacts">你似乎是新来的，目前还没有联系人。\n\n轻触上方的 + 按钮并根据提示添加联系人。\n\n请牢记：您只能通过面对面的方式添加新联系人，以防止未来他人冒充您的身份并查看您的信息。</string>
   <string name="date_no_private_messages">没有消息。</string>
-  <string name="no_private_messages">这是对话视图。\n\n这里似乎缺少对话。\n\n点击下方的输入框来开始对话。</string>
+  <string name="no_private_messages">这是对话视图。\n\n这里似乎缺少对话。\n\n轻触下方的输入框来开始对话。</string>
   <string name="message_hint">键入信息</string>
   <string name="delete_contact">删除联系人</string>
   <string name="dialog_title_delete_contact">确认删除联系人</string>
@@ -85,31 +100,20 @@
   <string name="contact_deleted_toast">联系人已删除</string>
   <!--Adding Contacts-->
   <string name="add_contact_title">添加联系人</string>
-  <string name="your_nickname">选取您想使用的身份：</string>
   <string name="face_to_face">您必须与您想要添加的联系人见面。\n\n这样可以防止未来他人冒充您的身份并查看您的信息。</string>
   <string name="continue_button">继续</string>
-  <string name="your_invitation_code">您的邀请码是</string>
-  <string name="enter_invitation_code">请输入您的联系人的邀请码：</string>
-  <string name="searching_format">正在查找该邀请码对应的联系人 %06d\u2026</string>
   <string name="connection_failed">连接失败</string>
-  <string name="could_not_find_contact">Briar 无法找到您身边的联系人</string>
   <string name="try_again_button">重试</string>
-  <string name="connected_to_contact">连接至联系人</string>
-  <string name="calculating_confirmation_code">正在计算确认码\u2026</string>
-  <string name="your_confirmation_code">您的确认码是</string>
-  <string name="enter_confirmation_code">请输入您的联系人的确认码：</string>
-  <string name="waiting_for_contact">等待联系人\u2026</string>
   <string name="waiting_for_contact_to_scan">等待联系人扫描并连接\u2026</string>
   <string name="exchanging_contact_details">交换联系人细节\u2026</string>
-  <string name="codes_do_not_match">密码不匹配</string>
-  <string name="interfering">这可能意味着有人正在尝试干预你们的连接</string>
   <string name="contact_added_toast">联系人已添加： %s</string>
   <string name="contact_already_exists">联系人 %s 已存在</string>
   <string name="contact_exchange_failed">联系人交换失败</string>
   <string name="qr_code_invalid">二维码无效</string>
+  <string name="camera_error">摄像头出错</string>
   <string name="connecting_to_device">正在连接至设备\u2026</string>
   <string name="authenticating_with_device">正在验证设备\u2026</string>
-  <string name="connection_aborted_local">连接已被我们中止！这可能意味着有人正在尝试干预你们的连接</string>
+  <string name="connection_aborted_local">连接中止！这可能意味着有人正在尝试干预你的连接</string>
   <string name="connection_aborted_remote">连接已被您的联系人中止！这可能意味着有人正在尝试干预你们的连接</string>
   <!--Introductions-->
   <string name="introduction_onboarding_title">介绍您的联系人</string>
@@ -325,6 +329,7 @@
   <string name="notify_sound_setting_default">默认铃声</string>
   <string name="notify_sound_setting_disabled">无</string>
   <string name="choose_ringtone_title">选择铃声</string>
+  <string name="cannot_load_ringtone">无法加载铃声</string>
   <!--Settings Feedback-->
   <string name="feedback_settings_title">反馈</string>
   <string name="send_feedback">提交反馈</string>
@@ -354,4 +359,9 @@
   <!--Screen Filters & Tapjacking-->
   <string name="screen_filter_title">检测到屏幕覆盖</string>
   <string name="screen_filter_body">另一个应用覆盖在 Briar 上。为了保护您的安全，在有其他应用覆盖的情况下， Briar 将不会对触控做出反应。\n\n使用 Briar 时请尝试关闭以下程序:\n\n%1$s</string>
+  <!--Permission Requests-->
+  <string name="permission_camera_title">相机权限</string>
+  <string name="permission_camera_request_body">Briar 需要获得相机权限以扫描二维码。</string>
+  <string name="permission_camera_denied_body">您拒绝了相机权限，而添加联系人需要使用相机\n\n请考虑授予相机权限。</string>
+  <string name="permission_camera_denied_toast">未授予相机权限</string>
 </resources>
diff --git a/briar-android/src/main/res/values/strings.xml b/briar-android/src/main/res/values/strings.xml
index f5efcf0a1..ce9467e21 100644
--- a/briar-android/src/main/res/values/strings.xml
+++ b/briar-android/src/main/res/values/strings.xml
@@ -90,7 +90,6 @@
 	<string name="delete">Delete</string>
 	<string name="accept">Accept</string>
 	<string name="decline">Decline</string>
-	<string name="options">Options</string>
 	<string name="online">Online</string>
 	<string name="offline">Offline</string>
 	<string name="send">Send</string>