Update feature_request

Add new file
2026-02-12 10:49:06 +01:00 · 2021-08-25 10:33:28 +00:00 · 2021-08-25 10:12:57 +00:00 · 2021-08-25 10:12:08 +00:00 · 2021-08-24 09:23:02 +00:00 · 2021-08-24 09:22:39 +00:00
135 changed files with 1169 additions and 3046 deletions
--- a/.gitlab/.gitkeep
+++ b/.gitlab/.gitkeep
--- a/.gitlab/issue_templates/.gitkeep
+++ b/.gitlab/issue_templates/.gitkeep
--- a/.gitlab/issue_templates/bug_report.md
+++ b/.gitlab/issue_templates/bug_report.md
@@ -0,0 +1,35 @@
+# Summary
+
+(Briefly describe the bug encontered)
+
+# Steps to reproduce 
+
+(Please list the steps you performed when you encountered the bug)
+
+-  
+- 
+- 
+
+# How often does it happen?
+
+(Every time, Sometimes, It happened only once)
+
+# What did you expect to happen
+
+(Describe the app behaviour that you expected to happen)
+
+# What actually happened?
+
+(Describe what actually happened)
+
+* What version of Briar app do you have installed? [Please fill in]
+* Did you send the feedback from your device? [Yes/No]
+* Your device manufacturer:  [Please fill in]
+* Your device model: [Please fill in]
+* Android version: [Please fill in]
+
+
+
+
+
+
--- a/.gitlab/issue_templates/feature_request
+++ b/.gitlab/issue_templates/feature_request
@@ -0,0 +1,15 @@
+# Are you requesting a new feature or an improvement to an existing feature?
+
+# Brief description of the new or improved feature you would like to see in the Briar app
+
+
+# Please describe in detail what you would like to do in Briar app, for which a new or improved feature is required?
+
+
+* Does the absence of this feature prevent you from using the Briar app for certain activities?  What are those activities?
+
+* Would your use of Briar app increase with this new feature?
+
+
+
+
--- a/.idea/codeStyles/Project.xml
+++ b/.idea/codeStyles/Project.xml
@@ -31,6 +31,15 @@
      <option name="PACKAGES_TO_USE_STAR_IMPORTS">
        <value />
      </option>
+      <option name="PACKAGES_IMPORT_LAYOUT">
+        <value>
+          <package name="" alias="false" withSubpackages="true" />
+          <package name="java" alias="false" withSubpackages="true" />
+          <package name="javax" alias="false" withSubpackages="true" />
+          <package name="kotlin" alias="false" withSubpackages="true" />
+          <package name="" alias="true" withSubpackages="true" />
+        </value>
+      </option>
      <option name="NAME_COUNT_TO_USE_STAR_IMPORT" value="2147483647" />
      <option name="NAME_COUNT_TO_USE_STAR_IMPORT_FOR_MEMBERS" value="2147483647" />
      <option name="CODE_STYLE_DEFAULTS" value="KOTLIN_OFFICIAL" />
@@ -188,9 +197,9 @@
    </codeStyleSettings>
    <codeStyleSettings language="kotlin">
      <option name="CODE_STYLE_DEFAULTS" value="KOTLIN_OFFICIAL" />
-      <indentOptions>
-        <option name="CONTINUATION_INDENT_SIZE" value="4" />
-      </indentOptions>
+      <option name="PARAMETER_ANNOTATION_WRAP" value="1" />
+      <option name="VARIABLE_ANNOTATION_WRAP" value="1" />
+      <option name="ENUM_CONSTANTS_WRAP" value="1" />
    </codeStyleSettings>
  </code_scheme>
 </component>
--- a/.idea/runConfigurations/All_tests.xml
+++ b/.idea/runConfigurations/All_tests.xml
@@ -1,32 +1,21 @@
 <component name="ProjectRunConfigurationManager">
-  <configuration default="false" name="All tests" type="GradleRunConfiguration" factoryName="Gradle">
-    <ExternalSystemSettings>
-      <option name="executionName" />
-      <option name="externalProjectPath" value="$PROJECT_DIR$" />
-      <option name="externalSystemIdString" value="GRADLE" />
-      <option name="scriptParameters" value="" />
-      <option name="taskDescriptions">
-        <list />
-      </option>
-      <option name="taskNames">
-        <list>
-          <option value=":briar-android:testOfficialDebugUnitTest" />
-          <option value=":briar-android:testScreenshotDebugUnitTest" />
-        </list>
-      </option>
-      <option name="vmOptions" value="" />
-    </ExternalSystemSettings>
-    <ExternalSystemDebugServerProcess>false</ExternalSystemDebugServerProcess>
-    <ExternalSystemReattachDebugProcess>true</ExternalSystemReattachDebugProcess>
-    <DebugAllEnabled>false</DebugAllEnabled>
+  <configuration default="false" name="All tests" type="AndroidJUnit" factoryName="Android JUnit">
+    <module name="briar.briar-android" />
+    <option name="PACKAGE_NAME" value="" />
+    <option name="MAIN_CLASS_NAME" value="" />
+    <option name="METHOD_NAME" value="" />
+    <option name="TEST_OBJECT" value="package" />
+    <option name="PARAMETERS" value="" />
+    <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$/briar-android" />
    <method v="2">
-      <option name="RunConfigurationTask" enabled="true" run_configuration_name="All tests in bramble-api" run_configuration_type="GradleRunConfiguration" />
-      <option name="RunConfigurationTask" enabled="true" run_configuration_name="All tests in bramble-core" run_configuration_type="GradleRunConfiguration" />
-      <option name="RunConfigurationTask" enabled="true" run_configuration_name="All tests in bramble-java" run_configuration_type="GradleRunConfiguration" />
-      <option name="RunConfigurationTask" enabled="true" run_configuration_name="All tests in bramble-android" run_configuration_type="GradleRunConfiguration" />
-      <option name="RunConfigurationTask" enabled="true" run_configuration_name="All tests in briar-api" run_configuration_type="GradleRunConfiguration" />
-      <option name="RunConfigurationTask" enabled="true" run_configuration_name="All tests in briar-core" run_configuration_type="GradleRunConfiguration" />
-      <option name="RunConfigurationTask" enabled="true" run_configuration_name="All tests in briar-headless" run_configuration_type="GradleRunConfiguration" />
+      <option name="Android.Gradle.BeforeRunTask" enabled="true" />
+      <option name="RunConfigurationTask" enabled="true" run_configuration_name="All tests in bramble-api" run_configuration_type="AndroidJUnit" />
+      <option name="RunConfigurationTask" enabled="true" run_configuration_name="All tests in bramble-core" run_configuration_type="AndroidJUnit" />
+      <option name="RunConfigurationTask" enabled="true" run_configuration_name="All tests in bramble-android" run_configuration_type="AndroidJUnit" />
+      <option name="RunConfigurationTask" enabled="true" run_configuration_name="All tests in bramble-java" run_configuration_type="AndroidJUnit" />
+      <option name="RunConfigurationTask" enabled="true" run_configuration_name="All tests in briar-api" run_configuration_type="AndroidJUnit" />
+      <option name="RunConfigurationTask" enabled="true" run_configuration_name="All tests in briar-core" run_configuration_type="AndroidJUnit" />
+      <option name="RunConfigurationTask" enabled="true" run_configuration_name="All tests in briar-headless" run_configuration_type="AndroidJUnit" />
    </method>
  </configuration>
 </component>
--- a/.idea/runConfigurations/All_tests_in_bramble_android.xml
+++ b/.idea/runConfigurations/All_tests_in_bramble_android.xml
@@ -1,23 +1,14 @@
 <component name="ProjectRunConfigurationManager">
-  <configuration default="false" name="All tests in bramble-android" type="GradleRunConfiguration" factoryName="Gradle">
-    <ExternalSystemSettings>
-      <option name="executionName" />
-      <option name="externalProjectPath" value="$PROJECT_DIR$" />
-      <option name="externalSystemIdString" value="GRADLE" />
-      <option name="scriptParameters" value="" />
-      <option name="taskDescriptions">
-        <list />
-      </option>
-      <option name="taskNames">
-        <list>
-          <option value=":bramble-android:testDebugUnitTest" />
-        </list>
-      </option>
-      <option name="vmOptions" value="" />
-    </ExternalSystemSettings>
-    <ExternalSystemDebugServerProcess>false</ExternalSystemDebugServerProcess>
-    <ExternalSystemReattachDebugProcess>true</ExternalSystemReattachDebugProcess>
-    <DebugAllEnabled>false</DebugAllEnabled>
-    <method v="2" />
+  <configuration default="false" name="All tests in bramble-android" type="AndroidJUnit" factoryName="Android JUnit">
+    <module name="briar.bramble-android" />
+    <option name="PACKAGE_NAME" value="" />
+    <option name="MAIN_CLASS_NAME" value="" />
+    <option name="METHOD_NAME" value="" />
+    <option name="TEST_OBJECT" value="package" />
+    <option name="PARAMETERS" value="" />
+    <option name="WORKING_DIRECTORY" value="file://$PROJECT_DIR$/bramble-android" />
+    <method v="2">
+      <option name="Android.Gradle.BeforeRunTask" enabled="true" />
+    </method>
  </configuration>
 </component>
--- a/.idea/runConfigurations/All_tests_in_bramble_api.xml
+++ b/.idea/runConfigurations/All_tests_in_bramble_api.xml
@@ -1,25 +1,14 @@
 <component name="ProjectRunConfigurationManager">
-  <configuration default="false" name="All tests in bramble-api" type="GradleRunConfiguration" factoryName="Gradle">
-    <ExternalSystemSettings>
-      <option name="executionName" />
-      <option name="externalProjectPath" value="$PROJECT_DIR$" />
-      <option name="externalSystemIdString" value="GRADLE" />
-      <option name="scriptParameters" value="" />
-      <option name="taskDescriptions">
-        <list />
-      </option>
-      <option name="taskNames">
-        <list>
-          <option value=":bramble-api:animalSnifferMain" />
-          <option value=":bramble-api:animalSnifferTest" />
-          <option value=":bramble-api:test" />
-        </list>
-      </option>
-      <option name="vmOptions" value="" />
-    </ExternalSystemSettings>
-    <ExternalSystemDebugServerProcess>false</ExternalSystemDebugServerProcess>
-    <ExternalSystemReattachDebugProcess>true</ExternalSystemReattachDebugProcess>
-    <DebugAllEnabled>false</DebugAllEnabled>
-    <method v="2" />
+  <configuration default="false" name="All tests in bramble-api" type="AndroidJUnit" factoryName="Android JUnit">
+    <module name="briar.bramble-api" />
+    <option name="PACKAGE_NAME" value="" />
+    <option name="MAIN_CLASS_NAME" value="" />
+    <option name="METHOD_NAME" value="" />
+    <option name="TEST_OBJECT" value="package" />
+    <option name="PARAMETERS" value="" />
+    <option name="WORKING_DIRECTORY" value="file://$PROJECT_DIR$/bramble-api" />
+    <method v="2">
+      <option name="Android.Gradle.BeforeRunTask" enabled="true" />
+    </method>
  </configuration>
 </component>
--- a/.idea/runConfigurations/All_tests_in_bramble_core.xml
+++ b/.idea/runConfigurations/All_tests_in_bramble_core.xml
@@ -1,25 +1,14 @@
 <component name="ProjectRunConfigurationManager">
-  <configuration default="false" name="All tests in bramble-core" type="GradleRunConfiguration" factoryName="Gradle">
-    <ExternalSystemSettings>
-      <option name="executionName" />
-      <option name="externalProjectPath" value="$PROJECT_DIR$" />
-      <option name="externalSystemIdString" value="GRADLE" />
-      <option name="scriptParameters" value="" />
-      <option name="taskDescriptions">
-        <list />
-      </option>
-      <option name="taskNames">
-        <list>
-          <option value=":bramble-core:animalSnifferMain" />
-          <option value=":bramble-core:animalSnifferTest" />
-          <option value=":bramble-core:test" />
-        </list>
-      </option>
-      <option name="vmOptions" value="" />
-    </ExternalSystemSettings>
-    <ExternalSystemDebugServerProcess>false</ExternalSystemDebugServerProcess>
-    <ExternalSystemReattachDebugProcess>true</ExternalSystemReattachDebugProcess>
-    <DebugAllEnabled>false</DebugAllEnabled>
-    <method v="2" />
+  <configuration default="false" name="All tests in bramble-core" type="AndroidJUnit" factoryName="Android JUnit">
+    <module name="briar.bramble-core" />
+    <option name="PACKAGE_NAME" value="" />
+    <option name="MAIN_CLASS_NAME" value="" />
+    <option name="METHOD_NAME" value="" />
+    <option name="TEST_OBJECT" value="package" />
+    <option name="PARAMETERS" value="" />
+    <option name="WORKING_DIRECTORY" value="file://$PROJECT_DIR$/bramble-core" />
+    <method v="2">
+      <option name="Android.Gradle.BeforeRunTask" enabled="true" />
+    </method>
  </configuration>
 </component>
--- a/.idea/runConfigurations/All_tests_in_bramble_java.xml
+++ b/.idea/runConfigurations/All_tests_in_bramble_java.xml
@@ -1,23 +1,15 @@
 <component name="ProjectRunConfigurationManager">
-  <configuration default="false" name="All tests in bramble-java" type="GradleRunConfiguration" factoryName="Gradle">
-    <ExternalSystemSettings>
-      <option name="executionName" />
-      <option name="externalProjectPath" value="$PROJECT_DIR$" />
-      <option name="externalSystemIdString" value="GRADLE" />
-      <option name="scriptParameters" value="" />
-      <option name="taskDescriptions">
-        <list />
-      </option>
-      <option name="taskNames">
-        <list>
-          <option value=":bramble-java:test" />
-        </list>
-      </option>
-      <option name="vmOptions" value="" />
-    </ExternalSystemSettings>
-    <ExternalSystemDebugServerProcess>false</ExternalSystemDebugServerProcess>
-    <ExternalSystemReattachDebugProcess>true</ExternalSystemReattachDebugProcess>
-    <DebugAllEnabled>false</DebugAllEnabled>
-    <method v="2" />
+  <configuration default="false" name="All tests in bramble-java" type="AndroidJUnit" factoryName="Android JUnit">
+    <module name="briar.bramble-java" />
+    <option name="PACKAGE_NAME" value="" />
+    <option name="MAIN_CLASS_NAME" value="" />
+    <option name="METHOD_NAME" value="" />
+    <option name="TEST_OBJECT" value="package" />
+    <option name="VM_PARAMETERS" value="-ea -Djava.library.path=libs" />
+    <option name="PARAMETERS" value="" />
+    <option name="WORKING_DIRECTORY" value="file://$PROJECT_DIR$/bramble-java" />
+    <method v="2">
+      <option name="Android.Gradle.BeforeRunTask" enabled="true" />
+    </method>
  </configuration>
 </component>
--- a/.idea/runConfigurations/All_tests_in_briar_android.xml
+++ b/.idea/runConfigurations/All_tests_in_briar_android.xml
@@ -1,24 +1,14 @@
 <component name="ProjectRunConfigurationManager">
-  <configuration default="false" name="All tests in briar-android" type="GradleRunConfiguration" factoryName="Gradle">
-    <ExternalSystemSettings>
-      <option name="executionName" />
-      <option name="externalProjectPath" value="$PROJECT_DIR$" />
-      <option name="externalSystemIdString" value="GRADLE" />
-      <option name="scriptParameters" value="" />
-      <option name="taskDescriptions">
-        <list />
-      </option>
-      <option name="taskNames">
-        <list>
-          <option value=":briar-android:testOfficialDebugUnitTest" />
-          <option value=":briar-android:testScreenshotDebugUnitTest" />
-        </list>
-      </option>
-      <option name="vmOptions" value="" />
-    </ExternalSystemSettings>
-    <ExternalSystemDebugServerProcess>false</ExternalSystemDebugServerProcess>
-    <ExternalSystemReattachDebugProcess>true</ExternalSystemReattachDebugProcess>
-    <DebugAllEnabled>false</DebugAllEnabled>
-    <method v="2" />
+  <configuration default="false" name="All tests in briar-android" type="AndroidJUnit" factoryName="Android JUnit">
+    <module name="briar.briar-android" />
+    <option name="PACKAGE_NAME" value="" />
+    <option name="MAIN_CLASS_NAME" value="" />
+    <option name="METHOD_NAME" value="" />
+    <option name="TEST_OBJECT" value="package" />
+    <option name="PARAMETERS" value="" />
+    <option name="WORKING_DIRECTORY" value="file://$PROJECT_DIR$/briar-android" />
+    <method v="2">
+      <option name="Android.Gradle.BeforeRunTask" enabled="true" />
+    </method>
  </configuration>
 </component>
--- a/.idea/runConfigurations/All_tests_in_briar_api.xml
+++ b/.idea/runConfigurations/All_tests_in_briar_api.xml
@@ -1,25 +1,14 @@
 <component name="ProjectRunConfigurationManager">
-  <configuration default="false" name="All tests in briar-api" type="GradleRunConfiguration" factoryName="Gradle">
-    <ExternalSystemSettings>
-      <option name="executionName" />
-      <option name="externalProjectPath" value="$PROJECT_DIR$" />
-      <option name="externalSystemIdString" value="GRADLE" />
-      <option name="scriptParameters" value="" />
-      <option name="taskDescriptions">
-        <list />
-      </option>
-      <option name="taskNames">
-        <list>
-          <option value=":briar-api:animalSnifferMain" />
-          <option value=":briar-api:animalSnifferTest" />
-          <option value=":briar-api:test" />
-        </list>
-      </option>
-      <option name="vmOptions" value="" />
-    </ExternalSystemSettings>
-    <ExternalSystemDebugServerProcess>false</ExternalSystemDebugServerProcess>
-    <ExternalSystemReattachDebugProcess>true</ExternalSystemReattachDebugProcess>
-    <DebugAllEnabled>false</DebugAllEnabled>
-    <method v="2" />
+  <configuration default="false" name="All tests in briar-api" type="AndroidJUnit" factoryName="Android JUnit">
+    <module name="briar.briar-api" />
+    <option name="PACKAGE_NAME" value="" />
+    <option name="MAIN_CLASS_NAME" value="" />
+    <option name="METHOD_NAME" value="" />
+    <option name="TEST_OBJECT" value="package" />
+    <option name="PARAMETERS" value="" />
+    <option name="WORKING_DIRECTORY" value="file://$PROJECT_DIR$/briar-api" />
+    <method v="2">
+      <option name="Android.Gradle.BeforeRunTask" enabled="true" />
+    </method>
  </configuration>
 </component>
--- a/.idea/runConfigurations/All_tests_in_briar_core.xml
+++ b/.idea/runConfigurations/All_tests_in_briar_core.xml
@@ -1,25 +1,14 @@
 <component name="ProjectRunConfigurationManager">
-  <configuration default="false" name="All tests in briar-core" type="GradleRunConfiguration" factoryName="Gradle">
-    <ExternalSystemSettings>
-      <option name="executionName" />
-      <option name="externalProjectPath" value="$PROJECT_DIR$" />
-      <option name="externalSystemIdString" value="GRADLE" />
-      <option name="scriptParameters" value="" />
-      <option name="taskDescriptions">
-        <list />
-      </option>
-      <option name="taskNames">
-        <list>
-          <option value=":briar-core:animalSnifferMain" />
-          <option value=":briar-core:animalSnifferTest" />
-          <option value=":briar-core:test" />
-        </list>
-      </option>
-      <option name="vmOptions" value="" />
-    </ExternalSystemSettings>
-    <ExternalSystemDebugServerProcess>false</ExternalSystemDebugServerProcess>
-    <ExternalSystemReattachDebugProcess>true</ExternalSystemReattachDebugProcess>
-    <DebugAllEnabled>false</DebugAllEnabled>
-    <method v="2" />
+  <configuration default="false" name="All tests in briar-core" type="AndroidJUnit" factoryName="Android JUnit">
+    <module name="briar.briar-core" />
+    <option name="PACKAGE_NAME" value="" />
+    <option name="MAIN_CLASS_NAME" value="" />
+    <option name="METHOD_NAME" value="" />
+    <option name="TEST_OBJECT" value="package" />
+    <option name="PARAMETERS" value="" />
+    <option name="WORKING_DIRECTORY" value="file://$PROJECT_DIR$/briar-core" />
+    <method v="2">
+      <option name="Android.Gradle.BeforeRunTask" enabled="true" />
+    </method>
  </configuration>
 </component>
--- a/.idea/runConfigurations/All_tests_in_briar_headless.xml
+++ b/.idea/runConfigurations/All_tests_in_briar_headless.xml
@@ -1,23 +1,15 @@
 <component name="ProjectRunConfigurationManager">
-  <configuration default="false" name="All tests in briar-headless" type="GradleRunConfiguration" factoryName="Gradle">
-    <ExternalSystemSettings>
-      <option name="executionName" />
-      <option name="externalProjectPath" value="$PROJECT_DIR$" />
-      <option name="externalSystemIdString" value="GRADLE" />
-      <option name="scriptParameters" value="" />
-      <option name="taskDescriptions">
-        <list />
-      </option>
-      <option name="taskNames">
-        <list>
-          <option value=":briar-headless:test" />
-        </list>
-      </option>
-      <option name="vmOptions" value="" />
-    </ExternalSystemSettings>
-    <ExternalSystemDebugServerProcess>false</ExternalSystemDebugServerProcess>
-    <ExternalSystemReattachDebugProcess>true</ExternalSystemReattachDebugProcess>
-    <DebugAllEnabled>false</DebugAllEnabled>
-    <method v="2" />
+  <configuration default="false" name="All tests in briar-headless" type="AndroidJUnit" factoryName="Android JUnit">
+    <module name="briar.briar-headless" />
+    <option name="PACKAGE_NAME" value="org.briarproject.briar.headless" />
+    <option name="MAIN_CLASS_NAME" value="" />
+    <option name="METHOD_NAME" value="" />
+    <option name="TEST_OBJECT" value="package" />
+    <option name="VM_PARAMETERS" />
+    <option name="PARAMETERS" value="" />
+    <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$/briar-headless" />
+    <method v="2">
+      <option name="Android.Gradle.BeforeRunTask" enabled="true" />
+    </method>
  </configuration>
 </component>
--- a/.idea/runConfigurations/BridgeTest.xml
+++ b/.idea/runConfigurations/BridgeTest.xml
@@ -1,28 +1,24 @@
 <component name="ProjectRunConfigurationManager">
-  <configuration default="false" name="BridgeTest" type="GradleRunConfiguration" factoryName="Gradle">
-    <ExternalSystemSettings>
-      <option name="env">
-        <map>
-          <entry key="OPTIONAL_TESTS" value="org.briarproject.bramble.plugin.tor.BridgeTest" />
-        </map>
-      </option>
-      <option name="executionName" />
-      <option name="externalProjectPath" value="$PROJECT_DIR$" />
-      <option name="externalSystemIdString" value="GRADLE" />
-      <option name="scriptParameters" value="--tests &quot;org.briarproject.bramble.plugin.tor.BridgeTest&quot;" />
-      <option name="taskDescriptions">
-        <list />
-      </option>
-      <option name="taskNames">
-        <list>
-          <option value=":bramble-java:test" />
-        </list>
-      </option>
-      <option name="vmOptions" value="" />
-    </ExternalSystemSettings>
-    <ExternalSystemDebugServerProcess>false</ExternalSystemDebugServerProcess>
-    <ExternalSystemReattachDebugProcess>true</ExternalSystemReattachDebugProcess>
-    <DebugAllEnabled>false</DebugAllEnabled>
-    <method v="2" />
+  <configuration default="false" name="BridgeTest" type="AndroidJUnit" factoryName="Android JUnit" nameIsGenerated="true">
+    <module name="briar.bramble-java" />
+    <useClassPathOnly />
+    <extension name="coverage">
+      <pattern>
+        <option name="PATTERN" value="org.briarproject.bramble.plugin.tor.*" />
+        <option name="ENABLED" value="true" />
+      </pattern>
+    </extension>
+    <option name="PACKAGE_NAME" value="org.briarproject.bramble.plugin.tor" />
+    <option name="MAIN_CLASS_NAME" value="org.briarproject.bramble.plugin.tor.BridgeTest" />
+    <option name="METHOD_NAME" value="" />
+    <option name="TEST_OBJECT" value="class" />
+    <option name="PARAMETERS" value="" />
+    <option name="WORKING_DIRECTORY" value="$MODULE_DIR$" />
+    <envs>
+      <env name="OPTIONAL_TESTS" value="org.briarproject.bramble.plugin.tor.BridgeTest" />
+    </envs>
+    <method v="2">
+      <option name="Android.Gradle.BeforeRunTask" enabled="true" />
+    </method>
  </configuration>
 </component>
--- a/.idea/runConfigurations/H2_Performance_Test.xml
+++ b/.idea/runConfigurations/H2_Performance_Test.xml
@@ -0,0 +1,14 @@
+<component name="ProjectRunConfigurationManager">
+  <configuration default="false" name="H2 Performance Test" type="AndroidJUnit" factoryName="Android JUnit">
+    <module name="briar.bramble-core" />
+    <option name="PACKAGE_NAME" value="org.briarproject.bramble.db" />
+    <option name="MAIN_CLASS_NAME" value="org.briarproject.bramble.db.H2DatabasePerformanceTest" />
+    <option name="METHOD_NAME" value="" />
+    <option name="TEST_OBJECT" value="class" />
+    <option name="PARAMETERS" value="" />
+    <option name="WORKING_DIRECTORY" value="" />
+    <method v="2">
+      <option name="Android.Gradle.BeforeRunTask" enabled="true" />
+    </method>
+  </configuration>
+</component>
--- a/.idea/runConfigurations/HyperSQL_Performance_Test.xml
+++ b/.idea/runConfigurations/HyperSQL_Performance_Test.xml
@@ -0,0 +1,14 @@
+<component name="ProjectRunConfigurationManager">
+  <configuration default="false" name="HyperSQL Performance Test" type="AndroidJUnit" factoryName="Android JUnit">
+    <module name="briar.bramble-core" />
+    <option name="PACKAGE_NAME" value="org.briarproject.bramble.db" />
+    <option name="MAIN_CLASS_NAME" value="org.briarproject.bramble.db.HyperSqlDatabasePerformanceTest" />
+    <option name="METHOD_NAME" value="" />
+    <option name="TEST_OBJECT" value="class" />
+    <option name="PARAMETERS" value="" />
+    <option name="WORKING_DIRECTORY" value="" />
+    <method v="2">
+      <option name="Android.Gradle.BeforeRunTask" enabled="true" />
+    </method>
+  </configuration>
+</component>
--- a/bramble-android/build.gradle
+++ b/bramble-android/build.gradle
@@ -1,7 +1,6 @@
 import com.android.build.gradle.tasks.MergeResources

 apply plugin: 'com.android.library'
-apply plugin: 'checkstyle'
 apply plugin: 'witness'
 apply from: 'witness.gradle'

@@ -16,8 +15,8 @@ android {
 	defaultConfig {
 		minSdkVersion 16
 		targetSdkVersion 30
-		versionCode 10401
-		versionName "1.4.1"
+		versionCode 10306
+		versionName "1.3.6"
 		consumerProguardFiles 'proguard-rules.txt'

 		testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
--- a/bramble-android/src/main/java/org/briarproject/bramble/plugin/tor/AndroidTorPlugin.java
+++ b/bramble-android/src/main/java/org/briarproject/bramble/plugin/tor/AndroidTorPlugin.java
@@ -70,14 +70,12 @@ class AndroidTorPlugin extends TorPlugin {
 			String architecture,
 			long maxLatency,
 			int maxIdleTime,
-			File torDirectory,
-			int torSocksPort,
-			int torControlPort) {
+			File torDirectory) {
 		super(ioExecutor, wakefulIoExecutor, networkManager, locationUtils,
 				torSocketFactory, clock, resourceProvider,
 				circumventionProvider, batteryManager, backoff,
 				torRendezvousCrypto, callback, architecture, maxLatency,
-				maxIdleTime, torDirectory, torSocksPort, torControlPort);
+				maxIdleTime, torDirectory);
 		this.app = app;
 		wakeLock = wakeLockManager.createWakeLock("TorPlugin");
 		String nativeLibDir = app.getApplicationInfo().nativeLibraryDir;
--- a/bramble-android/src/main/java/org/briarproject/bramble/plugin/tor/AndroidTorPluginFactory.java
+++ b/bramble-android/src/main/java/org/briarproject/bramble/plugin/tor/AndroidTorPluginFactory.java
@@ -11,9 +11,7 @@ import org.briarproject.bramble.api.plugin.Backoff;
 import org.briarproject.bramble.api.plugin.BackoffFactory;
 import org.briarproject.bramble.api.plugin.PluginCallback;
 import org.briarproject.bramble.api.plugin.TorConstants;
-import org.briarproject.bramble.api.plugin.TorControlPort;
 import org.briarproject.bramble.api.plugin.TorDirectory;
-import org.briarproject.bramble.api.plugin.TorSocksPort;
 import org.briarproject.bramble.api.plugin.TransportId;
 import org.briarproject.bramble.api.plugin.duplex.DuplexPlugin;
 import org.briarproject.bramble.api.plugin.duplex.DuplexPluginFactory;
@@ -58,8 +56,6 @@ public class AndroidTorPluginFactory implements DuplexPluginFactory {
 	private final AndroidWakeLockManager wakeLockManager;
 	private final Clock clock;
 	private final File torDirectory;
-	private int torSocksPort;
-	private int torControlPort;

 	@Inject
 	AndroidTorPluginFactory(@IoExecutor Executor ioExecutor,
@@ -75,9 +71,7 @@ public class AndroidTorPluginFactory implements DuplexPluginFactory {
 			BatteryManager batteryManager,
 			AndroidWakeLockManager wakeLockManager,
 			Clock clock,
-			@TorDirectory File torDirectory,
-			@TorSocksPort int torSocksPort,
-			@TorControlPort int torControlPort) {
+			@TorDirectory File torDirectory) {
 		this.ioExecutor = ioExecutor;
 		this.wakefulIoExecutor = wakefulIoExecutor;
 		this.app = app;
@@ -92,8 +86,6 @@ public class AndroidTorPluginFactory implements DuplexPluginFactory {
 		this.wakeLockManager = wakeLockManager;
 		this.clock = clock;
 		this.torDirectory = torDirectory;
-		this.torSocksPort = torSocksPort;
-		this.torControlPort = torControlPort;
 	}

 	@Override
@@ -141,8 +133,7 @@ public class AndroidTorPluginFactory implements DuplexPluginFactory {
 				torSocketFactory, clock, resourceProvider,
 				circumventionProvider, batteryManager, wakeLockManager,
 				backoff, torRendezvousCrypto, callback, architecture,
-				MAX_LATENCY, MAX_IDLE_TIME, torDirectory, torSocksPort,
-				torControlPort);
+				MAX_LATENCY, MAX_IDLE_TIME, torDirectory);
 		eventBus.addListener(plugin);
 		return plugin;
 	}
--- a/bramble-android/witness.gradle
+++ b/bramble-android/witness.gradle
@@ -1,6 +1,5 @@
 dependencyVerification {
    verify = [
-        'antlr:antlr:2.7.7:antlr-2.7.7.jar:88fbda4b912596b9f56e8e12e580cc954bacfb51776ecfddd3e18fc1cf56dc4c',
        'cglib:cglib:3.2.8:cglib-3.2.8.jar:3f64de999ecc5595dc84ca8ff0879d8a34c8623f9ef3c517a53ed59023fcb9db',
        'com.android.tools.analytics-library:protos:27.1.3:protos-27.1.3.jar:0d9e6cff60b318baac250b6f5bb076a8161103338bf2749cdf1db8a5a13a1f12',
        'com.android.tools.analytics-library:shared:27.1.3:shared-27.1.3.jar:10d2a51d8f89ff4ac849888e5a9c60b10e879c30d78545ec1da4d3df7bd56ae4',
@@ -52,17 +51,13 @@ dependencyVerification {
        'com.google.jimfs:jimfs:1.1:jimfs-1.1.jar:c4828e28d7c0a930af9387510b3bada7daa5c04d7c25a75c7b8b081f1c257ddd',
        'com.google.protobuf:protobuf-java:3.10.0:protobuf-java-3.10.0.jar:161d7d61a8cb3970891c299578702fd079646e032329d6c2cabf998d191437c9',
        'com.googlecode.json-simple:json-simple:1.1:json-simple-1.1.jar:2d9484f4c649f708f47f9a479465fc729770ee65617dca3011836602264f6439',
-        'com.puppycrawl.tools:checkstyle:8.27:checkstyle-8.27.jar:26c81958a112ebdfc5d7b40507bbfc8f15f606fea1e55ef5675609ddb41a6053',
        'com.squareup:javapoet:1.13.0:javapoet-1.13.0.jar:4c7517e848a71b36d069d12bb3bf46a70fd4cda3105d822b0ed2e19c00b69291',
        'com.squareup:javawriter:2.5.0:javawriter-2.5.0.jar:fcfb09fb0ea0aa97d3cfe7ea792398081348e468f126b3603cb3803f240197f0',
        'com.sun.activation:javax.activation:1.2.0:javax.activation-1.2.0.jar:993302b16cd7056f21e779cc577d175a810bb4900ef73cd8fbf2b50f928ba9ce',
        'com.sun.istack:istack-commons-runtime:3.0.7:istack-commons-runtime-3.0.7.jar:6443e10ba2e259fb821d9b6becf10db5316285fc30c53cec9d7b19a3877e7fdf',
        'com.sun.xml.fastinfoset:FastInfoset:1.2.15:FastInfoset-1.2.15.jar:785861db11ca1bd0d1956682b974ad73eb19cd3e01a4b3fa82d62eca97210aec',
-        'commons-beanutils:commons-beanutils:1.9.4:commons-beanutils-1.9.4.jar:7d938c81789028045c08c065e94be75fc280527620d5bd62b519d5838532368a',
        'commons-codec:commons-codec:1.10:commons-codec-1.10.jar:4241dfa94e711d435f29a4604a3e2de5c4aa3c165e23bd066be6fc1fc4309569',
-        'commons-collections:commons-collections:3.2.2:commons-collections-3.2.2.jar:eeeae917917144a68a741d4c0dff66aa5c5c5fd85593ff217bced3fc8ca783b8',
        'commons-logging:commons-logging:1.2:commons-logging-1.2.jar:daddea1ea0be0f56978ab3006b8ac92834afeefbd9b7e4e6316fca57df0fa636',
-        'info.picocli:picocli:4.1.1:picocli-4.1.1.jar:9238b6af4ded57dcfedf6f7dbcf2bdf334dae2f118ea2a0bd6d05066e63ee6fc',
        'it.unimi.dsi:fastutil:7.2.0:fastutil-7.2.0.jar:74fa208043740642f7e6eb09faba15965218ad2f50ce3020efb100136e4b591c',
        'javax.activation:javax.activation-api:1.2.0:javax.activation-api-1.2.0.jar:43fdef0b5b6ceb31b0424b208b930c74ab58fac2ceeb7b3f6fd3aeb8b5ca4393',
        'javax.annotation:jsr250-api:1.0:jsr250-api-1.0.jar:a1a922d0d9b6d183ed3800dfac01d1e1eb159f0e8c6f94736931c1def54a941f',
@@ -74,8 +69,6 @@ dependencyVerification {
        'net.ltgt.gradle.incap:incap:0.2:incap-0.2.jar:b625b9806b0f1e4bc7a2e3457119488de3cd57ea20feedd513db070a573a4ffd',
        'net.sf.jopt-simple:jopt-simple:4.9:jopt-simple-4.9.jar:26c5856e954b5f864db76f13b86919b59c6eecf9fd930b96baa8884626baf2f5',
        'net.sf.kxml:kxml2:2.3.0:kxml2-2.3.0.jar:f264dd9f79a1fde10ce5ecc53221eff24be4c9331c830b7d52f2f08a7b633de2',
-        'net.sf.saxon:Saxon-HE:9.9.1-5:Saxon-HE-9.9.1-5.jar:4b39a9e30d5b634b5e91db5f0c6937f176d4517543ababc9b5e01830b8c56620',
-        'org.antlr:antlr4-runtime:4.7.2:antlr4-runtime-4.7.2.jar:4c518b87d4bdff8b44cd8cbc1af816e944b62a3fe5b80b781501cf1f4759bbc4',
        'org.apache-extras.beanshell:bsh:2.0b6:bsh-2.0b6.jar:a17955976070c0573235ee662f2794a78082758b61accffce8d3f8aedcd91047',
        'org.apache.commons:commons-compress:1.12:commons-compress-1.12.jar:2c1542faf343185b7cab9c3d55c8ae5471d6d095d3887a4adefdbdf2984dc0b6',
        'org.apache.httpcomponents:httpclient:4.5.6:httpclient-4.5.6.jar:c03f813195e7a80e3608d0ddd8da80b21696a4c92a6a2298865bf149071551c7',
--- a/bramble-api/build.gradle
+++ b/bramble-api/build.gradle
@@ -3,7 +3,6 @@ sourceCompatibility = 1.8
 targetCompatibility = 1.8

 apply plugin: 'ru.vyarus.animalsniffer'
-apply plugin: 'checkstyle'
 apply plugin: 'witness'
 apply from: 'witness.gradle'

--- a/bramble-api/src/main/java/org/briarproject/bramble/api/FeatureFlags.java
+++ b/bramble-api/src/main/java/org/briarproject/bramble/api/FeatureFlags.java
@@ -10,4 +10,10 @@ public interface FeatureFlags {
 	boolean shouldEnableProfilePictures();

 	boolean shouldEnableDisappearingMessages();
+
+	boolean shouldEnableConnectViaBluetooth();
+
+	boolean shouldEnableTransferData();
+
+	boolean shouldEnableShareAppViaOfflineHotspot();
 }
--- a/bramble-api/src/main/java/org/briarproject/bramble/api/cleanup/CleanupHook.java
+++ b/bramble-api/src/main/java/org/briarproject/bramble/api/cleanup/CleanupHook.java
@@ -21,9 +21,8 @@ public interface CleanupHook {
 	 * <p>
 	 * The callee is not required to delete the messages, but the hook won't be
 	 * called again for these messages unless another cleanup timer is set (see
-	 * {@link DatabaseComponent#setCleanupTimerDuration(Transaction, MessageId,
-	 * long)} and {@link DatabaseComponent#startCleanupTimer(Transaction,
-	 * MessageId)}).
+	 * {@link DatabaseComponent#setCleanupTimerDuration(Transaction, MessageId, long)}
+	 * and {@link DatabaseComponent#startCleanupTimer(Transaction, MessageId)}).
 	 */
 	void deleteMessages(Transaction txn, GroupId g,
 			Collection<MessageId> messageIds) throws DbException;
--- a/bramble-api/src/main/java/org/briarproject/bramble/api/cleanup/CleanupManager.java
+++ b/bramble-api/src/main/java/org/briarproject/bramble/api/cleanup/CleanupManager.java
@@ -18,8 +18,8 @@ import org.briarproject.bramble.api.sync.MessageId;
 * {@link CleanupTimerStartedEvent CleanupTimerStartedEvents} broadcast by the
 * {@link DatabaseComponent}.
 * <p>
- * See {@link DatabaseComponent#setCleanupTimerDuration(Transaction, MessageId,
- * long)}, {@link DatabaseComponent#startCleanupTimer(Transaction, MessageId)},
+ * See {@link DatabaseComponent#setCleanupTimerDuration(Transaction, MessageId, long)},
+ * {@link DatabaseComponent#startCleanupTimer(Transaction, MessageId)},
 * {@link DatabaseComponent#stopCleanupTimer(Transaction, MessageId)}.
 */
@NotNullByDefault
--- a/bramble-api/src/main/java/org/briarproject/bramble/api/plugin/TorConstants.java
+++ b/bramble-api/src/main/java/org/briarproject/bramble/api/plugin/TorConstants.java
@@ -10,8 +10,8 @@ public interface TorConstants {
 	String PROP_ONION_V2 = "onion";
 	String PROP_ONION_V3 = "onion3";

-	int DEFAULT_SOCKS_PORT = 59050;
-	int DEFAULT_CONTROL_PORT = 59051;
+	int SOCKS_PORT = 59050;
+	int CONTROL_PORT = 59051;

 	int CONNECT_TO_PROXY_TIMEOUT = 5000; // Milliseconds
 	int EXTRA_SOCKET_TIMEOUT = 30000; // Milliseconds
--- a/bramble-api/src/main/java/org/briarproject/bramble/api/plugin/TorControlPort.java
+++ b/bramble-api/src/main/java/org/briarproject/bramble/api/plugin/TorControlPort.java
@@ -1,20 +0,0 @@
-package org.briarproject.bramble.api.plugin;
-
-import java.lang.annotation.Retention;
-import java.lang.annotation.Target;
-
-import javax.inject.Qualifier;
-
-import static java.lang.annotation.ElementType.FIELD;
-import static java.lang.annotation.ElementType.METHOD;
-import static java.lang.annotation.ElementType.PARAMETER;
-import static java.lang.annotation.RetentionPolicy.RUNTIME;
-
-/**
- * Annotation for injecting the control port for the Tor plugin.
- */
-@Qualifier
-@Target({FIELD, METHOD, PARAMETER})
-@Retention(RUNTIME)
-public @interface TorControlPort {
-}
--- a/bramble-api/src/main/java/org/briarproject/bramble/api/plugin/TorSocksPort.java
+++ b/bramble-api/src/main/java/org/briarproject/bramble/api/plugin/TorSocksPort.java
@@ -1,20 +0,0 @@
-package org.briarproject.bramble.api.plugin;
-
-import java.lang.annotation.Retention;
-import java.lang.annotation.Target;
-
-import javax.inject.Qualifier;
-
-import static java.lang.annotation.ElementType.FIELD;
-import static java.lang.annotation.ElementType.METHOD;
-import static java.lang.annotation.ElementType.PARAMETER;
-import static java.lang.annotation.RetentionPolicy.RUNTIME;
-
-/**
- * Annotation for injecting the socks port for the Tor plugin.
- */
-@Qualifier
-@Target({FIELD, METHOD, PARAMETER})
-@Retention(RUNTIME)
-public @interface TorSocksPort {
-}
--- a/bramble-api/src/main/java/org/briarproject/bramble/api/system/TaskScheduler.java
+++ b/bramble-api/src/main/java/org/briarproject/bramble/api/system/TaskScheduler.java
@@ -35,8 +35,8 @@ public interface TaskScheduler {

 		/**
 		 * Cancels the task if it has not already started running. If the task
-		 * is {@link #scheduleWithFixedDelay(Runnable, Executor, long, long,
-		 * TimeUnit) periodic}, all future executions of the task are cancelled.
+		 * is {@link #scheduleWithFixedDelay(Runnable, Executor, long, long, TimeUnit) periodic},
+		 * all future executions of the task are cancelled.
 		 */
 		void cancel();
 	}
--- a/bramble-api/witness.gradle
+++ b/bramble-api/witness.gradle
@@ -1,29 +1,15 @@
 dependencyVerification {
    verify = [
-        'antlr:antlr:2.7.7:antlr-2.7.7.jar:88fbda4b912596b9f56e8e12e580cc954bacfb51776ecfddd3e18fc1cf56dc4c',
        'cglib:cglib:3.2.8:cglib-3.2.8.jar:3f64de999ecc5595dc84ca8ff0879d8a34c8623f9ef3c517a53ed59023fcb9db',
        'com.google.code.findbugs:annotations:3.0.1:annotations-3.0.1.jar:6b47ff0a6de0ce17cbedc3abb0828ca5bce3009d53ea47b3723ff023c4742f79',
        'com.google.code.findbugs:jsr305:3.0.2:jsr305-3.0.2.jar:766ad2a0783f2687962c8ad74ceecc38a28b9f72a2d085ee438b7813e928d0c7',
        'com.google.dagger:dagger:2.33:dagger-2.33.jar:d8798c5b8cf6b125234e33af5c6293bb9f2208ce29b57924c35b8c0be7b6bdcb',
-        'com.google.errorprone:error_prone_annotations:2.3.2:error_prone_annotations-2.3.2.jar:357cd6cfb067c969226c442451502aee13800a24e950fdfde77bcdb4565a668d',
-        'com.google.guava:failureaccess:1.0.1:failureaccess-1.0.1.jar:a171ee4c734dd2da837e4b16be9df4661afab72a41adaf31eb84dfdaf936ca26',
-        'com.google.guava:guava:28.1-jre:guava-28.1-jre.jar:30beb8b8527bd07c6e747e77f1a92122c2f29d57ce347461a4a55eb26e382da4',
-        'com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava:listenablefuture-9999.0-empty-to-avoid-conflict-with-guava.jar:b372a037d4230aa57fbeffdef30fd6123f9c0c2db85d0aced00c91b974f33f99',
-        'com.google.j2objc:j2objc-annotations:1.3:j2objc-annotations-1.3.jar:21af30c92267bd6122c0e0b4d20cccb6641a37eaf956c6540ec471d584e64a7b',
-        'com.puppycrawl.tools:checkstyle:8.27:checkstyle-8.27.jar:26c81958a112ebdfc5d7b40507bbfc8f15f606fea1e55ef5675609ddb41a6053',
-        'commons-beanutils:commons-beanutils:1.9.4:commons-beanutils-1.9.4.jar:7d938c81789028045c08c065e94be75fc280527620d5bd62b519d5838532368a',
-        'commons-collections:commons-collections:3.2.2:commons-collections-3.2.2.jar:eeeae917917144a68a741d4c0dff66aa5c5c5fd85593ff217bced3fc8ca783b8',
-        'info.picocli:picocli:4.1.1:picocli-4.1.1.jar:9238b6af4ded57dcfedf6f7dbcf2bdf334dae2f118ea2a0bd6d05066e63ee6fc',
        'javax.inject:javax.inject:1:javax.inject-1.jar:91c77044a50c481636c32d916fd89c9118a72195390452c81065080f957de7ff',
        'junit:junit:4.13.2:junit-4.13.2.jar:8e495b634469d64fb8acfa3495a065cbacc8a0fff55ce1e31007be4c16dc57d3',
        'net.bytebuddy:byte-buddy:1.9.12:byte-buddy-1.9.12.jar:3688c3d434bebc3edc5516296a2ed0f47b65e451071b4afecad84f902f0efc11',
        'net.jcip:jcip-annotations:1.0:jcip-annotations-1.0.jar:be5805392060c71474bf6c9a67a099471274d30b83eef84bfc4e0889a4f1dcc0',
-        'net.sf.saxon:Saxon-HE:9.9.1-5:Saxon-HE-9.9.1-5.jar:4b39a9e30d5b634b5e91db5f0c6937f176d4517543ababc9b5e01830b8c56620',
-        'org.antlr:antlr4-runtime:4.7.2:antlr4-runtime-4.7.2.jar:4c518b87d4bdff8b44cd8cbc1af816e944b62a3fe5b80b781501cf1f4759bbc4',
        'org.apache-extras.beanshell:bsh:2.0b6:bsh-2.0b6.jar:a17955976070c0573235ee662f2794a78082758b61accffce8d3f8aedcd91047',
-        'org.checkerframework:checker-qual:2.8.1:checker-qual-2.8.1.jar:9103499008bcecd4e948da29b17864abb64304e15706444ae209d17ebe0575df',
        'org.codehaus.mojo.signature:java16:1.1:java16-1.1.signature:53799223a2c98dba2d0add810bed76315460df285c69e4f397ae6098f87dd619',
-        'org.codehaus.mojo:animal-sniffer-annotations:1.18:animal-sniffer-annotations-1.18.jar:47f05852b48ee9baefef80fa3d8cea60efa4753c0013121dd7fe5eef2e5c729d',
        'org.codehaus.mojo:animal-sniffer-ant-tasks:1.20:animal-sniffer-ant-tasks-1.20.jar:bb7d2498144118311d968bb08ff6fae3fc535fb1cb9cca8b8e9ea65b189422ac',
        'org.codehaus.mojo:animal-sniffer:1.20:animal-sniffer-1.20.jar:80c422523c38db91260c6d78e5ee4b012862ab61cc55020c9e243dd7b5c62249',
        'org.hamcrest:hamcrest-core:2.1:hamcrest-core-2.1.jar:e09109e54a289d88506b9bfec987ddd199f4217c9464132668351b9a4f00bee9',
--- a/bramble-core/build.gradle
+++ b/bramble-core/build.gradle
@@ -3,7 +3,6 @@ sourceCompatibility = 1.8
 targetCompatibility = 1.8

 apply plugin: 'ru.vyarus.animalsniffer'
-apply plugin: 'checkstyle'
 apply plugin: 'idea'
 apply plugin: 'witness'
 apply from: 'witness.gradle'
--- a/bramble-core/src/main/java/org/briarproject/bramble/db/Database.java
+++ b/bramble-core/src/main/java/org/briarproject/bramble/db/Database.java
@@ -845,8 +845,8 @@ interface Database<T> {
 	 * of the given message with respect to the given contact, using the latency
 	 * of the transport over which it was sent.
 	 */
-	void updateExpiryTimeAndEta(T txn, ContactId c, MessageId m,
-			long maxLatency) throws DbException;
+	void updateExpiryTimeAndEta(T txn, ContactId c, MessageId m, long maxLatency)
+			throws DbException;

 	/**
 	 * Stores the given transport keys, deleting any keys they have replaced.
--- a/bramble-core/src/main/java/org/briarproject/bramble/plugin/tor/TorPlugin.java
+++ b/bramble-core/src/main/java/org/briarproject/bramble/plugin/tor/TorPlugin.java
@@ -34,7 +34,6 @@ import org.briarproject.bramble.api.system.Clock;
 import org.briarproject.bramble.api.system.LocationUtils;
 import org.briarproject.bramble.api.system.ResourceProvider;

-import java.io.ByteArrayInputStream;
 import java.io.EOFException;
 import java.io.File;
 import java.io.FileInputStream;
@@ -45,7 +44,6 @@ import java.io.OutputStream;
 import java.net.InetSocketAddress;
 import java.net.ServerSocket;
 import java.net.Socket;
-import java.nio.charset.Charset;
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.List;
@@ -70,11 +68,13 @@ import static java.util.logging.Level.WARNING;
 import static java.util.logging.Logger.getLogger;
 import static net.freehaven.tor.control.TorControlCommands.HS_ADDRESS;
 import static net.freehaven.tor.control.TorControlCommands.HS_PRIVKEY;
+import static org.briarproject.bramble.api.nullsafety.NullSafety.requireNonNull;
 import static org.briarproject.bramble.api.plugin.Plugin.State.ACTIVE;
 import static org.briarproject.bramble.api.plugin.Plugin.State.DISABLED;
 import static org.briarproject.bramble.api.plugin.Plugin.State.ENABLING;
 import static org.briarproject.bramble.api.plugin.Plugin.State.INACTIVE;
 import static org.briarproject.bramble.api.plugin.Plugin.State.STARTING_STOPPING;
+import static org.briarproject.bramble.api.plugin.TorConstants.CONTROL_PORT;
 import static org.briarproject.bramble.api.plugin.TorConstants.DEFAULT_PREF_PLUGIN_ENABLE;
 import static org.briarproject.bramble.api.plugin.TorConstants.DEFAULT_PREF_TOR_MOBILE;
 import static org.briarproject.bramble.api.plugin.TorConstants.DEFAULT_PREF_TOR_NETWORK;
@@ -132,11 +132,8 @@ abstract class TorPlugin implements DuplexPlugin, EventHandler, EventListener {
 	private final CircumventionProvider circumventionProvider;
 	private final ResourceProvider resourceProvider;
 	private final long maxLatency;
-	private final int maxIdleTime;
-	private final int socketTimeout;
+	private final int maxIdleTime, socketTimeout;
 	private final File torDirectory, geoIpFile, configFile;
-	private int torSocksPort;
-	private int torControlPort;
 	private final File doneFile, cookieFile;
 	private final AtomicBoolean used = new AtomicBoolean(false);

@@ -165,9 +162,7 @@ abstract class TorPlugin implements DuplexPlugin, EventHandler, EventListener {
 			String architecture,
 			long maxLatency,
 			int maxIdleTime,
-			File torDirectory,
-			int torSocksPort,
-			int torControlPort) {
+			File torDirectory) {
 		this.ioExecutor = ioExecutor;
 		this.wakefulIoExecutor = wakefulIoExecutor;
 		this.networkManager = networkManager;
@@ -187,8 +182,6 @@ abstract class TorPlugin implements DuplexPlugin, EventHandler, EventListener {
 			socketTimeout = Integer.MAX_VALUE;
 		else socketTimeout = maxIdleTime * 2;
 		this.torDirectory = torDirectory;
-		this.torSocksPort = torSocksPort;
-		this.torControlPort = torControlPort;
 		geoIpFile = new File(torDirectory, "geoip");
 		configFile = new File(torDirectory, "torrc");
 		doneFile = new File(torDirectory, "done");
@@ -294,7 +287,7 @@ abstract class TorPlugin implements DuplexPlugin, EventHandler, EventListener {
 		}
 		try {
 			// Open a control connection and authenticate using the cookie file
-			controlSocket = new Socket("127.0.0.1", torControlPort);
+			controlSocket = new Socket("127.0.0.1", CONTROL_PORT);
 			controlConnection = new TorControlConnection(controlSocket);
 			controlConnection.authenticate(read(cookieFile));
 			// Tell Tor to exit when the control connection is closed
@@ -397,23 +390,9 @@ abstract class TorPlugin implements DuplexPlugin, EventHandler, EventListener {
 		return zin;
 	}

-	private static void append(StringBuilder strb, String name, int value) {
-		strb.append(name);
-		strb.append(" ");
-		strb.append(value);
-		strb.append("\n");
-	}
-
 	private InputStream getConfigInputStream() {
-		StringBuilder strb = new StringBuilder();
-		append(strb, "ControlPort", torControlPort);
-		append(strb, "CookieAuthentication", 1);
-		append(strb, "DisableNetwork", 1);
-		append(strb, "RunAsDaemon", 1);
-		append(strb, "SafeSocks", 1);
-		append(strb, "SocksPort", torSocksPort);
-		return new ByteArrayInputStream(
-				strb.toString().getBytes(Charset.forName("UTF-8")));
+		ClassLoader cl = getClass().getClassLoader();
+		return requireNonNull(cl.getResourceAsStream("torrc"));
 	}

 	private void listFiles(File f) {
--- a/bramble-core/src/main/java/org/briarproject/bramble/socks/SocksModule.java
+++ b/bramble-core/src/main/java/org/briarproject/bramble/socks/SocksModule.java
@@ -1,7 +1,5 @@
 package org.briarproject.bramble.socks;

-import org.briarproject.bramble.api.plugin.TorSocksPort;
-
 import java.net.InetSocketAddress;

 import javax.net.SocketFactory;
@@ -11,14 +9,15 @@ import dagger.Provides;

 import static org.briarproject.bramble.api.plugin.TorConstants.CONNECT_TO_PROXY_TIMEOUT;
 import static org.briarproject.bramble.api.plugin.TorConstants.EXTRA_SOCKET_TIMEOUT;
+import static org.briarproject.bramble.api.plugin.TorConstants.SOCKS_PORT;

@Module
 public class SocksModule {

 	@Provides
-	SocketFactory provideTorSocketFactory(@TorSocksPort int torSocksPort) {
+	SocketFactory provideTorSocketFactory() {
 		InetSocketAddress proxy = new InetSocketAddress("127.0.0.1",
-				torSocksPort);
+				SOCKS_PORT);
 		return new SocksSocketFactory(proxy, CONNECT_TO_PROXY_TIMEOUT,
 				EXTRA_SOCKET_TIMEOUT);
 	}
--- a/bramble-core/src/main/java/org/briarproject/bramble/socks/SocksSocketFactory.java
+++ b/bramble-core/src/main/java/org/briarproject/bramble/socks/SocksSocketFactory.java
@@ -22,8 +22,7 @@ class SocksSocketFactory extends SocketFactory {

 	@Override
 	public Socket createSocket() {
-		return new SocksSocket(proxy, connectToProxyTimeout,
-				extraSocketTimeout);
+		return new SocksSocket(proxy, connectToProxyTimeout, extraSocketTimeout);
 	}

 	@Override
--- a/bramble-core/src/main/resources/torrc
+++ b/bramble-core/src/main/resources/torrc
@@ -0,0 +1,6 @@
+ControlPort 59051
+CookieAuthentication 1
+DisableNetwork 1
+RunAsDaemon 1
+SafeSocks 1
+SocksPort 59050
--- a/bramble-core/src/test/java/org/briarproject/bramble/test/TestFeatureFlagModule.java
+++ b/bramble-core/src/test/java/org/briarproject/bramble/test/TestFeatureFlagModule.java
@@ -24,6 +24,21 @@ public class TestFeatureFlagModule {
 			public boolean shouldEnableDisappearingMessages() {
 				return true;
 			}
+
+			@Override
+			public boolean shouldEnableConnectViaBluetooth() {
+				return true;
+			}
+
+			@Override
+			public boolean shouldEnableTransferData() {
+				return true;
+			}
+
+			@Override
+			public boolean shouldEnableShareAppViaOfflineHotspot() {
+				return true;
+			}
 		};
 	}
 }
--- a/bramble-core/witness.gradle
+++ b/bramble-core/witness.gradle
@@ -1,6 +1,5 @@
 dependencyVerification {
    verify = [
-        'antlr:antlr:2.7.7:antlr-2.7.7.jar:88fbda4b912596b9f56e8e12e580cc954bacfb51776ecfddd3e18fc1cf56dc4c',
        'cglib:cglib:3.2.8:cglib-3.2.8.jar:3f64de999ecc5595dc84ca8ff0879d8a34c8623f9ef3c517a53ed59023fcb9db',
        'com.google.code.findbugs:annotations:3.0.1:annotations-3.0.1.jar:6b47ff0a6de0ce17cbedc3abb0828ca5bce3009d53ea47b3723ff023c4742f79',
        'com.google.code.findbugs:jsr305:3.0.2:jsr305-3.0.2.jar:766ad2a0783f2687962c8ad74ceecc38a28b9f72a2d085ee438b7813e928d0c7',
@@ -9,21 +8,14 @@ dependencyVerification {
        'com.google.dagger:dagger-spi:2.33:dagger-spi-2.33.jar:e2dcab2221b8afb9556ef0a1c83b0bd5f42552e254322a257330f754cdbbb9d4',
        'com.google.dagger:dagger:2.33:dagger-2.33.jar:d8798c5b8cf6b125234e33af5c6293bb9f2208ce29b57924c35b8c0be7b6bdcb',
        'com.google.errorprone:error_prone_annotations:2.2.0:error_prone_annotations-2.2.0.jar:6ebd22ca1b9d8ec06d41de8d64e0596981d9607b42035f9ed374f9de271a481a',
-        'com.google.errorprone:error_prone_annotations:2.3.2:error_prone_annotations-2.3.2.jar:357cd6cfb067c969226c442451502aee13800a24e950fdfde77bcdb4565a668d',
        'com.google.errorprone:javac-shaded:9-dev-r4023-3:javac-shaded-9-dev-r4023-3.jar:65bfccf60986c47fbc17c9ebab0be626afc41741e0a6ec7109e0768817a36f30',
        'com.google.googlejavaformat:google-java-format:1.5:google-java-format-1.5.jar:aa19ad7850fb85178aa22f2fddb163b84d6ce4d0035872f30d4408195ca1144e',
        'com.google.guava:failureaccess:1.0.1:failureaccess-1.0.1.jar:a171ee4c734dd2da837e4b16be9df4661afab72a41adaf31eb84dfdaf936ca26',
        'com.google.guava:guava:27.1-jre:guava-27.1-jre.jar:4a5aa70cc968a4d137e599ad37553e5cfeed2265e8c193476d7119036c536fe7',
-        'com.google.guava:guava:28.1-jre:guava-28.1-jre.jar:30beb8b8527bd07c6e747e77f1a92122c2f29d57ce347461a4a55eb26e382da4',
        'com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava:listenablefuture-9999.0-empty-to-avoid-conflict-with-guava.jar:b372a037d4230aa57fbeffdef30fd6123f9c0c2db85d0aced00c91b974f33f99',
        'com.google.j2objc:j2objc-annotations:1.1:j2objc-annotations-1.1.jar:2994a7eb78f2710bd3d3bfb639b2c94e219cedac0d4d084d516e78c16dddecf6',
-        'com.google.j2objc:j2objc-annotations:1.3:j2objc-annotations-1.3.jar:21af30c92267bd6122c0e0b4d20cccb6641a37eaf956c6540ec471d584e64a7b',
        'com.h2database:h2:1.4.192:h2-1.4.192.jar:225b22e9857235c46c93861410b60b8c81c10dc8985f4faf188985ba5445126c',
-        'com.puppycrawl.tools:checkstyle:8.27:checkstyle-8.27.jar:26c81958a112ebdfc5d7b40507bbfc8f15f606fea1e55ef5675609ddb41a6053',
        'com.squareup:javapoet:1.13.0:javapoet-1.13.0.jar:4c7517e848a71b36d069d12bb3bf46a70fd4cda3105d822b0ed2e19c00b69291',
-        'commons-beanutils:commons-beanutils:1.9.4:commons-beanutils-1.9.4.jar:7d938c81789028045c08c065e94be75fc280527620d5bd62b519d5838532368a',
-        'commons-collections:commons-collections:3.2.2:commons-collections-3.2.2.jar:eeeae917917144a68a741d4c0dff66aa5c5c5fd85593ff217bced3fc8ca783b8',
-        'info.picocli:picocli:4.1.1:picocli-4.1.1.jar:9238b6af4ded57dcfedf6f7dbcf2bdf334dae2f118ea2a0bd6d05066e63ee6fc',
        'javax.annotation:jsr250-api:1.0:jsr250-api-1.0.jar:a1a922d0d9b6d183ed3800dfac01d1e1eb159f0e8c6f94736931c1def54a941f',
        'javax.inject:javax.inject:1:javax.inject-1.jar:91c77044a50c481636c32d916fd89c9118a72195390452c81065080f957de7ff',
        'junit:junit:4.13.2:junit-4.13.2.jar:8e495b634469d64fb8acfa3495a065cbacc8a0fff55ce1e31007be4c16dc57d3',
@@ -32,18 +24,14 @@ dependencyVerification {
        'net.jcip:jcip-annotations:1.0:jcip-annotations-1.0.jar:be5805392060c71474bf6c9a67a099471274d30b83eef84bfc4e0889a4f1dcc0',
        'net.jodah:concurrentunit:0.4.2:concurrentunit-0.4.2.jar:5583078e1acf91734939e985bc9e7ee947b0e93a8eef679da6bb07bbeb47ced3',
        'net.ltgt.gradle.incap:incap:0.2:incap-0.2.jar:b625b9806b0f1e4bc7a2e3457119488de3cd57ea20feedd513db070a573a4ffd',
-        'net.sf.saxon:Saxon-HE:9.9.1-5:Saxon-HE-9.9.1-5.jar:4b39a9e30d5b634b5e91db5f0c6937f176d4517543ababc9b5e01830b8c56620',
-        'org.antlr:antlr4-runtime:4.7.2:antlr4-runtime-4.7.2.jar:4c518b87d4bdff8b44cd8cbc1af816e944b62a3fe5b80b781501cf1f4759bbc4',
        'org.apache-extras.beanshell:bsh:2.0b6:bsh-2.0b6.jar:a17955976070c0573235ee662f2794a78082758b61accffce8d3f8aedcd91047',
        'org.bitlet:weupnp:0.1.4:weupnp-0.1.4.jar:88df7e6504929d00bdb832863761385c68ab92af945b04f0770b126270a444fb',
        'org.bouncycastle:bcprov-jdk15on:1.69:bcprov-jdk15on-1.69.jar:e469bd39f936999f256002631003ff022a22951da9d5bd9789c7abfa9763a292',
        'org.briarproject:jtorctl:0.3:jtorctl-0.3.jar:f2939238a097898998432effe93b0334d97a787972ab3a91a8973a1d309fc864',
        'org.checkerframework:checker-compat-qual:2.5.3:checker-compat-qual-2.5.3.jar:d76b9afea61c7c082908023f0cbc1427fab9abd2df915c8b8a3e7a509bccbc6d',
        'org.checkerframework:checker-qual:2.5.2:checker-qual-2.5.2.jar:64b02691c8b9d4e7700f8ee2e742dce7ea2c6e81e662b7522c9ee3bf568c040a',
-        'org.checkerframework:checker-qual:2.8.1:checker-qual-2.8.1.jar:9103499008bcecd4e948da29b17864abb64304e15706444ae209d17ebe0575df',
        'org.codehaus.mojo.signature:java16:1.1:java16-1.1.signature:53799223a2c98dba2d0add810bed76315460df285c69e4f397ae6098f87dd619',
        'org.codehaus.mojo:animal-sniffer-annotations:1.17:animal-sniffer-annotations-1.17.jar:92654f493ecfec52082e76354f0ebf87648dc3d5cec2e3c3cdb947c016747a53',
-        'org.codehaus.mojo:animal-sniffer-annotations:1.18:animal-sniffer-annotations-1.18.jar:47f05852b48ee9baefef80fa3d8cea60efa4753c0013121dd7fe5eef2e5c729d',
        'org.codehaus.mojo:animal-sniffer-ant-tasks:1.20:animal-sniffer-ant-tasks-1.20.jar:bb7d2498144118311d968bb08ff6fae3fc535fb1cb9cca8b8e9ea65b189422ac',
        'org.codehaus.mojo:animal-sniffer:1.20:animal-sniffer-1.20.jar:80c422523c38db91260c6d78e5ee4b012862ab61cc55020c9e243dd7b5c62249',
        'org.hamcrest:hamcrest-core:2.1:hamcrest-core-2.1.jar:e09109e54a289d88506b9bfec987ddd199f4217c9464132668351b9a4f00bee9',
--- a/bramble-java/build.gradle
+++ b/bramble-java/build.gradle
@@ -2,7 +2,6 @@ apply plugin: 'java-library'
 sourceCompatibility = 1.8
 targetCompatibility = 1.8

-apply plugin: 'checkstyle'
 apply plugin: 'idea'
 apply plugin: 'witness'
 apply from: 'witness.gradle'
--- a/bramble-java/src/main/java/org/briarproject/bramble/plugin/modem/CountryCodes.java
+++ b/bramble-java/src/main/java/org/briarproject/bramble/plugin/modem/CountryCodes.java
@@ -81,36 +81,33 @@ class CountryCodes {
 		new Country("GA", "Gabonese Republic", "241", "00", ""),
 		new Country("GB", "United Kingdom", "44", "00", "0"),
 		new Country("GD", "Grenada", "1", "011", "4"),
-			new Country("GE", "Georgia", "995", "8**10", "8"),
-			new Country("GF", "French Guiana", "594", "00", ""),
-			new Country("GH", "Ghana", "233", "00", ""),
-			new Country("GI", "Gibraltar", "350", "00", ""),
-			new Country("GL", "Greenland", "299", "00", ""),
-			new Country("GM", "Gambia", "220", "00", ""),
-			new Country("GN", "Guinea", "224", "00", "0"),
-			new Country("GP", "Guadeloupe", "590", "00", ""),
-			new Country("GQ", "Equatorial Guinea", "240", "00", ""),
-			new Country("GR", "Greece", "30", "00", ""),
-			new Country("GS", "South Georgia and the South Sandwich Islands",
-					"995", "8**10", "8"),
-			new Country("GT", "Guatemala", "502", "00", ""),
-			new Country("GU", "Guam", "1", "011", "1"),
-			new Country("GW", "Guinea-Bissau", "245", "00", ""),
-			new Country("GY", "Guyana", "592", "001", "0"),
-			new Country("HK", "Hong Kong", "852", "001", ""),
-			new Country("HM", "Heard Island and McDonald Islands",
-					"692", "00", "0"),
-			new Country("HN", "Honduras", "504", "00", "0"),
-			new Country("HR", "Croatia", "385", "00", "0"),
-			new Country("HT", "Haiti", "509", "00", "0"),
-			new Country("HU", "Hungary", "36", "00", "06"),
-			new Country("ID", "Indonesia", "62", "001", "0"),
-			new Country("IE", "Ireland", "353", "00", "0"),
-			new Country("IL", "Israel", "972", "00", "0"),
-			new Country("IN", "India", "91", "00", "0"),
-			new Country("IO", "British Indian Ocean Territory", "246", "00",
-					""),
-			new Country("IQ", "Iraq", "964", "00", "0"),
+		new Country("GE", "Georgia", "995", "8**10", "8"),
+		new Country("GF", "French Guiana", "594", "00", ""),
+		new Country("GH", "Ghana", "233", "00", ""),
+		new Country("GI", "Gibraltar", "350", "00", ""),
+		new Country("GL", "Greenland", "299", "00", ""),
+		new Country("GM", "Gambia", "220", "00", ""),
+		new Country("GN", "Guinea", "224", "00", "0"),
+		new Country("GP", "Guadeloupe", "590", "00", ""),
+		new Country("GQ", "Equatorial Guinea", "240", "00", ""),
+		new Country("GR", "Greece", "30", "00", ""),
+		new Country("GS", "South Georgia and the South Sandwich Islands", "995", "8**10", "8"),
+		new Country("GT", "Guatemala", "502", "00", ""),
+		new Country("GU", "Guam", "1", "011", "1"),
+		new Country("GW", "Guinea-Bissau", "245", "00", ""),
+		new Country("GY", "Guyana", "592", "001", "0"),
+		new Country("HK", "Hong Kong", "852", "001", ""),
+		new Country("HM", "Heard Island and McDonald Islands", "692", "00", "0"),
+		new Country("HN", "Honduras", "504", "00", "0"),
+		new Country("HR", "Croatia", "385", "00", "0"),
+		new Country("HT", "Haiti", "509", "00", "0"),
+		new Country("HU", "Hungary", "36", "00", "06"),
+		new Country("ID", "Indonesia", "62", "001", "0"),
+		new Country("IE", "Ireland", "353", "00", "0"),
+		new Country("IL", "Israel", "972", "00", "0"),
+		new Country("IN", "India", "91", "00", "0"),
+		new Country("IO", "British Indian Ocean Territory", "246", "00", ""),
+		new Country("IQ", "Iraq", "964", "00", "0"),
 		new Country("IR", "Iran", "98", "00", "0"),
 		new Country("IS", "Iceland", "354", "00", "0"),
 		new Country("IT", "Italy", "39", "00", ""),
--- a/bramble-java/src/main/java/org/briarproject/bramble/plugin/modem/SerialPortImpl.java
+++ b/bramble-java/src/main/java/org/briarproject/bramble/plugin/modem/SerialPortImpl.java
@@ -28,8 +28,7 @@ class SerialPortImpl implements SerialPort {
 	@Override
 	public void closePort() throws IOException {
 		try {
-			if (!port.closePort())
-				throw new IOException("Failed to close port");
+			if (!port.closePort()) throw new IOException("Failed to close port");
 		} catch (SerialPortException e) {
 			throw new IOException(e);
 		}
--- a/bramble-java/src/main/java/org/briarproject/bramble/plugin/tor/JavaTorPlugin.java
+++ b/bramble-java/src/main/java/org/briarproject/bramble/plugin/tor/JavaTorPlugin.java
@@ -35,15 +35,12 @@ abstract class JavaTorPlugin extends TorPlugin {
 			String architecture,
 			long maxLatency,
 			int maxIdleTime,
-			File torDirectory,
-			int torSocksPort,
-			int torControlPort) {
+			File torDirectory) {
 		super(ioExecutor, wakefulIoExecutor, networkManager, locationUtils,
 				torSocketFactory, clock, resourceProvider,
 				circumventionProvider, batteryManager, backoff,
 				torRendezvousCrypto, callback, architecture,
-				maxLatency, maxIdleTime, torDirectory, torSocksPort,
-				torControlPort);
+				maxLatency, maxIdleTime, torDirectory);
 	}

 	@Override
--- a/bramble-java/src/main/java/org/briarproject/bramble/plugin/tor/UnixTorPlugin.java
+++ b/bramble-java/src/main/java/org/briarproject/bramble/plugin/tor/UnixTorPlugin.java
@@ -35,15 +35,12 @@ class UnixTorPlugin extends JavaTorPlugin {
 			String architecture,
 			long maxLatency,
 			int maxIdleTime,
-			File torDirectory,
-			int torSocksPort,
-			int torControlPort) {
+			File torDirectory) {
 		super(ioExecutor, wakefulIoExecutor, networkManager, locationUtils,
 				torSocketFactory, clock, resourceProvider,
 				circumventionProvider, batteryManager, backoff,
 				torRendezvousCrypto, callback, architecture,
-				maxLatency, maxIdleTime, torDirectory, torSocksPort,
-				torControlPort);
+				maxLatency, maxIdleTime, torDirectory);
 	}

 	@Override
--- a/bramble-java/src/main/java/org/briarproject/bramble/plugin/tor/UnixTorPluginFactory.java
+++ b/bramble-java/src/main/java/org/briarproject/bramble/plugin/tor/UnixTorPluginFactory.java
@@ -9,9 +9,7 @@ import org.briarproject.bramble.api.plugin.Backoff;
 import org.briarproject.bramble.api.plugin.BackoffFactory;
 import org.briarproject.bramble.api.plugin.PluginCallback;
 import org.briarproject.bramble.api.plugin.TorConstants;
-import org.briarproject.bramble.api.plugin.TorControlPort;
 import org.briarproject.bramble.api.plugin.TorDirectory;
-import org.briarproject.bramble.api.plugin.TorSocksPort;
 import org.briarproject.bramble.api.plugin.TransportId;
 import org.briarproject.bramble.api.plugin.duplex.DuplexPlugin;
 import org.briarproject.bramble.api.plugin.duplex.DuplexPluginFactory;
@@ -56,8 +54,6 @@ public class UnixTorPluginFactory implements DuplexPluginFactory {
 	private final BatteryManager batteryManager;
 	private final Clock clock;
 	private final File torDirectory;
-	private int torSocksPort;
-	private int torControlPort;

 	@Inject
 	UnixTorPluginFactory(@IoExecutor Executor ioExecutor,
@@ -71,9 +67,7 @@ public class UnixTorPluginFactory implements DuplexPluginFactory {
 			CircumventionProvider circumventionProvider,
 			BatteryManager batteryManager,
 			Clock clock,
-			@TorDirectory File torDirectory,
-			@TorSocksPort int torSocksPort,
-			@TorControlPort int torControlPort) {
+			@TorDirectory File torDirectory) {
 		this.ioExecutor = ioExecutor;
 		this.wakefulIoExecutor = wakefulIoExecutor;
 		this.networkManager = networkManager;
@@ -86,8 +80,6 @@ public class UnixTorPluginFactory implements DuplexPluginFactory {
 		this.batteryManager = batteryManager;
 		this.clock = clock;
 		this.torDirectory = torDirectory;
-		this.torSocksPort = torSocksPort;
-		this.torControlPort = torControlPort;
 	}

 	@Override
@@ -133,8 +125,7 @@ public class UnixTorPluginFactory implements DuplexPluginFactory {
 				networkManager, locationUtils, torSocketFactory, clock,
 				resourceProvider, circumventionProvider, batteryManager,
 				backoff, torRendezvousCrypto, callback, architecture,
-				MAX_LATENCY, MAX_IDLE_TIME, torDirectory, torSocksPort,
-				torControlPort);
+				MAX_LATENCY, MAX_IDLE_TIME, torDirectory);
 		eventBus.addListener(plugin);
 		return plugin;
 	}
--- a/bramble-java/src/test/java/org/briarproject/bramble/plugin/tor/BridgeTest.java
+++ b/bramble-java/src/test/java/org/briarproject/bramble/plugin/tor/BridgeTest.java
@@ -36,8 +36,6 @@ import static java.util.Collections.singletonList;
 import static java.util.concurrent.TimeUnit.SECONDS;
 import static java.util.logging.Logger.getLogger;
 import static org.briarproject.bramble.api.plugin.Plugin.State.ACTIVE;
-import static org.briarproject.bramble.api.plugin.TorConstants.DEFAULT_CONTROL_PORT;
-import static org.briarproject.bramble.api.plugin.TorConstants.DEFAULT_SOCKS_PORT;
 import static org.briarproject.bramble.test.TestUtils.deleteTestDirectory;
 import static org.briarproject.bramble.test.TestUtils.getTestDirectory;
 import static org.briarproject.bramble.test.TestUtils.isOptionalTestEnabled;
@@ -141,8 +139,7 @@ public class BridgeTest extends BrambleTestCase {
 		factory = new UnixTorPluginFactory(ioExecutor, wakefulIoExecutor,
 				networkManager, locationUtils, eventBus, torSocketFactory,
 				backoffFactory, resourceProvider, bridgeProvider,
-				batteryManager, clock, torDir, DEFAULT_SOCKS_PORT,
-				DEFAULT_CONTROL_PORT);
+				batteryManager, clock, torDir);
 	}

 	@After
--- a/bramble-java/witness.gradle
+++ b/bramble-java/witness.gradle
@@ -1,6 +1,5 @@
 dependencyVerification {
    verify = [
-        'antlr:antlr:2.7.7:antlr-2.7.7.jar:88fbda4b912596b9f56e8e12e580cc954bacfb51776ecfddd3e18fc1cf56dc4c',
        'cglib:cglib:3.2.8:cglib-3.2.8.jar:3f64de999ecc5595dc84ca8ff0879d8a34c8623f9ef3c517a53ed59023fcb9db',
        'com.google.code.findbugs:annotations:3.0.1:annotations-3.0.1.jar:6b47ff0a6de0ce17cbedc3abb0828ca5bce3009d53ea47b3723ff023c4742f79',
        'com.google.code.findbugs:jsr305:3.0.2:jsr305-3.0.2.jar:766ad2a0783f2687962c8ad74ceecc38a28b9f72a2d085ee438b7813e928d0c7',
@@ -9,20 +8,13 @@ dependencyVerification {
        'com.google.dagger:dagger-spi:2.33:dagger-spi-2.33.jar:e2dcab2221b8afb9556ef0a1c83b0bd5f42552e254322a257330f754cdbbb9d4',
        'com.google.dagger:dagger:2.33:dagger-2.33.jar:d8798c5b8cf6b125234e33af5c6293bb9f2208ce29b57924c35b8c0be7b6bdcb',
        'com.google.errorprone:error_prone_annotations:2.2.0:error_prone_annotations-2.2.0.jar:6ebd22ca1b9d8ec06d41de8d64e0596981d9607b42035f9ed374f9de271a481a',
-        'com.google.errorprone:error_prone_annotations:2.3.2:error_prone_annotations-2.3.2.jar:357cd6cfb067c969226c442451502aee13800a24e950fdfde77bcdb4565a668d',
        'com.google.errorprone:javac-shaded:9-dev-r4023-3:javac-shaded-9-dev-r4023-3.jar:65bfccf60986c47fbc17c9ebab0be626afc41741e0a6ec7109e0768817a36f30',
        'com.google.googlejavaformat:google-java-format:1.5:google-java-format-1.5.jar:aa19ad7850fb85178aa22f2fddb163b84d6ce4d0035872f30d4408195ca1144e',
        'com.google.guava:failureaccess:1.0.1:failureaccess-1.0.1.jar:a171ee4c734dd2da837e4b16be9df4661afab72a41adaf31eb84dfdaf936ca26',
        'com.google.guava:guava:27.1-jre:guava-27.1-jre.jar:4a5aa70cc968a4d137e599ad37553e5cfeed2265e8c193476d7119036c536fe7',
-        'com.google.guava:guava:28.1-jre:guava-28.1-jre.jar:30beb8b8527bd07c6e747e77f1a92122c2f29d57ce347461a4a55eb26e382da4',
        'com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava:listenablefuture-9999.0-empty-to-avoid-conflict-with-guava.jar:b372a037d4230aa57fbeffdef30fd6123f9c0c2db85d0aced00c91b974f33f99',
        'com.google.j2objc:j2objc-annotations:1.1:j2objc-annotations-1.1.jar:2994a7eb78f2710bd3d3bfb639b2c94e219cedac0d4d084d516e78c16dddecf6',
-        'com.google.j2objc:j2objc-annotations:1.3:j2objc-annotations-1.3.jar:21af30c92267bd6122c0e0b4d20cccb6641a37eaf956c6540ec471d584e64a7b',
-        'com.puppycrawl.tools:checkstyle:8.27:checkstyle-8.27.jar:26c81958a112ebdfc5d7b40507bbfc8f15f606fea1e55ef5675609ddb41a6053',
        'com.squareup:javapoet:1.13.0:javapoet-1.13.0.jar:4c7517e848a71b36d069d12bb3bf46a70fd4cda3105d822b0ed2e19c00b69291',
-        'commons-beanutils:commons-beanutils:1.9.4:commons-beanutils-1.9.4.jar:7d938c81789028045c08c065e94be75fc280527620d5bd62b519d5838532368a',
-        'commons-collections:commons-collections:3.2.2:commons-collections-3.2.2.jar:eeeae917917144a68a741d4c0dff66aa5c5c5fd85593ff217bced3fc8ca783b8',
-        'info.picocli:picocli:4.1.1:picocli-4.1.1.jar:9238b6af4ded57dcfedf6f7dbcf2bdf334dae2f118ea2a0bd6d05066e63ee6fc',
        'javax.annotation:jsr250-api:1.0:jsr250-api-1.0.jar:a1a922d0d9b6d183ed3800dfac01d1e1eb159f0e8c6f94736931c1def54a941f',
        'javax.inject:javax.inject:1:javax.inject-1.jar:91c77044a50c481636c32d916fd89c9118a72195390452c81065080f957de7ff',
        'junit:junit:4.13.2:junit-4.13.2.jar:8e495b634469d64fb8acfa3495a065cbacc8a0fff55ce1e31007be4c16dc57d3',
@@ -31,16 +23,12 @@ dependencyVerification {
        'net.java.dev.jna:jna:4.5.2:jna-4.5.2.jar:0c8eb7acf67261656d79005191debaba3b6bf5dd60a43735a245429381dbecff',
        'net.jcip:jcip-annotations:1.0:jcip-annotations-1.0.jar:be5805392060c71474bf6c9a67a099471274d30b83eef84bfc4e0889a4f1dcc0',
        'net.ltgt.gradle.incap:incap:0.2:incap-0.2.jar:b625b9806b0f1e4bc7a2e3457119488de3cd57ea20feedd513db070a573a4ffd',
-        'net.sf.saxon:Saxon-HE:9.9.1-5:Saxon-HE-9.9.1-5.jar:4b39a9e30d5b634b5e91db5f0c6937f176d4517543ababc9b5e01830b8c56620',
-        'org.antlr:antlr4-runtime:4.7.2:antlr4-runtime-4.7.2.jar:4c518b87d4bdff8b44cd8cbc1af816e944b62a3fe5b80b781501cf1f4759bbc4',
        'org.apache-extras.beanshell:bsh:2.0b6:bsh-2.0b6.jar:a17955976070c0573235ee662f2794a78082758b61accffce8d3f8aedcd91047',
        'org.briarproject:obfs4proxy:0.0.12-dev-40245c4a:obfs4proxy-0.0.12-dev-40245c4a.zip:172029e7058b3a83ac93ac4991a44bf76e16ce8d46f558f5836d57da3cb3a766',
        'org.briarproject:tor:0.3.5.15:tor-0.3.5.15.jar:2ff5b5a3b5eaa97d699629ad24ba9584b3199d0ffdb1ea7d8a02de3016b80e7a',
        'org.checkerframework:checker-compat-qual:2.5.3:checker-compat-qual-2.5.3.jar:d76b9afea61c7c082908023f0cbc1427fab9abd2df915c8b8a3e7a509bccbc6d',
        'org.checkerframework:checker-qual:2.5.2:checker-qual-2.5.2.jar:64b02691c8b9d4e7700f8ee2e742dce7ea2c6e81e662b7522c9ee3bf568c040a',
-        'org.checkerframework:checker-qual:2.8.1:checker-qual-2.8.1.jar:9103499008bcecd4e948da29b17864abb64304e15706444ae209d17ebe0575df',
        'org.codehaus.mojo:animal-sniffer-annotations:1.17:animal-sniffer-annotations-1.17.jar:92654f493ecfec52082e76354f0ebf87648dc3d5cec2e3c3cdb947c016747a53',
-        'org.codehaus.mojo:animal-sniffer-annotations:1.18:animal-sniffer-annotations-1.18.jar:47f05852b48ee9baefef80fa3d8cea60efa4753c0013121dd7fe5eef2e5c729d',
        'org.hamcrest:hamcrest-core:2.1:hamcrest-core-2.1.jar:e09109e54a289d88506b9bfec987ddd199f4217c9464132668351b9a4f00bee9',
        'org.hamcrest:hamcrest-library:2.1:hamcrest-library-2.1.jar:b7e2b6895b3b679f0e47b6380fda391b225e9b78505db9d8bdde8d3cc8d52a21',
        'org.hamcrest:hamcrest:2.1:hamcrest-2.1.jar:ba93b2e3a562322ba432f0a1b53addcc55cb188253319a020ed77f824e692050',
--- a/briar-android/artwork/bluetooth.svg
+++ b/briar-android/artwork/bluetooth.svg
@@ -1,28 +1,15 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:cc="http://creativecommons.org/ns#" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-    xmlns="http://www.w3.org/2000/svg" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-    xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" width="500" height="175" viewBox="0 0 500 175"
-    id="svg2" version="1.1" sodipodi:docname="bluetooth.svg" inkscape:version="1.0.2 (e86c870879, 2021-01-15)">
-  <sodipodi:namedview
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1"
-     objecttolerance="10"
-     gridtolerance="10"
-     guidetolerance="10"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:window-width="1920"
-     inkscape:window-height="892"
-     id="namedview10"
-     showgrid="false"
-     inkscape:zoom="0.93337848"
-     inkscape:cx="-49.861215"
-     inkscape:cy="137.66042"
-     inkscape:window-x="0"
-     inkscape:window-y="144"
-     inkscape:window-maximized="0"
-     inkscape:current-layer="svg2" />
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   width="499.24374"
+   height="175.49413"
+   viewBox="0 0 499.24373 175.49413"
+   id="svg2"
+   version="1.1">
  <defs
     id="defs4" />
  <metadata
@@ -39,23 +26,22 @@
  </metadata>
  <path
     id="path4201"
-     d="m 459.80937,167.15983 -4.32657,-4.3343 -7.06956,-2.42737 c -3.88825,-1.33505 -8.72285,-2.99587 -10.74354,-3.6907 l -3.674,-1.26333 3.524,-0.1726 c 8.24183,-0.40367 12.98778,-4.00671 14.33634,-10.88389 0.79628,-4.06078 1.12887,-17.29805 0.83016,-33.04122 -0.15338,-8.08375 -0.16617,-15.41641 -0.0284,-16.29481 0.13775,-0.8784 0.53527,-2.42011 0.88339,-3.42602 1.22247,-3.53243 0.33996,-11.90828 -1.8577,-17.63146 -0.34848,-0.9075 -1.93434,-4.215 -3.52415,-7.35 -4.15849,-8.2003 -4.50458,-8.94188 -4.89292,-10.4841 -0.45865,-1.82145 -0.21161,-5.43531 0.4625,-6.7659 0.66625,-1.31505 2.15695,-2.91616 3.24622,-3.48662 1.29885,-0.68024 2.61568,0.12202 4.6864,2.85512 3.42153,4.51599 14.00135,19.44095 15.73191,22.19301 3.74551,5.95636 5.95558,11.16496 7.9722,18.78849 0.6547,2.475 1.88525,6.9975 2.73456,10.05 0.84931,3.0525 2.71404,10.15792 4.14385,15.78983 l 2.59964,10.23983 4.65,5.19319 c 2.5575,2.85626 5.7975,6.46371 7.2,8.01657 1.4025,1.55286 2.55,2.97543 2.55,3.16127 0,0.33546 -34.49955,29.29931 -34.89913,29.29931 -0.11475,0 -2.15559,-1.95044 -4.5352,-4.3343 z M 365.9443,150.77206 c -1.25762,-0.62844 -2.20557,-1.3788 -2.91402,-2.30663 -2.08931,-2.73629 -1.95034,2.36868 -1.86433,-68.48249 l 0.0777,-64.03881 0.66066,-1.23494 c 1.0152,-1.89767 1.99201,-2.91087 3.73952,-3.87887 l 1.59982,-0.88619 37.78387,-0.0796 c 42.45592,-0.0894 39.40239,-0.2483 42.11646,2.19188 0.87544,0.78709 1.75715,1.95946 2.18393,2.90385 0.71264,1.57698 0.71613,1.63839 0.80561,14.20405 l 0.0899,12.62022 -1.79817,-0.13007 c -1.42577,-0.10313 -2.08143,0.007 -3.16601,0.5321 -2.01294,0.97445 -3.93993,2.89871 -5.11476,5.10753 l -1.03717,1.95 -0.007,-12.825 -0.007,-12.825 h -33.6 -33.6 v 51.3 51.3 h 33.59873 33.59874 l 0.0763,-34.425 c 0.073,-32.96021 0.0982,-34.36117 0.59098,-32.925 0.28309,0.825 1.80562,3.9975 3.3834,7.05 5.49252,10.62624 5.40494,9.86009 5.39597,47.20335 -0.007,27.62122 -0.12358,29.95084 -1.66204,33.10906 -1.07144,2.19949 -2.71143,3.71042 -5.05823,4.66019 l -1.67381,0.6774 -36.1677,0.0797 -36.16769,0.0797 -1.864,-0.93145 z m 42.39939,-5.03813 c 2.87119,-1.30885 4.45771,-3.6784 4.43003,-6.61652 -0.0388,-4.11587 -3.1088,-7.22328 -7.1364,-7.22328 -2.11956,0 -3.56727,0.60889 -5.16364,2.17177 -2.24518,2.19807 -2.75398,5.43897 -1.30101,8.28704 0.71312,1.39782 2.52137,3.00905 3.96214,3.53045 1.49707,0.54176 3.84003,0.47454 5.20888,-0.14946 z"
-     style="fill:#000000;stroke:none" />
+     d="m 459.80937,171.15983 -4.32657,-4.3343 -7.06956,-2.42737 c -3.88825,-1.33505 -8.72285,-2.99587 -10.74354,-3.6907 l -3.674,-1.26333 3.524,-0.1726 c 8.24183,-0.40367 12.98778,-4.00671 14.33634,-10.88389 0.79628,-4.06078 1.12887,-17.29805 0.83016,-33.04122 -0.15338,-8.08375 -0.16617,-15.41641 -0.0284,-16.29481 0.13775,-0.8784 0.53527,-2.42011 0.88339,-3.42602 1.22247,-3.53243 0.33996,-11.90828 -1.8577,-17.63146 -0.34848,-0.9075 -1.93434,-4.215 -3.52415,-7.35 -4.15849,-8.2003 -4.50458,-8.94188 -4.89292,-10.4841 -0.45865,-1.82145 -0.21161,-5.43531 0.4625,-6.7659 0.66625,-1.31505 2.15695,-2.91616 3.24622,-3.48662 1.29885,-0.68024 2.61568,0.12202 4.6864,2.85512 3.42153,4.51599 14.00135,19.44095 15.73191,22.19301 3.74551,5.95636 5.95558,11.16496 7.9722,18.78849 0.6547,2.475 1.88525,6.9975 2.73456,10.05 0.84931,3.0525 2.71404,10.15792 4.14385,15.78983 l 2.59964,10.23983 4.65,5.19319 c 2.5575,2.85626 5.7975,6.46371 7.2,8.01657 1.4025,1.55286 2.55,2.97543 2.55,3.16127 0,0.33546 -34.49955,29.29931 -34.89913,29.29931 -0.11475,0 -2.15559,-1.95044 -4.5352,-4.3343 z M 365.9443,154.77206 c -1.25762,-0.62844 -2.20557,-1.3788 -2.91402,-2.30663 -2.08931,-2.73629 -1.95034,2.36868 -1.86433,-68.48249 l 0.0777,-64.03881 0.66066,-1.23494 c 1.0152,-1.89767 1.99201,-2.91087 3.73952,-3.87887 l 1.59982,-0.88619 37.78387,-0.0796 c 42.45592,-0.0894 39.40239,-0.2483 42.11646,2.19188 0.87544,0.78709 1.75715,1.95946 2.18393,2.90385 0.71264,1.57698 0.71613,1.63839 0.80561,14.20405 l 0.0899,12.62022 -1.79817,-0.13007 c -1.42577,-0.10313 -2.08143,0.007 -3.16601,0.5321 -2.01294,0.97445 -3.93993,2.89871 -5.11476,5.10753 l -1.03717,1.95 -0.007,-12.825 -0.007,-12.825 -33.6,0 -33.6,0 0,51.3 0,51.3 33.59873,0 33.59874,0 0.0763,-34.425 c 0.073,-32.96021 0.0982,-34.36117 0.59098,-32.925 0.28309,0.825 1.80562,3.9975 3.3834,7.05 5.49252,10.62624 5.40494,9.86009 5.39597,47.20335 -0.007,27.62122 -0.12358,29.95084 -1.66204,33.10906 -1.07144,2.19949 -2.71143,3.71042 -5.05823,4.66019 l -1.67381,0.6774 -36.1677,0.0797 -36.16769,0.0797 -1.864,-0.93145 z m 42.39939,-5.03813 c 2.87119,-1.30885 4.45771,-3.6784 4.43003,-6.61652 -0.0388,-4.11587 -3.1088,-7.22328 -7.1364,-7.22328 -2.11956,0 -3.56727,0.60889 -5.16364,2.17177 -2.24518,2.19807 -2.75398,5.43897 -1.30101,8.28704 0.71312,1.39782 2.52137,3.00905 3.96214,3.53045 1.49707,0.54176 3.84003,0.47454 5.20888,-0.14946 z"
+     style="fill:#000000" />
  <path
     id="path4201-1"
-     d="m 39.434334,167.15983 4.32657,-4.3343 7.06956,-2.42737 c 3.88825,-1.33505 8.72285,-2.99587 10.74354,-3.6907 l 3.674,-1.26333 -3.524,-0.1726 c -8.24183,-0.40367 -12.98778,-4.00671 -14.33634,-10.88389 -0.79628,-4.06078 -1.12887,-17.29805 -0.83016,-33.04122 0.15338,-8.08375 0.16617,-15.41641 0.0284,-16.29481 -0.13775,-0.8784 -0.53527,-2.42011 -0.88339,-3.42602 -1.22247,-3.53243 -0.33996,-11.90828 1.8577,-17.63146 0.34848,-0.9075 1.93434,-4.215 3.52415,-7.35 4.15849,-8.2003 4.50458,-8.94188 4.89292,-10.4841 0.45865,-1.82145 0.21161,-5.43531 -0.4625,-6.7659 -0.66625,-1.31505 -2.15695,-2.91616 -3.24622,-3.48662 -1.29885,-0.68024 -2.61568,0.12202 -4.6864,2.85512 -3.42153,4.51599 -14.00135,19.44095 -15.73191,22.19301 -3.74551,5.95636 -5.955584,11.16496 -7.972204,18.78849 -0.6547,2.475 -1.88525,6.9975 -2.73456,10.05 -0.84931,3.0525 -2.71404,10.15792 -4.14385,15.78983 L 14.4,125.82379 9.75,131.01698 c -2.5575,2.85626 -5.7975,6.46371 -7.2,8.01657 -1.4025,1.55286 -2.55,2.97543 -2.55,3.16127 0,0.33546 34.499554,29.29931 34.899134,29.29931 0.11475,0 2.15559,-1.95044 4.53519,-4.3343 z m 93.865056,-16.38777 c 1.25762,-0.62844 2.20557,-1.3788 2.91402,-2.30663 2.08931,-2.73629 1.95034,2.36868 1.86433,-68.48249 l -0.0777,-64.03881 -0.66066,-1.23494 c -1.0152,-1.89767 -1.99201,-2.91087 -3.73952,-3.87887 L 132.00004,9.94413 94.216184,9.86453 c -42.45592,-0.0894 -39.40239,-0.2483 -42.11646,2.19188 -0.87544,0.78709 -1.75715,1.95946 -2.18393,2.90385 -0.71264,1.57698 -0.71613,1.63839 -0.80561,14.20405 l -0.0899,12.62022 1.79817,-0.13007 c 1.42577,-0.10313 2.08143,0.007 3.16601,0.5321 2.01294,0.97445 3.93993,2.89871 5.11476,5.10753 l 1.03717,1.95 0.007,-12.825 0.007,-12.825 h 33.6 33.599986 v 51.3 51.3 H 93.751664 60.152924 l -0.0763,-34.425 c -0.073,-32.96021 -0.0982,-34.36117 -0.59098,-32.925 -0.28309,0.825 -1.80562,3.9975 -3.3834,7.05 -5.49252,10.62624 -5.40494,9.86009 -5.39597,47.20335 0.007,27.62122 0.12358,29.95084 1.66204,33.10906 1.07144,2.19949 2.71143,3.71042 5.05823,4.66019 l 1.67381,0.6774 36.1677,0.0797 36.167676,0.0797 1.864,-0.93145 z m -42.399376,-5.03813 c -2.87119,-1.30885 -4.45771,-3.6784 -4.43003,-6.61652 0.0388,-4.11587 3.1088,-7.22328 7.1364,-7.22328 2.11956,0 3.56727,0.60889 5.16364,2.17177 2.245176,2.19807 2.753976,5.43897 1.301006,8.28704 -0.713116,1.39782 -2.521366,3.00905 -3.962136,3.53045 -1.49707,0.54176 -3.84003,0.47454 -5.20888,-0.14946 z"
-     style="fill:#000000;stroke:none" />
+     d="m 39.434334,171.15983 4.32657,-4.3343 7.06956,-2.42737 c 3.88825,-1.33505 8.72285,-2.99587 10.74354,-3.6907 l 3.674,-1.26333 -3.524,-0.1726 c -8.24183,-0.40367 -12.98778,-4.00671 -14.33634,-10.88389 -0.79628,-4.06078 -1.12887,-17.29805 -0.83016,-33.04122 0.15338,-8.08375 0.16617,-15.41641 0.0284,-16.29481 -0.13775,-0.8784 -0.53527,-2.42011 -0.88339,-3.42602 -1.22247,-3.53243 -0.33996,-11.90828 1.8577,-17.63146 0.34848,-0.9075 1.93434,-4.215 3.52415,-7.35 4.15849,-8.2003 4.50458,-8.94188 4.89292,-10.4841 0.45865,-1.82145 0.21161,-5.43531 -0.4625,-6.7659 -0.66625,-1.31505 -2.15695,-2.91616 -3.24622,-3.48662 -1.29885,-0.68024 -2.61568,0.12202 -4.6864,2.85512 -3.42153,4.51599 -14.00135,19.44095 -15.73191,22.19301 -3.74551,5.95636 -5.955584,11.16496 -7.972204,18.78849 -0.6547,2.475 -1.88525,6.9975 -2.73456,10.05 -0.84931,3.0525 -2.71404,10.15792 -4.14385,15.78983 L 14.4,129.82379 9.75,135.01698 c -2.5575,2.85626 -5.7975,6.46371 -7.2,8.01657 -1.4025,1.55286 -2.55,2.97543 -2.55,3.16127 0,0.33546 34.499554,29.29931 34.899134,29.29931 0.11475,0 2.15559,-1.95044 4.53519,-4.3343 z m 93.865056,-16.38777 c 1.25762,-0.62844 2.20557,-1.3788 2.91402,-2.30663 2.08931,-2.73629 1.95034,2.36868 1.86433,-68.48249 l -0.0777,-64.03881 -0.66066,-1.23494 c -1.0152,-1.89767 -1.99201,-2.91087 -3.73952,-3.87887 l -1.59982,-0.88619 -37.783856,-0.0796 c -42.45592,-0.0894 -39.40239,-0.2483 -42.11646,2.19188 -0.87544,0.78709 -1.75715,1.95946 -2.18393,2.90385 -0.71264,1.57698 -0.71613,1.63839 -0.80561,14.20405 l -0.0899,12.62022 1.79817,-0.13007 c 1.42577,-0.10313 2.08143,0.007 3.16601,0.5321 2.01294,0.97445 3.93993,2.89871 5.11476,5.10753 l 1.03717,1.95 0.007,-12.825 0.007,-12.825 33.6,0 33.599986,0 0,51.3 0,51.3 -33.598716,0 -33.59874,0 -0.0763,-34.425 c -0.073,-32.96021 -0.0982,-34.36117 -0.59098,-32.925 -0.28309,0.825 -1.80562,3.9975 -3.3834,7.05 -5.49252,10.62624 -5.40494,9.86009 -5.39597,47.20335 0.007,27.62122 0.12358,29.95084 1.66204,33.10906 1.07144,2.19949 2.71143,3.71042 5.05823,4.66019 l 1.67381,0.6774 36.1677,0.0797 36.167676,0.0797 1.864,-0.93145 z m -42.399376,-5.03813 c -2.87119,-1.30885 -4.45771,-3.6784 -4.43003,-6.61652 0.0388,-4.11587 3.1088,-7.22328 7.1364,-7.22328 2.11956,0 3.56727,0.60889 5.16364,2.17177 2.245176,2.19807 2.753976,5.43897 1.301006,8.28704 -0.713116,1.39782 -2.521366,3.00905 -3.962136,3.53045 -1.49707,0.54176 -3.84003,0.47454 -5.20888,-0.14946 z"
+     style="fill:#000000" />
  <path
     id="rect4270"
-     d="m 247.25369,71.97921 h 4.73637 c 13.16497,0 23.76348,10.598514 23.76348,23.763485 v 32.174615 c 0,13.16497 -10.59851,23.76348 -23.76348,23.76348 h -4.73637 c -13.16497,0 -23.76349,-10.59851 -23.76349,-23.76348 V 95.742695 c 0,-13.164971 10.59852,-23.763485 23.76349,-23.763485 z"
-     style="fill:#0a3d91;stroke:none" />
+     d="m 247.25369,75.97921 4.73637,0 c 13.16497,0 23.76348,10.598514 23.76348,23.763485 l 0,32.174615 c 0,13.16497 -10.59851,23.76348 -23.76348,23.76348 l -4.73637,0 c -13.16497,0 -23.76349,-10.59851 -23.76349,-23.76348 l 0,-32.174615 c 0,-13.164971 10.59852,-23.763485 23.76349,-23.763485 z"
+     style="fill:#0a3d91" />
+  <path
+     id="path4272"
+     d="m 236.31105,102.92749 24.90674,25.07007 -12.00423,14.53574 0,-51.936691 12.00423,13.882451 -24.90674,24.41678"
+     style="fill:none;stroke:#ffffff;stroke-width:4.32805729" />
  <path
     id="path4844"
-     d="m 143.67921,23.5571 c -1.59043,2.623831 0.18153,5.574737 2.78461,6.642714 2.69504,1.572445 6.1706,4.987176 9.14793,2.232151 2.23313,-2.039515 0.60129,-5.727894 -2.04109,-6.67035 -3.06433,-1.676733 -6.55172,-5.514807 -9.89145,-2.204515 z M 351.7046,23.12937 c -2.76779,1.960623 -7.06819,2.694997 -8.37782,6.042717 -0.64195,2.73095 1.93572,4.99255 4.58419,4.426453 3.2021,-1.637914 7.05658,-2.8424 9.17849,-5.94769 0.56931,-2.60435 -1.49324,-5.35066 -4.26769,-4.745697 -0.41558,-0.107679 -0.76003,0.03505 -1.11717,0.224217 z m -26.76172,13.17187 c -2.93431,1.708015 -7.32039,1.922759 -8.93076,5.153004 -0.90775,2.654328 1.43202,5.159236 4.12365,4.861044 3.35587,-1.304271 7.31954,-2.112696 9.73662,-5.002268 0.81368,-2.537666 -0.97658,-5.469583 -3.79644,-5.128908 -0.4035,-0.14574 -0.75969,-0.03824 -1.13307,0.117128 z m -155.23633,2.46289 c -1.21948,2.711869 0.75683,5.460507 3.4437,6.14538 2.85847,1.080772 6.66937,4.11785 9.31224,1.23392 2.3151,-2.03652 0.33929,-5.835383 -2.40983,-6.41823 -3.32833,-1.175814 -7.38479,-4.713633 -10.34611,-0.96107 z m 127.27344,7.61719 c -3.12289,1.309174 -7.49226,0.970678 -9.49244,3.970097 -1.23184,2.518748 0.7727,5.298264 3.48037,5.339749 3.48706,-0.907308 7.56742,-1.1128 10.30314,-3.739116 1.11397,-2.422222 -0.31199,-5.546068 -3.1516,-5.551016 -0.3827,-0.195662 -0.75023,-0.126964 -1.13947,-0.01971 z m -97.49023,1.54492 c -2.22858,1.461838 -2.68005,4.865948 -0.27553,6.376909 2.5869,1.470583 5.91459,1.954941 8.83971,2.495346 2.78485,0.332188 4.74603,-2.479173 3.89118,-5.048668 -2.04264,-3.279676 -6.47206,-2.73364 -9.71704,-4.089227 -0.91277,0.08855 -1.82555,0.177093 -2.73832,0.26564 z m 68.51367,4.50782 c -3.27623,0.788856 -7.46081,-0.187875 -9.93635,2.381992 -1.64972,2.268076 -0.15709,5.353662 2.50432,5.86185 3.61172,-0.292365 7.71764,0.09072 10.84009,-2.093962 1.46245,-2.227649 0.52336,-5.531725 -2.28478,-5.959415 -0.34949,-0.249225 -0.72211,-0.239347 -1.12328,-0.190465 z m -39.44922,1.41796 c -1.93309,1.83595 -1.76537,5.266611 0.87081,6.321491 2.80857,0.988807 6.17065,0.846733 9.1444,0.861366 2.79909,-0.172766 4.22635,-3.289835 2.92376,-5.664738 -2.60365,-2.851635 -6.84699,-1.541752 -10.29251,-2.269899 -0.88215,0.250593 -1.76431,0.501187 -2.64646,0.75178 z"
-     style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;writing-mode:lr-tb;direction:ltr;baseline-shift:baseline;text-anchor:start;white-space:normal;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#0a3d91;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:7.55;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:7.55, 22.65;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" />
-  <path
-     d="m 252.50083,112.08988 11.6563,-11.45156 -17.12592,-19.790888 0.0193,25.792048 -9.14185,-9.24454 -3.12531,3.09064 11.5214,11.58063 -11.49773,11.30756 c 3.03061,3.05593 0,0 3.03061,3.05593 l 9.18921,-8.97308 c 0.0443,4.73517 0.004,27.16515 0.004,27.16515 l 17.10224,-20.77257 z m -1.07721,-19.570428 6.79869,7.863838 -6.79869,6.63278 z m -0.0237,40.027828 0.0237,-15.39623 6.89338,6.9879 z"
-     id="path1536"
-     style="display:inline;opacity:1;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:0.254891"
-     sodipodi:nodetypes="ccccccccccccccccccccc" />
+     d="m 143.67921,27.5571 c -1.59043,2.623831 0.18153,5.574737 2.78461,6.642714 2.69504,1.572445 6.1706,4.987176 9.14793,2.232151 2.23313,-2.039515 0.60129,-5.727894 -2.04109,-6.67035 -3.06433,-1.676733 -6.55172,-5.514807 -9.89145,-2.204515 z M 351.7046,27.12937 c -2.76779,1.960623 -7.06819,2.694997 -8.37782,6.042717 -0.64195,2.73095 1.93572,4.99255 4.58419,4.426453 3.2021,-1.637914 7.05658,-2.8424 9.17849,-5.94769 0.56931,-2.60435 -1.49324,-5.35066 -4.26769,-4.745697 -0.41558,-0.107679 -0.76003,0.03505 -1.11717,0.224217 z m -26.76172,13.17187 c -2.93431,1.708015 -7.32039,1.922759 -8.93076,5.153004 -0.90775,2.654328 1.43202,5.159236 4.12365,4.861044 3.35587,-1.304271 7.31954,-2.112696 9.73662,-5.002268 0.81368,-2.537666 -0.97658,-5.469583 -3.79644,-5.128908 -0.4035,-0.14574 -0.75969,-0.03824 -1.13307,0.117128 z m -155.23633,2.46289 c -1.21948,2.711869 0.75683,5.460507 3.4437,6.14538 2.85847,1.080772 6.66937,4.11785 9.31224,1.23392 2.3151,-2.03652 0.33929,-5.835383 -2.40983,-6.41823 -3.32833,-1.175814 -7.38479,-4.713633 -10.34611,-0.96107 z m 127.27344,7.61719 c -3.12289,1.309174 -7.49226,0.970678 -9.49244,3.970097 -1.23184,2.518748 0.7727,5.298264 3.48037,5.339749 3.48706,-0.907308 7.56742,-1.1128 10.30314,-3.739116 1.11397,-2.422222 -0.31199,-5.546068 -3.1516,-5.551016 -0.3827,-0.195662 -0.75023,-0.126964 -1.13947,-0.01971 z m -97.49023,1.54492 c -2.22858,1.461838 -2.68005,4.865948 -0.27553,6.376909 2.5869,1.470583 5.91459,1.954941 8.83971,2.495346 2.78485,0.332188 4.74603,-2.479173 3.89118,-5.048668 -2.04264,-3.279676 -6.47206,-2.73364 -9.71704,-4.089227 -0.91277,0.08855 -1.82555,0.177093 -2.73832,0.26564 z m 68.51367,4.50782 c -3.27623,0.788856 -7.46081,-0.187875 -9.93635,2.381992 -1.64972,2.268076 -0.15709,5.353662 2.50432,5.86185 3.61172,-0.292365 7.71764,0.09072 10.84009,-2.093962 1.46245,-2.227649 0.52336,-5.531725 -2.28478,-5.959415 -0.34949,-0.249225 -0.72211,-0.239347 -1.12328,-0.190465 z m -39.44922,1.41796 c -1.93309,1.83595 -1.76537,5.266611 0.87081,6.321491 2.80857,0.988807 6.17065,0.846733 9.1444,0.861366 2.79909,-0.172766 4.22635,-3.289835 2.92376,-5.664738 -2.60365,-2.851635 -6.84699,-1.541752 -10.29251,-2.269899 -0.88215,0.250593 -1.76431,0.501187 -2.64646,0.75178 z"
+     style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;white-space:normal;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#0a3d91;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:7.55000019;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:7.55, 22.65;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" />
 </svg>
--- a/briar-android/artwork/share_app.svg
+++ b/briar-android/artwork/share_app.svg
@@ -1,83 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:cc="http://creativecommons.org/ns#"
-	xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg"
-	xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-	xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" width="256" height="204"
-	viewBox="0 0 256 204" fill="none" version="1.1" id="svg42" sodipodi:docname="share_app.svg"
-	inkscape:version="1.0.2 (e86c870879, 2021-01-15)">
-	<metadata id="metadata48">
-		<rdf:RDF>
-			<cc:Work rdf:about="">
-				<dc:format>image/svg+xml</dc:format>
-				<dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-				<dc:title></dc:title>
-			</cc:Work>
-		</rdf:RDF>
-	</metadata>
-	<defs id="defs46" />
-	<sodipodi:namedview pagecolor="#000000" bordercolor="#666666" borderopacity="1"
-		objecttolerance="10" gridtolerance="10" guidetolerance="10" inkscape:pageopacity="0"
-		inkscape:pageshadow="2" inkscape:window-width="1920" inkscape:window-height="964"
-		id="namedview44" showgrid="false" inkscape:zoom="2.4705882" inkscape:cx="123.34752"
-		inkscape:cy="83.759737" inkscape:window-x="1920" inkscape:window-y="72"
-		inkscape:window-maximized="0" inkscape:current-layer="svg42" />
-	<path opacity="0.5" fill-rule="evenodd" clip-rule="evenodd"
-		d="M41.583 100.841H22.1807V102.841H52.7503V136.663H54.7503V102.841H68.0341C70.9241 102.841 73.267 105.184 73.267 108.074C73.267 112.068 76.5053 115.307 80.4999 115.307H92.727V113.307H80.4999C77.6098 113.307 75.267 110.964 75.267 108.074C75.267 104.079 72.0287 100.841 68.0341 100.841H43.583V63.6593H41.583V100.841Z"
-		fill="#657D99" id="path2" />
-	<path opacity="0.5" fill-rule="evenodd" clip-rule="evenodd"
-		d="M122.611 86.0596V46.2531H124.611V86.0596H122.611Z" fill="#657D99" id="path4" />
-	<path opacity="0.5" fill-rule="evenodd" clip-rule="evenodd"
-		d="M119.754 179.928L119.754 142.682L121.754 142.682L121.754 179.928L119.754 179.928Z"
-		fill="#657D99" id="path6" />
-	<path opacity="0.5" fill-rule="evenodd" clip-rule="evenodd"
-		d="M195.251 100.841V86.5962H193.251V113.826H148.362V115.826H194.251C198.125 115.826 201.301 118.969 201.301 122.826V127.044H203.301V122.826C203.301 118.186 199.75 114.378 195.251 113.881V102.841H233.052V100.841H195.251Z"
-		fill="#657D99" id="path8" />
-	<path fill-rule="evenodd" clip-rule="evenodd"
-		d="M32.1213 57.4112L32.8875 55.5637C33.5961 55.8576 34.3747 56.0208 35.1966 56.0208H37.0795V58.0208H35.1966C34.1072 58.0208 33.0686 57.804 32.1213 57.4112ZM48.3769 58.0208V56.0208H50.2598C51.0816 56.0208 51.8602 55.8576 52.5689 55.5637L53.335 57.4112C52.3877 57.804 51.3491 58.0208 50.2598 58.0208H48.3769ZM58.2935 36.8067H56.2935V34.9238C56.2935 34.102 56.1303 33.3234 55.8364 32.6147L57.6839 31.8486C58.0767 32.7959 58.2935 33.8345 58.2935 34.9238V36.8067ZM37.0795 26.8901H35.1966C34.1072 26.8901 33.0686 27.1069 32.1213 27.4997L32.8875 29.3472C33.5961 29.0533 34.3747 28.8901 35.1966 28.8901H37.0795V26.8901ZM27.1628 48.1042H29.1628V49.9871C29.1628 50.8089 29.326 51.5875 29.6199 52.2962L27.7724 53.0623C27.3796 52.115 27.1628 51.0764 27.1628 49.9871V48.1042ZM27.1628 44.3384H29.1628V40.5725H27.1628V44.3384ZM27.1628 36.8067H29.1628V34.9238C29.1628 34.102 29.326 33.3234 29.6199 32.6147L27.7724 31.8486C27.3796 32.7959 27.1628 33.8345 27.1628 34.9238V36.8067ZM40.8453 26.8901V28.8901H44.6111V26.8901H40.8453ZM48.3769 26.8901V28.8901H50.2598C51.0816 28.8901 51.8602 29.0533 52.5689 29.3472L53.335 27.4997C52.3877 27.1069 51.3491 26.8901 50.2598 26.8901H48.3769ZM58.2935 40.5725H56.2935V44.3383H58.2935V40.5725ZM58.2935 48.1042H56.2935V49.9871C56.2935 50.8089 56.1303 51.5875 55.8364 52.2962L57.6839 53.0623C58.0767 52.115 58.2935 51.0764 58.2935 49.9871V48.1042ZM44.6111 58.0208V56.0208H40.8453V58.0208H44.6111Z"
-		fill="#657D99" id="path10" />
-	<path fill-rule="evenodd" clip-rule="evenodd"
-		d="M112.487 40.4256L112.875 38.4636C113.41 38.5694 113.964 38.6251 114.533 38.6251H116.99V40.6251H114.533C113.833 40.6251 113.149 40.5565 112.487 40.4256ZM131.733 40.6251V38.6251H134.191C134.76 38.6251 135.314 38.5694 135.848 38.4636L136.237 40.4256C135.575 40.5565 134.891 40.6251 134.191 40.6251H131.733ZM140.016 38.8593L138.903 37.1973C139.829 36.5774 140.627 35.7797 141.247 34.8536L142.909 35.9663C142.143 37.1095 141.159 38.0939 140.016 38.8593ZM144.674 12.9411H142.674V10.4839C142.674 9.91475 142.619 9.36059 142.513 8.82599L144.475 8.43785C144.606 9.0996 144.674 9.78374 144.674 10.4839V12.9411ZM142.909 4.65889L141.247 5.77152C140.627 4.84548 139.829 4.04776 138.903 3.42779L140.016 1.76585C141.159 2.53126 142.143 3.5156 142.909 4.65889ZM116.99 0H114.533C113.833 0 113.149 0.0686375 112.487 0.199551L112.875 2.16153C113.41 2.05577 113.964 2 114.533 2H116.99V0ZM108.708 1.76585L109.821 3.42779C108.895 4.04776 108.097 4.84548 107.477 5.77152L105.815 4.65888C106.581 3.5156 107.565 2.53126 108.708 1.76585ZM104.049 27.6841H106.049V30.1412C106.049 30.7104 106.105 31.2645 106.211 31.7992L104.249 32.1873C104.118 31.5255 104.049 30.8414 104.049 30.1412V27.6841ZM105.815 35.9663L107.477 34.8536C108.097 35.7797 108.895 36.5774 109.821 37.1973L108.708 38.8593C107.565 38.0939 106.581 37.1095 105.815 35.9663ZM104.049 22.7697H106.049V17.8554H104.049V22.7697ZM104.049 12.9411H106.049V10.4839C106.049 9.91475 106.105 9.36059 106.211 8.82598L104.249 8.43785C104.118 9.09959 104.049 9.78374 104.049 10.4839V12.9411ZM121.905 0V2H126.819V0H121.905ZM131.733 0V2H134.191C134.76 2 135.314 2.05577 135.848 2.16153L136.237 0.199552C135.575 0.0686377 134.891 0 134.191 0H131.733ZM144.674 17.8554H142.674V22.7697H144.674V17.8554ZM144.674 27.6841H142.674V30.1412C142.674 30.7104 142.619 31.2645 142.513 31.7992L144.475 32.1873C144.606 31.5255 144.674 30.8414 144.674 30.1412V27.6841ZM126.819 40.6251V38.6251H121.905V40.6251H126.819Z"
-		fill="#657D99" id="path12" />
-	<path fill-rule="evenodd" clip-rule="evenodd"
-		d="M183.397 81.9904L184.163 80.1429C184.902 80.4493 185.714 80.6194 186.57 80.6194H188.513V82.6194H186.57C185.446 82.6194 184.375 82.3957 183.397 81.9904ZM200.171 82.6194V80.6194H202.114C202.97 80.6194 203.782 80.4493 204.521 80.1429L205.287 81.9904C204.309 82.3957 203.238 82.6194 202.114 82.6194H200.171ZM210.403 60.7295H208.403V58.7866C208.403 57.9301 208.233 57.1184 207.927 56.3795L209.774 55.6134C210.18 56.5908 210.403 57.6626 210.403 58.7866V60.7295ZM188.513 50.4969H186.57C185.446 50.4969 184.375 50.7207 183.397 51.126L184.163 52.9734C184.902 52.667 185.714 52.4969 186.57 52.4969H188.513V50.4969ZM178.281 72.3869H180.281V74.3297C180.281 75.1863 180.451 75.998 180.757 76.7368L178.91 77.5029C178.504 76.5255 178.281 75.4538 178.281 74.3297V72.3869ZM178.281 68.5011H180.281V64.6153H178.281V68.5011ZM178.281 60.7295H180.281V58.7866C180.281 57.9301 180.451 57.1184 180.757 56.3795L178.91 55.6134C178.504 56.5908 178.281 57.6626 178.281 58.7866V60.7295ZM192.399 50.4969V52.4969H196.285V50.4969H192.399ZM200.171 50.4969V52.4969H202.114C202.97 52.4969 203.782 52.667 204.521 52.9734L205.287 51.126C204.309 50.7207 203.238 50.4969 202.114 50.4969H200.171ZM210.403 64.6153H208.403V68.5011H210.403V64.6153ZM210.403 72.3869H208.403V74.3297C208.403 75.1863 208.233 75.998 207.927 76.7368L209.774 77.5029C210.18 76.5255 210.403 75.4538 210.403 74.3297V72.3869ZM196.285 82.6194V80.6194H192.399V82.6194H196.285Z"
-		fill="#657D99" id="path14" />
-	<path fill-rule="evenodd" clip-rule="evenodd"
-		d="M188.271 180.562L188.659 178.6C189.316 178.73 189.996 178.798 190.694 178.798H192.633V180.798H190.694C189.865 180.798 189.055 180.717 188.271 180.562ZM212.029 180.798V178.798H213.968C214.666 178.798 215.346 178.73 216.003 178.6L216.391 180.562C215.607 180.717 214.797 180.798 213.968 180.798H212.029ZM220.865 178.708L219.753 177.046C220.889 176.285 221.868 175.306 222.629 174.17L224.291 175.282C223.384 176.636 222.219 177.801 220.865 178.708ZM226.381 147.05H224.381V145.111C224.381 144.413 224.313 143.733 224.183 143.077L226.145 142.688C226.3 143.472 226.381 144.282 226.381 145.111V147.05ZM224.291 138.214L222.629 139.327C221.868 138.19 220.889 137.211 219.753 136.451L220.865 134.789C222.219 135.695 223.384 136.86 224.291 138.214ZM192.633 132.698H190.694C189.865 132.698 189.055 132.779 188.271 132.934L188.659 134.896C189.316 134.766 189.996 134.698 190.694 134.698H192.633V132.698ZM183.797 134.789L184.91 136.451C183.773 137.211 182.794 138.19 182.033 139.327L180.372 138.214C181.278 136.86 182.443 135.695 183.797 134.789ZM178.281 166.446H180.281V168.385C180.281 169.083 180.349 169.763 180.479 170.42L178.517 170.808C178.362 170.024 178.281 169.214 178.281 168.385V166.446ZM180.372 175.282L182.033 174.17C182.794 175.306 183.773 176.285 184.91 177.046L183.797 178.708C182.443 177.801 181.278 176.636 180.372 175.282ZM178.281 162.567H180.281V158.688H178.281V162.567ZM178.281 154.809H180.281V150.93H178.281V154.809ZM178.281 147.05H180.281V145.111C180.281 144.413 180.349 143.733 180.479 143.077L178.517 142.688C178.362 143.472 178.281 144.282 178.281 145.111V147.05ZM196.512 132.698V134.698H200.392V132.698H196.512ZM204.271 132.698V134.698H208.15V132.698H204.271ZM212.029 132.698V134.698H213.968C214.666 134.698 215.346 134.766 216.003 134.896L216.391 132.934C215.607 132.779 214.797 132.698 213.968 132.698H212.029ZM226.381 150.93H224.381V154.809H226.381V150.93ZM226.381 158.688H224.381V162.567H226.381V158.688ZM226.381 166.446H224.381V168.385C224.381 169.083 224.313 169.763 224.183 170.42L226.145 170.808C226.3 170.024 226.381 169.214 226.381 168.385V166.446ZM208.15 180.798V178.798H204.271V180.798H208.15ZM200.392 180.798V178.798H196.512V180.798H200.392Z"
-		fill="#657D99" id="path16" />
-	<path fill-rule="evenodd" clip-rule="evenodd"
-		d="M40.3891 175.457L41.1552 173.609C41.9338 173.932 42.7892 174.111 43.6915 174.111H45.7134V176.111H43.6915C42.5217 176.111 41.4063 175.878 40.3891 175.457ZM57.8451 176.111V174.111H59.8671C60.7693 174.111 61.6247 173.932 62.4033 173.609L63.1694 175.457C62.1522 175.878 61.0368 176.111 59.8671 176.111H57.8451ZM68.4941 153.33H66.4941V151.309C66.4941 150.406 66.3149 149.551 65.992 148.772L67.8395 148.006C68.2613 149.023 68.4941 150.139 68.4941 151.309V153.33ZM45.7134 142.682H43.6915C42.5217 142.682 41.4063 142.914 40.3891 143.336L41.1552 145.184C41.9338 144.861 42.7892 144.682 43.6915 144.682H45.7134V142.682ZM35.0645 165.462H37.0645V167.484C37.0645 168.386 37.2437 169.242 37.5665 170.02L35.7191 170.786C35.2973 169.769 35.0645 168.654 35.0645 167.484V165.462ZM35.0645 161.418H37.0645V157.374H35.0645V161.418ZM35.0645 153.33H37.0645V151.309C37.0645 150.406 37.2437 149.551 37.5665 148.772L35.7191 148.006C35.2973 149.023 35.0645 150.139 35.0645 151.309V153.33ZM49.7573 142.682V144.682H53.8012V142.682H49.7573ZM57.8451 142.682V144.682H59.8671C60.7693 144.682 61.6247 144.861 62.4033 145.184L63.1694 143.336C62.1522 142.914 61.0368 142.682 59.8671 142.682H57.8451ZM68.4941 157.374H66.4941V161.418H68.4941V157.374ZM68.4941 165.462H66.4941V167.484C66.4941 168.386 66.3149 169.242 65.992 170.02L67.8395 170.786C68.2613 169.769 68.4941 168.654 68.4941 167.484V165.462ZM53.8012 176.111V174.111H49.7573V176.111H53.8012Z"
-		fill="#657D99" id="path18" />
-	<path fill-rule="evenodd" clip-rule="evenodd"
-		d="M2.84 110.802L3.60611 108.954C3.91005 109.081 4.24493 109.151 4.60133 109.151H6.75821V111.151H4.60133C3.97743 111.151 3.38253 111.027 2.84 110.802ZM11.072 111.151V109.151H13.2288C13.5852 109.151 13.9201 109.081 14.2241 108.954L14.9902 110.802C14.4476 111.027 13.8527 111.151 13.2288 111.151H11.072ZM17.8302 100.079H15.8302V97.9223C15.8302 97.5659 15.7596 97.231 15.6336 96.927L17.481 96.1609C17.706 96.7035 17.8302 97.2984 17.8302 97.9223V100.079ZM6.75821 93.3209H4.60133C3.97743 93.3209 3.38253 93.4451 2.84 93.6701L3.60611 95.5175C3.91005 95.3915 4.24493 95.3209 4.60133 95.3209H6.75821V93.3209ZM0 104.393H2V106.55C2 106.906 2.07056 107.241 2.1966 107.545L0.349152 108.311C0.124172 107.769 0 107.174 0 106.55V104.393ZM0 100.079H2V97.9223C2 97.5659 2.07056 97.231 2.1966 96.927L0.349152 96.1609C0.124172 96.7035 0 97.2984 0 97.9223V100.079ZM11.072 93.3209V95.3209H13.2288C13.5852 95.3209 13.9201 95.3915 14.2241 95.5175L14.9902 93.6701C14.4476 93.4451 13.8527 93.3209 13.2288 93.3209H11.072ZM17.8302 104.393H15.8302V106.55C15.8302 106.906 15.7596 107.241 15.6336 107.545L17.481 108.311C17.706 107.769 17.8302 107.174 17.8302 106.55V104.393Z"
-		fill="#657D99" id="path20" />
-	<path fill-rule="evenodd" clip-rule="evenodd"
-		d="M114.745 202.969L115.511 201.122C115.815 201.248 116.149 201.318 116.506 201.318H118.663V203.318H116.506C115.882 203.318 115.287 203.194 114.745 202.969ZM122.977 203.318V201.318H125.133C125.49 201.318 125.825 201.248 126.129 201.122L126.895 202.969C126.352 203.194 125.757 203.318 125.133 203.318H122.977ZM129.735 192.246H127.735V190.09C127.735 189.733 127.664 189.398 127.538 189.094L129.386 188.328C129.611 188.871 129.735 189.466 129.735 190.09V192.246ZM118.663 185.488H116.506C115.882 185.488 115.287 185.612 114.745 185.837L115.511 187.685C115.815 187.559 116.149 187.488 116.506 187.488H118.663V185.488ZM111.905 196.56H113.905V198.717C113.905 199.074 113.975 199.408 114.101 199.712L112.254 200.478C112.029 199.936 111.905 199.341 111.905 198.717V196.56ZM111.905 192.246H113.905V190.09C113.905 189.733 113.975 189.398 114.101 189.094L112.254 188.328C112.029 188.871 111.905 189.466 111.905 190.09V192.246ZM122.977 185.488V187.488H125.133C125.49 187.488 125.825 187.559 126.129 187.685L126.895 185.837C126.352 185.612 125.757 185.488 125.133 185.488H122.977ZM129.735 196.56H127.735V198.717C127.735 199.074 127.664 199.408 127.538 199.712L129.386 200.478C129.611 199.936 129.735 199.341 129.735 198.717V196.56Z"
-		fill="#657D99" id="path22" />
-	<path fill-rule="evenodd" clip-rule="evenodd"
-		d="M240.444 110.802L241.21 108.954C241.514 109.081 241.849 109.151 242.205 109.151H244.362V111.151H242.205C241.581 111.151 240.987 111.027 240.444 110.802ZM248.676 111.151V109.151H250.833C251.189 109.151 251.524 109.081 251.828 108.954L252.594 110.802C252.052 111.027 251.457 111.151 250.833 111.151H248.676ZM255.434 100.079H253.434V97.9223C253.434 97.5659 253.364 97.231 253.238 96.927L255.085 96.1609C255.31 96.7035 255.434 97.2984 255.434 97.9223V100.079ZM244.362 93.3209H242.205C241.581 93.3209 240.987 93.4451 240.444 93.6701L241.21 95.5175C241.514 95.3915 241.849 95.3209 242.205 95.3209H244.362V93.3209ZM237.604 104.393H239.604V106.55C239.604 106.906 239.675 107.241 239.801 107.545L237.953 108.311C237.728 107.769 237.604 107.174 237.604 106.55V104.393ZM237.604 100.079H239.604V97.9223C239.604 97.5659 239.675 97.231 239.801 96.927L237.953 96.1609C237.728 96.7035 237.604 97.2984 237.604 97.9223V100.079ZM248.676 93.3209V95.3209H250.833C251.189 95.3209 251.524 95.3915 251.828 95.5175L252.594 93.6701C252.052 93.4451 251.457 93.3209 250.833 93.3209H248.676ZM255.434 104.393H253.434V106.55C253.434 106.906 253.364 107.241 253.238 107.545L255.085 108.311C255.31 107.769 255.434 107.174 255.434 106.55V104.393Z"
-		fill="#657D99" id="path24" />
-	<path
-		d="M108.75 109.808V129.511C108.75 131.11 110.052 132.429 111.668 132.429H113.036C114.636 132.429 115.955 131.11 115.955 129.511V109.808H108.75V109.808Z"
-		fill="#87C214" id="path26" />
-	<path
-		d="M115.938 100.312V96.6023C115.938 95.003 114.636 93.684 113.036 93.684H111.668C110.069 93.684 108.75 95.003 108.75 96.6023V100.312H115.938V100.312Z"
-		fill="#87C214" id="path28" />
-	<path
-		d="M131.931 116.305V96.6023C131.931 95.003 130.628 93.684 129.029 93.684H127.66C126.061 93.684 124.742 95.003 124.742 96.6023V116.305H131.931V116.305Z"
-		fill="#87C214" id="path30" />
-	<path
-		d="M124.742 125.801V129.511C124.742 131.11 126.061 132.429 127.66 132.429H129.029C130.628 132.429 131.947 131.11 131.947 129.511V125.801H124.742Z"
-		fill="#87C214" id="path32" />
-	<path
-		d="M107.595 117.459H103.886C102.286 117.459 100.967 118.761 100.967 120.377V121.746C100.967 123.345 102.27 124.664 103.886 124.664H107.595V117.459Z"
-		fill="#95D220" id="path34" />
-	<path
-		d="M136.795 117.459H117.092V124.664H136.795C138.394 124.664 139.713 123.345 139.713 121.746V120.377C139.713 118.761 138.394 117.459 136.795 117.459Z"
-		fill="#95D220" id="path36" />
-	<path
-		d="M123.588 101.466H103.886C102.286 101.466 100.967 102.769 100.967 104.385V105.753C100.967 107.352 102.27 108.671 103.886 108.671H123.588V101.466Z"
-		fill="#95D220" id="path38" />
-	<path
-		d="M136.795 101.466H133.085V108.671H136.795C138.394 108.671 139.713 107.369 139.713 105.753V104.384C139.713 102.769 138.394 101.466 136.795 101.466Z"
-		fill="#95D220" id="path40" />
-</svg>
--- a/briar-android/build.gradle
+++ b/briar-android/build.gradle
@@ -1,5 +1,4 @@
 apply plugin: 'com.android.application'
-apply plugin: 'checkstyle'
 apply plugin: 'witness'
 apply from: 'witness.gradle'

@@ -27,8 +26,8 @@ android {
 	defaultConfig {
 		minSdkVersion 16
 		targetSdkVersion 30
-		versionCode 10401
-		versionName "1.4.1"
+		versionCode 10306
+		versionName "1.3.6"
 		applicationId "org.briarproject.briar.android"

 		vectorDrawables.useSupportLibrary = true
--- a/briar-android/src/main/AndroidManifest.xml
+++ b/briar-android/src/main/AndroidManifest.xml
@@ -462,17 +462,6 @@
 			android:label="@string/hotspot_title"
 			android:theme="@style/BriarTheme" />

-		<activity
-			android:name=".android.contact.connect.ConnectViaBluetoothActivity"
-			android:exported="false"
-			android:label="@string/connect_via_bluetooth_title"
-			android:parentActivityName="org.briarproject.briar.android.conversation.ConversationActivity"
-			android:theme="@style/BriarTheme">
-			<meta-data
-				android:name="android.support.PARENT_ACTIVITY"
-				android:value="org.briarproject.briar.android.conversation.ConversationActivity" />
-		</activity>
-
 	</application>

 	<queries>
--- a/briar-android/src/main/java/org/briarproject/briar/android/AndroidComponent.java
+++ b/briar-android/src/main/java/org/briarproject/briar/android/AndroidComponent.java
@@ -35,7 +35,6 @@ import org.briarproject.briar.BriarCoreEagerSingletons;
 import org.briarproject.briar.BriarCoreModule;
 import org.briarproject.briar.android.attachment.AttachmentModule;
 import org.briarproject.briar.android.attachment.media.MediaModule;
-import org.briarproject.briar.android.contact.connect.BluetoothIntroFragment;
 import org.briarproject.briar.android.conversation.glide.BriarModelLoader;
 import org.briarproject.briar.android.hotspot.AbstractTabsFragment;
 import org.briarproject.briar.android.hotspot.FallbackFragment;
@@ -237,6 +236,4 @@ public interface AndroidComponent
 	void inject(SendFragment sendFragment);

 	void inject(ReceiveFragment receiveFragment);
-
-	void inject(BluetoothIntroFragment bluetoothIntroFragment);
 }
--- a/briar-android/src/main/java/org/briarproject/briar/android/AppModule.java
+++ b/briar-android/src/main/java/org/briarproject/briar/android/AppModule.java
@@ -18,9 +18,7 @@ import org.briarproject.bramble.api.nullsafety.NotNullByDefault;
 import org.briarproject.bramble.api.plugin.BluetoothConstants;
 import org.briarproject.bramble.api.plugin.LanTcpConstants;
 import org.briarproject.bramble.api.plugin.PluginConfig;
-import org.briarproject.bramble.api.plugin.TorControlPort;
 import org.briarproject.bramble.api.plugin.TorDirectory;
-import org.briarproject.bramble.api.plugin.TorSocksPort;
 import org.briarproject.bramble.api.plugin.TransportId;
 import org.briarproject.bramble.api.plugin.duplex.DuplexPluginFactory;
 import org.briarproject.bramble.api.plugin.simplex.SimplexPluginFactory;
@@ -37,7 +35,6 @@ import org.briarproject.briar.android.account.SetupModule;
 import org.briarproject.briar.android.blog.BlogModule;
 import org.briarproject.briar.android.contact.ContactListModule;
 import org.briarproject.briar.android.contact.add.nearby.AddNearbyContactModule;
-import org.briarproject.briar.android.contact.connect.ConnectViaBluetoothModule;
 import org.briarproject.briar.android.forum.ForumModule;
 import org.briarproject.briar.android.hotspot.HotspotModule;
 import org.briarproject.briar.android.introduction.IntroductionModule;
@@ -76,8 +73,6 @@ import static java.util.Arrays.asList;
 import static java.util.Collections.emptyList;
 import static java.util.Collections.singletonList;
 import static java.util.Collections.singletonMap;
-import static org.briarproject.bramble.api.plugin.TorConstants.DEFAULT_CONTROL_PORT;
-import static org.briarproject.bramble.api.plugin.TorConstants.DEFAULT_SOCKS_PORT;
 import static org.briarproject.bramble.api.reporting.ReportingConstants.DEV_ONION_ADDRESS;
 import static org.briarproject.bramble.api.reporting.ReportingConstants.DEV_PUBLIC_KEY_HEX;
 import static org.briarproject.briar.android.TestingConstants.IS_DEBUG_BUILD;
@@ -94,7 +89,6 @@ import static org.briarproject.briar.android.TestingConstants.IS_DEBUG_BUILD;
 		DevReportModule.class,
 		ContactListModule.class,
 		IntroductionModule.class,
-		ConnectViaBluetoothModule.class,
 		// below need to be within same scope as ViewModelProvider.Factory
 		BlogModule.class,
 		ForumModule.class,
@@ -159,28 +153,6 @@ public class AppModule {
 		return app.getDir("tor", MODE_PRIVATE);
 	}

-	@Provides
-	@Singleton
-	@TorSocksPort
-	int provideTorSocksPort() {
-		if (!IS_DEBUG_BUILD) {
-			return DEFAULT_SOCKS_PORT;
-		} else {
-			return DEFAULT_SOCKS_PORT + 2;
-		}
-	}
-
-	@Provides
-	@Singleton
-	@TorControlPort
-	int provideTorControlPort() {
-		if (!IS_DEBUG_BUILD) {
-			return DEFAULT_CONTROL_PORT;
-		} else {
-			return DEFAULT_CONTROL_PORT + 2;
-		}
-	}
-
 	@Provides
 	@Singleton
 	PluginConfig providePluginConfig(AndroidBluetoothPluginFactory bluetooth,
@@ -197,8 +169,11 @@ public class AppModule {

 			@Override
 			public Collection<SimplexPluginFactory> getSimplexFactories() {
-				if (SDK_INT >= 19) return singletonList(drive);
-				else return emptyList();
+				if (SDK_INT >= 19 && featureFlags.shouldEnableTransferData()) {
+					return singletonList(drive);
+				} else {
+					return emptyList();
+				}
 			}

 			@Override
@@ -335,6 +310,21 @@ public class AppModule {
 			public boolean shouldEnableDisappearingMessages() {
 				return true;
 			}
+
+			@Override
+			public boolean shouldEnableConnectViaBluetooth() {
+				return IS_DEBUG_BUILD;
+			}
+
+			@Override
+			public boolean shouldEnableTransferData() {
+				return IS_DEBUG_BUILD;
+			}
+
+			@Override
+			public boolean shouldEnableShareAppViaOfflineHotspot() {
+				return IS_DEBUG_BUILD;
+			}
 		};
 	}
 }
--- a/briar-android/src/main/java/org/briarproject/briar/android/activity/ActivityComponent.java
+++ b/briar-android/src/main/java/org/briarproject/briar/android/activity/ActivityComponent.java
@@ -28,8 +28,8 @@ import org.briarproject.briar.android.contact.add.remote.AddContactActivity;
 import org.briarproject.briar.android.contact.add.remote.LinkExchangeFragment;
 import org.briarproject.briar.android.contact.add.remote.NicknameFragment;
 import org.briarproject.briar.android.contact.add.remote.PendingContactListActivity;
-import org.briarproject.briar.android.contact.connect.ConnectViaBluetoothActivity;
 import org.briarproject.briar.android.conversation.AliasDialogFragment;
+import org.briarproject.briar.android.conversation.BluetoothConnecterDialogFragment;
 import org.briarproject.briar.android.conversation.ConversationActivity;
 import org.briarproject.briar.android.conversation.ConversationSettingsDialog;
 import org.briarproject.briar.android.conversation.ImageActivity;
@@ -238,6 +238,9 @@ public interface ActivityComponent {

 	void inject(ConversationSettingsDialog dialog);

+	void inject(
+			BluetoothConnecterDialogFragment bluetoothConnecterDialogFragment);
+
 	void inject(RssFeedImportFragment fragment);

 	void inject(RssFeedManageFragment fragment);
@@ -245,6 +248,4 @@ public interface ActivityComponent {
 	void inject(RssFeedImportFailedDialogFragment fragment);

 	void inject(RssFeedDeleteFeedDialogFragment fragment);
-
-	void inject(ConnectViaBluetoothActivity connectViaBluetoothActivity);
 }
--- a/briar-android/src/main/java/org/briarproject/briar/android/contact/connect/BluetoothConditionManager.java
+++ b/briar-android/src/main/java/org/briarproject/briar/android/contact/connect/BluetoothConditionManager.java
@@ -1,87 +0,0 @@
-package org.briarproject.briar.android.contact.connect;
-
-import android.app.Activity;
-import android.content.Context;
-
-import org.briarproject.briar.R;
-
-import androidx.activity.result.ActivityResultLauncher;
-import androidx.annotation.Nullable;
-import androidx.annotation.UiThread;
-import androidx.appcompat.app.AlertDialog;
-
-import static android.Manifest.permission.ACCESS_FINE_LOCATION;
-import static android.os.Build.VERSION.SDK_INT;
-import static androidx.core.app.ActivityCompat.shouldShowRequestPermissionRationale;
-import static org.briarproject.briar.android.util.UiUtils.getGoToSettingsListener;
-import static org.briarproject.briar.android.util.UiUtils.isLocationEnabled;
-import static org.briarproject.briar.android.util.UiUtils.showLocationDialog;
-
-class BluetoothConditionManager {
-
-	private enum Permission {
-		UNKNOWN, GRANTED, SHOW_RATIONALE, PERMANENTLY_DENIED
-	}
-
-	private Permission locationPermission = Permission.UNKNOWN;
-
-	/**
-	 * Call this when the using activity or fragment starts,
-	 * because permissions might have changed while it was stopped.
-	 */
-	void reset() {
-		locationPermission = Permission.UNKNOWN;
-	}
-
-	@UiThread
-	void onLocationPermissionResult(Activity activity,
-			@Nullable Boolean result) {
-		if (result != null && result) {
-			locationPermission = Permission.GRANTED;
-		} else if (shouldShowRequestPermissionRationale(activity,
-				ACCESS_FINE_LOCATION)) {
-			locationPermission = Permission.SHOW_RATIONALE;
-		} else {
-			locationPermission = Permission.PERMANENTLY_DENIED;
-		}
-	}
-
-	boolean areRequirementsFulfilled(Context ctx,
-			ActivityResultLauncher<String> permissionRequest,
-			Runnable onLocationDenied) {
-		boolean permissionGranted =
-				SDK_INT < 23 || locationPermission == Permission.GRANTED;
-		boolean locationEnabled = isLocationEnabled(ctx);
-		if (permissionGranted && locationEnabled) return true;
-
-		if (locationPermission == Permission.PERMANENTLY_DENIED) {
-			showDenialDialog(ctx, onLocationDenied);
-		} else if (locationPermission == Permission.SHOW_RATIONALE) {
-			showRationale(ctx, permissionRequest);
-		} else if (!locationEnabled) {
-			showLocationDialog(ctx);
-		}
-		return false;
-	}
-
-	private void showDenialDialog(Context ctx, Runnable onLocationDenied) {
-		new AlertDialog.Builder(ctx, R.style.BriarDialogTheme)
-				.setTitle(R.string.permission_location_title)
-				.setMessage(R.string.permission_location_denied_body)
-				.setPositiveButton(R.string.ok, getGoToSettingsListener(ctx))
-				.setNegativeButton(R.string.cancel, (v, d) ->
-						onLocationDenied.run())
-				.show();
-	}
-
-	private void showRationale(Context ctx,
-			ActivityResultLauncher<String> permissionRequest) {
-		new AlertDialog.Builder(ctx, R.style.BriarDialogTheme)
-				.setTitle(R.string.permission_location_title)
-				.setMessage(R.string.permission_location_request_body)
-				.setPositiveButton(R.string.ok, (dialog, which) ->
-						permissionRequest.launch(ACCESS_FINE_LOCATION))
-				.show();
-	}
-
-}
--- a/briar-android/src/main/java/org/briarproject/briar/android/contact/connect/BluetoothIntroFragment.java
+++ b/briar-android/src/main/java/org/briarproject/briar/android/contact/connect/BluetoothIntroFragment.java
@@ -1,109 +0,0 @@
-package org.briarproject.briar.android.contact.connect;
-
-import android.app.Activity;
-import android.content.Context;
-import android.os.Bundle;
-import android.view.LayoutInflater;
-import android.view.View;
-import android.view.ViewGroup;
-import android.widget.Button;
-import android.widget.Toast;
-
-import org.briarproject.bramble.api.nullsafety.MethodsNotNullByDefault;
-import org.briarproject.bramble.api.nullsafety.ParametersNotNullByDefault;
-import org.briarproject.briar.R;
-import org.briarproject.briar.android.util.ActivityLaunchers.RequestBluetoothDiscoverable;
-
-import javax.inject.Inject;
-
-import androidx.activity.result.ActivityResultLauncher;
-import androidx.activity.result.contract.ActivityResultContracts.RequestPermission;
-import androidx.annotation.Nullable;
-import androidx.fragment.app.Fragment;
-import androidx.lifecycle.ViewModelProvider;
-
-import static android.Manifest.permission.ACCESS_FINE_LOCATION;
-import static android.widget.Toast.LENGTH_LONG;
-import static org.briarproject.briar.android.AppModule.getAndroidComponent;
-
-@MethodsNotNullByDefault
-@ParametersNotNullByDefault
-public class BluetoothIntroFragment extends Fragment {
-
-	final static String TAG = BluetoothIntroFragment.class.getName();
-
-	@Inject
-	ViewModelProvider.Factory viewModelFactory;
-
-	private final BluetoothConditionManager conditionManager =
-			new BluetoothConditionManager();
-	private ConnectViaBluetoothViewModel viewModel;
-
-	private final ActivityResultLauncher<Integer> bluetoothDiscoverableRequest =
-			registerForActivityResult(new RequestBluetoothDiscoverable(),
-					this::onBluetoothDiscoverable);
-	private final ActivityResultLauncher<String> permissionRequest =
-			registerForActivityResult(new RequestPermission(),
-					this::onPermissionRequestResult);
-
-	@Override
-	public void onAttach(Context context) {
-		super.onAttach(context);
-		getAndroidComponent(requireContext()).inject(this);
-		viewModel = new ViewModelProvider(requireActivity(), viewModelFactory)
-				.get(ConnectViaBluetoothViewModel.class);
-	}
-
-	@Override
-	public View onCreateView(LayoutInflater inflater,
-			@Nullable ViewGroup container,
-			@Nullable Bundle savedInstanceState) {
-		return inflater
-				.inflate(R.layout.fragment_bluetooth_intro, container, false);
-	}
-
-	@Override
-	public void onViewCreated(View view, @Nullable Bundle savedInstanceState) {
-		Button startButton = view.findViewById(R.id.startButton);
-		startButton.setOnClickListener(this::onStartClicked);
-	}
-
-	@Override
-	public void onStart() {
-		super.onStart();
-		conditionManager.reset();
-	}
-
-	private void onStartClicked(View v) {
-		if (viewModel.shouldStartFlow()) {
-			// The dialog starts a permission request which comes back as true
-			// if the permission is already granted.
-			// So we can use the request as a generic entry point
-			// to the whole flow.
-			permissionRequest.launch(ACCESS_FINE_LOCATION);
-		}
-	}
-
-	private void onPermissionRequestResult(@Nullable Boolean result) {
-		Activity a = requireActivity();
-		// update permission result in BluetoothConnecter
-		conditionManager.onLocationPermissionResult(a, result);
-		// what to do when the user denies granting the location permission
-		Runnable onLocationPermissionDenied = () -> Toast.makeText(
-				requireContext(),
-				R.string.connect_via_bluetooth_no_location_permission,
-				LENGTH_LONG).show();
-		// if requirements are fulfilled, request Bluetooth discoverability
-		if (conditionManager.areRequirementsFulfilled(a, permissionRequest,
-				onLocationPermissionDenied)) {
-			bluetoothDiscoverableRequest.launch(120); // for 2min
-		}
-	}
-
-	private void onBluetoothDiscoverable(@Nullable Boolean result) {
-		if (result != null && result) {
-			viewModel.onBluetoothDiscoverable();
-		}
-	}
-
-}
--- a/briar-android/src/main/java/org/briarproject/briar/android/contact/connect/BluetoothProgressFragment.java
+++ b/briar-android/src/main/java/org/briarproject/briar/android/contact/connect/BluetoothProgressFragment.java
@@ -1,29 +0,0 @@
-package org.briarproject.briar.android.contact.connect;
-
-import android.os.Bundle;
-import android.view.LayoutInflater;
-import android.view.View;
-import android.view.ViewGroup;
-
-import org.briarproject.bramble.api.nullsafety.MethodsNotNullByDefault;
-import org.briarproject.bramble.api.nullsafety.ParametersNotNullByDefault;
-import org.briarproject.briar.R;
-
-import androidx.annotation.Nullable;
-import androidx.fragment.app.Fragment;
-
-@MethodsNotNullByDefault
-@ParametersNotNullByDefault
-public class BluetoothProgressFragment extends Fragment {
-
-	final static String TAG = BluetoothProgressFragment.class.getName();
-
-	@Override
-	public View onCreateView(LayoutInflater inflater,
-			@Nullable ViewGroup container,
-			@Nullable Bundle savedInstanceState) {
-		return inflater
-				.inflate(R.layout.fragment_bluetooth_progress, container, false);
-	}
-
-}
--- a/briar-android/src/main/java/org/briarproject/briar/android/contact/connect/ConnectViaBluetoothActivity.java
+++ b/briar-android/src/main/java/org/briarproject/briar/android/contact/connect/ConnectViaBluetoothActivity.java
@@ -1,98 +0,0 @@
-package org.briarproject.briar.android.contact.connect;
-
-import android.content.Intent;
-import android.os.Bundle;
-import android.view.MenuItem;
-import android.widget.Toast;
-
-import org.briarproject.bramble.api.contact.ContactId;
-import org.briarproject.bramble.api.nullsafety.MethodsNotNullByDefault;
-import org.briarproject.bramble.api.nullsafety.ParametersNotNullByDefault;
-import org.briarproject.briar.R;
-import org.briarproject.briar.android.activity.ActivityComponent;
-import org.briarproject.briar.android.activity.BriarActivity;
-
-import javax.inject.Inject;
-
-import androidx.annotation.NonNull;
-import androidx.annotation.Nullable;
-import androidx.fragment.app.Fragment;
-import androidx.lifecycle.ViewModelProvider;
-
-import static android.widget.Toast.LENGTH_LONG;
-import static java.util.Objects.requireNonNull;
-import static org.briarproject.briar.android.conversation.ConversationActivity.CONTACT_ID;
-import static org.briarproject.briar.android.util.UiUtils.showFragment;
-
-@MethodsNotNullByDefault
-@ParametersNotNullByDefault
-public class ConnectViaBluetoothActivity extends BriarActivity {
-
-	@Inject
-	ViewModelProvider.Factory viewModelFactory;
-
-	private ConnectViaBluetoothViewModel viewModel;
-
-	@Override
-	public void injectActivity(ActivityComponent component) {
-		component.inject(this);
-
-		viewModel = new ViewModelProvider(this, viewModelFactory)
-				.get(ConnectViaBluetoothViewModel.class);
-	}
-
-	@Override
-	public void onCreate(@Nullable Bundle savedInstanceState) {
-		super.onCreate(savedInstanceState);
-
-		Intent intent = requireNonNull(getIntent());
-		int contactId = intent.getIntExtra(CONTACT_ID, -1);
-		if (contactId == -1) throw new IllegalArgumentException("ContactId");
-		viewModel.setContactId(new ContactId(contactId));
-
-		setContentView(R.layout.activity_fragment_container);
-
-		viewModel.getState().observeEvent(this, this::onStateChanged);
-
-		if (savedInstanceState == null) {
-			Fragment f = new BluetoothIntroFragment();
-			String tag = BluetoothIntroFragment.TAG;
-			getSupportFragmentManager().beginTransaction()
-					.replace(R.id.fragmentContainer, f, tag)
-					.commitNow();
-		}
-	}
-
-	@Override
-	public void onStart() {
-		super.onStart();
-		viewModel.reset();
-	}
-
-	@Override
-	public boolean onOptionsItemSelected(@NonNull MenuItem item) {
-		if (item.getItemId() == android.R.id.home) {
-			onBackPressed();
-			return true;
-		}
-		return super.onOptionsItemSelected(item);
-	}
-
-	private void onStateChanged(ConnectViaBluetoothState state) {
-		if (state instanceof ConnectViaBluetoothState.Connecting) {
-			Fragment f = new BluetoothProgressFragment();
-			String tag = BluetoothProgressFragment.TAG;
-			showFragment(getSupportFragmentManager(), f, tag, false);
-		} else if (state instanceof ConnectViaBluetoothState.Success) {
-			Toast.makeText(this, R.string.connect_via_bluetooth_success,
-					LENGTH_LONG).show();
-			supportFinishAfterTransition();
-		} else if (state instanceof ConnectViaBluetoothState.Error) {
-			Toast.makeText(this,
-					((ConnectViaBluetoothState.Error) state).errorRes,
-					LENGTH_LONG).show();
-			supportFinishAfterTransition();
-		} else throw new AssertionError();
-	}
-
-}
--- a/briar-android/src/main/java/org/briarproject/briar/android/contact/connect/ConnectViaBluetoothModule.java
+++ b/briar-android/src/main/java/org/briarproject/briar/android/contact/connect/ConnectViaBluetoothModule.java
@@ -1,19 +0,0 @@
-package org.briarproject.briar.android.contact.connect;
-
-import org.briarproject.briar.android.viewmodel.ViewModelKey;
-
-import androidx.lifecycle.ViewModel;
-import dagger.Binds;
-import dagger.Module;
-import dagger.multibindings.IntoMap;
-
-@Module
-public abstract class ConnectViaBluetoothModule {
-
-	@Binds
-	@IntoMap
-	@ViewModelKey(ConnectViaBluetoothViewModel.class)
-	abstract ViewModel bindContactListViewModel(
-			ConnectViaBluetoothViewModel connectViaBluetoothViewModel);
-
-}
--- a/briar-android/src/main/java/org/briarproject/briar/android/contact/connect/ConnectViaBluetoothState.java
+++ b/briar-android/src/main/java/org/briarproject/briar/android/contact/connect/ConnectViaBluetoothState.java
@@ -1,23 +0,0 @@
-package org.briarproject.briar.android.contact.connect;
-
-import androidx.annotation.StringRes;
-
-abstract class ConnectViaBluetoothState {
-
-	static class Connecting extends ConnectViaBluetoothState {
-	}
-
-	static class Success extends ConnectViaBluetoothState {
-	}
-
-	static class Error extends ConnectViaBluetoothState {
-		@StringRes
-		final int errorRes;
-
-		Error(@StringRes int errorRes) {
-			this.errorRes = errorRes;
-		}
-	}
-
-}
-
--- a/briar-android/src/main/java/org/briarproject/briar/android/contact/connect/ConnectViaBluetoothViewModel.java
+++ b/briar-android/src/main/java/org/briarproject/briar/android/contact/connect/ConnectViaBluetoothViewModel.java
@@ -1,20 +1,19 @@
-package org.briarproject.briar.android.contact.connect;
+package org.briarproject.briar.android.conversation;

+import android.app.Activity;
 import android.app.Application;
 import android.bluetooth.BluetoothAdapter;
+import android.content.Context;
+import android.widget.Toast;

 import org.briarproject.bramble.api.connection.ConnectionManager;
 import org.briarproject.bramble.api.connection.ConnectionRegistry;
 import org.briarproject.bramble.api.contact.ContactId;
-import org.briarproject.bramble.api.db.DatabaseExecutor;
 import org.briarproject.bramble.api.db.DbException;
-import org.briarproject.bramble.api.db.TransactionManager;
 import org.briarproject.bramble.api.event.Event;
 import org.briarproject.bramble.api.event.EventBus;
 import org.briarproject.bramble.api.event.EventListener;
 import org.briarproject.bramble.api.lifecycle.IoExecutor;
-import org.briarproject.bramble.api.lifecycle.LifecycleManager;
-import org.briarproject.bramble.api.nullsafety.NotNullByDefault;
 import org.briarproject.bramble.api.plugin.PluginManager;
 import org.briarproject.bramble.api.plugin.duplex.DuplexTransportConnection;
 import org.briarproject.bramble.api.plugin.event.ConnectionOpenedEvent;
@@ -22,22 +21,23 @@ import org.briarproject.bramble.api.properties.TransportPropertyManager;
 import org.briarproject.bramble.api.system.AndroidExecutor;
 import org.briarproject.bramble.plugin.bluetooth.BluetoothPlugin;
 import org.briarproject.briar.R;
-import org.briarproject.briar.android.contact.connect.ConnectViaBluetoothState.Connecting;
-import org.briarproject.briar.android.contact.connect.ConnectViaBluetoothState.Success;
-import org.briarproject.briar.android.viewmodel.DbViewModel;
-import org.briarproject.briar.android.viewmodel.LiveEvent;
-import org.briarproject.briar.android.viewmodel.MutableLiveEvent;
+import org.briarproject.briar.android.contact.ContactItem;

 import java.util.concurrent.Executor;
 import java.util.logging.Logger;

-import javax.annotation.Nullable;
 import javax.inject.Inject;

+import androidx.activity.result.ActivityResultLauncher;
 import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.annotation.StringRes;
 import androidx.annotation.UiThread;
+import androidx.appcompat.app.AlertDialog;

-import static java.util.Objects.requireNonNull;
+import static android.Manifest.permission.ACCESS_FINE_LOCATION;
+import static android.os.Build.VERSION.SDK_INT;
+import static androidx.core.app.ActivityCompat.shouldShowRequestPermissionRationale;
 import static java.util.concurrent.TimeUnit.SECONDS;
 import static java.util.logging.Level.WARNING;
 import static java.util.logging.Logger.getLogger;
@@ -46,50 +46,48 @@ import static org.briarproject.bramble.api.plugin.BluetoothConstants.PROP_UUID;
 import static org.briarproject.bramble.api.plugin.Plugin.State.ACTIVE;
 import static org.briarproject.bramble.util.LogUtils.logException;
 import static org.briarproject.bramble.util.StringUtils.isNullOrEmpty;
+import static org.briarproject.briar.android.util.UiUtils.getGoToSettingsListener;
+import static org.briarproject.briar.android.util.UiUtils.isLocationEnabled;
+import static org.briarproject.briar.android.util.UiUtils.showLocationDialog;

-@UiThread
-@NotNullByDefault
-class ConnectViaBluetoothViewModel extends DbViewModel implements
-		EventListener {
+class BluetoothConnecter implements EventListener {

-	private final Logger LOG =
-			getLogger(ConnectViaBluetoothViewModel.class.getName());
+	private final Logger LOG = getLogger(BluetoothConnecter.class.getName());

 	private final long BT_ACTIVE_TIMEOUT = SECONDS.toMillis(5);

+	private enum Permission {
+		UNKNOWN, GRANTED, SHOW_RATIONALE, PERMANENTLY_DENIED
+	}
+
+	private final Application app;
 	private final PluginManager pluginManager;
 	private final Executor ioExecutor;
+	private final AndroidExecutor androidExecutor;
 	private final ConnectionRegistry connectionRegistry;
-	@Nullable
 	private final BluetoothAdapter bt = BluetoothAdapter.getDefaultAdapter();
 	private final EventBus eventBus;
 	private final TransportPropertyManager transportPropertyManager;
 	private final ConnectionManager connectionManager;

-	@Nullable
 	private volatile BluetoothPlugin bluetoothPlugin;
-	@Nullable
+
+	private Permission locationPermission = Permission.UNKNOWN;
 	private ContactId contactId = null;

-	private final MutableLiveEvent<ConnectViaBluetoothState> state =
-			new MutableLiveEvent<>();
-
 	@Inject
-	ConnectViaBluetoothViewModel(
-			Application app,
-			@DatabaseExecutor Executor dbExecutor,
-			LifecycleManager lifecycleManager,
-			TransactionManager db,
-			AndroidExecutor androidExecutor,
+	BluetoothConnecter(Application app,
 			PluginManager pluginManager,
 			@IoExecutor Executor ioExecutor,
+			AndroidExecutor androidExecutor,
 			ConnectionRegistry connectionRegistry,
 			EventBus eventBus,
 			TransportPropertyManager transportPropertyManager,
 			ConnectionManager connectionManager) {
-		super(app, dbExecutor, lifecycleManager, db, androidExecutor);
+		this.app = app;
 		this.pluginManager = pluginManager;
 		this.ioExecutor = ioExecutor;
+		this.androidExecutor = androidExecutor;
 		this.bluetoothPlugin = (BluetoothPlugin) pluginManager.getPlugin(ID);
 		this.connectionRegistry = connectionRegistry;
 		this.eventBus = eventBus;
@@ -97,22 +95,20 @@ class ConnectViaBluetoothViewModel extends DbViewModel implements
 		this.connectionManager = connectionManager;
 	}

-	@Override
-	protected void onCleared() {
-		stopConnecting();
+	boolean isConnectedViaBluetooth(ContactId contactId) {
+		return connectionRegistry.isConnected(contactId, ID);
+	}
+
+	boolean isDiscovering() {
+		return bluetoothPlugin.isDiscovering();
 	}

 	/**
-	 * Set this as soon as it becomes available.
-	 */
-	void setContactId(ContactId contactId) {
-		this.contactId = contactId;
-	}
-
-	/**
-	 * Call this when the using activity or fragment starts.
+	 * Call this when the using activity or fragment starts,
+	 * because permissions might have changed while it was stopped.
 	 */
 	void reset() {
+		locationPermission = Permission.UNKNOWN;
 		// When this class is instantiated before we are logged in
 		// (like when returning to a killed activity), bluetoothPlugin would be
 		// null and we consider bluetooth not supported. So reset here.
@@ -120,52 +116,94 @@ class ConnectViaBluetoothViewModel extends DbViewModel implements
 	}

 	@UiThread
-	boolean shouldStartFlow() {
-		if (isBluetoothNotSupported()) {
-			state.setEvent(new ConnectViaBluetoothState.Error(
-					R.string.bt_plugin_status_inactive));
-			return false;
-		} else if (isConnectedViaBluetooth()) {
-			state.setEvent(new Success());
-			return false;
-		} else if (isDiscovering()) {
-			state.setEvent(new ConnectViaBluetoothState.Error(
-					R.string.connect_via_bluetooth_already_discovering));
-			return false;
+	void onLocationPermissionResult(Activity activity,
+			@Nullable Boolean result) {
+		if (result != null && result) {
+			locationPermission = Permission.GRANTED;
+		} else if (shouldShowRequestPermissionRationale(activity,
+				ACCESS_FINE_LOCATION)) {
+			locationPermission = Permission.SHOW_RATIONALE;
+		} else {
+			locationPermission = Permission.PERMANENTLY_DENIED;
 		}
-		return true;
 	}

-	private boolean isBluetoothNotSupported() {
+	boolean isBluetoothNotSupported() {
 		return bt == null || bluetoothPlugin == null;
 	}

-	private boolean isDiscovering() {
-		// we should not be calling this if isBluetoothNotSupported() is true
-		return requireNonNull(bluetoothPlugin).isDiscovering();
+	boolean areRequirementsFulfilled(Context ctx,
+			ActivityResultLauncher<String> permissionRequest,
+			Runnable onLocationDenied) {
+		boolean permissionGranted =
+				SDK_INT < 23 || locationPermission == Permission.GRANTED;
+		boolean locationEnabled = isLocationEnabled(ctx);
+		if (permissionGranted && locationEnabled) return true;
+
+		if (locationPermission == Permission.PERMANENTLY_DENIED) {
+			showDenialDialog(ctx, onLocationDenied);
+		} else if (locationPermission == Permission.SHOW_RATIONALE) {
+			showRationale(ctx, permissionRequest);
+		} else if (!locationEnabled) {
+			showLocationDialog(ctx);
+		}
+		return false;
 	}

-	private boolean isConnectedViaBluetooth() {
-		return connectionRegistry.isConnected(requireNonNull(contactId), ID);
+	private void showDenialDialog(Context ctx, Runnable onLocationDenied) {
+		new AlertDialog.Builder(ctx, R.style.BriarDialogTheme)
+				.setTitle(R.string.permission_location_title)
+				.setMessage(R.string.permission_location_denied_body)
+				.setPositiveButton(R.string.ok, getGoToSettingsListener(ctx))
+				.setNegativeButton(R.string.cancel, (v, d) ->
+						onLocationDenied.run())
+				.show();
+	}
+
+	private void showRationale(Context ctx,
+			ActivityResultLauncher<String> permissionRequest) {
+		new AlertDialog.Builder(ctx, R.style.BriarDialogTheme)
+				.setTitle(R.string.permission_location_title)
+				.setMessage(R.string.permission_location_request_body)
+				.setPositiveButton(R.string.ok, (dialog, which) ->
+						permissionRequest.launch(ACCESS_FINE_LOCATION))
+				.show();
 	}

 	@UiThread
-	void onBluetoothDiscoverable() {
-		ContactId contactId = requireNonNull(this.contactId);
-		BluetoothPlugin bluetoothPlugin = requireNonNull(this.bluetoothPlugin);
+	void onBluetoothDiscoverable(ContactItem contact) {
+		contactId = contact.getContact().getId();
+		connect();
+	}

-		state.setEvent(new Connecting());
+	@UiThread
+	@Override
+	public void eventOccurred(@NonNull Event e) {
+		if (e instanceof ConnectionOpenedEvent) {
+			ConnectionOpenedEvent c = (ConnectionOpenedEvent) e;
+			if (c.getContactId().equals(contactId) && c.isIncoming() &&
+					c.getTransportId() == ID) {
+				if (bluetoothPlugin != null) {
+					bluetoothPlugin.stopDiscoverAndConnect();
+				}
+				LOG.info("Contact connected to us");
+				showToast(R.string.toast_connect_via_bluetooth_success);
+			}
+		}
+	}

+	private void connect() {
 		bluetoothPlugin.disablePolling();
 		pluginManager.setPluginEnabled(ID, true);
+
 		ioExecutor.execute(() -> {
 			try {
 				if (!waitForBluetoothActive()) {
-					state.postEvent(new ConnectViaBluetoothState.Error(
-							R.string.bt_plugin_status_inactive));
+					showToast(R.string.bt_plugin_status_inactive);
 					LOG.warning("Bluetooth plugin didn't become active");
 					return;
 				}
+				showToast(R.string.toast_connect_via_bluetooth_start);
 				eventBus.addListener(this);
 				try {
 					String uuid = null;
@@ -188,7 +226,7 @@ class ConnectViaBluetoothViewModel extends DbViewModel implements
 						LOG.info("Could connect, handling connection");
 						connectionManager
 								.manageOutgoingConnection(contactId, ID, conn);
-						state.postEvent(new Success());
+						showToast(R.string.toast_connect_via_bluetooth_success);
 					}
 				} finally {
 					eventBus.removeListener(this);
@@ -199,23 +237,8 @@ class ConnectViaBluetoothViewModel extends DbViewModel implements
 		});
 	}

-	@UiThread
-	@Override
-	public void eventOccurred(@NonNull Event e) {
-		if (e instanceof ConnectionOpenedEvent) {
-			ConnectionOpenedEvent c = (ConnectionOpenedEvent) e;
-			if (c.getContactId().equals(contactId) && c.isIncoming() &&
-					c.getTransportId() == ID) {
-				stopConnecting();
-				LOG.info("Contact connected to us");
-				state.postEvent(new Success());
-			}
-		}
-	}
-
 	@IoExecutor
 	private boolean waitForBluetoothActive() {
-		BluetoothPlugin bluetoothPlugin = requireNonNull(this.bluetoothPlugin);
 		long left = BT_ACTIVE_TIMEOUT;
 		final long sleep = 250;
 		try {
@@ -241,9 +264,9 @@ class ConnectViaBluetoothViewModel extends DbViewModel implements
 		final long sleep = 250;
 		try {
 			while (left > 0) {
-				if (isConnectedViaBluetooth()) {
+				if (isConnectedViaBluetooth(contactId)) {
 					LOG.info("Failed to connect, but contact connected");
-					// no success state needed here, as it gets shown when
+					// no Toast needed here, as it gets shown when
 					// ConnectionOpenedEvent is received
 					return;
 				}
@@ -254,19 +277,13 @@ class ConnectViaBluetoothViewModel extends DbViewModel implements
 			Thread.currentThread().interrupt();
 		}
 		LOG.warning("Failed to connect");
-		state.postEvent(new ConnectViaBluetoothState.Error(
-				R.string.connect_via_bluetooth_error));
+		showToast(R.string.toast_connect_via_bluetooth_error);
 	}

-	private void stopConnecting() {
-		BluetoothPlugin bluetoothPlugin = this.bluetoothPlugin;
-		if (bluetoothPlugin != null) {
-			bluetoothPlugin.stopDiscoverAndConnect();
-		}
-	}
-
-	LiveEvent<ConnectViaBluetoothState> getState() {
-		return state;
+	private void showToast(@StringRes int res) {
+		androidExecutor.runOnUiThread(() ->
+				Toast.makeText(app, res, Toast.LENGTH_LONG).show()
+		);
 	}

 }
--- a/briar-android/src/main/java/org/briarproject/briar/android/conversation/BluetoothConnecterDialogFragment.java
+++ b/briar-android/src/main/java/org/briarproject/briar/android/conversation/BluetoothConnecterDialogFragment.java
@@ -0,0 +1,151 @@
+package org.briarproject.briar.android.conversation;
+
+import android.app.Activity;
+import android.app.Dialog;
+import android.content.Context;
+import android.os.Bundle;
+import android.view.View;
+import android.widget.Button;
+import android.widget.Toast;
+
+import org.briarproject.bramble.api.contact.ContactId;
+import org.briarproject.bramble.api.nullsafety.MethodsNotNullByDefault;
+import org.briarproject.bramble.api.nullsafety.ParametersNotNullByDefault;
+import org.briarproject.briar.R;
+import org.briarproject.briar.android.activity.BaseActivity;
+import org.briarproject.briar.android.contact.ContactItem;
+import org.briarproject.briar.android.util.ActivityLaunchers.RequestBluetoothDiscoverable;
+
+import javax.inject.Inject;
+
+import androidx.activity.result.ActivityResultLauncher;
+import androidx.activity.result.contract.ActivityResultContracts.RequestPermission;
+import androidx.annotation.Nullable;
+import androidx.annotation.StringRes;
+import androidx.appcompat.app.AlertDialog;
+import androidx.fragment.app.DialogFragment;
+import androidx.lifecycle.ViewModelProvider;
+
+import static android.Manifest.permission.ACCESS_FINE_LOCATION;
+import static android.content.DialogInterface.BUTTON_POSITIVE;
+import static android.widget.Toast.LENGTH_LONG;
+import static java.util.Objects.requireNonNull;
+
+@MethodsNotNullByDefault
+@ParametersNotNullByDefault
+public class BluetoothConnecterDialogFragment extends DialogFragment {
+
+	final static String TAG = BluetoothConnecterDialogFragment.class.getName();
+
+	@Inject
+	ViewModelProvider.Factory viewModelFactory;
+
+	private ConversationViewModel viewModel;
+	private BluetoothConnecter bluetoothConnecter;
+
+	private final ActivityResultLauncher<Integer> bluetoothDiscoverableRequest =
+			registerForActivityResult(new RequestBluetoothDiscoverable(),
+					this::onBluetoothDiscoverable);
+	private final ActivityResultLauncher<String> permissionRequest =
+			registerForActivityResult(new RequestPermission(),
+					this::onPermissionRequestResult);
+
+	@Override
+	public void onAttach(Context ctx) {
+		super.onAttach(ctx);
+		((BaseActivity) requireActivity()).getActivityComponent().inject(this);
+		viewModel = new ViewModelProvider(requireActivity(), viewModelFactory)
+				.get(ConversationViewModel.class);
+		bluetoothConnecter = viewModel.getBluetoothConnecter();
+	}
+
+	@Override
+	public Dialog onCreateDialog(@Nullable Bundle savedInstanceState) {
+		Context ctx = requireContext();
+		return new AlertDialog.Builder(ctx, R.style.BriarDialogTheme)
+				.setTitle(R.string.dialog_title_connect_via_bluetooth)
+				.setMessage(R.string.dialog_message_connect_via_bluetooth)
+				// actual listener gets set in onResume()
+				.setPositiveButton(R.string.start, null)
+				.setNegativeButton(R.string.cancel, null)
+				.setCancelable(false) // keep it open until dismissed
+				.create();
+	}
+
+	@Override
+	public void onStart() {
+		super.onStart();
+		bluetoothConnecter.reset();
+		if (bluetoothConnecter.isBluetoothNotSupported()) {
+			showToast(R.string.toast_connect_via_bluetooth_error);
+			dismiss();
+			return;
+		}
+		// MenuItem only gets enabled after contactItem has loaded
+		ContactItem contact =
+				requireNonNull(viewModel.getContactItem().getValue());
+		ContactId contactId = contact.getContact().getId();
+		if (bluetoothConnecter.isConnectedViaBluetooth(contactId)) {
+			showToast(R.string.toast_connect_via_bluetooth_success);
+			dismiss();
+			return;
+		}
+		if (bluetoothConnecter.isDiscovering()) {
+			showToast(R.string.toast_connect_via_bluetooth_already_discovering);
+			dismiss();
+		}
+	}
+
+	@Override
+	public void onResume() {
+		super.onResume();
+		// Set the click listener for the START button here
+		// to prevent it from automatically dismissing the dialog.
+		// The dialog is shown in onStart(), so we set the listener here later.
+		AlertDialog dialog = (AlertDialog) getDialog();
+		Button positiveButton = dialog.getButton(BUTTON_POSITIVE);
+		positiveButton.setOnClickListener(this::onStartClicked);
+	}
+
+	private void onStartClicked(View v) {
+		// The dialog starts a permission request which comes back as true
+		// if the permission is already granted.
+		// So we can use the request as a generic entry point to the whole flow.
+		permissionRequest.launch(ACCESS_FINE_LOCATION);
+	}
+
+	private void onPermissionRequestResult(@Nullable Boolean result) {
+		Activity a = requireActivity();
+		// update permission result in BluetoothConnecter
+		bluetoothConnecter.onLocationPermissionResult(a, result);
+		// what to do when the user denies granting the location permission
+		Runnable onLocationPermissionDenied = () -> {
+			Toast.makeText(requireContext(),
+					R.string.toast_connect_via_bluetooth_no_location_permission,
+					LENGTH_LONG).show();
+			dismiss();
+		};
+		// if requirements are fulfilled, request Bluetooth discoverability
+		if (bluetoothConnecter.areRequirementsFulfilled(a, permissionRequest,
+				onLocationPermissionDenied)) {
+			bluetoothDiscoverableRequest.launch(120); // for 2min
+		}
+	}
+
+	private void onBluetoothDiscoverable(@Nullable Boolean result) {
+		if (result != null && result) {
+			// MenuItem only gets enabled after contactItem has loaded
+			ContactItem contact =
+					requireNonNull(viewModel.getContactItem().getValue());
+			bluetoothConnecter.onBluetoothDiscoverable(contact);
+			dismiss();
+		} else {
+			showToast(R.string.toast_connect_via_bluetooth_not_discoverable);
+		}
+	}
+
+	private void showToast(@StringRes int stringRes) {
+		Toast.makeText(requireContext(), stringRes, LENGTH_LONG).show();
+	}
+
+}
--- a/briar-android/src/main/java/org/briarproject/briar/android/conversation/ConversationActivity.java
+++ b/briar-android/src/main/java/org/briarproject/briar/android/conversation/ConversationActivity.java
@@ -48,7 +48,6 @@ import org.briarproject.briar.android.activity.BriarActivity;
 import org.briarproject.briar.android.attachment.AttachmentItem;
 import org.briarproject.briar.android.attachment.AttachmentRetriever;
 import org.briarproject.briar.android.blog.BlogActivity;
-import org.briarproject.briar.android.contact.connect.ConnectViaBluetoothActivity;
 import org.briarproject.briar.android.conversation.ConversationVisitor.AttachmentCache;
 import org.briarproject.briar.android.conversation.ConversationVisitor.TextCache;
 import org.briarproject.briar.android.forum.ForumActivity;
@@ -105,6 +104,7 @@ import androidx.appcompat.widget.Toolbar;
 import androidx.core.app.ActivityCompat;
 import androidx.core.app.ActivityOptionsCompat;
 import androidx.core.content.ContextCompat;
+import androidx.fragment.app.FragmentManager;
 import androidx.lifecycle.LiveData;
 import androidx.lifecycle.Observer;
 import androidx.lifecycle.ViewModelProvider;
@@ -379,8 +379,11 @@ public class ConversationActivity extends BriarActivity
 						this::showIntroductionOnboarding);
 			}
 		});
+		if (!featureFlags.shouldEnableConnectViaBluetooth()) {
+			menu.findItem(R.id.action_connect_via_bluetooth).setVisible(false);
+		}
 		// Transfer Data feature only supported on API 19+
-		if (SDK_INT >= 19) {
+		if (SDK_INT >= 19 && featureFlags.shouldEnableTransferData()) {
 			menu.findItem(R.id.action_transfer_data).setVisible(true);
 		}
 		// enable alias and bluetooth action once available
@@ -419,9 +422,9 @@ public class ConversationActivity extends BriarActivity
 			onAutoDeleteTimerNoticeClicked();
 			return true;
 		} else if (itemId == R.id.action_connect_via_bluetooth) {
-			Intent intent = new Intent(this, ConnectViaBluetoothActivity.class);
-			intent.putExtra(CONTACT_ID, contactId.getInt());
-			startActivity(intent);
+			FragmentManager fm = getSupportFragmentManager();
+			new BluetoothConnecterDialogFragment().show(fm,
+					BluetoothConnecterDialogFragment.TAG);
 			return true;
 		} else if (itemId == R.id.action_transfer_data) {
 			Intent intent = new Intent(this, RemovableDriveActivity.class);
--- a/briar-android/src/main/java/org/briarproject/briar/android/conversation/ConversationViewModel.java
+++ b/briar-android/src/main/java/org/briarproject/briar/android/conversation/ConversationViewModel.java
@@ -101,6 +101,7 @@ public class ConversationViewModel extends DbViewModel
 	private final AttachmentCreator attachmentCreator;
 	private final AutoDeleteManager autoDeleteManager;
 	private final ConversationManager conversationManager;
+	private final BluetoothConnecter bluetoothConnecter;

 	@Nullable
 	private ContactId contactId = null;
@@ -139,7 +140,8 @@ public class ConversationViewModel extends DbViewModel
 			AttachmentRetriever attachmentRetriever,
 			AttachmentCreator attachmentCreator,
 			AutoDeleteManager autoDeleteManager,
-			ConversationManager conversationManager) {
+			ConversationManager conversationManager,
+			BluetoothConnecter bluetoothConnecter) {
 		super(application, dbExecutor, lifecycleManager, db, androidExecutor);
 		this.db = db;
 		this.eventBus = eventBus;
@@ -152,6 +154,7 @@ public class ConversationViewModel extends DbViewModel
 		this.attachmentCreator = attachmentCreator;
 		this.autoDeleteManager = autoDeleteManager;
 		this.conversationManager = conversationManager;
+		this.bluetoothConnecter = bluetoothConnecter;
 		messagingGroupId = map(contactItem, c ->
 				messagingManager.getContactGroup(c.getContact()).getId());
 		eventBus.addListener(this);
@@ -411,6 +414,10 @@ public class ConversationViewModel extends DbViewModel
 		return attachmentRetriever;
 	}

+	BluetoothConnecter getBluetoothConnecter() {
+		return bluetoothConnecter;
+	}
+
 	LiveData<ContactItem> getContactItem() {
 		return contactItem;
 	}
--- a/briar-android/src/main/java/org/briarproject/briar/android/fragment/FinalFragment.java
+++ b/briar-android/src/main/java/org/briarproject/briar/android/fragment/FinalFragment.java
@@ -25,7 +25,6 @@ import androidx.core.widget.NestedScrollView;
 import androidx.fragment.app.Fragment;

 import static android.view.View.FOCUS_DOWN;
-import static android.view.View.GONE;

 /**
 * A fragment to be used at the end of a user flow
@@ -82,12 +81,7 @@ public class FinalFragment extends Fragment {
 		int color = getResources().getColor(args.getInt(ARG_ICON_TINT));
 		ColorStateList tint = ColorStateList.valueOf(color);
 		ImageViewCompat.setImageTintList(iconView, tint);
-		int textRes = args.getInt(ARG_TEXT);
-		if (textRes == 0) {
-			textView.setVisibility(GONE);
-		} else {
-			textView.setText(textRes);
-		}
+		textView.setText(args.getInt(ARG_TEXT));

 		buttonView.setOnClickListener(view -> onBackButtonPressed());

--- a/briar-android/src/main/java/org/briarproject/briar/android/hotspot/HotspotManager.java
+++ b/briar-android/src/main/java/org/briarproject/briar/android/hotspot/HotspotManager.java
@@ -52,7 +52,6 @@ import static java.util.Objects.requireNonNull;
 import static java.util.logging.Level.INFO;
 import static java.util.logging.Level.WARNING;
 import static java.util.logging.Logger.getLogger;
-import static org.briarproject.briar.android.util.QrCodeUtils.HOTSPOT_QRCODE_FACTOR;
 import static org.briarproject.briar.android.util.UiUtils.handleException;

@MethodsNotNullByDefault
@@ -335,8 +334,7 @@ class HotspotManager {
 		ioExecutor.execute(() -> {
 			String content = createWifiLoginString(group.getNetworkName(),
 					group.getPassphrase());
-			Bitmap qrCode = QrCodeUtils.createQrCode(
-					(int) (dm.heightPixels * HOTSPOT_QRCODE_FACTOR), content);
+			Bitmap qrCode = QrCodeUtils.createQrCode(dm, content);
 			NetworkConfig config = new NetworkConfig(group.getNetworkName(),
 					group.getPassphrase(), qrCode);
 			listener.onHotspotStarted(config);
@@ -439,8 +437,9 @@ class HotspotManager {
 		return "WIFI:S:" + ssid + ";T:WPA;P:" + password + ";;";
 	}

-	// exclude chars that are easy to confuse: 0 (O), 5 (S), 1 l (I)
-	private static final String chars = "2346789abcdefghijkmnopqrstuvwxyz";
+	// exclude chars that are easy to confuse: 0 O, 5 S, 1 l I
+	private static final String chars =
+			"2346789ABCDEFGHJKLMNPQRTUVWXYZabcdefghijkmnopqrstuvwxyz";

 	private String getRandomString(int length) {
 		char[] c = new char[length];
--- a/briar-android/src/main/java/org/briarproject/briar/android/hotspot/WebServerManager.java
+++ b/briar-android/src/main/java/org/briarproject/briar/android/hotspot/WebServerManager.java
@@ -27,7 +27,6 @@ import static java.util.logging.Logger.getLogger;
 import static org.briarproject.bramble.util.LogUtils.logException;
 import static org.briarproject.bramble.util.NetworkUtils.getNetworkInterfaces;
 import static org.briarproject.briar.android.hotspot.WebServer.PORT;
-import static org.briarproject.briar.android.util.QrCodeUtils.HOTSPOT_QRCODE_FACTOR;

@MethodsNotNullByDefault
@ParametersNotNullByDefault
@@ -84,8 +83,7 @@ class WebServerManager {
 			}
 			url = "http://" + address.getHostAddress() + ":" + PORT;
 		}
-		Bitmap qrCode = QrCodeUtils.createQrCode(
-				(int) (dm.heightPixels * HOTSPOT_QRCODE_FACTOR), url);
+		Bitmap qrCode = QrCodeUtils.createQrCode(dm, url);
 		listener.onWebServerStarted(new WebsiteConfig(url, qrCode));
 	}

--- a/briar-android/src/main/java/org/briarproject/briar/android/removabledrive/ChooserFragment.java
+++ b/briar-android/src/main/java/org/briarproject/briar/android/removabledrive/ChooserFragment.java
@@ -11,7 +11,6 @@ import android.widget.ScrollView;
 import org.briarproject.bramble.api.nullsafety.MethodsNotNullByDefault;
 import org.briarproject.bramble.api.nullsafety.ParametersNotNullByDefault;
 import org.briarproject.briar.R;
-import org.briarproject.briar.android.widget.OnboardingFullDialogFragment;

 import javax.inject.Inject;

@@ -52,10 +51,6 @@ public class ChooserFragment extends Fragment {
 				container, false);

 		scrollView = (ScrollView) v;
-
-		Button buttonLearnMore = v.findViewById(R.id.buttonLearnMore);
-		buttonLearnMore.setOnClickListener(e -> showLearnMoreDialog());
-
 		Button sendButton = v.findViewById(R.id.sendButton);
 		sendButton.setOnClickListener(i -> viewModel.startSendData());

@@ -80,10 +75,4 @@ public class ChooserFragment extends Fragment {
 		}
 	}

-	private void showLearnMoreDialog() {
-		OnboardingFullDialogFragment.newInstance(
-				R.string.removable_drive_menu_title,
-				R.string.removable_drive_explanation
-		).show(getChildFragmentManager(), OnboardingFullDialogFragment.TAG);
-	}
 }
--- a/briar-android/src/main/java/org/briarproject/briar/android/settings/SettingsFragment.java
+++ b/briar-android/src/main/java/org/briarproject/briar/android/settings/SettingsFragment.java
@@ -86,6 +86,12 @@ public class SettingsFragment extends PreferenceFragmentCompat {
 			PreferenceGroup dev = requireNonNull(findPreference(PREF_KEY_DEV));
 			dev.setVisible(false);
 		}
+
+		if (!viewModel.shouldEnableShareAppViaOfflineHotspot()) {
+			Preference shareApp =
+					requireNonNull(findPreference(PREF_KEY_SHARE_APP));
+			shareApp.setVisible(false);
+		}
 	}

 	@Override
--- a/briar-android/src/main/java/org/briarproject/briar/android/settings/SettingsViewModel.java
+++ b/briar-android/src/main/java/org/briarproject/briar/android/settings/SettingsViewModel.java
@@ -262,4 +262,8 @@ class SettingsViewModel extends DbViewModel implements EventListener {
 		return screenLockTimeout;
 	}

+	boolean shouldEnableShareAppViaOfflineHotspot() {
+		return featureFlags.shouldEnableShareAppViaOfflineHotspot();
+	}
+
 }
--- a/briar-android/src/main/java/org/briarproject/briar/android/util/QrCodeUtils.java
+++ b/briar-android/src/main/java/org/briarproject/briar/android/util/QrCodeUtils.java
@@ -26,19 +26,13 @@ public class QrCodeUtils {

 	private static final Logger LOG = getLogger(QrCodeUtils.class.getName());

-	public static final double HOTSPOT_QRCODE_FACTOR = 0.35;
-
 	@Nullable
 	public static Bitmap createQrCode(DisplayMetrics dm, String input) {
-		return createQrCode(Math.min(dm.widthPixels, dm.heightPixels), input);
-	}
-
-	@Nullable
-	public static Bitmap createQrCode(int edgeLen, String input) {
+		int smallestDimen = Math.min(dm.widthPixels, dm.heightPixels);
 		try {
 			// Generate QR code
 			BitMatrix encoded = new QRCodeWriter().encode(input, QR_CODE,
-					edgeLen, edgeLen);
+					smallestDimen, smallestDimen);
 			return renderQrCode(encoded);
 		} catch (WriterException e) {
 			logException(LOG, WARNING, e);
--- a/briar-android/src/main/res/drawable/ic_bluetooth.xml
+++ b/briar-android/src/main/res/drawable/ic_bluetooth.xml
@@ -1,21 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-	android:width="100dp"
-	android:height="35dp"
-	android:viewportWidth="500"
-	android:viewportHeight="175">
-	<path
-		android:fillColor="?attr/colorControlNormal"
-		android:pathData="m459.809,167.16 l-4.327,-4.334 -7.07,-2.427c-3.888,-1.335 -8.723,-2.996 -10.744,-3.691l-3.674,-1.263 3.524,-0.173c8.242,-0.404 12.988,-4.007 14.336,-10.884 0.796,-4.061 1.129,-17.298 0.83,-33.041 -0.153,-8.084 -0.166,-15.416 -0.028,-16.295 0.138,-0.878 0.535,-2.42 0.883,-3.426 1.222,-3.532 0.34,-11.908 -1.858,-17.631 -0.348,-0.908 -1.934,-4.215 -3.524,-7.35 -4.158,-8.2 -4.505,-8.942 -4.893,-10.484 -0.459,-1.821 -0.212,-5.435 0.463,-6.766 0.666,-1.315 2.157,-2.916 3.246,-3.487 1.299,-0.68 2.616,0.122 4.686,2.855 3.422,4.516 14.001,19.441 15.732,22.193 3.746,5.956 5.956,11.165 7.972,18.788 0.655,2.475 1.885,6.997 2.735,10.05 0.849,3.053 2.714,10.158 4.144,15.79l2.6,10.24 4.65,5.193c2.557,2.856 5.798,6.464 7.2,8.017 1.403,1.553 2.55,2.975 2.55,3.161 0,0.335 -34.5,29.299 -34.899,29.299 -0.115,0 -2.156,-1.95 -4.535,-4.334zM365.944,150.772c-1.258,-0.628 -2.206,-1.379 -2.914,-2.307 -2.089,-2.736 -1.95,2.369 -1.864,-68.482l0.078,-64.039 0.661,-1.235c1.015,-1.898 1.992,-2.911 3.74,-3.879l1.6,-0.886 37.784,-0.08c42.456,-0.089 39.402,-0.248 42.116,2.192 0.875,0.787 1.757,1.959 2.184,2.904 0.713,1.577 0.716,1.638 0.806,14.204l0.09,12.62 -1.798,-0.13c-1.426,-0.103 -2.081,0.007 -3.166,0.532 -2.013,0.974 -3.94,2.899 -5.115,5.108l-1.037,1.95 -0.007,-12.825 -0.007,-12.825h-33.6,-33.6v51.3,51.3h33.599,33.599l0.076,-34.425c0.073,-32.96 0.098,-34.361 0.591,-32.925 0.283,0.825 1.806,3.997 3.383,7.05 5.493,10.626 5.405,9.86 5.396,47.203 -0.007,27.621 -0.124,29.951 -1.662,33.109 -1.071,2.199 -2.711,3.71 -5.058,4.66l-1.674,0.677 -36.168,0.08 -36.168,0.08 -1.864,-0.931zM408.344,145.734c2.871,-1.309 4.458,-3.678 4.43,-6.617 -0.039,-4.116 -3.109,-7.223 -7.136,-7.223 -2.12,0 -3.567,0.609 -5.164,2.172 -2.245,2.198 -2.754,5.439 -1.301,8.287 0.713,1.398 2.521,3.009 3.962,3.53 1.497,0.542 3.84,0.475 5.209,-0.149z" />
-	<path
-		android:fillColor="?attr/colorControlNormal"
-		android:pathData="m39.434,167.16 l4.327,-4.334 7.07,-2.427c3.888,-1.335 8.723,-2.996 10.744,-3.691l3.674,-1.263 -3.524,-0.173c-8.242,-0.404 -12.988,-4.007 -14.336,-10.884 -0.796,-4.061 -1.129,-17.298 -0.83,-33.041 0.153,-8.084 0.166,-15.416 0.028,-16.295 -0.138,-0.878 -0.535,-2.42 -0.883,-3.426 -1.222,-3.532 -0.34,-11.908 1.858,-17.631 0.348,-0.908 1.934,-4.215 3.524,-7.35 4.158,-8.2 4.505,-8.942 4.893,-10.484 0.459,-1.821 0.212,-5.435 -0.463,-6.766 -0.666,-1.315 -2.157,-2.916 -3.246,-3.487 -1.299,-0.68 -2.616,0.122 -4.686,2.855 -3.422,4.516 -14.001,19.441 -15.732,22.193 -3.746,5.956 -5.956,11.165 -7.972,18.788 -0.655,2.475 -1.885,6.997 -2.735,10.05 -0.849,3.053 -2.714,10.158 -4.144,15.79L14.4,125.824 9.75,131.017c-2.557,2.856 -5.798,6.464 -7.2,8.017 -1.403,1.553 -2.55,2.975 -2.55,3.161 0,0.335 34.5,29.299 34.899,29.299 0.115,0 2.156,-1.95 4.535,-4.334zM133.299,150.772c1.258,-0.628 2.206,-1.379 2.914,-2.307 2.089,-2.736 1.95,2.369 1.864,-68.482l-0.078,-64.039 -0.661,-1.235c-1.015,-1.898 -1.992,-2.911 -3.74,-3.879L132,9.944 94.216,9.865c-42.456,-0.089 -39.402,-0.248 -42.116,2.192 -0.875,0.787 -1.757,1.959 -2.184,2.904 -0.713,1.577 -0.716,1.638 -0.806,14.204l-0.09,12.62 1.798,-0.13c1.426,-0.103 2.081,0.007 3.166,0.532 2.013,0.974 3.94,2.899 5.115,5.108l1.037,1.95 0.007,-12.825 0.007,-12.825h33.6,33.6v51.3,51.3L93.752,126.194 60.153,126.194l-0.076,-34.425c-0.073,-32.96 -0.098,-34.361 -0.591,-32.925 -0.283,0.825 -1.806,3.997 -3.383,7.05 -5.493,10.626 -5.405,9.86 -5.396,47.203 0.007,27.621 0.124,29.951 1.662,33.109 1.071,2.199 2.711,3.71 5.058,4.66l1.674,0.677 36.168,0.08 36.168,0.08 1.864,-0.931zM90.9,145.734c-2.871,-1.309 -4.458,-3.678 -4.43,-6.617 0.039,-4.116 3.109,-7.223 7.136,-7.223 2.12,0 3.567,0.609 5.164,2.172 2.245,2.198 2.754,5.439 1.301,8.287 -0.713,1.398 -2.521,3.009 -3.962,3.53 -1.497,0.542 -3.84,0.475 -5.209,-0.149z" />
-	<path
-		android:fillColor="#0a3d91"
-		android:pathData="m247.254,71.979h4.736c13.165,0 23.763,10.599 23.763,23.763v32.175c0,13.165 -10.599,23.763 -23.763,23.763h-4.736c-13.165,0 -23.763,-10.599 -23.763,-23.763V95.743c0,-13.165 10.599,-23.763 23.763,-23.763z" />
-	<path
-		android:fillColor="#0a3d91"
-		android:pathData="m143.679,23.557c-1.59,2.624 0.182,5.575 2.785,6.643 2.695,1.572 6.171,4.987 9.148,2.232 2.233,-2.04 0.601,-5.728 -2.041,-6.67 -3.064,-1.677 -6.552,-5.515 -9.891,-2.205zM351.705,23.129c-2.768,1.961 -7.068,2.695 -8.378,6.043 -0.642,2.731 1.936,4.993 4.584,4.426 3.202,-1.638 7.057,-2.842 9.178,-5.948 0.569,-2.604 -1.493,-5.351 -4.268,-4.746 -0.416,-0.108 -0.76,0.035 -1.117,0.224zM324.943,36.301c-2.934,1.708 -7.32,1.923 -8.931,5.153 -0.908,2.654 1.432,5.159 4.124,4.861 3.356,-1.304 7.32,-2.113 9.737,-5.002 0.814,-2.538 -0.977,-5.47 -3.796,-5.129 -0.403,-0.146 -0.76,-0.038 -1.133,0.117zM169.707,38.764c-1.219,2.712 0.757,5.461 3.444,6.145 2.858,1.081 6.669,4.118 9.312,1.234 2.315,-2.037 0.339,-5.835 -2.41,-6.418 -3.328,-1.176 -7.385,-4.714 -10.346,-0.961zM296.98,46.381c-3.123,1.309 -7.492,0.971 -9.492,3.97 -1.232,2.519 0.773,5.298 3.48,5.34 3.487,-0.907 7.567,-1.113 10.303,-3.739 1.114,-2.422 -0.312,-5.546 -3.152,-5.551 -0.383,-0.196 -0.75,-0.127 -1.139,-0.02zM199.49,47.926c-2.229,1.462 -2.68,4.866 -0.276,6.377 2.587,1.471 5.915,1.955 8.84,2.495 2.785,0.332 4.746,-2.479 3.891,-5.049 -2.043,-3.28 -6.472,-2.734 -9.717,-4.089 -0.913,0.089 -1.826,0.177 -2.738,0.266zM268.003,52.434c-3.276,0.789 -7.461,-0.188 -9.936,2.382 -1.65,2.268 -0.157,5.354 2.504,5.862 3.612,-0.292 7.718,0.091 10.84,-2.094 1.462,-2.228 0.523,-5.532 -2.285,-5.959 -0.349,-0.249 -0.722,-0.239 -1.123,-0.19zM228.554,53.852c-1.933,1.836 -1.765,5.267 0.871,6.321 2.809,0.989 6.171,0.847 9.144,0.861 2.799,-0.173 4.226,-3.29 2.924,-5.665 -2.604,-2.852 -6.847,-1.542 -10.293,-2.27 -0.882,0.251 -1.764,0.501 -2.646,0.752z" />
-	<path
-		android:fillColor="#ffffff"
-		android:pathData="m252.501,112.09 l11.656,-11.452 -17.126,-19.791 0.019,25.792 -9.142,-9.245 -3.125,3.091 11.521,11.581 -11.498,11.308c3.031,3.056 0,0 3.031,3.056l9.189,-8.973c0.044,4.735 0.004,27.165 0.004,27.165l17.102,-20.773zM251.424,92.519 L258.222,100.383 251.424,107.016zM251.4,132.547 L251.424,117.151 258.317,124.139z" />
-</vector>
--- a/briar-android/src/main/res/drawable/ic_share_app.xml
+++ b/briar-android/src/main/res/drawable/ic_share_app.xml
@@ -1,66 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-	android:width="256dp"
-	android:height="204dp"
-	android:viewportWidth="256"
-	android:viewportHeight="204">
-	<path
-		android:fillColor="#657D99"
-		android:pathData="M41.583,100.841H22.181V102.841H52.75V136.663H54.75V102.841H68.034C70.924,102.841 73.267,105.184 73.267,108.074C73.267,112.068 76.505,115.307 80.5,115.307H92.727V113.307H80.5C77.61,113.307 75.267,110.964 75.267,108.074C75.267,104.079 72.029,100.841 68.034,100.841H43.583V63.659H41.583V100.841Z" />
-	<path
-		android:fillColor="#657D99"
-		android:pathData="M122.611,86.06V46.253H124.611V86.06H122.611Z" />
-	<path
-		android:fillColor="#657D99"
-		android:pathData="M119.754,179.928L119.754,142.682L121.754,142.682L121.754,179.928L119.754,179.928Z" />
-	<path
-		android:fillColor="#657D99"
-		android:pathData="M195.251,100.841V86.596H193.251V113.826H148.362V115.826H194.251C198.125,115.826 201.301,118.969 201.301,122.826V127.044H203.301V122.826C203.301,118.186 199.75,114.378 195.251,113.881V102.841H233.052V100.841H195.251Z" />
-	<path
-		android:fillColor="#657D99"
-		android:pathData="M32.121,57.411L32.888,55.564C33.596,55.858 34.375,56.021 35.197,56.021H37.079V58.021H35.197C34.107,58.021 33.069,57.804 32.121,57.411ZM48.377,58.021V56.021H50.26C51.082,56.021 51.86,55.858 52.569,55.564L53.335,57.411C52.388,57.804 51.349,58.021 50.26,58.021H48.377ZM58.293,36.807H56.293V34.924C56.293,34.102 56.13,33.323 55.836,32.615L57.684,31.849C58.077,32.796 58.293,33.834 58.293,34.924V36.807ZM37.079,26.89H35.197C34.107,26.89 33.069,27.107 32.121,27.5L32.888,29.347C33.596,29.053 34.375,28.89 35.197,28.89H37.079V26.89ZM27.163,48.104H29.163V49.987C29.163,50.809 29.326,51.588 29.62,52.296L27.772,53.062C27.38,52.115 27.163,51.076 27.163,49.987V48.104ZM27.163,44.338H29.163V40.572H27.163V44.338ZM27.163,36.807H29.163V34.924C29.163,34.102 29.326,33.323 29.62,32.615L27.772,31.849C27.38,32.796 27.163,33.834 27.163,34.924V36.807ZM40.845,26.89V28.89H44.611V26.89H40.845ZM48.377,26.89V28.89H50.26C51.082,28.89 51.86,29.053 52.569,29.347L53.335,27.5C52.388,27.107 51.349,26.89 50.26,26.89H48.377ZM58.293,40.572H56.293V44.338H58.293V40.572ZM58.293,48.104H56.293V49.987C56.293,50.809 56.13,51.588 55.836,52.296L57.684,53.062C58.077,52.115 58.293,51.076 58.293,49.987V48.104ZM44.611,58.021V56.021H40.845V58.021H44.611Z" />
-	<path
-		android:fillColor="#657D99"
-		android:pathData="M112.487,40.426L112.875,38.464C113.41,38.569 113.964,38.625 114.533,38.625H116.99V40.625H114.533C113.833,40.625 113.149,40.556 112.487,40.426ZM131.733,40.625V38.625H134.191C134.76,38.625 135.314,38.569 135.848,38.464L136.237,40.426C135.575,40.556 134.891,40.625 134.191,40.625H131.733ZM140.016,38.859L138.903,37.197C139.829,36.577 140.627,35.78 141.247,34.854L142.909,35.966C142.143,37.11 141.159,38.094 140.016,38.859ZM144.674,12.941H142.674V10.484C142.674,9.915 142.619,9.361 142.513,8.826L144.475,8.438C144.606,9.1 144.674,9.784 144.674,10.484V12.941ZM142.909,4.659L141.247,5.772C140.627,4.845 139.829,4.048 138.903,3.428L140.016,1.766C141.159,2.531 142.143,3.516 142.909,4.659ZM116.99,0H114.533C113.833,0 113.149,0.069 112.487,0.2L112.875,2.162C113.41,2.056 113.964,2 114.533,2H116.99V0ZM108.708,1.766L109.821,3.428C108.895,4.048 108.097,4.845 107.477,5.772L105.815,4.659C106.581,3.516 107.565,2.531 108.708,1.766ZM104.049,27.684H106.049V30.141C106.049,30.71 106.105,31.264 106.211,31.799L104.249,32.187C104.118,31.525 104.049,30.841 104.049,30.141V27.684ZM105.815,35.966L107.477,34.854C108.097,35.78 108.895,36.577 109.821,37.197L108.708,38.859C107.565,38.094 106.581,37.11 105.815,35.966ZM104.049,22.77H106.049V17.855H104.049V22.77ZM104.049,12.941H106.049V10.484C106.049,9.915 106.105,9.361 106.211,8.826L104.249,8.438C104.118,9.1 104.049,9.784 104.049,10.484V12.941ZM121.905,0V2H126.819V0H121.905ZM131.733,0V2H134.191C134.76,2 135.314,2.056 135.848,2.162L136.237,0.2C135.575,0.069 134.891,0 134.191,0H131.733ZM144.674,17.855H142.674V22.77H144.674V17.855ZM144.674,27.684H142.674V30.141C142.674,30.71 142.619,31.264 142.513,31.799L144.475,32.187C144.606,31.525 144.674,30.841 144.674,30.141V27.684ZM126.819,40.625V38.625H121.905V40.625H126.819Z" />
-	<path
-		android:fillColor="#657D99"
-		android:pathData="M183.397,81.99L184.163,80.143C184.902,80.449 185.714,80.619 186.57,80.619H188.513V82.619H186.57C185.446,82.619 184.375,82.396 183.397,81.99ZM200.171,82.619V80.619H202.114C202.97,80.619 203.782,80.449 204.521,80.143L205.287,81.99C204.309,82.396 203.238,82.619 202.114,82.619H200.171ZM210.403,60.729H208.403V58.787C208.403,57.93 208.233,57.118 207.927,56.38L209.774,55.613C210.18,56.591 210.403,57.663 210.403,58.787V60.729ZM188.513,50.497H186.57C185.446,50.497 184.375,50.721 183.397,51.126L184.163,52.973C184.902,52.667 185.714,52.497 186.57,52.497H188.513V50.497ZM178.281,72.387H180.281V74.33C180.281,75.186 180.451,75.998 180.757,76.737L178.91,77.503C178.504,76.525 178.281,75.454 178.281,74.33V72.387ZM178.281,68.501H180.281V64.615H178.281V68.501ZM178.281,60.729H180.281V58.787C180.281,57.93 180.451,57.118 180.757,56.38L178.91,55.613C178.504,56.591 178.281,57.663 178.281,58.787V60.729ZM192.399,50.497V52.497H196.285V50.497H192.399ZM200.171,50.497V52.497H202.114C202.97,52.497 203.782,52.667 204.521,52.973L205.287,51.126C204.309,50.721 203.238,50.497 202.114,50.497H200.171ZM210.403,64.615H208.403V68.501H210.403V64.615ZM210.403,72.387H208.403V74.33C208.403,75.186 208.233,75.998 207.927,76.737L209.774,77.503C210.18,76.525 210.403,75.454 210.403,74.33V72.387ZM196.285,82.619V80.619H192.399V82.619H196.285Z" />
-	<path
-		android:fillColor="#657D99"
-		android:pathData="M188.271,180.562L188.659,178.6C189.316,178.73 189.996,178.798 190.694,178.798H192.633V180.798H190.694C189.865,180.798 189.055,180.717 188.271,180.562ZM212.029,180.798V178.798H213.968C214.666,178.798 215.346,178.73 216.003,178.6L216.391,180.562C215.607,180.717 214.797,180.798 213.968,180.798H212.029ZM220.865,178.708L219.753,177.046C220.889,176.285 221.868,175.306 222.629,174.17L224.291,175.282C223.384,176.636 222.219,177.801 220.865,178.708ZM226.381,147.05H224.381V145.111C224.381,144.413 224.313,143.733 224.183,143.077L226.145,142.688C226.3,143.472 226.381,144.282 226.381,145.111V147.05ZM224.291,138.214L222.629,139.327C221.868,138.19 220.889,137.211 219.753,136.451L220.865,134.789C222.219,135.695 223.384,136.86 224.291,138.214ZM192.633,132.698H190.694C189.865,132.698 189.055,132.779 188.271,132.934L188.659,134.896C189.316,134.766 189.996,134.698 190.694,134.698H192.633V132.698ZM183.797,134.789L184.91,136.451C183.773,137.211 182.794,138.19 182.033,139.327L180.372,138.214C181.278,136.86 182.443,135.695 183.797,134.789ZM178.281,166.446H180.281V168.385C180.281,169.083 180.349,169.763 180.479,170.42L178.517,170.808C178.362,170.024 178.281,169.214 178.281,168.385V166.446ZM180.372,175.282L182.033,174.17C182.794,175.306 183.773,176.285 184.91,177.046L183.797,178.708C182.443,177.801 181.278,176.636 180.372,175.282ZM178.281,162.567H180.281V158.688H178.281V162.567ZM178.281,154.809H180.281V150.93H178.281V154.809ZM178.281,147.05H180.281V145.111C180.281,144.413 180.349,143.733 180.479,143.077L178.517,142.688C178.362,143.472 178.281,144.282 178.281,145.111V147.05ZM196.512,132.698V134.698H200.392V132.698H196.512ZM204.271,132.698V134.698H208.15V132.698H204.271ZM212.029,132.698V134.698H213.968C214.666,134.698 215.346,134.766 216.003,134.896L216.391,132.934C215.607,132.779 214.797,132.698 213.968,132.698H212.029ZM226.381,150.93H224.381V154.809H226.381V150.93ZM226.381,158.688H224.381V162.567H226.381V158.688ZM226.381,166.446H224.381V168.385C224.381,169.083 224.313,169.763 224.183,170.42L226.145,170.808C226.3,170.024 226.381,169.214 226.381,168.385V166.446ZM208.15,180.798V178.798H204.271V180.798H208.15ZM200.392,180.798V178.798H196.512V180.798H200.392Z" />
-	<path
-		android:fillColor="#657D99"
-		android:pathData="M40.389,175.457L41.155,173.609C41.934,173.932 42.789,174.111 43.692,174.111H45.713V176.111H43.692C42.522,176.111 41.406,175.878 40.389,175.457ZM57.845,176.111V174.111H59.867C60.769,174.111 61.625,173.932 62.403,173.609L63.169,175.457C62.152,175.878 61.037,176.111 59.867,176.111H57.845ZM68.494,153.33H66.494V151.309C66.494,150.406 66.315,149.551 65.992,148.772L67.84,148.006C68.261,149.023 68.494,150.139 68.494,151.309V153.33ZM45.713,142.682H43.692C42.522,142.682 41.406,142.914 40.389,143.336L41.155,145.184C41.934,144.861 42.789,144.682 43.692,144.682H45.713V142.682ZM35.064,165.462H37.064V167.484C37.064,168.386 37.244,169.242 37.567,170.02L35.719,170.786C35.297,169.769 35.064,168.654 35.064,167.484V165.462ZM35.064,161.418H37.064V157.374H35.064V161.418ZM35.064,153.33H37.064V151.309C37.064,150.406 37.244,149.551 37.567,148.772L35.719,148.006C35.297,149.023 35.064,150.139 35.064,151.309V153.33ZM49.757,142.682V144.682H53.801V142.682H49.757ZM57.845,142.682V144.682H59.867C60.769,144.682 61.625,144.861 62.403,145.184L63.169,143.336C62.152,142.914 61.037,142.682 59.867,142.682H57.845ZM68.494,157.374H66.494V161.418H68.494V157.374ZM68.494,165.462H66.494V167.484C66.494,168.386 66.315,169.242 65.992,170.02L67.84,170.786C68.261,169.769 68.494,168.654 68.494,167.484V165.462ZM53.801,176.111V174.111H49.757V176.111H53.801Z" />
-	<path
-		android:fillColor="#657D99"
-		android:pathData="M2.84,110.802L3.606,108.954C3.91,109.081 4.245,109.151 4.601,109.151H6.758V111.151H4.601C3.977,111.151 3.383,111.027 2.84,110.802ZM11.072,111.151V109.151H13.229C13.585,109.151 13.92,109.081 14.224,108.954L14.99,110.802C14.448,111.027 13.853,111.151 13.229,111.151H11.072ZM17.83,100.079H15.83V97.922C15.83,97.566 15.76,97.231 15.634,96.927L17.481,96.161C17.706,96.703 17.83,97.298 17.83,97.922V100.079ZM6.758,93.321H4.601C3.977,93.321 3.383,93.445 2.84,93.67L3.606,95.518C3.91,95.392 4.245,95.321 4.601,95.321H6.758V93.321ZM0,104.393H2V106.55C2,106.906 2.071,107.241 2.197,107.545L0.349,108.311C0.124,107.769 0,107.174 0,106.55V104.393ZM0,100.079H2V97.922C2,97.566 2.071,97.231 2.197,96.927L0.349,96.161C0.124,96.703 0,97.298 0,97.922V100.079ZM11.072,93.321V95.321H13.229C13.585,95.321 13.92,95.392 14.224,95.518L14.99,93.67C14.448,93.445 13.853,93.321 13.229,93.321H11.072ZM17.83,104.393H15.83V106.55C15.83,106.906 15.76,107.241 15.634,107.545L17.481,108.311C17.706,107.769 17.83,107.174 17.83,106.55V104.393Z" />
-	<path
-		android:fillColor="#657D99"
-		android:pathData="M114.745,202.969L115.511,201.122C115.815,201.248 116.149,201.318 116.506,201.318H118.663V203.318H116.506C115.882,203.318 115.287,203.194 114.745,202.969ZM122.977,203.318V201.318H125.133C125.49,201.318 125.825,201.248 126.129,201.122L126.895,202.969C126.352,203.194 125.757,203.318 125.133,203.318H122.977ZM129.735,192.246H127.735V190.09C127.735,189.733 127.664,189.398 127.538,189.094L129.386,188.328C129.611,188.871 129.735,189.466 129.735,190.09V192.246ZM118.663,185.488H116.506C115.882,185.488 115.287,185.612 114.745,185.837L115.511,187.685C115.815,187.559 116.149,187.488 116.506,187.488H118.663V185.488ZM111.905,196.56H113.905V198.717C113.905,199.074 113.975,199.408 114.101,199.712L112.254,200.478C112.029,199.936 111.905,199.341 111.905,198.717V196.56ZM111.905,192.246H113.905V190.09C113.905,189.733 113.975,189.398 114.101,189.094L112.254,188.328C112.029,188.871 111.905,189.466 111.905,190.09V192.246ZM122.977,185.488V187.488H125.133C125.49,187.488 125.825,187.559 126.129,187.685L126.895,185.837C126.352,185.612 125.757,185.488 125.133,185.488H122.977ZM129.735,196.56H127.735V198.717C127.735,199.074 127.664,199.408 127.538,199.712L129.386,200.478C129.611,199.936 129.735,199.341 129.735,198.717V196.56Z" />
-	<path
-		android:fillColor="#657D99"
-		android:pathData="M240.444,110.802L241.21,108.954C241.514,109.081 241.849,109.151 242.205,109.151H244.362V111.151H242.205C241.581,111.151 240.987,111.027 240.444,110.802ZM248.676,111.151V109.151H250.833C251.189,109.151 251.524,109.081 251.828,108.954L252.594,110.802C252.052,111.027 251.457,111.151 250.833,111.151H248.676ZM255.434,100.079H253.434V97.922C253.434,97.566 253.364,97.231 253.238,96.927L255.085,96.161C255.31,96.703 255.434,97.298 255.434,97.922V100.079ZM244.362,93.321H242.205C241.581,93.321 240.987,93.445 240.444,93.67L241.21,95.518C241.514,95.392 241.849,95.321 242.205,95.321H244.362V93.321ZM237.604,104.393H239.604V106.55C239.604,106.906 239.675,107.241 239.801,107.545L237.953,108.311C237.728,107.769 237.604,107.174 237.604,106.55V104.393ZM237.604,100.079H239.604V97.922C239.604,97.566 239.675,97.231 239.801,96.927L237.953,96.161C237.728,96.703 237.604,97.298 237.604,97.922V100.079ZM248.676,93.321V95.321H250.833C251.189,95.321 251.524,95.392 251.828,95.518L252.594,93.67C252.052,93.445 251.457,93.321 250.833,93.321H248.676ZM255.434,104.393H253.434V106.55C253.434,106.906 253.364,107.241 253.238,107.545L255.085,108.311C255.31,107.769 255.434,107.174 255.434,106.55V104.393Z" />
-	<path
-		android:fillColor="#87C214"
-		android:pathData="M108.75,109.808V129.511C108.75,131.11 110.052,132.429 111.668,132.429H113.036C114.636,132.429 115.955,131.11 115.955,129.511V109.808H108.75V109.808Z" />
-	<path
-		android:fillColor="#87C214"
-		android:pathData="M115.938,100.312V96.602C115.938,95.003 114.636,93.684 113.036,93.684H111.668C110.069,93.684 108.75,95.003 108.75,96.602V100.312H115.938V100.312Z" />
-	<path
-		android:fillColor="#87C214"
-		android:pathData="M131.931,116.305V96.602C131.931,95.003 130.628,93.684 129.029,93.684H127.66C126.061,93.684 124.742,95.003 124.742,96.602V116.305H131.931V116.305Z" />
-	<path
-		android:fillColor="#87C214"
-		android:pathData="M124.742,125.801V129.511C124.742,131.11 126.061,132.429 127.66,132.429H129.029C130.628,132.429 131.947,131.11 131.947,129.511V125.801H124.742Z" />
-	<path
-		android:fillColor="#95D220"
-		android:pathData="M107.595,117.459H103.886C102.286,117.459 100.967,118.761 100.967,120.377V121.746C100.967,123.345 102.27,124.664 103.886,124.664H107.595V117.459Z" />
-	<path
-		android:fillColor="#95D220"
-		android:pathData="M136.795,117.459H117.092V124.664H136.795C138.394,124.664 139.713,123.345 139.713,121.746V120.377C139.713,118.761 138.394,117.459 136.795,117.459Z" />
-	<path
-		android:fillColor="#95D220"
-		android:pathData="M123.588,101.466H103.886C102.286,101.466 100.967,102.769 100.967,104.385V105.753C100.967,107.352 102.27,108.671 103.886,108.671H123.588V101.466Z" />
-	<path
-		android:fillColor="#95D220"
-		android:pathData="M136.795,101.466H133.085V108.671H136.795C138.394,108.671 139.713,107.369 139.713,105.753V104.384C139.713,102.769 138.394,101.466 136.795,101.466Z" />
-</vector>
--- a/briar-android/src/main/res/layout/fragment_bluetooth_intro.xml
+++ b/briar-android/src/main/res/layout/fragment_bluetooth_intro.xml
@@ -1,51 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
-	xmlns:app="http://schemas.android.com/apk/res-auto"
-	xmlns:tools="http://schemas.android.com/tools"
-	android:layout_width="match_parent"
-	android:layout_height="match_parent"
-	android:fillViewport="true"
-	tools:context=".android.contact.connect.BluetoothIntroFragment">
-
-	<androidx.constraintlayout.widget.ConstraintLayout
-		android:layout_width="match_parent"
-		android:layout_height="wrap_content">
-
-		<androidx.appcompat.widget.AppCompatImageView
-			android:id="@+id/introImageView"
-			android:layout_width="0dp"
-			android:layout_height="0dp"
-			android:layout_margin="16dp"
-			app:layout_constraintBottom_toTopOf="@+id/introTextView"
-			app:layout_constraintEnd_toEndOf="parent"
-			app:layout_constraintHeight_percent="0.2"
-			app:layout_constraintStart_toStartOf="parent"
-			app:layout_constraintTop_toTopOf="parent"
-			app:srcCompat="@drawable/ic_bluetooth" />
-
-		<TextView
-			android:id="@+id/introTextView"
-			android:layout_width="0dp"
-			android:layout_height="wrap_content"
-			android:layout_margin="16dp"
-			android:text="@string/connect_via_bluetooth_intro"
-			app:layout_constraintBottom_toTopOf="@+id/startButton"
-			app:layout_constraintEnd_toEndOf="parent"
-			app:layout_constraintHorizontal_bias="0.5"
-			app:layout_constraintStart_toStartOf="parent"
-			app:layout_constraintTop_toBottomOf="@+id/introImageView" />
-
-		<Button
-			android:id="@+id/startButton"
-			style="@style/BriarButton"
-			android:layout_width="0dp"
-			android:layout_height="wrap_content"
-			android:layout_margin="16dp"
-			android:text="@string/start"
-			app:layout_constraintBottom_toBottomOf="parent"
-			app:layout_constraintEnd_toEndOf="parent"
-			app:layout_constraintStart_toStartOf="parent" />
-
-	</androidx.constraintlayout.widget.ConstraintLayout>
-
-</ScrollView>
--- a/briar-android/src/main/res/layout/fragment_bluetooth_progress.xml
+++ b/briar-android/src/main/res/layout/fragment_bluetooth_progress.xml
@@ -1,43 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
-	xmlns:app="http://schemas.android.com/apk/res-auto"
-	android:layout_width="match_parent"
-	android:layout_height="match_parent">
-
-	<androidx.appcompat.widget.AppCompatImageView
-		android:id="@+id/introImageView"
-		android:layout_width="0dp"
-		android:layout_height="0dp"
-		android:layout_margin="16dp"
-		app:layout_constraintBottom_toTopOf="@+id/progressBar"
-		app:layout_constraintEnd_toEndOf="parent"
-		app:layout_constraintHeight_percent="0.2"
-		app:layout_constraintStart_toStartOf="parent"
-		app:layout_constraintTop_toTopOf="parent"
-		app:layout_constraintVertical_chainStyle="packed"
-		app:srcCompat="@drawable/ic_bluetooth" />
-
-	<ProgressBar
-		android:id="@+id/progressBar"
-		style="?android:attr/progressBarStyleHorizontal"
-		android:layout_width="0dp"
-		android:layout_height="wrap_content"
-		android:indeterminate="true"
-		app:layout_constraintBottom_toTopOf="@+id/textView"
-		app:layout_constraintEnd_toEndOf="@+id/introImageView"
-		app:layout_constraintStart_toStartOf="@+id/introImageView"
-		app:layout_constraintTop_toBottomOf="@+id/introImageView" />
-
-	<TextView
-		android:id="@+id/textView"
-		android:layout_width="0dp"
-		android:layout_height="wrap_content"
-		android:layout_margin="16dp"
-		android:gravity="center"
-		android:text="@string/connect_via_bluetooth_start"
-		app:layout_constraintBottom_toBottomOf="parent"
-		app:layout_constraintEnd_toEndOf="parent"
-		app:layout_constraintStart_toStartOf="parent"
-		app:layout_constraintTop_toBottomOf="@+id/progressBar" />
-
-</androidx.constraintlayout.widget.ConstraintLayout>
--- a/briar-android/src/main/res/layout/fragment_hotspot_help.xml
+++ b/briar-android/src/main/res/layout/fragment_hotspot_help.xml
@@ -47,19 +47,6 @@
 			app:layout_constraintStart_toStartOf="parent"
 			app:layout_constraintTop_toBottomOf="@+id/wifi1View" />

-		<androidx.appcompat.widget.AppCompatTextView
-			android:id="@+id/wifi3View"
-			android:layout_width="0dp"
-			android:layout_height="wrap_content"
-			android:layout_marginTop="6dp"
-			android:drawablePadding="6dp"
-			android:text="@string/hotspot_help_wifi_3"
-			app:drawableLeftCompat="@drawable/ic_circle_small"
-			app:drawableStartCompat="@drawable/ic_circle_small"
-			app:layout_constraintEnd_toEndOf="parent"
-			app:layout_constraintStart_toStartOf="parent"
-			app:layout_constraintTop_toBottomOf="@+id/wifi2View" />
-
 		<TextView
 			android:id="@+id/siteTitleView"
 			android:layout_width="0dp"
@@ -70,7 +57,7 @@
 			android:textStyle="bold"
 			app:layout_constraintEnd_toEndOf="parent"
 			app:layout_constraintStart_toStartOf="parent"
-			app:layout_constraintTop_toBottomOf="@+id/wifi3View" />
+			app:layout_constraintTop_toBottomOf="@+id/wifi2View" />

 		<TextView
 			android:id="@+id/site1View"
--- a/briar-android/src/main/res/layout/fragment_hotspot_intro.xml
+++ b/briar-android/src/main/res/layout/fragment_hotspot_intro.xml
@@ -14,8 +14,8 @@

 		<ImageView
 			android:id="@+id/imageView"
-			android:layout_width="@dimen/hero_rect_width"
-			android:layout_height="@dimen/hero_rect_width"
+			android:layout_width="@dimen/hero_square"
+			android:layout_height="@dimen/hero_square"
 			android:layout_marginHorizontal="@dimen/margin_xlarge"
 			android:layout_marginTop="@dimen/margin_xlarge"
 			app:layout_constraintBottom_toTopOf="@+id/introView"
@@ -24,7 +24,7 @@
 			app:layout_constraintTop_toTopOf="parent"
 			app:layout_constraintVertical_bias="0.25"
 			app:layout_constraintVertical_chainStyle="packed"
-			app:srcCompat="@drawable/ic_share_app"
+			app:srcCompat="@drawable/ic_wifi_tethering"
 			tools:ignore="ContentDescription" />

 		<TextView
--- a/briar-android/src/main/res/layout/fragment_hotspot_manual.xml
+++ b/briar-android/src/main/res/layout/fragment_hotspot_manual.xml
@@ -4,7 +4,6 @@
 	xmlns:tools="http://schemas.android.com/tools"
 	android:layout_width="match_parent"
 	android:layout_height="match_parent"
-	android:scrollbars="vertical"
 	android:fillViewport="true">

 	<androidx.constraintlayout.widget.ConstraintLayout
--- a/briar-android/src/main/res/layout/fragment_hotspot_qr.xml
+++ b/briar-android/src/main/res/layout/fragment_hotspot_qr.xml
@@ -4,7 +4,6 @@
 	xmlns:tools="http://schemas.android.com/tools"
 	android:layout_width="match_parent"
 	android:layout_height="match_parent"
-	android:scrollbars="vertical"
 	android:fillViewport="true">

 	<androidx.constraintlayout.widget.ConstraintLayout
--- a/briar-android/src/main/res/layout/fragment_onboarding_full.xml
+++ b/briar-android/src/main/res/layout/fragment_onboarding_full.xml
@@ -20,7 +20,6 @@
 		android:layout_width="match_parent"
 		android:layout_height="0dp"
 		android:layout_weight="1"
-		android:scrollbars="vertical"
 		android:fillViewport="true">

 		<androidx.constraintlayout.widget.ConstraintLayout
--- a/briar-android/src/main/res/layout/fragment_transfer_data_chooser.xml
+++ b/briar-android/src/main/res/layout/fragment_transfer_data_chooser.xml
@@ -31,28 +31,14 @@
 			android:layout_height="wrap_content"
 			android:layout_marginHorizontal="@dimen/margin_xlarge"
 			android:layout_marginTop="@dimen/margin_xlarge"
+			android:layout_marginBottom="@dimen/margin_large"
 			android:text="@string/removable_drive_intro"
 			android:textAppearance="@style/TextAppearance.MaterialComponents.Body1"
-			app:layout_constraintBottom_toTopOf="@+id/buttonLearnMore"
+			app:layout_constraintBottom_toTopOf="@+id/sendButton"
 			app:layout_constraintEnd_toEndOf="parent"
 			app:layout_constraintStart_toStartOf="parent"
 			app:layout_constraintTop_toBottomOf="@+id/imageView" />

-		<Button
-			android:id="@+id/buttonLearnMore"
-			style="@style/BriarButtonFlat.Positive"
-			android:layout_width="wrap_content"
-			android:layout_height="wrap_content"
-			android:layout_marginBottom="@dimen/margin_large"
-			android:padding="16dp"
-			android:text="@string/learn_more"
-			android:textAllCaps="false"
-			android:textSize="14sp"
-			app:layout_constraintBottom_toTopOf="@id/sendButton"
-			app:layout_constraintEnd_toEndOf="parent"
-			app:layout_constraintStart_toStartOf="parent"
-			app:layout_constraintTop_toBottomOf="@+id/introView" />
-
 		<Button
 			android:id="@+id/sendButton"
 			style="@style/BriarButton"
--- a/briar-android/src/main/res/values-ar/strings.xml
+++ b/briar-android/src/main/res/values-ar/strings.xml
@@ -1,5 +1,5 @@
 <?xml version='1.0' encoding='UTF-8'?>
-<resources>
+<resources xmlns:tools="http://schemas.android.com/tools">
  <!--Setup-->
  <string name="setup_title">مرحبًا بك في Briar (براير)</string>
  <string name="setup_name_explanation">سيتم إظهار اسمك المستعار بجانب كل ما تنشره من محتوى. لا يمكنك تغيير الاسم بعد إنشاء حسابك.</string>
@@ -175,7 +175,7 @@
  <string name="set_contact_alias">تعديل إسم جهة الاتصال</string>
  <string name="set_contact_alias_hint">اسم جهة الاتصال</string>
  <string name="menu_item_connect_via_bluetooth">الإتصال عبر بلوتوث</string>
-  <string name="connect_via_bluetooth_title">الإتصال عبر بلوتوث</string>
+  <string name="dialog_title_connect_via_bluetooth">الإتصال عبر بلوتوث</string>
  <!--The first placeholder will show a duration like "7 days". The second placeholder at the end will add "Tap to learn more."-->
  <!--The placeholder at the end will add "Tap to learn more."-->
  <!--The first placeholder will show a contact's name. The second placeholder will show a duration like "7 days". The third placeholder at the end will add "Tap to learn more."-->
--- a/briar-android/src/main/res/values-bg/strings.xml
+++ b/briar-android/src/main/res/values-bg/strings.xml
@@ -2,7 +2,7 @@
 <resources xmlns:tools="http://schemas.android.com/tools">
  <!--Setup-->
  <string name="setup_title">Добре дошли в Briar</string>
-  <string name="setup_name_explanation">Прякорът ще бъде видим до всяка ваша публикация. Няма да можете да го промените след като създадете профила си.</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>
@@ -40,12 +40,13 @@
  <string name="forgotten_password">Забравена парола</string>
  <string name="dialog_title_lost_password">Забравена парола</string>
  <string name="dialog_message_lost_password">Профилът в Briar се съхранява шифриран на вашето устройство, а не в облака и за това паролата не може да бъде сменена. Желаете ли да профилът да бъде премахнат и да бъде направен нов?\n\nВнимание: Профилът, контактите и съобщенията ще бъдат безвъзвратно загубени.</string>
+  <string name="startup_failed_notification_title">Briar не можа да стартира</string>
+  <string name="startup_failed_notification_text">Докоснете за повече информация.</string>
  <string name="startup_failed_activity_title">Неуспешно стартиране</string>
-  <string name="startup_failed_clock_error">Briar не може да стартира, защото часовника на устройството не е верен.\n\nСверете часовника и пробвайте отново.</string>
-  <string name="startup_failed_db_error">Briar не може да отвори банката от данни с вашия профил, контакти и всички съобщения.\n\nИнсталирайте последното издание и пробвайте отново или създайте нов профил, избирайки „Забравена парола“ от екрана за вход.</string>
-  <string name="startup_failed_data_too_old_error">Профилът е създаден с по-ранно издание на приложението и не може да бъде отворен с текущото издание. Или инсталирайте по-ранното издание, или създайте нов профил, избирайки „Забравена парола“ от екрана за вход.</string>
-  <string name="startup_failed_data_too_new_error">Профилът е създаден с по-ново издание на приложението и не може да бъде отворен с текущото издание.\n\nОбновете до последно издание и опитайте отново.</string>
-  <string name="startup_failed_service_error">Briar не може да стартира задължителна приставка.\n\nОбновете до последно издание и опитайте отново.</string>
+  <string name="startup_failed_db_error">По някаква причина банката от данни на Briar е непоправимо повредена. Вашият профил, данни и всичките ви контакти са загубени. За жалост, се налага да преинсталирате Briar или да създадете нов профил, избирайки „Забравена парола“ от екрана за вход.</string>
+  <string name="startup_failed_data_too_old_error">Вашия профил е създаден със по-ранно издание на приложението и не може да бъде отворен. Трябва или да инсталирате по-ранното издание или да създадете нов профил, избирайки „Забравена парола“ от екрана за вход.</string>
+  <string name="startup_failed_data_too_new_error">Тава издание на приложението е твърде старо. Обновете до последно издание и опитайте отново.</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>
@@ -128,7 +129,7 @@
  <string name="ok">Добре</string>
  <string name="cancel">Отказ</string>
  <string name="got_it">Разбрах</string>
-  <string name="delete">Премахване</string>
+  <string name="delete">Изтриване</string>
  <string name="accept">Приемане</string>
  <string name="decline">Отказване</string>
  <string name="online">На линия</string>
@@ -138,7 +139,6 @@
  <string name="open">Отваряне</string>
  <string name="change">Променяне</string>
  <string name="start">Старт</string>
-  <string name="finish">Край</string>
  <string name="no_data">Няма данни</string>
  <string name="ellipsis">...</string>
  <string name="text_too_long">Въведеният текст е твърде дълъг</string>
@@ -148,7 +148,6 @@
  <string name="sorry">Съжаляваме</string>
  <string name="error_start_activity">Недостъпно на вашата система</string>
  <string name="status_heading">Състояние</string>
-  <string name="error">Грешка</string>
  <!--Contacts and Private Conversations-->
  <string name="no_contacts">Няма контакти</string>
  <string name="no_contacts_action">Докоснете иконата с +, за да добавите контакти</string>
@@ -162,9 +161,18 @@
  <string name="image_attach_error">Грешка при прикачване на изображения</string>
  <string name="image_attach_error_too_big">Изображението е твърде голямо. Има ограничение от %dМБ.</string>
  <string name="image_attach_error_invalid_mime_type">Неподдържан формат на изображение: %s</string>
-  <string name="set_contact_alias">Преименуване</string>
+  <string name="set_contact_alias">Преименуване на контакт</string>
  <string name="set_contact_alias_hint">Име на контакта</string>
  <string name="menu_item_disappearing_messages">Изчезващи съобщения</string>
+  <string name="menu_item_connect_via_bluetooth">Свързване чрез Bluetooth</string>
+  <string name="dialog_title_connect_via_bluetooth">Свързване чрез Bluetooth</string>
+  <string name="dialog_message_connect_via_bluetooth">За да сработи този метод, контактът трябва да бъде близо до вас.\n\nДвамата трябва да натиснете „Start“ едновременно.</string>
+  <string name="toast_connect_via_bluetooth_already_discovering">Има започнат опит за връзка чрез Bluetooth</string>
+  <string name="toast_connect_via_bluetooth_not_discoverable">Не може да продължи без Bluetooth</string>
+  <string name="toast_connect_via_bluetooth_no_location_permission">Не може да продължи без разрешение за местоположение</string>
+  <string name="toast_connect_via_bluetooth_start">Свързване чрез Bluetooth…</string>
+  <string name="toast_connect_via_bluetooth_success">Успешно свързване чрез Bluetooth</string>
+  <string name="toast_connect_via_bluetooth_error">Не може да се установи връзка чрез Bluetooth</string>
  <!--The first placeholder will show a duration like "7 days". The second placeholder at the end will add "Tap to learn more."-->
  <string name="auto_delete_msg_you_enabled">Съобщението ще изчезне след %1$s. %2$s</string>
  <!--The placeholder at the end will add "Tap to learn more."-->
@@ -190,7 +198,7 @@
  <string name="auto_delete_changed_warning_message_enabled">Откакто съставяте съобщението е бил включен механизмът за изчезващи съобщения.</string>
  <string name="auto_delete_changed_warning_message_disabled">Откакто съставяте съобщението е бил изключен механизмът за изчезващи съобщения.</string>
  <string name="auto_delete_changed_warning_send">Изпращане въпреки това</string>
-  <string name="delete_all_messages">Премахване на всички</string>
+  <string name="delete_all_messages">Изтриване на всички</string>
  <string name="dialog_title_delete_all_messages">Потвърждение на премахване на съобщение</string>
  <string name="dialog_message_delete_all_messages">Сигурни ли сте, че желаете всички съобщения да бъдат премахнати?</string>
  <string name="dialog_title_not_all_messages_deleted">Не премахнати съобщения</string>
@@ -200,9 +208,9 @@
  <string name="dialog_message_not_deleted_not_all_selected_both">За да премахнете покана или запознанство трябва да изберете заявката и отговора.</string>
  <string name="dialog_message_not_deleted_not_all_selected_introductions">За да премахнете запознанство трябва да изберете заявката и отговора.</string>
  <string name="dialog_message_not_deleted_not_all_selected_invitations">За да премахнете покана трябва да изберете заявката и отговора.</string>
-  <string name="delete_contact">Премахване</string>
+  <string name="delete_contact">Премахване на контакт</string>
  <string name="dialog_title_delete_contact">Потвърждение на премахване на контакт</string>
-  <string name="dialog_message_delete_contact">Сигурни ли сте, че желаете да бъде премахнат този контакт и всички обменени с него съобщения?</string>
+  <string name="dialog_message_delete_contact">Сигурни ли сте, че желаете да изтриете контакта и всички обменени с него съобщения?</string>
  <string name="contact_deleted_toast">Контактът е премахнат</string>
  <!--This is shown in the action bar when opening an image in fullscreen that the user sent-->
  <string name="you">Вие</string>
@@ -216,7 +224,6 @@
  <string name="dialog_title_image_support">Вече можете да изпращате изображения на този контакт</string>
  <string name="dialog_message_image_support">Докоснете иконата за да изпратите изображение</string>
  <string name="messaging_too_many_attachments_toast">Само първите %dизображения ще бъдат изпратени</string>
-  <string name="menu_contact">Контакт</string>
  <!--Adding Contacts-->
  <string name="add_contact_title">Добавяне на контакт на живо</string>
  <string name="face_to_face">Трябва да се срещнете лично с човека, чиито контакт искате да добавите.\n\nТака никой не може да се представи за вас или да чете съобщенията ви в бъдеще.</string>
@@ -238,7 +245,7 @@
  <string name="add_contact_remotely_title_case">Добавяне на контакт отдалечено</string>
  <string name="add_contact_nearby_title">Добавяне на контакт на живо</string>
  <string name="add_contact_remotely_title">Добавяне на контакт отдалечено</string>
-  <string name="contact_link_intro">Въведете препратката на контакта, когото добавяте</string>
+  <string name="contact_link_intro">Въведете препратката от вашия контакт</string>
  <string name="contact_link_hint">Препратка от контакт</string>
  <string name="paste_button">Поставяне</string>
  <string name="add_contact_button">Добавяне на контакт</string>
@@ -277,8 +284,8 @@
  </plurals>
  <string name="offline_state">Няма връзка с интернет.</string>
  <string name="duplicate_link_dialog_title">Дублираща се препратка</string>
-  <string name="duplicate_link_dialog_text_1">Вече има чакаща заявка за контакт с тази препратка: %s</string>
-  <string name="duplicate_link_dialog_text_1_contact">Вече има контакт с тази препратка: %s</string>
+  <string name="duplicate_link_dialog_text_1">Вече имате чакаща заявка за контакт с тази препратка: %s</string>
+  <string name="duplicate_link_dialog_text_1_contact">Вече имате контакт с тази препратка: %s</string>
  <!--This is a question asking whether two nicknames refer to the same person-->
  <string name="duplicate_link_dialog_text_2">%s и %s един и същи човек ли са?</string>
  <!--This is a button for answering that two nicknames do indeed refer to the same person. This
@@ -293,7 +300,7 @@
  <string name="pending_contact_updated_toast">Обновена чакаща заявка за контакт</string>
  <!--Introductions-->
  <string name="introduction_onboarding_title">Запознаване на контакти</string>
-  <string name="introduction_onboarding_text">Можете да запознавате контактите си един с друг. Така няма да им се налага да се срещат лично, за да се свържат в Briar.</string>
+  <string name="introduction_onboarding_text">Можете да запознавате контакти помежду им. Така няма да им се наложи да се срещат лично, за да се свържат в Briar.</string>
  <string name="introduction_menu_item">Запознаване</string>
  <string name="introduction_activity_title">Избор на контакт</string>
  <string name="introduction_not_possible">С тези контакти вече имате запознанство в процес. Нека първо завърши. Ако вие или контактите ви сте рядко на линия може да отнеме известно време.</string>
@@ -313,16 +320,6 @@
  <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>
-  <!--Connect via Bluetooth-->
-  <string name="menu_item_connect_via_bluetooth">Свързване чрез Bluetooth</string>
-  <string name="connect_via_bluetooth_title">Свързване чрез Bluetooth</string>
-  <string name="connect_via_bluetooth_intro">В случай, че връзка чрез Bluetooth не се установява автоматично можете да използвате този екран, за да се свържете ръчно.\n\nВие и контакта трябва да бъдете близо един до друг.\n\nДвамата трябва да докоснете бутона „Старт“ едновременно.</string>
-  <string name="connect_via_bluetooth_already_discovering">Осъществява св връзка през Bluetooth. По-късно опитайте отново.</string>
-  <string name="connect_via_bluetooth_no_location_permission">Не може да продължи без разрешение за местоположение</string>
-  <string name="connect_via_bluetooth_start">Свързване чрез Bluetooth…</string>
-  <string name="connect_via_bluetooth_success">Успешно е създaдена връзка чрез Bluetooth</string>
-  <string name="connect_via_bluetooth_error">Не може да бъде установена връзка чрез Bluetooth.</string>
-  <string name="connect_via_bluetooth_error_not_supported">Bluetooth не се поддържа от устройството.</string>
  <!--Private Groups-->
  <string name="groups_list_empty">Няма групи</string>
  <string name="groups_list_empty_action">Докоснете иконата с +, за да създадете своя или поискайте от контактите си да споделят група с вас</string>
@@ -347,10 +344,10 @@
  <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_leave_dialog_message">Сигурни ли сте, че искате да напуснете тази група?</string>
  <string name="groups_dissolve">Разпускане на група</string>
  <string name="groups_dissolve_dialog_title">Потвърждение на разпускане на група</string>
-  <string name="groups_dissolve_dialog_message">Сигурни ли сте, че желаете да разпуснете групата?\n\nОстаналите членове няма да могат да продължат разговорите си и може да не получат последните съобщения.</string>
+  <string name="groups_dissolve_dialog_message">Сигурни ли сте, че искате да разпуснете групата?\n\nОстаналите членове няма да могат да продължат разговорите си и може да не получат последните съобщения.</string>
  <string name="groups_dissolve_button">Разпускане</string>
  <string name="groups_dissolved_dialog_title">Разпусната група</string>
  <string name="groups_dissolved_dialog_message">Групата е разпусната от нейния основател.\n\nНе можете да изпращате съобщения и може да не сте получили всички изпратени до групата съобщения.</string>
@@ -422,10 +419,10 @@
  <string name="forum_invitation_response_declined_received">%s отказа поканата във форум.</string>
  <string name="sharing_status">Състояние на споделяне</string>
  <string name="sharing_status_forum">Всеки участник във форума може да го сподели с контактите си. Споделяте този форум със следните контакти. Възможно е да има и други, които не можете да видите.</string>
-  <string name="shared_with">Споделено с %1$d (на линия %2$d)</string>
+  <string name="shared_with">Споделен %1$d (на линия %2$d)</string>
  <plurals name="forums_shared">
    <item quantity="one">%d форум, споделен от контакти</item>
-    <item quantity="other">%d форума споделени от контакти</item>
+    <item quantity="other">%d форума, споделени от контакти</item>
  </plurals>
  <string name="nobody">Никого</string>
  <!--Blogs-->
@@ -438,9 +435,9 @@
  <string name="blogs_blog_post_received">Получена е нова публикация в блога</string>
  <string name="blogs_blog_post_scroll_to">Плъзване до нея</string>
  <string name="blogs_feed_empty_state">Няма публикации</string>
-  <string name="blogs_feed_empty_state_action">Тук се показват публикациите от вашите контакти и блоговете, за които имате абонамент.\n\nЗа да направите вие публикация, докоснете иконата на писалка.</string>
+  <string name="blogs_feed_empty_state_action">Публикации от вашите контакти и абонираните блогове се показват тук.\n\nДокоснете иконата на писалка, за да направите публикация.</string>
  <string name="blogs_remove_blog">Премахване на блог</string>
-  <string name="blogs_remove_blog_dialog_message">Сигурни ли сте, че желаете да премахнете блога?\n\nПубликациите ще бъдат премахнати от устройството ви, но не и от устройствата на другите хора.\n\nКонтактите, с които сте споделили този блог може да спрат да получават обновявания.</string>
+  <string name="blogs_remove_blog_dialog_message">Сигурни ли сте, че желаете да изтриете блога?\n\nПубликациите ще бъдат премахнати от устройството ви, но не и от устройствата на другите членове.\n\nКонтактите, с които сте споделили този блог може да спрат да получават обновявания.</string>
  <string name="blogs_remove_blog_ok">Премахване</string>
  <string name="blogs_blog_removed">Блогът е премахнат</string>
  <string name="blogs_reblog_comment_hint">Добавете съобщение (незадължително)</string>
@@ -472,7 +469,7 @@
  <string name="blogs_rss_feeds_manage_author">Автор:</string>
  <string name="blogs_rss_feeds_manage_updated">Последно обновяване:</string>
  <string name="blogs_rss_remove_feed">Премахване на емисия</string>
-  <string name="blogs_rss_remove_feed_dialog_message">Сигурни ли сте, че желаете да премахнете емисията?\n\nПубликациите ще бъдат премахнати от устройството ви, но не и от устройствата на другите хора.\n\nКонтактите, с които сте споделили тази емисия може да спрат да получават обновявания.</string>
+  <string name="blogs_rss_remove_feed_dialog_message">Сигурни ли сте, че желаете да изтриете емисията?\n\nПубликациите ще бъдат премахнати от устройството ви, но не и от устройствата на другите членове.\n\nКонтактите, с които сте споделили тази емисия може да спрат да получават обновявания.</string>
  <string name="blogs_rss_remove_feed_ok">Премахване</string>
  <string name="blogs_rss_feeds_manage_empty_state">Няма емисии на RSS\n\nДокоснете иконата с +, за да внесете емисия</string>
  <string name="blogs_rss_feeds_manage_error">Възникна проблем при зареждането на емисиите ви. Моля, опитайте пак по-късно.</string>
@@ -514,7 +511,7 @@
  <string name="pref_lock_disabled_summary">За да се възползвате от тази възможност, настройте заключване на екрана</string>
  <string name="pref_lock_timeout_title">Заключване при бездействие</string>
  <!--The %s placeholder is replaced with the following time spans, e.g. 5 Minutes, 1 Hour-->
-  <string name="pref_lock_timeout_summary">При неактивност Briar автоматично се заключав след %s</string>
+  <string name="pref_lock_timeout_summary">Briar се изключва автоматично при неактивност от %s</string>
  <!--Will be shown in a list of lock times. Should fit into the %s of "automatically lock it after %s"-->
  <string name="pref_lock_timeout_1">1 минута</string>
  <!--Will be shown in a list of lock times. Should fit into the %s of "automatically lock it after %s"-->
@@ -543,9 +540,9 @@
  <string name="dialog_message_connect_panic_app">Сигурни ли сте, че желаете да позволите на %1$s да задейства разрушителните действия на бутона за паника?</string>
  <string name="panic_setting_destructive_action">Разрушителни действия</string>
  <string name="panic_setting_signout_title">Отписване</string>
-  <string name="panic_setting_signout_summary">Отписване от Briar при задействан бутон за паника</string>
-  <string name="purge_setting_title">Премахване на профил</string>
-  <string name="purge_setting_summary">Профилът на Briar се изтрива при задействане на бутона за паника. Внимание: Изтрива безвъзвратно профила, контактите и съобщенията</string>
+  <string name="panic_setting_signout_summary">Отписване от Briar при натиснат бутон за паника</string>
+  <string name="purge_setting_title">Изтриване на профил</string>
+  <string name="purge_setting_summary">Профила на Briar се изтрива при натиснат бутон за паника. Внимание: Изтрива безвъзвратно профила, контактите и съобщенията</string>
  <!--Settings Notifications-->
  <string name="notification_settings_title">Известия</string>
  <string name="notify_sign_in_title">Напомняне за вписване</string>
@@ -559,8 +556,8 @@
  <string name="notify_forum_posts_setting_title">Публикации във форуми</string>
  <string name="notify_forum_posts_setting_summary">Известия за публикации във форуми</string>
  <string name="notify_forum_posts_setting_summary_26">Настройки на известия за публикации във форуми</string>
-  <string name="notify_blog_posts_setting_title">Публикации в блогове</string>
-  <string name="notify_blog_posts_setting_summary">Известия за публикации в блогове</string>
+  <string name="notify_blog_posts_setting_title">Публикации в блог</string>
+  <string name="notify_blog_posts_setting_summary">Известия за публикации в блог</string>
  <string name="notify_blog_posts_setting_summary_26">Настройки на известия за публикации в блог</string>
  <string name="notify_vibration_setting">Вибрация</string>
  <string name="notify_sound_setting">Звук</string>
@@ -577,9 +574,8 @@
 \n\nАко вие промените настройката промяната ще влезе в действие веднага, още върху следващото ви съобщение, а при вашите контакти след получаването му. Контактите ви също могат да правят промяна на тази настройка, което ще се отрази и на двама ви.</string>
  <string name="learn_more">Научете повече</string>
  <string name="disappearing_messages_summary">Бъдещите съобщения в разговора изчезват след 7\u00A0дни</string>
-  <!--Settings Actions-->
-  <string name="pref_category_actions">Действия</string>
-  <string name="send_feedback">Изпращане на обратна връзка</string>
+  <!--Settings Feedback-->
+  <string name="send_feedback">Изпращане на отзив</string>
  <!--Link Warning-->
  <string name="link_warning_title">Предупреждение за препратка</string>
  <string name="link_warning_intro">Препратката ще бъде отворена от външно приложение.</string>
@@ -587,10 +583,10 @@
  <string name="link_warning_open_link">Отваряне</string>
  <!--Crash Reporter-->
  <string name="crash_report_title">Доклад на срив</string>
-  <string name="briar_crashed">Съжаляваме, Briar се срина</string>
+  <string name="briar_crashed">Извинете, Briar се срина.</string>
  <string name="not_your_fault">Не е по ваша вина.</string>
  <string name="please_send_report">Помогнете да направим Briar по-добър като ни изпратите доклад.</string>
-  <string name="report_is_encrypted">Обещаваме, че докладът е ще бъде изпратен шифрован и добре защитен.</string>
+  <string name="report_is_encrypted">Даваме обещание, че докладът е шифрован и е изпратен добре защитен.</string>
  <string name="feedback_title">Обратна връзка</string>
  <string name="describe_crash">Опишете случилото се (незадължително)</string>
  <string name="enter_feedback">Въведете обратна връзка</string>
@@ -645,64 +641,6 @@
  <string name="lock_tap_to_unlock">Докоснете за отключване</string>
  <!--Connections Screen-->
  <string name="transports_help_text">Briar може да се свърже с контактите ви през интернет, Wi-Fi или Bluetooth.\n\nЗа повече поверителност цялата връзка към интернет се пренасочва през мрежата на Tor.\n\nАко даден контакт може да бъде достъпен чрез няколко метода Briar ги използва успоредно.</string>
-  <!--Share app offline-->
-  <string name="hotspot_title">Споделяне на приложението извън мрежа</string>
-  <string name="hotspot_intro">Споделете приложението с някого около вас без достъп до интернет с използване на Wi-Fi на устройствата.
-\n\nВашето устройство създава безжична точка за достъп. Хората около вас биха могли да се свържат към нея и да изтеглят Briar от вашето устройство.</string>
-  <string name="hotspot_button_start_sharing">Включване на безжична точка</string>
-  <string name="hotspot_button_stop_sharing">Спиране на безжична точка</string>
-  <string name="hotspot_progress_text_start">Настройване на безжична точка…</string>
-  <string name="hotspot_notification_channel_title">Безжична точка за достъп</string>
-  <string name="hotspot_notification_title">Споделяне на Briar извън мрежа</string>
-  <string name="hotspot_button_connected">Напред</string>
-  <string name="permission_hotspot_location_request_body">За да създаде безжична точка за достъп, на Briar му е необходимо разрешение за достъп до местоположението.\n\nBriar не го пази и не го споделя с никого.</string>
-  <string name="permission_hotspot_location_denied_body">Отказахте достъп до местоположението, но то е необходимо за създаване на безжична точка за достъп.\n\nОбмислете дали да не дадете разрешение.</string>
-  <string name="wifi_settings_title">Настройки на Wi-Fi</string>
-  <string name="wifi_settings_request_enable_body">За създаване на безжична точка за достъп Briar се нуждае от Wi-Fi. Включете го.</string>
-  <string name="hotspot_tab_manual">Ръчно</string>
-  <!--The placeholder to be inserted into the string 'hotspot_manual_wifi': People can connect by %s-->
-  <string name="hotspot_scanning_a_qr_code">като сканират код за QR</string>
-  <!--Wi-Fi setup-->
-  <!--The %s placeholder will be replaced with the translation of 'hotspot_scanning_a_qr_code'-->
-  <string name="hotspot_manual_wifi">Устройството ви създава безжична точка за достъп. Хората, които желаят да изтеглят Briar могат да се свържат към нея като добавят в настройките за Wi-Fi на техните устройства параметрите по-долу или %s. Когато те се свържат към точката за достъп натиснете „Напред“.</string>
-  <string name="hotspot_manual_wifi_ssid">Наименование на мрежата</string>
-  <string name="hotspot_qr_wifi">Устройството ви създава безжична точка за достъп. Хората, които желаят да изтеглят Briar могат да се свържат към нея като сканират този код за QR. Когато те се свържат към точката за достъп натиснете „Напред“.</string>
-  <string name="hotspot_no_peers_connected">Няма свързани устройства</string>
-  <plurals name="hotspot_peers_connected">
-    <item quantity="one">%s свързано устройства</item>
-    <item quantity="other">%s свързани устройства</item>
-  </plurals>
-  <!--Download link-->
-  <!--The %s placeholder will be replaced with the translation of 'hotspot_scanning_a_qr_code'-->
-  <string name="hotspot_manual_site">Устройството ви създава безжична точка за достъп. Хората, които са свързани към нея могат да изтеглят Briar от следния адрес или %s.</string>
-  <string name="hotspot_manual_site_address">Адрес (URL)</string>
-  <string name="hotspot_qr_site">Устройството ви създава безжична точка за достъп. Хората, които са свързани към нея могат да изтеглят Briar като сканират този код за QR.</string>
-  <!--e.g. Download Briar 1.2.20-->
-  <string name="website_download_title">Изтеглете %s</string>
-  <string name="website_download_intro">Някой наблизо споделя с вас %s.</string>
-  <string name="website_download_outro">След като файлът се изтегли, отворете го и го инсталирайте.</string>
-  <string name="website_troubleshooting_title">Отстраняване на неизправности</string>
-  <string name="website_troubleshooting_1">Ако не можете да изтеглите приложението пробвайте с друг мрежов четец.</string>
-  <string name="hotspot_help_fallback_title">Нищо не става?</string>
-  <!--error handling-->
-  <!--Transfer Data via Removable Drives-->
-  <string name="removable_drive_title_send">Изпращане на сведения</string>
-  <string name="removable_drive_title_receive">Получаване на сведения</string>
-  <string name="removable_drive_send_intro">Докоснете бутона по-долу, за да бъде създаден файл, който ще съдържа шифрованите съобщения. Можете да изберете къде да бъде запазен този файл.\n\nАко желаете да го запазите на преносим диск го включете сега.</string>
-  <string name="removable_drive_send_no_data">В момента няма съобщения, чакащи за изпращане до този контакт.</string>
-  <string name="removable_drive_send_not_supported">Контактът използва по-ранно издание на Briar или устройство, което не поддържа тази възможност.</string>
-  <string name="removable_drive_send_button">Избиране на файл</string>
-  <string name="removable_drive_ongoing">Изчакайте текущата задача да завърши</string>
-  <string name="removable_drive_receive_intro">Докоснете бутона по-долу, за да изберете файла, който вашия контакт ви е изпратил.\n\nАко файлът се намира на преносим диск го включете сега.</string>
-  <string name="removable_drive_receive_button">Избиране на файл</string>
-  <string name="removable_drive_success_send_title">Успешно изнасяне</string>
-  <string name="removable_drive_success_send_text">Информацията е изнесена успешно. От сега имате 28 дена, за да предадете файла на вашия контакт.\n\nАко той се намира на преносим диск, използвайте известието в лентата за състоянието, за да освободите диска преди да го изключите.</string>
-  <string name="removable_drive_success_receive_title">Успешно внасяне</string>
-  <string name="removable_drive_success_receive_text">Всички шифровани съобщения от файла са получени.</string>
-  <string name="removable_drive_error_send_title">Грешка при изнасяне</string>
-  <string name="removable_drive_error_send_text">Информацията не може да бъде записана във файла.\n\nАко използвате преносим диск се уверете, че е включен правилно и опитайте отново.\n\nАко грешката продължава да се проявява изпратете обратна връзка до екипа на Briar, за да ги уведомите за проблема.</string>
-  <string name="removable_drive_error_receive_title">Грешка при внасяне</string>
-  <string name="removable_drive_error_receive_text">Избраният файл не съдържа нищо, което Briar разпознава.\n\nУверете се, че сте избрали правилния файл.\n\nАко вашият контакт го е създал преди повече от 28 дена Briar няма да го разпознае.</string>
  <!--Screenshots-->
  <!--This is a name to be used in screenshots. Feel free to change it to a local name.-->
  <string name="screenshot_alice">Ани</string>
--- a/briar-android/src/main/res/values-ca/strings.xml
+++ b/briar-android/src/main/res/values-ca/strings.xml
@@ -40,7 +40,13 @@
  <string name="forgotten_password">No recordo la contrasenya</string>
  <string name="dialog_title_lost_password">Contrasenya perduda</string>
  <string name="dialog_message_lost_password">El vostre compte de Briar s\'emmagatzema només en el vostre dispositiu i xifrat. La contrasenya, doncs, no es pot restablir. Voleu esborrar el compte i crear-ne un de nou?\n\nAtenció! Si esborreu el compte la vostra identitat, els contactes i els missatges antics es perdran per sempre.</string>
+  <string name="startup_failed_notification_title">Briar no s\'ha pogut iniciar</string>
+  <string name="startup_failed_notification_text">Feu un toc per obtenir més informació.</string>
  <string name="startup_failed_activity_title">Error iniciant Briar</string>
+  <string name="startup_failed_db_error">Per alguna raó, la base de dades de Briar s\'ha corromput i no es pot adobar. El vostre compte, les dades i els contactes s\'han perdut. Malauradament, heu de reinstal·lar Briar o bé crear un nou compte triant l\'opció «No recordo la contrasenya» quan se us demani la contrasenya.</string>
+  <string name="startup_failed_data_too_old_error">El vostre compte fou creat amb una versió antiga de Briar i no es pot obrir amb la versió actual. O bé reinstal·leu la versió antiga o bé creeu un nou compte triant l\'opció «No recordo la contrasenya» quan se us demani la contrasenya.</string>
+  <string name="startup_failed_data_too_new_error">Aquesta versió de Briar és massa antiga. Actualitzeu Briar a la darrera versió i torneu a provar-ho.</string>
+  <string name="startup_failed_service_error">Briar no ha pogut engegar un connector imprescindible. La reinstal·lació de Briar acostuma a resoldre aquest problema. Tingueu en compte que si reinstal·leu, perdreu el vostre compte i les dades associades doncs Briar no usa servidors centrals per desar-les.</string>
  <plurals name="expiry_warning">
    <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 caducarà en %d dies i no es podrà renovar.</item>
@@ -133,7 +139,6 @@
  <string name="open">Obre</string>
  <string name="change">Canvia</string>
  <string name="start">Inicia</string>
-  <string name="finish">Fi</string>
  <string name="no_data">Sense dades</string>
  <string name="ellipsis">...</string>
  <string name="text_too_long">El text és massa llarg</string>
@@ -143,7 +148,6 @@
  <string name="sorry">Ens sap greu</string>
  <string name="error_start_activity">No està disponible en el vostre sistema</string>
  <string name="status_heading">Estat</string>
-  <string name="error">Error</string>
  <!--Contacts and Private Conversations-->
  <string name="no_contacts">No hi ha cap contacte per mostrar</string>
  <string name="no_contacts_action">Toqueu la icona + per afegir un contacte</string>
@@ -160,6 +164,15 @@
  <string name="set_contact_alias">Canvia el nom del contacte</string>
  <string name="set_contact_alias_hint">Nom del contacte</string>
  <string name="menu_item_disappearing_messages">Missatges fonedissos</string>
+  <string name="menu_item_connect_via_bluetooth">Connecta via bluetooth</string>
+  <string name="dialog_title_connect_via_bluetooth">Connecta via bluetooth</string>
+  <string name="dialog_message_connect_via_bluetooth">El vostre contacte ha de ser a prop per a que vagi bé.\n\nVós i el vostre contacte heu de prémer «Engega» simultàniament.</string>
+  <string name="toast_connect_via_bluetooth_already_discovering">Ja està mirant de connectar-se amb Bluetooth.</string>
+  <string name="toast_connect_via_bluetooth_not_discoverable">No es pot continuar sense Bluetooth.</string>
+  <string name="toast_connect_via_bluetooth_no_location_permission">No es pot continuar sense permís per obtenir la posició.</string>
+  <string name="toast_connect_via_bluetooth_start">Connectant-se via Bluetooth...</string>
+  <string name="toast_connect_via_bluetooth_success">S\'ha connectat via Bluetooth.</string>
+  <string name="toast_connect_via_bluetooth_error">No ha pogut connectar-se amb Bluetooth.</string>
  <!--The first placeholder will show a duration like "7 days". The second placeholder at the end will add "Tap to learn more."-->
  <string name="auto_delete_msg_you_enabled">Els vostres missatges es faran fonedissos en %1$s. %2$s</string>
  <!--The placeholder at the end will add "Tap to learn more."-->
@@ -212,7 +225,6 @@ Així que l\'actualitzi li veureu una icona diferent .</string>
  <string name="dialog_title_image_support">Ara ja podeu enviar imatges a aquest contacte</string>
  <string name="dialog_message_image_support">Premeu aquesta icona per afegir imatges.</string>
  <string name="messaging_too_many_attachments_toast">Només s\'enviaran les %d primeres imatges</string>
-  <string name="menu_contact">Contacte</string>
  <!--Adding Contacts-->
  <string name="add_contact_title">Afegeix un contacte proper</string>
  <string name="face_to_face">Heu de coincidir en el mateix lloc amb la persona que voleu afegir com a contacte.\n\nD\'aquesta manera evitareu que algú suplanti les vostres identitats o pugui llegir els vostres missatges en el futur.</string>
@@ -309,12 +321,6 @@ Així que l\'actualitzi li veureu una icona diferent .</string>
  <string name="introduction_response_accepted_received">%1$s ha acceptat conèixer a %2$s.</string>
  <string name="introduction_response_declined_received">%1$s ha refusat conèixer a %2$s.</string>
  <string name="introduction_response_declined_received_by_introducee">%1$s diu que %2$s ha refusat conèixer-lo.</string>
-  <!--Connect via Bluetooth-->
-  <string name="menu_item_connect_via_bluetooth">Connecta via bluetooth</string>
-  <string name="connect_via_bluetooth_title">Connecta via bluetooth</string>
-  <string name="connect_via_bluetooth_no_location_permission">No es pot continuar sense permís per obtenir la posició.</string>
-  <string name="connect_via_bluetooth_start">Connectant-se via Bluetooth...</string>
-  <string name="connect_via_bluetooth_success">S\'ha connectat via Bluetooth.</string>
  <!--Private Groups-->
  <string name="groups_list_empty">No hi ha cap grup per mostrar</string>
  <string name="groups_list_empty_action">Toqueu la icona + per crear un grup o demaneu als vostres contactes que us afegeixin als seus grups</string>
@@ -563,8 +569,7 @@ Així que l\'actualitzi li veureu una icona diferent .</string>
  <!--Conversation Settings-->
  <string name="disappearing_messages_title">Missatges fonedissos</string>
  <string name="learn_more">Més informació</string>
-  <!--Settings Actions-->
-  <string name="pref_category_actions">Accions</string>
+  <!--Settings Feedback-->
  <string name="send_feedback">Envieu comentaris</string>
  <!--Link Warning-->
  <string name="link_warning_title">Avís d\'enllaç</string>
@@ -573,6 +578,7 @@ Així que l\'actualitzi li veureu una icona diferent .</string>
  <string name="link_warning_open_link">Obre l\'enllaç</string>
  <!--Crash Reporter-->
  <string name="crash_report_title">Informe de fallida de Briar</string>
+  <string name="briar_crashed">Ens sap greu, Briar s\'ha tancat inesperadament.</string>
  <string name="not_your_fault">Això no és culpa vostra.</string>
  <string name="please_send_report">Ajudi\'ns a construir un Briar millor enviant-nos un informe de fallida.</string>
  <string name="report_is_encrypted">Us garantim que l\'informe es xifra i s\'envia de manera segura.</string>
@@ -612,18 +618,6 @@ Així que l\'actualitzi li veureu una icona diferent .</string>
  <string name="lock_tap_to_unlock">Toqueu per desbloquejar-lo</string>
  <!--Connections Screen-->
  <string name="transports_help_text">Briar pot contactar els vostres contactes via Internet, WiFi o Bluetooth.\n\nTotes les connexions d\'Internet van via la xarxa Tor per privacitat.\n\nSi es pot arribar a un contacte per diversos mètodes, Briar els usa tots simultàniament.</string>
-  <!--Share app offline-->
-  <string name="hotspot_notification_channel_title">Punt d\'accés Wi-Fi</string>
-  <string name="hotspot_button_connected">Endavant</string>
-  <!--The placeholder to be inserted into the string 'hotspot_manual_wifi': People can connect by %s-->
-  <!--Wi-Fi setup-->
-  <!--The %s placeholder will be replaced with the translation of 'hotspot_scanning_a_qr_code'-->
-  <!--Download link-->
-  <!--The %s placeholder will be replaced with the translation of 'hotspot_scanning_a_qr_code'-->
-  <!--e.g. Download Briar 1.2.20-->
-  <string name="website_troubleshooting_title">Detecció d\'errors</string>
-  <!--error handling-->
-  <!--Transfer Data via Removable Drives-->
  <!--Screenshots-->
  <!--This is a name to be used in screenshots. Feel free to change it to a local name.-->
  <string name="screenshot_alice">Alba</string>
--- a/briar-android/src/main/res/values-de/strings.xml
+++ b/briar-android/src/main/res/values-de/strings.xml
@@ -40,12 +40,13 @@
  <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  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">Für weitere Informationen hier antippen.</string>
  <string name="startup_failed_activity_title">Fehler beim Starten von Briar</string>
-  <string name="startup_failed_clock_error">Briar konnte nicht gestartet werden, weil die Uhr deines Geräts falsch eingestellt ist.\n\Bitte stelle die Uhr deines Geräts auf die richtige Zeit ein und versuche es erneut.</string>
-  <string name="startup_failed_db_error">Briar konnte die Datenbank, die dein Konto, deine Kontakte und deine Nachrichten enthält, nicht öffnen.\n\nBitte aktualisiere auf die neueste Version der App und versuche es erneut, oder richte ein neues Konto ein, indem du bei der Passwortabfrage \"Ich habe mein Passwort vergessen\" wählst.</string>
-  <string name="startup_failed_data_too_old_error">Dein Konto wurde mit einer alten Version dieser App erstellt und kann mit dieser Version nicht geöffnet werden. Du musst entweder die alte Version neu installieren oder ein neues Konto einrichten, indem du bei der Passwortabfrage \"Ich habe mein Passwort vergessen\" wählst.</string>
-  <string name="startup_failed_data_too_new_error">Dein Konto wurde mit einer neueren Version dieser App erstellt und kann mit dieser Version nicht geöffnet werden.\n\nBitte aktualisiere auf die aktuelle Version und versuche es erneut.</string>
-  <string name="startup_failed_service_error">Briar konnte eine erforderliche Komponente nicht starten.\n\nBitte aktualisiere auf die neueste Version der App und versuche es erneut.</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 oder ein neues Konto einrichten, indem du \'Ich habe mein Passwort vergessen\' auswählst, wenn du zur Eingabe deines Passworts aufgefordert wirst. </string>
+  <string name="startup_failed_data_too_old_error">Dein Konto wurde mit einer alten Version dieser App erstellt und kann mit dieser Version nicht geöffnet werden. Installiere entweder die alte Version oder richte ein neues Konto ein, indem du \'Ich habe mein Passwort vergessen\' auswählst, wenn du zur Eingabe deines Passworts aufgefordert wirst.</string>
+  <string name="startup_failed_data_too_new_error">Diese Version der App ist zu alt. Bitte führe eine Aktualisierung auf die aktuelle Version der App durch und versuche es dann nochmal.</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 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>
@@ -138,7 +139,6 @@
  <string name="open">Öffnen</string>
  <string name="change">Ändern</string>
  <string name="start">Start</string>
-  <string name="finish">Fertigstellen</string>
  <string name="no_data">Keine Daten</string>
  <string name="ellipsis">…</string>
  <string name="text_too_long">Der eingegebene Text ist zu lang</string>
@@ -148,7 +148,6 @@
  <string name="sorry">Entschuldigung</string>
  <string name="error_start_activity">Nicht verfügbar für dein System</string>
  <string name="status_heading">Status:</string>
-  <string name="error">Fehler</string>
  <!--Contacts and Private Conversations-->
  <string name="no_contacts">Keine Kontakte vorhanden</string>
  <string name="no_contacts_action">Tippe auf das + Symbol, um einen Kontakt hinzuzufügen</string>
@@ -165,6 +164,15 @@
  <string name="set_contact_alias">Kontaktnamen ändern</string>
  <string name="set_contact_alias_hint">Name des Kontakts</string>
  <string name="menu_item_disappearing_messages">Selbstlöschende Nachrichten</string>
+  <string name="menu_item_connect_via_bluetooth">Über Bluetooth verbinden</string>
+  <string name="dialog_title_connect_via_bluetooth">Über Bluetooth verbinden</string>
+  <string name="dialog_message_connect_via_bluetooth">Dein Kontakt muss in der Nähe sein, damit dies funktioniert.\n\nDu und dein Kontakt sollten beide gleichzeitig \"Start\" drücken.</string>
+  <string name="toast_connect_via_bluetooth_already_discovering">Versucht bereits, eine Verbindung über Bluetooth herzustellen</string>
+  <string name="toast_connect_via_bluetooth_not_discoverable">Kann ohne Bluetooth nicht fortgesetzt werden</string>
+  <string name="toast_connect_via_bluetooth_no_location_permission">Kann ohne Standortberechtigung nicht fortgesetzt werden</string>
+  <string name="toast_connect_via_bluetooth_start">Verbinde über Bluetooth…</string>
+  <string name="toast_connect_via_bluetooth_success">Erfolgsreich über Bluetooth verbunden</string>
+  <string name="toast_connect_via_bluetooth_error">Konnte keine Verbindung über Bluetooth herstellen</string>
  <!--The first placeholder will show a duration like "7 days". The second placeholder at the end will add "Tap to learn more."-->
  <string name="auto_delete_msg_you_enabled">Deine Nachrichten werden nach %1$sgelöscht. %2$s</string>
  <!--The placeholder at the end will add "Tap to learn more."-->
@@ -216,7 +224,6 @@
  <string name="dialog_title_image_support">Du kannst nun Bilder an diesen Kontakt senden</string>
  <string name="dialog_message_image_support">Tippe auf dieses Symbol, um Bilder anzuhängen.</string>
  <string name="messaging_too_many_attachments_toast">Nur die ersten %d Bilder werden übertragen werden</string>
-  <string name="menu_contact">Kontakt</string>
  <!--Adding Contacts-->
  <string name="add_contact_title">Kontakt in der Nähe hinzufügen</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>
@@ -313,16 +320,6 @@
  <string name="introduction_response_accepted_received">%1$s hat die Kontaktempfehlung für %2$s angenommen.</string>
  <string name="introduction_response_declined_received">%1$s hat die Kontaktempfehlung von %2$s abgelehnt.</string>
  <string name="introduction_response_declined_received_by_introducee">%1$s meldet, dass %2$s die Kontaktempfehlung abgelehnt hat.</string>
-  <!--Connect via Bluetooth-->
-  <string name="menu_item_connect_via_bluetooth">Über Bluetooth verbinden</string>
-  <string name="connect_via_bluetooth_title">Über Bluetooth verbinden</string>
-  <string name="connect_via_bluetooth_intro">Falls Verbindungen über Bluetooth nicht automatisch funktionieren, kannst du über diesen Bildschirm eine manuelle Verbindung herstellen.\n\nDein Kontakt muss sich in der Nähe befinden, damit dies funktioniert. Du und dein Kontakt sollten gleichzeitig auf \"Start\" drücken.</string>
-  <string name="connect_via_bluetooth_already_discovering">Es wird bereits versucht, eine Verbindung über Bluetooth herzustellen. Bitte probiere es in Kürze erneut.</string>
-  <string name="connect_via_bluetooth_no_location_permission">Kann ohne Standortberechtigung nicht fortgesetzt werden</string>
-  <string name="connect_via_bluetooth_start">Verbinde über Bluetooth…</string>
-  <string name="connect_via_bluetooth_success">Erfolgsreich über Bluetooth verbunden</string>
-  <string name="connect_via_bluetooth_error">Konnte keine Verbindung über Bluetooth herstellen.</string>
-  <string name="connect_via_bluetooth_error_not_supported">Bluetooth wird vom Gerät nicht unterstützt.</string>
  <!--Private Groups-->
  <string name="groups_list_empty">Keine Gruppen vorhanden</string>
  <string name="groups_list_empty_action">Tippe auf das + Symbol, um eine Gruppe anzulegen oder frage deine Kontakte, Gruppen mit dir zu teilen</string>
@@ -581,8 +578,7 @@
 		Dein Kontakt kann diese Einstellung auch für euch beide ändern.</string>
  <string name="learn_more">Mehr erfahren</string>
  <string name="disappearing_messages_summary">Zukünftige Nachrichten in dieser Unterhaltung werden automatisch nach 7\u00A0Tagen gelöscht.</string>
-  <!--Settings Actions-->
-  <string name="pref_category_actions">Aktionen</string>
+  <!--Settings Feedback-->
  <string name="send_feedback">Feedback senden</string>
  <!--Link Warning-->
  <string name="link_warning_title">Link-Warnung</string>
@@ -591,7 +587,7 @@
  <string name="link_warning_open_link">Link öffnen</string>
  <!--Crash Reporter-->
  <string name="crash_report_title">Briar-Absturzbericht</string>
-  <string name="briar_crashed">Es tut uns leid, Briar ist abgestürzt</string>
+  <string name="briar_crashed">Es tut uns leid, Briar ist abgestürzt.</string>
  <string name="not_your_fault">Das ist nicht deine Schuld.</string>
  <string name="please_send_report">Bitte hilf uns, Briar zu verbessern, indem du einen Absturzbericht sendest.</string>
  <string name="report_is_encrypted">Wir versprechen, dass der Bericht verschlüsselt ist und über eine sichere Verbindung geschickt wird.</string>
@@ -630,7 +626,7 @@
  <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_location_title">Berechtigung Standort</string>
-  <string name="permission_location_request_body">Um Bluetooth-Geräte zu finden, braucht Briar Zugriff auf deinen Standort.\n\nBriar speichert weder deinen Standort noch gibt es ihn an andere weiter.</string>
+  <string name="permission_location_request_body">Um Bluetooth-Geräte zu  finden, braucht Briar Zugriff auf deinen Standort.\n\nBriar speichert weder deinen Standort noch gibt es ihn an andere weiter.</string>
  <string name="permission_camera_location_title">Kamera und Standort</string>
  <string name="permission_camera_location_request_body">Um den QR-Code zu scannen, braucht Briar Zugriff auf die Kamera.\n\nUm Bluetooth-Geräte zu finden, braucht Briar Zugriff auf deinen Standort.\n\nBriar speichert weder deinen Standort noch gibt es ihn an andere weiter.</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>
@@ -649,89 +645,6 @@
  <string name="lock_tap_to_unlock">Zum Entsperren antippen</string>
  <!--Connections Screen-->
  <string name="transports_help_text">Briar kann sich über das Internet, WLAN oder Bluetooth mit deinen Kontakten verbinden.\n\nAlle Internetverbindungen laufen über das Tor-Netzwerk, um den Datenschutz zu gewährleisten.\n\nWenn ein Kontakt auf mehreren Wegen erreichbar ist, nutzt Briar diese parallel.</string>
-  <!--Share app offline-->
-  <string name="hotspot_title">Diese App offline teilen</string>
-  <string name="hotspot_intro">Teile diese App mit jemandem in der Nähe ohne Internetverbindung, indem du das WLAN deines Telefons verwendest.
-		\n\nDein Telefon startet einen WLAN-Hotspot. Personen in der Nähe können sich mit dem Hotspot verbinden und die App von deinem Telefon herunterladen.</string>
-  <string name="hotspot_button_start_sharing">Hotspot starten</string>
-  <string name="hotspot_button_stop_sharing">Hotspot beenden</string>
-  <string name="hotspot_progress_text_start">Hotspot wird eingerichtet…</string>
-  <string name="hotspot_notification_channel_title">WLAN-Hotspot</string>
-  <string name="hotspot_notification_title">Briar offline teilen</string>
-  <string name="hotspot_button_connected">Weiter</string>
-  <string name="permission_hotspot_location_request_body">Um einen WLAN-Hotspot zu erstellen, benötigt Briar die Erlaubnis, auf deinen Standort zuzugreifen.\n\nBriar speichert weder deinen Standort noch gibt es ihn an andere weiter.</string>
-  <string name="permission_hotspot_location_denied_body">Du hast den Zugriff auf deinen Standort verweigert, aber Briar benötigt diese Berechtigung, um einen WLAN-Hotspot zu erstellen.\n\nBitte gewähre den Zugriff.</string>
-  <string name="wifi_settings_title">WLAN-Einstellungen</string>
-  <string name="wifi_settings_request_enable_body">Um einen WLAN-Hotspot zu erstellen, benötigt Briar das WLAN. Bitte aktiviere es.</string>
-  <string name="hotspot_tab_manual">Manuell</string>
-  <!--The placeholder to be inserted into the string 'hotspot_manual_wifi': People can connect by %s-->
-  <string name="hotspot_scanning_a_qr_code">Scannen eines QR-Codes</string>
-  <!--Wi-Fi setup-->
-  <!--The %s placeholder will be replaced with the translation of 'hotspot_scanning_a_qr_code'-->
-  <string name="hotspot_manual_wifi">Dein Telefon stellt einen WLAN-Hotspot bereit. Personen, die Briar herunterladen möchten, können sich mit dem Hotspot verbinden, indem sie ihn in den WLAN-Einstellungen ihres Geräts mit Hilfe der unten stehenden Angaben oder durch %s hinzufügen. Wenn sie sich mit dem Hotspot verbunden haben, drücken sie \'\'Weiter\'\'.</string>
-  <string name="hotspot_manual_wifi_ssid">Netzwerkname</string>
-  <string name="hotspot_qr_wifi">Dein Telefon stellt einen WLAN-Hotspot bereit. Personen, die Briar herunterladen möchten, können sich mit dem Hotspot verbinden, indem sie diesen QR-Code scannen. Wenn sie sich mit dem Hotspot verbunden haben, drücken sie \'\'Weiter\'\'.</string>
-  <string name="hotspot_no_peers_connected">Keine Geräte verbunden</string>
-  <plurals name="hotspot_peers_connected">
-    <item quantity="one">%s Gerät verbunden</item>
-    <item quantity="other">%s Geräte verbunden</item>
-  </plurals>
-  <!--Download link-->
-  <!--The %s placeholder will be replaced with the translation of 'hotspot_scanning_a_qr_code'-->
-  <string name="hotspot_manual_site">Dein Telefon stellt einen WLAN-Hotspot bereit. Personen, die mit dem Hotspot verbunden sind, können Briar herunterladen, indem sie den folgenden Link in einen Webbrowser eingeben oder %s.</string>
-  <string name="hotspot_manual_site_address">Adresse (URL)</string>
-  <string name="hotspot_qr_site">Dein Telefon stellt einen WLAN-Hotspot bereit. Personen, die mit dem Hotspot verbunden sind, können Briar durch Scannen dieses QR-Codes herunterladen.</string>
-  <!--e.g. Download Briar 1.2.20-->
-  <string name="website_download_title">Download %s</string>
-  <string name="website_download_intro">Jemand in der Nähe hat %s mit dir geteilt.</string>
-  <string name="website_download_outro">Nach Abschluss des Downloads öffne die heruntergeladene Datei und installiere sie.</string>
-  <string name="website_troubleshooting_title">Fehlerbehebung</string>
-  <string name="website_troubleshooting_1">Wenn du die App nicht herunterladen kannst, versuche es mit einer anderen Webbrowser-App.</string>
-  <string name="website_troubleshooting_2_old">Um die heruntergeladene App zu installieren, musst du möglicherweise die Installation von Apps aus \"Unbekannten Quellen\" in den Systemeinstellungen zulassen. Danach musst du die App möglicherweise erneut herunterladen. Wir empfehlen, die Einstellung \"Unbekannte Quellen\" nach der Installation der App zu deaktivieren.</string>
-  <string name="website_troubleshooting_2_new">Um die heruntergeladene App zu installieren, musst du deinem Browser eventuell erlauben, unbekannte Apps zu installieren. Nach der Installation der App empfehlen wir, die Erlaubnis des Browsers zur Installation unbekannter Apps zu entfernen.</string>
-  <string name="hotspot_help_wifi_title">Probleme bei der WLAN-Verbindung:</string>
-  <string name="hotspot_help_wifi_1">Versuche, WLAN auf beiden Telefonen zu deaktivieren und wieder zu aktivieren, und versuche es dann erneut.</string>
-  <string name="hotspot_help_wifi_2">Wenn dein Telefon meldet, dass das WLAN kein Internet hat, sag ihm, dass du trotzdem verbunden bleiben willst.</string>
-  <string name="hotspot_help_site_title">Probleme beim Besuch der lokalen Webseite:</string>
-  <string name="hotspot_help_site_1">Überprüfe unbedingt, ob du die Adresse genau so wie angezeigt eingegeben hast. Ein kleiner Fehler kann dazu führen, dass der Versuch fehlschlägt.</string>
-  <string name="hotspot_help_site_2">Vergewissere dich, dass dein Telefon immer noch mit dem richtigen WLAN verbunden ist (siehe oben), wenn du die Webseite aufrufen willst.</string>
-  <string name="hotspot_help_site_3">Wenn du eine Firewall-App hast, prüfe, dass sie den Zugriff nicht blockiert.</string>
-  <string name="hotspot_help_site_4">Wenn du die Website besuchen, aber die Briar-App nicht herunterladen kannst, versuche es mit einer anderen Webbrowser-App.</string>
-  <string name="hotspot_help_fallback_title">Nichts funktioniert?</string>
-  <string name="hotspot_help_fallback_intro">Du kannst versuchen, die App als .apk-Datei zu speichern, um sie auf eine andere Weise weiterzugeben. Sobald die Datei auf das andere Gerät übertragen wurde, kann sie zur Installation von Briar verwendet werden.
-		\n\nTipp: Für die Freigabe über Bluetooth musst du die Datei möglicherweise zuerst umbenennen, sodass sie mit .zip endet.</string>
-  <string name="hotspot_help_fallback_button">App speichern</string>
-  <!--error handling-->
-  <string name="hotspot_error_intro">Beim Versuch, die App über WLAN zu teilen, ist ein Fehler aufgetreten:</string>
-  <string name="hotspot_error_no_wifi_direct">Gerät unterstützt kein WLAN-Direct</string>
-  <string name="hotspot_error_start_callback_failed">Hotspot konnte nicht gestartet werden: Fehler %s</string>
-  <string name="hotspot_error_start_callback_failed_unknown">Hotspot konnte aus einem unbekannten Grund nicht gestartet werden, Grund %d</string>
-  <string name="hotspot_error_start_callback_no_group_info">Hotspot konnte nicht gestartet werden: keine Gruppeninformation</string>
-  <string name="hotspot_error_web_server_start">Fehler beim Starten des Webservers</string>
-  <string name="hotspot_error_web_server_serve">Fehler bei der Darstellung der Website.\n\nBitte sende eine Rückmeldung (mit anonymen Daten) über die Briar-App, wenn das Problem weiterhin besteht.</string>
-  <string name="hotspot_flag_test">Warnung: Diese App wurde mit Android Studio installiert und kann NICHT auf einem anderen Gerät installiert werden.</string>
-  <string name="hotspot_error_framework_busy">Hotspot kann nicht gestartet werden.\n\nWenn du einen anderen Hotspot betreibst oder deine Internetverbindung über WLAN teilst, beende dies und versuche es danach erneut.</string>
-  <!--Transfer Data via Removable Drives-->
-  <string name="removable_drive_menu_title">Über Wechseldatenträger verbinden</string>
-  <string name="removable_drive_intro">Wenn du keine Verbindung zu deinem Kontakt über das Internet, WLAN oder Bluetooth herstellen kannst, kann Briar auch Nachrichten auf einem Wechseldatenträger wie einem USB-Stick oder einer SD-Karte übertragen.</string>
-  <string name="removable_drive_explanation">Wenn du keine Verbindung zu deinem Kontakt über das Internet, WLAN oder Bluetooth herstellen kannst, kann Briar auch Nachrichten auf einem Wechseldatenträger wie einem USB-Stick oder einer SD-Karte übertragen.n\nWenn du die Schaltfläche \"Daten senden\" verwendest, werden alle Daten, die darauf warten, an den Kontakt gesendet zu werden, auf den Wechseldatenträger geschrieben. Dazu gehören private Nachrichten, Anhänge, Blogs, Foren und private Gruppen.\n\nAlles wird verschlüsselt, bevor es auf den Wechseldatenträger geschrieben wird.\n\nWenn dein Kontakt den Wechseldatenträger erhält, kann er die Schaltfläche \"Daten empfangen\" verwenden, um die Nachrichten in Briar zu importieren.</string>
-  <string name="removable_drive_title_send">Daten senden</string>
-  <string name="removable_drive_title_receive">Daten empfangen</string>
-  <string name="removable_drive_send_intro">Tippe auf die Schaltfläche unten, um eine neue Datei mit den verschlüsselten Nachrichten zu erstellen. Du kannst wählen, wo die Datei gespeichert werden soll.\n\nWenn du die Datei auf einem Wechsellaufwerk speichern möchtest, lege das Laufwerk jetzt ein.</string>
-  <string name="removable_drive_send_no_data">Es gibt derzeit keine Nachrichten, die an diesen Kontakt gesendet werden sollen.</string>
-  <string name="removable_drive_send_not_supported">Dieser Kontakt verwendet eine alte Version von Briar oder ein altes Gerät, das diese Funktion nicht unterstützt.</string>
-  <string name="removable_drive_send_button">Datei für den Export wählen</string>
-  <string name="removable_drive_ongoing">Warte bitte auf den Abschluss der laufenden Aufgabe</string>
-  <string name="removable_drive_receive_intro">Tippe auf die Schaltfläche unten, um die Datei auszuwählen, die dir dein Kontakt geschickt hat.\n\nWenn sich die Datei auf einem Wechsellaufwerk befindet, lege das Laufwerk jetzt ein.</string>
-  <string name="removable_drive_receive_button">Datei für den Import wählen</string>
-  <string name="removable_drive_success_send_title">Export erfolgreich</string>
-  <string name="removable_drive_success_send_text">Die Daten wurden erfolgreich exportiert. Du hast nun 28 Tage Zeit, um die Datei zu deinem Kontakt zu transportieren.\n\nWenn sich die Datei auf einem Wechsellaufwerk befindet, verwende die Benachrichtigung in der Statusleiste, um das Laufwerk auszuwerfen, bevor du es aussteckst.</string>
-  <string name="removable_drive_success_receive_title">Import erfolgreich</string>
-  <string name="removable_drive_success_receive_text">Alle verschlüsselten Nachrichten, die in dieser Datei enthalten sind, wurden empfangen.</string>
-  <string name="removable_drive_error_send_title">Fehler beim Datenexport</string>
-  <string name="removable_drive_error_send_text">Es ist ein Fehler beim Schreiben von Daten in die Datei aufgetreten.\n\nWenn du ein Wechsellaufwerk verwendest, vergewissere dich, dass es richtig eingelegt ist, und versuche es noch einmal.\n\nWenn der Fehler weiterhin besteht, sende bitte eine Rückmeldung, um das Briar-Team über das Problem zu informieren.</string>
-  <string name="removable_drive_error_receive_title">Fehler beim Datenimport</string>
-  <string name="removable_drive_error_receive_text">Die ausgewählte Datei enthält nichts, was Briar erkennen konnte.\n\nBitte überprüfe, ob du die richtige Datei ausgewählt hast. Wenn dein Kontakt die Datei vor mehr als 28 Tagen erstellt hat, kann Briar sie nicht mehr erkennen.</string>
  <!--Screenshots-->
  <!--This is a name to be used in screenshots. Feel free to change it to a local name.-->
  <string name="screenshot_alice">Alice</string>
--- a/briar-android/src/main/res/values-es/strings.xml
+++ b/briar-android/src/main/res/values-es/strings.xml
@@ -40,12 +40,13 @@
  <string name="forgotten_password">He olvidado mi contraseña</string>
  <string name="dialog_title_lost_password">Contraseña perdida</string>
  <string name="dialog_message_lost_password">Tu cuenta de Briar se almacena cifrada en tu dispositivo, no en la nube, así que no podemos restablecer tu contraseña. ¿Deseas eliminar tu cuenta y empezar de nuevo?\n\nAdvertencia: tus identidades, contactos y mensajes se perderán para siempre.</string>
+  <string name="startup_failed_notification_title">Briar no pudo iniciarse</string>
+  <string name="startup_failed_notification_text">Pulsa para más información.</string>
  <string name="startup_failed_activity_title">Fallo al iniciar Briar</string>
-  <string name="startup_failed_clock_error">Briar no pudo arrancar porque el reloj de tu dispositivo no está bien.\n\nPor favor, ajusta el reloj del mismo con la fecha y hora correctas e inténtalo de nuevo.</string>
-  <string name="startup_failed_db_error">Briar no fue capaz de abrir la base de datos conteniendo tu cuenta, contactos y mensajes.\n\nPor favor, actualiza a la última versión de la aplicación e inténtalo de nuevo, o dá de alta una nueva cuenta eligiendo \'He olvidado mi contraseña\', donde se solicita la misma.</string>
-  <string name="startup_failed_data_too_old_error">Tu cuenta fue creada con una versión antigua de esta aplicación y no se puede abrir con esta versión.\n\nDebes reinstalar la versión antigua o configurar una nueva cuenta seleccionando \"He olvidado mi contraseña\" donde se solicita la misma.</string>
-  <string name="startup_failed_data_too_new_error">Tu cuenta fue creada con una versión más nueva de esta aplicación y no se puede abrir con esta.\n\nPor favor, actualiza a la última versión e inténtalo de nuevo.</string>
-  <string name="startup_failed_service_error">Briar no fue capaz de iniciar un componente requerido.\n\nPor favor, actualiza a la última versión de la aplicación e inténtalo de nuevo.</string>
+  <string name="startup_failed_db_error">Por alguna razón, la base de datos de Briar está dañada irreparablemente. Tu cuenta, datos y todos tus contactos están perdidos. Desafortunadamente, necesitas reinstalar Briar o configurar una nueva cuenta seleccionando \"He olvidado mi contraseña\" en la solicitud de contraseña.</string>
+  <string name="startup_failed_data_too_old_error">Tu cuenta fue creada con una versión antigua de esta apli y no se puede abrir con esta versión. Debes reinstalar la versión antigua o configurar una nueva cuenta seleccionando \"He olvidado mi contraseña\" en la solicitud de contraseña.</string>
+  <string name="startup_failed_data_too_new_error">La versión de esta apli es demasiado antigua. Por favor, actualiza a la última versión y prueba de nuevo.</string>
+  <string name="startup_failed_service_error">Briar no pudo arrancar un complemento necesario. Reinstalando Briar se suele solucionar este problema. Sin embargo, por favor nota 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 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. Tu cuenta expirará en %d días y no podrá ser renovada.</item>
@@ -138,7 +139,6 @@
  <string name="open">Abrir</string>
  <string name="change">Cambiar</string>
  <string name="start">Iniciar</string>
-  <string name="finish">Finalizar</string>
  <string name="no_data">Sin datos</string>
  <string name="ellipsis">…</string>
  <string name="text_too_long">El texto ingresado es demasiado largo</string>
@@ -148,7 +148,6 @@
  <string name="sorry">Disculpa</string>
  <string name="error_start_activity">No disponible en tu sistema</string>
  <string name="status_heading">Estado:</string>
-  <string name="error">Error</string>
  <!--Contacts and Private Conversations-->
  <string name="no_contacts">No hay contactos para mostrar</string>
  <string name="no_contacts_action">Golpear el icono + para añadir un contacto</string>
@@ -165,6 +164,15 @@
  <string name="set_contact_alias">Cambiar nombre del contacto</string>
  <string name="set_contact_alias_hint">Nombre del contacto</string>
  <string name="menu_item_disappearing_messages">Mensajes con caducidad</string>
+  <string name="menu_item_connect_via_bluetooth">Conectar mediante Bluetooth</string>
+  <string name="dialog_title_connect_via_bluetooth">Conectar mediante Bluetooth</string>
+  <string name="dialog_message_connect_via_bluetooth">Tu contacto necesita estar cerca para que esto funcione.\n\nTú y tu contacto deberían presionar \"Iniciar\" ambos al mismo tiempo.</string>
+  <string name="toast_connect_via_bluetooth_already_discovering">Ya se está intentando conectar mediante Bluetooth</string>
+  <string name="toast_connect_via_bluetooth_not_discoverable">No se puede continuar sin Bluetooth</string>
+  <string name="toast_connect_via_bluetooth_no_location_permission">No se puede continuar sin permiso de ubicación</string>
+  <string name="toast_connect_via_bluetooth_start">Conectar mediante Bluetooth...</string>
+  <string name="toast_connect_via_bluetooth_success">Conectado exitosamente mediante Bluetooth</string>
+  <string name="toast_connect_via_bluetooth_error">No se pudo conectar mediante Bluetooth</string>
  <!--The first placeholder will show a duration like "7 days". The second placeholder at the end will add "Tap to learn more."-->
  <string name="auto_delete_msg_you_enabled">Tus mensajes desaparecerán después de %1$s. %2$s</string>
  <!--The placeholder at the end will add "Tap to learn more."-->
@@ -216,7 +224,6 @@
  <string name="dialog_title_image_support">Ahora puedes enviar imágenes a este contacto.</string>
  <string name="dialog_message_image_support">Pulsa este ícono para adjuntar imágenes.</string>
  <string name="messaging_too_many_attachments_toast">Solo se enviarán las primeras %d  imágenes</string>
-  <string name="menu_contact">Contacto</string>
  <!--Adding Contacts-->
  <string name="add_contact_title">Agregar contacto cercano</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>
@@ -313,16 +320,6 @@
  <string name="introduction_response_accepted_received">%1$s aceptó la presentación a %2$s.</string>
  <string name="introduction_response_declined_received">%1$s rechazó la presentación a %2$s.</string>
  <string name="introduction_response_declined_received_by_introducee">%1$s dice que %2$s rechazó la presentación.</string>
-  <!--Connect via Bluetooth-->
-  <string name="menu_item_connect_via_bluetooth">Conectar mediante Bluetooth</string>
-  <string name="connect_via_bluetooth_title">Conectar mediante Bluetooth</string>
-  <string name="connect_via_bluetooth_intro">En el caso que las conexiones Bluetooth no funcionen automáticamente, puedes usar esta pantalla para conectarte manualmente.\n\nTu contacto necesita estar cerca para que esto funcione.\n\nAmbos deberían presionar \"Inicio\" al mismo tiempo.</string>
-  <string name="connect_via_bluetooth_already_discovering">Ya se está intentando conectar vía Bluetooth. Por favor inténtalo de nuevo en unos segundos.</string>
-  <string name="connect_via_bluetooth_no_location_permission">No se puede continuar sin permiso de ubicación</string>
-  <string name="connect_via_bluetooth_start">Conectar mediante Bluetooth...</string>
-  <string name="connect_via_bluetooth_success">Conectado exitosamente mediante Bluetooth</string>
-  <string name="connect_via_bluetooth_error">No se pudo conectar mediante Bluetooth.</string>
-  <string name="connect_via_bluetooth_error_not_supported">Este dispositivo no soporta Bluetooth.</string>
  <!--Private Groups-->
  <string name="groups_list_empty">No hay grupos para mostrar</string>
  <string name="groups_list_empty_action">Golpea el icono + para crear un grupo, o pregunta a tus contactos si quieren compartir grupos contigo</string>
@@ -581,8 +578,7 @@
 		Tu contacto también puede cambiar este ajuste para ambos.</string>
  <string name="learn_more">Aprende más</string>
  <string name="disappearing_messages_summary">Haz que futuros mensajes en esta conversación desaparezcan automáticamente después de 7\u00A0days.</string>
-  <!--Settings Actions-->
-  <string name="pref_category_actions">Acciones</string>
+  <!--Settings Feedback-->
  <string name="send_feedback">Enviar comentario</string>
  <!--Link Warning-->
  <string name="link_warning_title">Advertencia sobre el enlace</string>
@@ -591,7 +587,7 @@
  <string name="link_warning_open_link">Abrir enlace</string>
  <!--Crash Reporter-->
  <string name="crash_report_title">Informe de falla de Briar</string>
-  <string name="briar_crashed">Lo sentimos, Briar se colgó.</string>
+  <string name="briar_crashed">Lo sentimos, Briar ha fallado.</string>
  <string name="not_your_fault">No es tu culpa.</string>
  <string name="please_send_report">Por favor, ayúdanos a mejorar Briar enviándonos un informe de falla.</string>
  <string name="report_is_encrypted">Prometemos que el informe se cifrará y se enviará de forma segura.</string>
@@ -649,90 +645,6 @@
  <string name="lock_tap_to_unlock">Golpear para desbloquear</string>
  <!--Connections Screen-->
  <string name="transports_help_text">Briar puede conectar a tus contactos vía Internet, Wi-Fi o Bluetooth.\n\nTodas las conexiones a Internet van a través de la red Tor por privacidad.\n\nSi un contacto puede ser alcanzado por múltiples métodos, Briar los usa en paralelo.</string>
-  <!--Share app offline-->
-  <string name="hotspot_title">Comparte esta aplicación fuera de línea</string>
-  <string name="hotspot_intro">Comparte esta aplicación con alguien que esté cerca tuyo sin conexión a Internet, usando el Wi-Fi de tu teléfono.
-		\n\nTu teléfono iniciará un punto de acceso Wi-Fi. Las personas cercanas a tí pueden conectarse al punto de acceso y descargar la aplicación Briar desde tu teléfono.</string>
-  <string name="hotspot_button_start_sharing">Iniciar punto de acceso</string>
-  <string name="hotspot_button_stop_sharing">Detener punto de acceso</string>
-  <string name="hotspot_progress_text_start">Estableciendo punto de acceso...</string>
-  <string name="hotspot_notification_channel_title">Punto de acceso Wi-fi</string>
-  <string name="hotspot_notification_title">Compartiendo Briar sin conexión</string>
-  <string name="hotspot_button_connected">Siguiente</string>
-  <string name="permission_hotspot_location_request_body">Para crear un punto de acceso Wi-Fi, Briar necesita permiso para acceder tu ubicación.\n\nBriar no la almacena o la comparte con nadie.</string>
-  <string name="permission_hotspot_location_denied_body">Has denegado el acceso a tu ubicación, pero Briar necesita este permiso para crear un punto de acceso Wi-Fi.\n\nPor favor considera la posibilidad de conceder el acceso.</string>
-  <string name="wifi_settings_title">Configuración de Wi-Fi</string>
-  <string name="wifi_settings_request_enable_body">Para crear un punto de acceso Wi-Fi, Briar necesita usar Wi-Fi. Por favor habilítalo.</string>
-  <string name="hotspot_tab_manual">Manual</string>
-  <!--The placeholder to be inserted into the string 'hotspot_manual_wifi': People can connect by %s-->
-  <string name="hotspot_scanning_a_qr_code">escaneando un código QR</string>
-  <!--Wi-Fi setup-->
-  <!--The %s placeholder will be replaced with the translation of 'hotspot_scanning_a_qr_code'-->
-  <string name="hotspot_manual_wifi">Tu teléfono está proporcionando un punto de acceso Wi-Fi. Las personas que quieran descargar Briar pueden conectarse al punto de acceso agregándolo en la configuración de Wi-Fi de sus dispositivos, usando los detalles de abajo o mediante %s. Una vez que se hayan conectado al punto de acceso, presiona \'Siguiente\'.</string>
-  <string name="hotspot_manual_wifi_ssid">Nombre de red</string>
-  <string name="hotspot_qr_wifi">Tu teléfono está proporcionando un punto de acceso Wi-Fi. Las personas que quieran descargar Briar pueden conectarse al punto de acceso escaneando este código QR. Una vez que se hayan conectado al punto de acceso, presiona \'Siguiente\'.</string>
-  <string name="hotspot_no_peers_connected">No hay dispositivos conectados</string>
-  <plurals name="hotspot_peers_connected">
-    <item quantity="one">%s dispositivo conectado</item>
-    <item quantity="other">%s dispositivos conectados</item>
-  </plurals>
-  <!--Download link-->
-  <!--The %s placeholder will be replaced with the translation of 'hotspot_scanning_a_qr_code'-->
-  <string name="hotspot_manual_site">Tu teléfono está proporcionando un punto de acceso Wi-Fi. Las personas que están conectadas al mismo pueden descargar Briar tipeando el siguiente vínculo en un navegador web o %s.</string>
-  <string name="hotspot_manual_site_address">Dirección (URL)</string>
-  <string name="hotspot_qr_site">Tu teléfono está proporcionando un punto de acceso Wi-Fi. Las personas que están conectadas al mismo pueden descargar Briar escaneando este código QR.</string>
-  <!--e.g. Download Briar 1.2.20-->
-  <string name="website_download_title">Descargar %s</string>
-  <string name="website_download_intro">Alguien en las cercanías compartió %s contigo.</string>
-  <string name="website_download_outro">Luego de que la descarga se complete, abre el archivo descargado e instálalo.</string>
-  <string name="website_troubleshooting_title">Resolución de problemas</string>
-  <string name="website_troubleshooting_1">Si no puedes descargar la aplicación, inténtalo con una aplicación de navegación web diferente.</string>
-  <string name="website_troubleshooting_2_old">Para instalar la aplicación descargada, podrías necesitar permitir la instalación de aplicaciones desde \"Fuentes desconocidas\" en la configuración del sistema. Con posterioridad, podrías necesitar descargar la aplicación de nuevo. Te recomendamos deshabilitar el ajuste \"Fuentes desconocidas\" después de instalar la aplicación.</string>
-  <string name="website_troubleshooting_2_new">Para instalar la aplicación descargada, podrías necesitar permitirle a tu navegador instalar aplicaciones desconocidas. Luego de instalar la aplicación, recomendamos remover el permiso del navegador para este tipo de instalaciones.</string>
-  <string name="hotspot_help_wifi_title">Problemas para conectar al Wi-Fi:</string>
-  <string name="hotspot_help_wifi_1">Intenta deshabilitar y rehabilitar el Wi-Fi en ambos teléfonos, e intenta de nuevo.</string>
-  <string name="hotspot_help_wifi_2">Si tu teléfono se queja de que el Wi-Fi no tiene Internet, dile que quieres permanecer conectado de todos modos.</string>
-  <string name="hotspot_help_wifi_3">Reinicia el teléfono que está ejecutando el punto de acceso Wi-Fi, luego inicia Briar e intenta compartir de nuevo.</string>
-  <string name="hotspot_help_site_title">Problemas visitando al sitio web local:</string>
-  <string name="hotspot_help_site_1">Comprueba doblemente que hayas entrado la dirección exactamente como se muestra. Un pequeño error puede hacer que falle.</string>
-  <string name="hotspot_help_site_2">Asegúrate de que tu teléfono aún esté conectado al Wi-Fi correcto (ver arriba) cuando intentes acceder al sitio.</string>
-  <string name="hotspot_help_site_3">Si tienes una aplicación de cortafuegos, comprueba que no esté bloqueando el acceso.</string>
-  <string name="hotspot_help_site_4">Si puedes visitar el sitio, pero no descargar la aplicación Briar, inténtalo con una aplicación de navegación web diferente.</string>
-  <string name="hotspot_help_fallback_title">¿Nada funciona?</string>
-  <string name="hotspot_help_fallback_intro">Puedes intentar guardar la aplicación como archivo .apk para compartir de cualquier otra manera. Una vez que el archivo ha sido transferido al otro dispositivo, puede ser usado para instalar Briar.
-		\n\nConsejo: Para compartir vía Bluetooth, primero podrías necesitar renombrar al archivo para que finalice con .zip.</string>
-  <string name="hotspot_help_fallback_button">Guardar aplicación</string>
-  <!--error handling-->
-  <string name="hotspot_error_intro">Algo salió mal mientras se intentaba compartir la aplicación vía Wi-Fi:</string>
-  <string name="hotspot_error_no_wifi_direct">El dispositivo no soporta Wi-Fi Direct</string>
-  <string name="hotspot_error_start_callback_failed">Fallo al iniciar punto de acceso: error %s</string>
-  <string name="hotspot_error_start_callback_failed_unknown">El punto de acceso falló al iniciar con un error desconocido, la razón es %d</string>
-  <string name="hotspot_error_start_callback_no_group_info">Fallo al iniciar punto de acceso: no hay información de grupo</string>
-  <string name="hotspot_error_web_server_start">Error al iniciar el servidor web</string>
-  <string name="hotspot_error_web_server_serve">Error al presentar el sitio web.\n\nPor favor, envía tus comentarios (con datos anónimos) a través de la aplicación Briar si la dificultad persiste.</string>
-  <string name="hotspot_flag_test">Advertencia: Esta aplicación fue instalada con Android Studio, y NO puede ser instalada en otro dispositivo.</string>
-  <string name="hotspot_error_framework_busy">Incapaz de iniciar el punto de acceso.\n\nSi tienes otro punto de acceso ejecutándose o estás compartiendo tu conexión de Internet vía Wi-Fi, intenta detener eso e intentar de nuevo luego.</string>
-  <!--Transfer Data via Removable Drives-->
-  <string name="removable_drive_menu_title">Conectar a través de Discos Removibles</string>
-  <string name="removable_drive_intro">Si no puedes conectarte con tu contacto vía Internet, Wi-Fi o Bluetooth, Briar también puede transferir mensajes en un disco removible, tal como una memoria USB o tarjeta SD.</string>
-  <string name="removable_drive_explanation">Si no puedes conectarte con tu contacto vía Internet, Wi-Fi o Bluetooth, Briar también puede transferir mensajes en un disco removible, tal como una memoria USB o tarjeta SD.\n\nCuando usas el botón \"Enviar Datos\", cualesquiera datos que estén esperando ser enviados al contacto serán escritos al disco removible. Esto incluye mensajes privados, adjuntos, blogs, foros y grupos privados.\n\nTodo será cifrado antes de que sea escrito al disco removible.\n\nCuando tu contacto reciba el disco removible, puede usar el botón \"Recibir Datos\" para importar los mensajes dentro de Briar.</string>
-  <string name="removable_drive_title_send">Enviar Datos</string>
-  <string name="removable_drive_title_receive">Recibir Datos</string>
-  <string name="removable_drive_send_intro">Pulsa el botón de abajo para crear un nuevo archivo conteniendo los mensajes cifrados. Puedes elegir dónde será guardado el archivo.\n\nSi quieres guardarlo en un disco removible, insértalo ahora.</string>
-  <string name="removable_drive_send_no_data">Actualmente no hay mensajes esperando ser enviados a este contacto.</string>
-  <string name="removable_drive_send_not_supported">Este contacto está usando una versión vieja de Briar, o un dispositivo viejo que no soporta esta característica.</string>
-  <string name="removable_drive_send_button">Selecciona el archivo a exportar</string>
-  <string name="removable_drive_ongoing">Por favor espera hasta que la tarea en curso se complete</string>
-  <string name="removable_drive_receive_intro">Pulsa el botón de abajo para elegir el archivo que envió tu contacto.\n\nSi el archivo está en un disco removible, insértalo ahora.</string>
-  <string name="removable_drive_receive_button">Selecciona el archivo a importar</string>
-  <string name="removable_drive_success_send_title">Exportado con éxito</string>
-  <string name="removable_drive_success_send_text">Datos exportados exitosamente. Ahora tienes 28 días para transportar el archivo hasta tu contacto.\n\nSi el archivo está en un disco removible, usa la notificación en la barra de estado para expulsar el disco antes de desconectarlo.</string>
-  <string name="removable_drive_success_receive_title">Importado con éxito</string>
-  <string name="removable_drive_success_receive_text">Todos los mensajes cifrados contenidos en este archivo han sido recibidos.</string>
-  <string name="removable_drive_error_send_title">Error al exportar datos</string>
-  <string name="removable_drive_error_send_text">Hubo un error escribiendo los datos al archivo.\n\nSi estás usando un disco removible, asegúrate de que esté apropiadamente insertado e inténtalo de nuevo.\n\nSi el error persiste, por favor envía tus comentarios para que el equipo de Briar conozca acerca de esta dificultad.</string>
-  <string name="removable_drive_error_receive_title">Error al importar datos</string>
-  <string name="removable_drive_error_receive_text">El archivo seleccionado no contenía nada que Briar pudiera reconocer.\n\nPor favor comprueba que hayas elegido el archivo correcto.\n\nSi tu contacto creó el archivo más de 28 días atrás, Briar no será capaz de reconocerlo.</string>
  <!--Screenshots-->
  <!--This is a name to be used in screenshots. Feel free to change it to a local name.-->
  <string name="screenshot_alice">Alicia</string>
--- a/briar-android/src/main/res/values-eu/strings.xml
+++ b/briar-android/src/main/res/values-eu/strings.xml
@@ -1,5 +1,5 @@
 <?xml version='1.0' encoding='UTF-8'?>
-<resources>
+<resources xmlns:tools="http://schemas.android.com/tools">
  <!--Setup-->
  <string name="setup_title">Ongi etorri Briar-era</string>
  <string name="setup_name_explanation">Zure ezizena argitaratzen dituzun eduki guztien ondoan agertuko da. Ezingo duzu aldatu, kontua sortu eta gero.</string>
@@ -130,7 +130,7 @@
  <string name="set_contact_alias">Aldatu kontaktuaren izena</string>
  <string name="set_contact_alias_hint">Kontaktuaren izena</string>
  <string name="menu_item_connect_via_bluetooth">Konektatu Bluetooth bidez</string>
-  <string name="connect_via_bluetooth_title">Konektatu Bluetooth bidez</string>
+  <string name="dialog_title_connect_via_bluetooth">Konektatu Bluetooth bidez</string>
  <!--The first placeholder will show a duration like "7 days". The second placeholder at the end will add "Tap to learn more."-->
  <!--The placeholder at the end will add "Tap to learn more."-->
  <!--The first placeholder will show a contact's name. The second placeholder will show a duration like "7 days". The third placeholder at the end will add "Tap to learn more."-->
--- a/briar-android/src/main/res/values-fa/strings.xml
+++ b/briar-android/src/main/res/values-fa/strings.xml
@@ -44,7 +44,13 @@
  <string name="dialog_message_lost_password">حساب کاربری Briar (برایر) شما به صورت رمزنگاری شده روی سیستم شما به جای حافظه ابری ذخیره شده است برای همین ما نمی توانیم گذرواژه شما را به صورت مجدد تنظیم کنیم. آیا مایل هستید تا حساب کاربری شما را پاک کنیم و دوباره از ابتدا شروع کنیم؟

 اخطار: هویت های شما، مخاطبان شما و پیام های شما برای همیشه از بین خواهند رفت.</string>
+  <string name="startup_failed_notification_title">Briar (برایر) نمی تواند شروع به کار کند.</string>
+  <string name="startup_failed_notification_text">برای اطلاعات بیشتر کلیک کنید</string>
  <string name="startup_failed_activity_title">خطا در شروع Briar (برایر)</string>
+  <string name="startup_failed_db_error">به دلایلی، پایگاه داده Briar (برایر) شما خراب شده و قابل اصلاح نیست. حساب کاربری شما، داده های شما و تمام مخاطبان شما از بین رفته اند. متاسفانه، شما یا باید Briar (برایر) را دوباره نصب کنید یا یک حساب کاربری جدید در هنگام خواست گذرواژه با انتخاب گذرواژه خود را فراموش کرده ام\' ایجاد کنید.</string>
+  <string name="startup_failed_data_too_old_error">حساب کاربری شما با یک نسخه قدیمی از این برنامه ایجاد شده است و به همین خاطر با این نسخه نمی تواند باز شود. شما باید نسخه قدیمی را دوباره نصب کنید یا یک حساب کاربری جدید با \"گذرواژه خود را فراموش کرده ام\" در صفحه ی گذرواژه ایجاد کنید.</string>
+  <string name="startup_failed_data_too_new_error">این نسخه از برنامه قدیمی می باشد. لطفا به آخرین نسخه از برنامه ارتقاء داده و دوباره سعی کنید.</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>
@@ -139,7 +145,6 @@
  <string name="open">باز کردن</string>
  <string name="change">تغییر</string>
  <string name="start">آغاز</string>
-  <string name="finish">پایان</string>
  <string name="no_data">داده ای موجود نمی باشد</string>
  <string name="ellipsis">…</string>
  <string name="text_too_long">متن وارد شده بیش از حد طولانی می باشد</string>
@@ -149,7 +154,6 @@
  <string name="sorry">پوزش</string>
  <string name="error_start_activity">برای سیستم شما موجود نمی باشد</string>
  <string name="status_heading">وضعیت:</string>
-  <string name="error">خطا</string>
  <!--Contacts and Private Conversations-->
  <string name="no_contacts">هیچ مخاطبی برای نمایش وجود ندارد</string>
  <string name="no_contacts_action">برای افزودن مخاطب روی + کلیک کنید</string>
@@ -166,6 +170,15 @@
  <string name="set_contact_alias">تغییر نام مخاطب</string>
  <string name="set_contact_alias_hint">نام مخاطب</string>
  <string name="menu_item_disappearing_messages">پیام‌های ناپدید شونده</string>
+  <string name="menu_item_connect_via_bluetooth">اتصال از طریق بلوتوث</string>
+  <string name="dialog_title_connect_via_bluetooth">اتصال از طریق بلوتوث</string>
+  <string name="dialog_message_connect_via_bluetooth">برای امکان این عملکرد، مخاطب شما باید نزدیک باشد. \n\n شما و مخاطبتان باید همزمان گزینه‌ی \"شروع\" را بفشارید.</string>
+  <string name="toast_connect_via_bluetooth_already_discovering">در حال تلاش برای اتصال از طریق بلوتوث</string>
+  <string name="toast_connect_via_bluetooth_not_discoverable">امکان ادامه بدون بلوتوث وجود ندارد</string>
+  <string name="toast_connect_via_bluetooth_no_location_permission">امکان ادامه بدون اجازه مکان‌یابی وجود ندارد</string>
+  <string name="toast_connect_via_bluetooth_start">در حال اتصال از طریق بلوتوث</string>
+  <string name="toast_connect_via_bluetooth_success">ارتباط از طریق بلوتوث با موفقیت انجام شد</string>
+  <string name="toast_connect_via_bluetooth_error">اتصال از طریق بلوتوث برقرار نشد</string>
  <!--The first placeholder will show a duration like "7 days". The second placeholder at the end will add "Tap to learn more."-->
  <string name="auto_delete_msg_you_enabled">پیام شما پس از %1$s ناپدید خواهد شد. %2$s</string>
  <!--The placeholder at the end will add "Tap to learn more."-->
@@ -219,7 +232,6 @@
  <string name="dialog_title_image_support">شما هم اکنون می‌توانید به این مخاطب تصاویر ارسال کنید</string>
  <string name="dialog_message_image_support">برای پیوست کردن تصاویر به روی آیکون ضربه بزنید.</string>
  <string name="messaging_too_many_attachments_toast">فقط %d تصویر آغازین ارسال خواهند شد</string>
-  <string name="menu_contact">تماس</string>
  <!--Adding Contacts-->
  <string name="add_contact_title">افزودن مخاطب از نزدیک</string>
  <string name="face_to_face">برای اضافه کردن فرد به عنوان مخاطب باید با او به صورت حضوری ملاقات کنید.
@@ -326,12 +338,6 @@
  <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>
-  <!--Connect via Bluetooth-->
-  <string name="menu_item_connect_via_bluetooth">اتصال از طریق بلوتوث</string>
-  <string name="connect_via_bluetooth_title">اتصال از طریق بلوتوث</string>
-  <string name="connect_via_bluetooth_no_location_permission">امکان ادامه بدون اجازه مکان‌یابی وجود ندارد</string>
-  <string name="connect_via_bluetooth_start">در حال اتصال از طریق بلوتوث</string>
-  <string name="connect_via_bluetooth_success">ارتباط از طریق بلوتوث با موفقیت انجام شد</string>
  <!--Private Groups-->
  <string name="groups_list_empty">هیچ گروهی برای نمایش وجود ندارد</string>
  <string name="groups_list_empty_action">برای ایجاد یک گروه روی آیکون + کلیک کنید، یا از مخاطبان خود بخواهید تا گروه های خود را با شما به اشتراک بگذارند</string>
@@ -612,8 +618,7 @@
 		 همچنین مخاطب شما می‌تواند این تنظیمات را برای شما تغییر دهد.</string>
  <string name="learn_more">اطلاعات بیشتر</string>
  <string name="disappearing_messages_summary">پس از این پیام‌های این گفتگو را بعد از 7\u00A0 روز ناپدید کن.</string>
-  <!--Settings Actions-->
-  <string name="pref_category_actions">فعالیتها </string>
+  <!--Settings Feedback-->
  <string name="send_feedback">ارسال بازخورد</string>
  <!--Link Warning-->
  <string name="link_warning_title">هشدار پیوند</string>
@@ -622,6 +627,7 @@
  <string name="link_warning_open_link">باز کردن پیوند</string>
  <!--Crash Reporter-->
  <string name="crash_report_title">گزارش خطای Briar (برایر)</string>
+  <string name="briar_crashed">متاسفیم، Briar (برایر) از کار افتاده است.</string>
  <string name="not_your_fault">این تقصیر شما نیست.</string>
  <string name="please_send_report">لطفا با فرستادن گزارش خطا به ما کمک کنید تا Briar (برایر) را بهتر کنیم.</string>
  <string name="report_is_encrypted">به شما اطمینان می دهیم که گزارش شما رمزنگاری شده و به صورت امن فرستاده می شود.</string>
@@ -691,19 +697,6 @@ Briar (برایر) موقعیت شما را ذخیره نمی‌کند و آن
  <string name="lock_tap_to_unlock">برای آنلاک کردن کلیک کنید</string>
  <!--Connections Screen-->
  <string name="transports_help_text">Briar (برایر) می‌تواند از طریق اینترنت، Wi-Fi و یا بلوتوث به مخاطبین شما متصل گردد.\n\nارتباط با اینترنت از طریق شبکه‌ی تور صورت می‌پذیرد.\n\nاگر دسترسی به مخاطب شما از روش‌های مختلفی ممکن باشد، Briar (برایر) به صورت موازی از آن‌ها استفاده خواهد کرد.</string>
-  <!--Share app offline-->
-  <string name="hotspot_button_connected">بعد</string>
-  <string name="hotspot_tab_manual">دستی</string>
-  <!--The placeholder to be inserted into the string 'hotspot_manual_wifi': People can connect by %s-->
-  <!--Wi-Fi setup-->
-  <!--The %s placeholder will be replaced with the translation of 'hotspot_scanning_a_qr_code'-->
-  <!--Download link-->
-  <!--The %s placeholder will be replaced with the translation of 'hotspot_scanning_a_qr_code'-->
-  <!--e.g. Download Briar 1.2.20-->
-  <string name="website_troubleshooting_title">◾️ عیب یابی</string>
-  <!--error handling-->
-  <!--Transfer Data via Removable Drives-->
-  <string name="removable_drive_success_receive_title">درون برد موفق بود</string>
  <!--Screenshots-->
  <!--This is a name to be used in screenshots. Feel free to change it to a local name.-->
  <string name="screenshot_alice">آلیس</string>
--- a/briar-android/src/main/res/values-fr/strings.xml
+++ b/briar-android/src/main/res/values-fr/strings.xml
@@ -40,7 +40,13 @@
  <string name="forgotten_password">J’ai oublié mon mot de passe</string>
  <string name="dialog_title_lost_password">Mot de passe oublié</string>
  <string name="dialog_message_lost_password">Votre compte Briar est enregistré chiffré sur votre appareil, pas dans le nuage, et nous ne pouvons donc pas réinitialiser votre mot de passe. Voulez-vous supprimer votre compte et recommencer ?\n\nAttention : vos identités, contacts et messages seront perdus irrémédiablement.</string>
+  <string name="startup_failed_notification_title">Impossible de démarrer Briar</string>
+  <string name="startup_failed_notification_text">Toucher pour plus d’informations.</string>
  <string name="startup_failed_activity_title">Échec de démarrage de Briar</string>
+  <string name="startup_failed_db_error">Pour quelque raison, votre base de données Briar est corrompue sans espoir de réparation. Votre compte, vos données et tous vos contacts sont perdus. Malheureusement, vous devez réinstaller Briar et créer un nouveau compte en choisissant « J’ai oublié mon mot de passe » dans l’invite de mot de passe.</string>
+  <string name="startup_failed_data_too_old_error">Votre compte a été créé avec une ancienne version de cette appli et ne peut pas être ouvert avec cette version. Vous devez soit réinstaller l’ancienne version, soit créer un nouveau compte en choisissant « J’ai oublié mon mot de passe » dans l’invite de mot de passe.</string>
+  <string name="startup_failed_data_too_new_error">Cette version de l’appli est trop ancienne. Veuillez passer à la version la plus récente et réessayer.</string>
+  <string name="startup_failed_service_error">Briar n’a pas pu démarrer un greffon exigé. Réinstaller Briar résout généralement ce problème. Veuillez cependant noter que vous perdrez votre compte et toutes données relatives puisque Briar n’utilise pas de serveurs centralisés sur lesquels enregistrer vos données.</string>
  <plurals name="expiry_warning">
    <item quantity="one">Ceci est une version de test de Briar. Votre compte arrivera à expiration dans %d jour et ne peut pas être renouvelé.</item>
    <item quantity="other">Ceci est une version de test de Briar. Votre compte arrivera à expiration dans %d jours et ne pourra pas être renouvelé.</item>
@@ -133,7 +139,6 @@
  <string name="open">Ouvrir</string>
  <string name="change">Changer</string>
  <string name="start">Commencer</string>
-  <string name="finish">Terminer</string>
  <string name="no_data">Aucune donnée</string>
  <string name="ellipsis">...</string>
  <string name="text_too_long">Le texte saisi est trop long</string>
@@ -143,7 +148,6 @@
  <string name="sorry">Désolé</string>
  <string name="error_start_activity">N’est pas proposée sur votre système.</string>
  <string name="status_heading">État :</string>
-  <string name="error">Erreur</string>
  <!--Contacts and Private Conversations-->
  <string name="no_contacts">Aucun contact à afficher</string>
  <string name="no_contacts_action">Touchez l’icône + pour ajouter un contact</string>
@@ -160,6 +164,15 @@
  <string name="set_contact_alias">Changer le nom du contact</string>
  <string name="set_contact_alias_hint">Nom du contact</string>
  <string name="menu_item_disappearing_messages">Messages éphémères</string>
+  <string name="menu_item_connect_via_bluetooth">Se connecter par Bluetooth</string>
+  <string name="dialog_title_connect_via_bluetooth">Se connecter par Bluetooth</string>
+  <string name="dialog_message_connect_via_bluetooth">Afin que cela fonctionne, votre contact doit être à proximité.\n\nVotre contact et vous devriez appuyer ensemble sur « Commencer ».</string>
+  <string name="toast_connect_via_bluetooth_already_discovering">Tentative de connexion par Bluetooth déjà en cours</string>
+  <string name="toast_connect_via_bluetooth_not_discoverable">Impossible de poursuivre sans le Bluetooth</string>
+  <string name="toast_connect_via_bluetooth_no_location_permission">Impossible de poursuivre sans la permission de position</string>
+  <string name="toast_connect_via_bluetooth_start">Connexion par Bluetooth…</string>
+  <string name="toast_connect_via_bluetooth_success">Connectée par Bluetooth avec succès</string>
+  <string name="toast_connect_via_bluetooth_error">Impossible de se connecter par Bluetooth</string>
  <!--The first placeholder will show a duration like "7 days". The second placeholder at the end will add "Tap to learn more."-->
  <string name="auto_delete_msg_you_enabled">Vos messages disparaîtront après %1$s. %2$s</string>
  <!--The placeholder at the end will add "Tap to learn more."-->
@@ -211,7 +224,6 @@
  <string name="dialog_title_image_support">Vous pouvez désormais envoyer des images à ce contact</string>
  <string name="dialog_message_image_support">Touchez cette icône pour joindre des images.</string>
  <string name="messaging_too_many_attachments_toast">Seules les %d premières images seront envoyées</string>
-  <string name="menu_contact">Contact</string>
  <!--Adding Contacts-->
  <string name="add_contact_title">Ajouter un contact à proximité</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>
@@ -308,12 +320,6 @@
  <string name="introduction_response_accepted_received">%1$s a accepté d’être présenté à %2$s.</string>
  <string name="introduction_response_declined_received">%1$s a refusé d’être présenté à %2$s.</string>
  <string name="introduction_response_declined_received_by_introducee">%1$s annonce que %2$s a refusé la présentation.</string>
-  <!--Connect via Bluetooth-->
-  <string name="menu_item_connect_via_bluetooth">Se connecter par Bluetooth</string>
-  <string name="connect_via_bluetooth_title">Se connecter par Bluetooth</string>
-  <string name="connect_via_bluetooth_no_location_permission">Impossible de poursuivre sans la permission de position</string>
-  <string name="connect_via_bluetooth_start">Connexion par Bluetooth…</string>
-  <string name="connect_via_bluetooth_success">Connectée par Bluetooth avec succès</string>
  <!--Private Groups-->
  <string name="groups_list_empty">Aucun groupe à afficher</string>
  <string name="groups_list_empty_action">Touchez l’icône + pour créer un groupe ou pour demander à vos contacts de partager des groupes avec vous</string>
@@ -574,8 +580,7 @@ copies des messages que vous envoyez.
 		Votre contact peut aussi changer ce paramètre pour vous deux.</string>
  <string name="learn_more">En apprendre davantage</string>
  <string name="disappearing_messages_summary">Faire disparaître automatiquement les futurs messages de cette conversation après 7 jours.</string>
-  <!--Settings Actions-->
-  <string name="pref_category_actions">Actions</string>
+  <!--Settings Feedback-->
  <string name="send_feedback">Envoyer une rétroaction</string>
  <!--Link Warning-->
  <string name="link_warning_title">Avertissement de lien</string>
@@ -584,6 +589,7 @@ copies des messages que vous envoyez.
  <string name="link_warning_open_link">Ouvrir le lien</string>
  <!--Crash Reporter-->
  <string name="crash_report_title">Rapport de plantage de Briar</string>
+  <string name="briar_crashed">Désolé, Briar a planté.</string>
  <string name="not_your_fault">Vous n’y êtes pour rien.</string>
  <string name="please_send_report">Veuillez nous aider à améliorer Briar en nous envoyant un rapport de plantage.</string>
  <string name="report_is_encrypted">Nous promettons que le rapport est chiffré et envoyé en toute sécurité. </string>
@@ -641,20 +647,6 @@ copies des messages que vous envoyez.
  <string name="lock_tap_to_unlock">Toucher pour déverrouiller</string>
  <!--Connections Screen-->
  <string name="transports_help_text">Briar peut se connecter à vos contacts par Internet, Wi-Fi ou Bluetooth.\n\nToutes les connections Internet passent par le réseau Tor afin de protéger les données.\n\nSi un contact peut être joint par plusieurs moyens, Briar les utilisera simultanément.</string>
-  <!--Share app offline-->
-  <string name="hotspot_notification_channel_title">Point d’accès Wi-Fi</string>
-  <string name="hotspot_button_connected">Suivant</string>
-  <string name="hotspot_tab_manual">Manuel</string>
-  <!--The placeholder to be inserted into the string 'hotspot_manual_wifi': People can connect by %s-->
-  <!--Wi-Fi setup-->
-  <!--The %s placeholder will be replaced with the translation of 'hotspot_scanning_a_qr_code'-->
-  <!--Download link-->
-  <!--The %s placeholder will be replaced with the translation of 'hotspot_scanning_a_qr_code'-->
-  <!--e.g. Download Briar 1.2.20-->
-  <string name="website_troubleshooting_title">Dépannage</string>
-  <!--error handling-->
-  <!--Transfer Data via Removable Drives-->
-  <string name="removable_drive_success_receive_title">L’importation est réussie</string>
  <!--Screenshots-->
  <!--This is a name to be used in screenshots. Feel free to change it to a local name.-->
  <string name="screenshot_alice">Laurence</string>
--- a/briar-android/src/main/res/values-gl/strings.xml
+++ b/briar-android/src/main/res/values-gl/strings.xml
@@ -33,7 +33,13 @@
  <string name="forgotten_password">Esquecín a miña clave</string>
  <string name="dialog_title_lost_password">Contrasinal perdido</string>
  <string name="dialog_message_lost_password">Briar almacena a túa configuración cifrada no dispositivo, non na nube, así que non podemos restabelecer o teu contrasinal. Quererías borrar a túa conta e empezar de novo?\n\nPrecaución: As túas identidades, contactos e mensaxes serán eliminadas de forma permanente.</string>
+  <string name="startup_failed_notification_title">Briar non puido iniciarse</string>
+  <string name="startup_failed_notification_text">Toca para máis información.</string>
  <string name="startup_failed_activity_title">Fallo de Inicio de Briar</string>
+  <string name="startup_failed_db_error">Por algún motivo, a túa base de datos de Briar está defectuosa sen remedio. A túa conta, os teus datos e contactos perdéronse. Desgraciadamente, debes reinstalar Briar ou crear unha nova conta escollendo \'Esquecín o meu contrasinal\' cando se che solicite o contrasinal.</string>
+  <string name="startup_failed_data_too_old_error">A túa conta foi creada cunha versión anterior da aplicación e non se pode abrir con esta versión. Deberás reinstalar a versión anterior ou ben crear unha nova conta escollendo \'Esquecín o meu contrasinal\' cando se che solicite o contrasinal.</string>
+  <string name="startup_failed_data_too_new_error">Esta versión da app é moi antiga. Actualiza por favor á última versión e inténtao de novo.</string>
+  <string name="startup_failed_service_error">Briar non puido iniciar un complemento necesario. Normalmente ao reinstalar Briar solucionase este problema. Ten en conta que entón perderás a túa conta e todos os datos asociados a esta pois Briar non está a utilizar servidores centrais para almacenar os teus datos.</string>
  <plurals name="expiry_warning">
    <item quantity="one">Esta versión de Briar é para probas. A conta caducará en %d día e non se pode anovar.</item>
    <item quantity="other">Esta é unha versión de proba de Briar. A conta caducará en %d días e non se pode anovar.</item>
@@ -126,7 +132,6 @@
  <string name="open">Abrir</string>
  <string name="change">Cambiar</string>
  <string name="start">Comezar</string>
-  <string name="finish">Rematar</string>
  <string name="no_data">Sen datos</string>
  <string name="ellipsis">...</string>
  <string name="text_too_long">O texto inserido e demasiado longo</string>
@@ -136,7 +141,6 @@
  <string name="sorry">Desculpa</string>
  <string name="error_start_activity">Non dispoñible para o teu sistema</string>
  <string name="status_heading">Estado:</string>
-  <string name="error">Erro</string>
  <!--Contacts and Private Conversations-->
  <string name="no_contacts">Sen contactos que amosar</string>
  <string name="no_contacts_action">Toca na icona + para engadir un contacto</string>
@@ -153,6 +157,14 @@
  <string name="set_contact_alias">Cambiar o nome do contacto</string>
  <string name="set_contact_alias_hint">Nome do contacto</string>
  <string name="menu_item_disappearing_messages">Mensaxes efémeras</string>
+  <string name="menu_item_connect_via_bluetooth">Conectar vía Bluetooth</string>
+  <string name="dialog_title_connect_via_bluetooth">Conectar vía Bluetooth</string>
+  <string name="dialog_message_connect_via_bluetooth">O teu contacto ten que estar preto para que isto funcione.\n\nTi e o teu contacto tedes que premer en \"Iniciar\" ao mesmo tempo.</string>
+  <string name="toast_connect_via_bluetooth_not_discoverable">Non se pode continuar sen o Bluetooth</string>
+  <string name="toast_connect_via_bluetooth_no_location_permission">Non se pode continuar sen o permiso de localización</string>
+  <string name="toast_connect_via_bluetooth_start">Conectando vía Bluetooth...</string>
+  <string name="toast_connect_via_bluetooth_success">Conectouse correctamente vía Bluetooth</string>
+  <string name="toast_connect_via_bluetooth_error">Non se puido conectar vía Bluetooth</string>
  <!--The first placeholder will show a duration like "7 days". The second placeholder at the end will add "Tap to learn more."-->
  <string name="auto_delete_msg_you_enabled">As túas mensaxes desaparecerán após %1$s . %2$s</string>
  <!--The placeholder at the end will add "Tap to learn more."-->
@@ -204,7 +216,6 @@
  <string name="dialog_title_image_support">Xa podes enviar imaxes a este contacto</string>
  <string name="dialog_message_image_support">Toque nesta icona para anexar imaxes.</string>
  <string name="messaging_too_many_attachments_toast">Só se enviarán as primeiras %d imaxes</string>
-  <string name="menu_contact">Contacto</string>
  <!--Adding Contacts-->
  <string name="add_contact_title">Engadir contacto próximo</string>
  <string name="face_to_face">Debes verte coa persoa que queres engadir como contacto.\n\Isto evitará que calquera poida suplantarte ou ler as túas mensaxes no futuro.</string>
@@ -301,12 +312,6 @@
  <string name="introduction_response_accepted_received">%1$s aceptou a presentación a %2$s.</string>
  <string name="introduction_response_declined_received">%1$s rexeitou a presentación a %2$s.</string>
  <string name="introduction_response_declined_received_by_introducee">%1$s di que %2$srexeitou a presentación.</string>
-  <!--Connect via Bluetooth-->
-  <string name="menu_item_connect_via_bluetooth">Conectar vía Bluetooth</string>
-  <string name="connect_via_bluetooth_title">Conectar vía Bluetooth</string>
-  <string name="connect_via_bluetooth_no_location_permission">Non se pode continuar sen o permiso de localización</string>
-  <string name="connect_via_bluetooth_start">Conectando vía Bluetooth...</string>
-  <string name="connect_via_bluetooth_success">Conectouse correctamente vía Bluetooth</string>
  <!--Private Groups-->
  <string name="groups_list_empty">Sen grupos que amosar</string>
  <string name="groups_list_empty_action">Toca a icona + para crear un grupo, ou solicita aos contactos que compartan grupos contigo</string>
@@ -564,8 +569,7 @@
 		O teu contacto tamén pode cambiar este axuste para ambas.</string>
  <string name="learn_more">Aprender máis</string>
  <string name="disappearing_messages_summary">Facer que as futuras mensaxes da conversa desaparecerán automáticamente após 7\u00A0días.</string>
-  <!--Settings Actions-->
-  <string name="pref_category_actions">Accións</string>
+  <!--Settings Feedback-->
  <string name="send_feedback">Envía a avaliación</string>
  <!--Link Warning-->
  <string name="link_warning_title">Aviso de ligazón</string>
@@ -574,6 +578,7 @@
  <string name="link_warning_open_link">Abrir ligazón</string>
  <!--Crash Reporter-->
  <string name="crash_report_title">Informe de fallo de Briar</string>
+  <string name="briar_crashed">Lamentámolo, Briar fallou.</string>
  <string name="not_your_fault">Non é culpa túa.</string>
  <string name="please_send_report">Axúdanos por favor a mellorar Briar enviándonos un informe do fallo.</string>
  <string name="report_is_encrypted">Prometemos que o informe está cifrado e enviado con seguridade.</string>
@@ -631,19 +636,6 @@
  <string name="lock_tap_to_unlock">Toca para desbloquear</string>
  <!--Connections Screen-->
  <string name="transports_help_text">Briar pode conectar cos teus contactos a través de Internet, Wi-Fi ou Bluetooth.\n\nTodas as conexións a internet pasan a través da rede Tor para máis privacidade.\n\nSe un contacto é accesible de múltiples xeitos, Briar usaráos en paralelo.</string>
-  <!--Share app offline-->
-  <string name="hotspot_notification_channel_title">Punto de acceso Wi-Fi</string>
-  <string name="hotspot_button_connected">Seguinte</string>
-  <!--The placeholder to be inserted into the string 'hotspot_manual_wifi': People can connect by %s-->
-  <!--Wi-Fi setup-->
-  <!--The %s placeholder will be replaced with the translation of 'hotspot_scanning_a_qr_code'-->
-  <!--Download link-->
-  <!--The %s placeholder will be replaced with the translation of 'hotspot_scanning_a_qr_code'-->
-  <!--e.g. Download Briar 1.2.20-->
-  <string name="website_troubleshooting_title">Solución de problemas</string>
-  <!--error handling-->
-  <!--Transfer Data via Removable Drives-->
-  <string name="removable_drive_success_receive_title">Importación exitosa</string>
  <!--Screenshots-->
  <!--This is a name to be used in screenshots. Feel free to change it to a local name.-->
  <string name="screenshot_alice">Alice</string>
--- a/briar-android/src/main/res/values-he/strings.xml
+++ b/briar-android/src/main/res/values-he/strings.xml
@@ -33,7 +33,13 @@
  <string name="forgotten_password">שכחתי את הסיסמה שלי</string>
  <string name="dialog_title_lost_password">סיסמה אבודה</string>
  <string name="dialog_message_lost_password">חשבון Briar שלך מאוחסן באופן מוצפן על המכשיר שלך, לא בענן, כך שאנחנו לא יכולים לאפס את הסיסמה שלך. האם תרצה למחוק את החשבון שלך ולהתחיל מחדש?\n\nזהירות: הזהויות, אנשי הקשר וההודעות שלך יאבדו לצמיתות.</string>
+  <string name="startup_failed_notification_title">Briar לא היה ניתן להתחיל</string>
+  <string name="startup_failed_notification_text">יש להקיש למידע נוסף.</string>
  <string name="startup_failed_activity_title">כישלון הזנק Briar</string>
+  <string name="startup_failed_db_error">מסיבה כלשהי, מסד נתונים Briar שלך פגום ללא יכולת תיקון. החשבון שלך, הנתונים שלך וכל אנשי הקשר שלך אבדו. למרבה הצער, אתה צריך להתקין מחדש את Briar או להגדיר חשבון חדש ע״י בחירה באפשרות \'שכחתי את הסיסמה שלי\' בתזכיר הסיסמה.</string>
+  <string name="startup_failed_data_too_old_error">החשבון שלך נוצר עם גרסה ישנה של יישום זה ואינו יכול להיפתח עם גרסה זו. אתה חייב להתקין מחדש את הגרסה הישנה או להגדיר חשבון חדש ע״י בחירה באפשרות \'שכחתי את הסיסמה שלי\' בתזכיר הסיסמה.</string>
+  <string name="startup_failed_data_too_new_error">גרסה זו של היישום ישנה מדי. אנא שדרג אל הגרסה האחרונה ונסה שוב.</string>
+  <string name="startup_failed_service_error">Briar לא הצליח להתחיל מתקע דרוש. התקנה מחדש של Briar פותרת בדרך כלל בעיה זו. עם זאת, שים לב שתאבד את חשבונך ואת כל הנתונים המשויכים אליו כי Briar אינו משתמש בשרתים מרכזיים כדי לאחסן עליהם את נתוניך.</string>
  <plurals name="expiry_warning">
    <item quantity="one">זאת גרסת בחינה של Briar. חשבונך יפוג תוך יום %d ואינו יכול להתחדש.</item>
    <item quantity="two">זאת גרסת בחינה של Briar. חשבונך יפוג תוך %d ימים ואינו יכול להתחדש.</item>
@@ -136,7 +142,6 @@
  <string name="open">פתיחה</string>
  <string name="change">שינוי</string>
  <string name="start">התחל</string>
-  <string name="finish">סיים</string>
  <string name="no_data">אין נתונים</string>
  <string name="ellipsis">…</string>
  <string name="text_too_long">הטקסט המוכנס ארוך מדי</string>
@@ -146,7 +151,6 @@
  <string name="sorry">עמך הסליחה</string>
  <string name="error_start_activity">בלתי זמין במערכת שלך</string>
  <string name="status_heading">מצב</string>
-  <string name="error">שגיאה</string>
  <!--Contacts and Private Conversations-->
  <string name="no_contacts">אין אנשי קשר להראות</string>
  <string name="no_contacts_action">הקש על הצלמית + כדי להוסיף איש קשר</string>
@@ -160,6 +164,8 @@
  <string name="image_attach_error_invalid_mime_type">תסדיר תמונה בלתי נתמך: %s</string>
  <string name="set_contact_alias">שַׁנֵּה שם איש קשר</string>
  <string name="set_contact_alias_hint">שם איש הקשר</string>
+  <string name="menu_item_connect_via_bluetooth">התחבר באמצעות שן כחולה</string>
+  <string name="dialog_title_connect_via_bluetooth">התחבר באמצעות שן כחולה</string>
  <!--The first placeholder will show a duration like "7 days". The second placeholder at the end will add "Tap to learn more."-->
  <!--The placeholder at the end will add "Tap to learn more."-->
  <!--The first placeholder will show a contact's name. The second placeholder will show a duration like "7 days". The third placeholder at the end will add "Tap to learn more."-->
@@ -190,7 +196,6 @@
  <string name="dialog_title_image_support">כעת אפשר לשלוח תמונות אל איש קשר זה</string>
  <string name="dialog_message_image_support">הקש על צלמית זו כדי לצרף תמונות.</string>
  <string name="messaging_too_many_attachments_toast">רק %d התמונות הראשונות יישלחו</string>
-  <string name="menu_contact">צרו קשר</string>
  <!--Adding Contacts-->
  <string name="add_contact_title">הוסף איש קשר בקרבה</string>
  <string name="face_to_face">אתה חייב להיפגש עם האדם שאותו אתה רוצה להוסיף כאיש קשר.\n\nזה ימנע מכל אחד להתחזות אליך או לקרוא את ההודעות שלך בעתיד.</string>
@@ -288,9 +293,6 @@
  <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>
-  <!--Connect via Bluetooth-->
-  <string name="menu_item_connect_via_bluetooth">התחבר באמצעות שן כחולה</string>
-  <string name="connect_via_bluetooth_title">התחבר באמצעות שן כחולה</string>
  <!--Private Groups-->
  <string name="groups_list_empty">אין קבוצות להראות</string>
  <string name="groups_list_empty_action">הקש על הצלמית + כדי ליצור קבוצה, או בקש מאנשי הקשר שלך לשתף איתך קבוצות</string>
@@ -546,8 +548,7 @@
  <string name="cannot_load_ringtone">לא ניתן לטעון צלצול</string>
  <!--Conversation Settings-->
  <string name="learn_more">למד עוד</string>
-  <!--Settings Actions-->
-  <string name="pref_category_actions">פעולות</string>
+  <!--Settings Feedback-->
  <string name="send_feedback">שלח משוב</string>
  <!--Link Warning-->
  <string name="link_warning_title">אזהרת קישור</string>
@@ -556,6 +557,7 @@
  <string name="link_warning_open_link">פתח קישור</string>
  <!--Crash Reporter-->
  <string name="crash_report_title">דוח קריסת Briar</string>
+  <string name="briar_crashed">Briar התרסק, עמך הסליחה.</string>
  <string name="not_your_fault">זאת לא אשמתך.</string>
  <string name="please_send_report">אנא עזור לנו לבנות Briar טוב יותר ע״י שליחת דוח קריסה אלינו.</string>
  <string name="report_is_encrypted">אנו מבטיחים שהדוח הזה מוצפן ונשלח באופן מאובטח.</string>
@@ -609,18 +611,6 @@
  <string name="lock_tap_to_unlock">הקשה תבטל את הנעילה</string>
  <!--Connections Screen-->
  <string name="transports_help_text">Briar יכול להתחבר אל אנשי הקשר שלך באמצעות האינטרנט, הרשת האלחוטית או Bluetooth.\n\nכל חיבורי האינטרנט עוברים דרך רשת Tor למען פרטיות.\n\nאם איש קשר ניתן להשגה באמצעות שיטות רבות, Briar משתמש בהן במקביל.</string>
-  <!--Share app offline-->
-  <string name="hotspot_notification_channel_title">נקודה חמה של Wi-Fi</string>
-  <string name="hotspot_button_connected">הבא</string>
-  <!--The placeholder to be inserted into the string 'hotspot_manual_wifi': People can connect by %s-->
-  <!--Wi-Fi setup-->
-  <!--The %s placeholder will be replaced with the translation of 'hotspot_scanning_a_qr_code'-->
-  <!--Download link-->
-  <!--The %s placeholder will be replaced with the translation of 'hotspot_scanning_a_qr_code'-->
-  <!--e.g. Download Briar 1.2.20-->
-  <string name="website_troubleshooting_title">פתרון תקלות</string>
-  <!--error handling-->
-  <!--Transfer Data via Removable Drives-->
  <!--Screenshots-->
  <!--This is a name to be used in screenshots. Feel free to change it to a local name.-->
  <string name="screenshot_alice">נועה</string>
--- a/briar-android/src/main/res/values-hi/strings.xml
+++ b/briar-android/src/main/res/values-hi/strings.xml
@@ -1,5 +1,5 @@
 <?xml version='1.0' encoding='UTF-8'?>
-<resources>
+<resources xmlns:tools="http://schemas.android.com/tools">
  <!--Setup-->
  <string name="setup_title">Briar में आपका स्वागत है</string>
  <string name="setup_name_explanation">आपके उपनाम आप पोस्ट किसी भी सामग्री के बगल में दिखाया जाएगा। आप अपना खाता बनाने के बाद इसे बदल नहीं सकते</string>
@@ -124,7 +124,7 @@
  <string name="set_contact_alias">संपर्क नाम बदलें</string>
  <string name="set_contact_alias_hint">संपर्क नाम</string>
  <string name="menu_item_connect_via_bluetooth">ब्लूटूथ के माध्यम से कनेक्ट करें</string>
-  <string name="connect_via_bluetooth_title">ब्लूटूथ के माध्यम से कनेक्ट करें</string>
+  <string name="dialog_title_connect_via_bluetooth">ब्लूटूथ के माध्यम से कनेक्ट करें</string>
  <!--The first placeholder will show a duration like "7 days". The second placeholder at the end will add "Tap to learn more."-->
  <!--The placeholder at the end will add "Tap to learn more."-->
  <!--The first placeholder will show a contact's name. The second placeholder will show a duration like "7 days". The third placeholder at the end will add "Tap to learn more."-->
--- a/briar-android/src/main/res/values-hu/strings.xml
+++ b/briar-android/src/main/res/values-hu/strings.xml
@@ -19,17 +19,17 @@
  <string name="create_account_button">Fiók létrehozása</string>
  <string name="more_info">További információ</string>
  <string name="don_t_ask_again">Ne kérdezze még egyszer</string>
-  <string name="setup_huawei_text">Kérjük koppintson a gombra alább és ellenőrizze, hogy a Briar védett, a \"Védett alkalmazások\" képernyőn.</string>
+  <string name="setup_huawei_text">Kérjük érintse meg a gombot alább és ellenőrizze, hogy a Briar védett, a \"Védett alkalmazások\" képernyőn.</string>
  <string name="setup_huawei_button">A Briar védelme</string>
  <string name="setup_huawei_help">Ha Briar nincs hozzáadva a védett alkalmazások listájához, akkor nem képes futni a háttérben.</string>
-  <string name="setup_huawei_app_launch_text">Kérjük koppintson a gombra alább, hogy megnyissa az \"App indítás\" képernyőt és ellenőrizze, hogy a Briar beállított  \"Kézi kezelés\"-re.</string>
+  <string name="setup_huawei_app_launch_text">Kérjük érintsd meg a gombot alább, hogy megnyitsd az \"App indítás\" képernyőt és ellenőrizd, hogy a Briar beállított  \"Kézi kezelés\"-re.</string>
  <string name="setup_huawei_app_launch_button">Az akkumulátor beállítások megnyitása</string>
  <string name="setup_huawei_app_launch_help">Ha a Briar nincs beállítva \"Kézi kezelés\"-re az \"App indítás\" képernyőn, nem fog tudni futni a háttérben.</string>
  <string name="setup_xiaomi_text">Ahhoz, hogy a háttérben fusson, a Briar-t rögzíteni kell a legutóbbi appok listáján.</string>
  <string name="setup_xiaomi_button">A Briar védelme</string>
  <string name="setup_xiaomi_help">Ha Briar nincs rögzítve a legutóbbi appok listájában, akkor nem képes futni a háttérben.</string>
-  <string name="setup_xiaomi_dialog_body_old">1. Nyissa meg a legutolsó appok listáját (másnéven az app váltót)\n\n2. Görgessen le a Briar képén, hogy megjelenjen a lakat ikon\n\n3. Ha a lakat nem zárt, koppintson a lezárásához</string>
-  <string name="setup_xiaomi_dialog_body_new">1. Nyissa meg a legutolsó appok listáját (másnéven az app váltót)\n\n2. Nyomja meg és tartsa nyomva a Briar képét, hogy megjelenjen a lakat ikon\n\n3. Ha a lakat nem zárt, koppintson a lezárásához</string>
+  <string name="setup_xiaomi_dialog_body_old">1. Nyissa meg a legutolsó appok listáját (másnéven az app váltót)\n\n2. Görgessen le a Briar képén, hogy megjelenjen a lakat ikon\n\n3. Ha a lakat nem zárt, érintse meg a lezárásához</string>
+  <string name="setup_xiaomi_dialog_body_new">1. Nyissa meg a legutolsó appok listáját (másnéven az app váltót)\n\n2. Nyomja meg és tartsa nyomva a Briar képét, hogy megjelenjen a lakat ikon\n\n3. Ha a lakat nem zárt, érintse meg a lezárásához</string>
  <string name="warning_dozed">%s nem tud futni a háttérben</string>
  <!--Login-->
  <string name="enter_password">Jelszó</string>
@@ -40,7 +40,13 @@
  <string name="forgotten_password">Elfelejtettem a jelszavam</string>
  <string name="dialog_title_lost_password">Elveszett jelszó</string>
  <string name="dialog_message_lost_password">A Briar fiókja az eszközén kerül tárolásra titkosítva, nem a felhőben. Ha elfelejti a jelszavát, vagy eltávolítja a Briar-t, nincs lehetőség fiókja visszanyerésére.\n\nVálasszon egy hosszú, nehezen kitalálható jelszót, például négy tetszőleges szó vagy tíz tetszőleges betű, szám vagy szimbólum.</string>
+  <string name="startup_failed_notification_title">Briar nem tud elindulni</string>
+  <string name="startup_failed_notification_text">Érintse meg további információért</string>
  <string name="startup_failed_activity_title">Briar indítási hiba</string>
+  <string name="startup_failed_db_error">Valamilyen okból az Ön Briar adatbázisa hibás még javítás után is. A fiókja, adatai, kapcsolatai elvesztek. Sajnos vagy újratelepíti a Briar-t, vagy létrehoz egy új fiókot az \'Elfelejtettem a jelszavam\' menüpont alatt, amikor a jelszóbekérés történik.</string>
+  <string name="startup_failed_data_too_old_error">A fiókja egy régi app verzióval volt létrehozva, és nem nyitható meg ezzel a verzióval. Vagy visszatelepíti a régi verziót, vagy létrehoz egy új fiókot az \'Elfelejtettem a jelszavam\' menüpont alatt, amikor a jelszóbekérés történik.</string>
+  <string name="startup_failed_data_too_new_error">Az alkalmazás verziója túl régi. Kérjük frissítsen a legújabb verzióra és próbálja újra.</string>
+  <string name="startup_failed_service_error">A Briar nem tudja elindítani a szükséges plugint. A Briar újratelepítése többnyire megoldja a problémát. Fontos, hogy megjegyezze, hogy ez esetben elveszti fiókját és minden kapcsolatos adatát, mert a Briar nem tárolja központi szerveren az adatait.</string>
  <plurals name="expiry_warning">
    <item quantity="one">Ez a teszt verziója a Briar-nak. A fiókja le fog járni %d napon belül és nem megújítható.</item>
    <item quantity="other">Ez a teszt verziója a Briar-nak. A fiókja le fog járni %d napon belül és nem megújítható.</item>
@@ -63,7 +69,7 @@
  <string name="lock_button">App zárolása</string>
  <string name="settings_button">Beállítások</string>
  <string name="sign_out_button">Kijelentkezés</string>
-  <string name="transports_onboarding_text">Koppintson ide, hogy beállíthassa, hogyan csatlakozzon a Tor kapcsolataihoz.</string>
+  <string name="transports_onboarding_text">Érintse meg itt, hogy beállíthassa, hogyan csatlakozzon a Tor kapcsolataihoz.</string>
  <!--Transports: Tor-->
  <string name="transport_tor">Internet</string>
  <string name="tor_device_status_online_wifi">A telefonja Internet hozzáféréssel rendelkezik Wi-Fi-n keresztül</string>
@@ -95,7 +101,7 @@
  <string name="bt_plugin_status_disabled">A Briar Bluetooth nélküli használatra van beállítva</string>
  <!--Notifications-->
  <string name="reminder_notification_title">Kilépve a Briar-ból</string>
-  <string name="reminder_notification_text">Koppintson az újra belépéshez.</string>
+  <string name="reminder_notification_text">Érintse meg az újra belépéshez.</string>
  <string name="reminder_notification_channel_title">Briar Belépési emlékeztető</string>
  <string name="reminder_notification_dismiss">Kihagy</string>
  <string name="ongoing_notification_title">Belépve a Briar-ba</string>
@@ -133,7 +139,6 @@
  <string name="open">Megnyitás</string>
  <string name="change">Módosítás</string>
  <string name="start">Indítás</string>
-  <string name="finish">Befejezés</string>
  <string name="no_data">Nincs adat</string>
  <string name="ellipsis">...</string>
  <string name="text_too_long">A beírt szöveg túl hosszú</string>
@@ -143,10 +148,9 @@
  <string name="sorry">Sajnáljuk</string>
  <string name="error_start_activity">Nem elérhető az ön rendszerén</string>
  <string name="status_heading">Állapot</string>
-  <string name="error">Hiba</string>
  <!--Contacts and Private Conversations-->
  <string name="no_contacts">Nincs megjeleníthető kapcsolat</string>
-  <string name="no_contacts_action">Koppintson a + gombra a kapcsolatok hozzáadásához</string>
+  <string name="no_contacts_action">Érintse meg a + gombot kapcsolatok hozzáadásához</string>
  <string name="date_no_private_messages">Nincs üzenet.</string>
  <string name="no_private_messages">Nincs megjeleníthető üzenet</string>
  <string name="message_hint">Új üzenet</string>
@@ -160,6 +164,15 @@
  <string name="set_contact_alias">Kapcsolat nevének megváltoztatása</string>
  <string name="set_contact_alias_hint">Kapcsolat neve</string>
  <string name="menu_item_disappearing_messages">Eltűnő üzenetek</string>
+  <string name="menu_item_connect_via_bluetooth">Csatlakozás bluetooth-on keresztül</string>
+  <string name="dialog_title_connect_via_bluetooth">Csatlakozás bluetooth-on keresztül</string>
+  <string name="dialog_message_connect_via_bluetooth">A kapcsolatai közel kell legyenek, hogy ez működjön.\n\n Ön és a kapcsolata egyaránt meg kell nyomja a \"Start\" gombot egyidőben.</string>
+  <string name="toast_connect_via_bluetooth_already_discovering">Már próbálkozik csatlakozni Bluetooth-on</string>
+  <string name="toast_connect_via_bluetooth_not_discoverable">Nem folytatható Bluetooth nélkül</string>
+  <string name="toast_connect_via_bluetooth_no_location_permission">Nem folytatható hely engedélyek nélkül</string>
+  <string name="toast_connect_via_bluetooth_start">Csatlakozás Bluetooth-on...</string>
+  <string name="toast_connect_via_bluetooth_success">Sikeres csatlakozás Bluetooth-on.</string>
+  <string name="toast_connect_via_bluetooth_error">Nem sikerült csatlakozni Bluetooth-on</string>
  <!--The first placeholder will show a duration like "7 days". The second placeholder at the end will add "Tap to learn more."-->
  <string name="auto_delete_msg_you_enabled">Az üzenetei eltűnnek %1$s. %2$s múlva</string>
  <!--The placeholder at the end will add "Tap to learn more."-->
@@ -180,7 +193,7 @@
  </plurals>
  <!--The first placeholder will show a contact's name. The second placeholder at the end will add "Tap to learn more."-->
  <string name="auto_delete_msg_contact_disabled">%1$s üzenetei nem fognak eltűnni. %2$s</string>
-  <string name="tap_to_learn_more">Koppintson a további információkért.</string>
+  <string name="tap_to_learn_more">Érintse meg a további információkért.</string>
  <string name="auto_delete_changed_warning_title">Eltűnő üzenetek megváltoztak</string>
  <string name="auto_delete_changed_warning_message_enabled">Azóta, hogy elkezdte írni az üzenetét, az eltűnő üzenetek engedélyezésre kerültek.</string>
  <string name="auto_delete_changed_warning_message_disabled">Azóta, hogy elkezdte írni az üzenetét, az eltűnő üzenetek tiltásra kerültek.</string>
@@ -211,9 +224,8 @@ Biztosan szeretné menteni?</string>
  <string name="dialog_title_no_image_support">Képek nem elérhetők</string>
  <string name="dialog_message_no_image_support">A Briar kapcsolata nem támogatja a kép csatolmányokat. Ha frissített, akkor más ikont fog látni.</string>
  <string name="dialog_title_image_support">Most már küldhet képeket a kapcsolatainak</string>
-  <string name="dialog_message_image_support">Koppintson az ikonra képek csatolásához.</string>
+  <string name="dialog_message_image_support">Érintse meg az ikont képek csatolásához.</string>
  <string name="messaging_too_many_attachments_toast">Csak az első %d kép kerül küldésre</string>
-  <string name="menu_contact">Kapcsolat</string>
  <!--Adding Contacts-->
  <string name="add_contact_title">Közeli kapcsolat hozzáadása</string>
  <string name="face_to_face">Találkoznia kell a személlyel akit, hozzá szeretne adni a kapcsolatokhoz.\n\nEz megelőzi azt, hogy valaki megszemélyesítse Önt, vagy elolvassa későbbi üzeneteit.</string>
@@ -311,15 +323,9 @@ Kérjük frissítsen a legutolsó verzióra és próbálja újra.</string>
  <string name="introduction_response_accepted_received">%1$s elfogadta a bemutatkozást %2$s számára.</string>
  <string name="introduction_response_declined_received">%1$s elutasította a bemutatkozást %2$s számára.</string>
  <string name="introduction_response_declined_received_by_introducee">%1$s alapján %2$s elutasította a bemutatkozást.</string>
-  <!--Connect via Bluetooth-->
-  <string name="menu_item_connect_via_bluetooth">Csatlakozás bluetooth-on keresztül</string>
-  <string name="connect_via_bluetooth_title">Csatlakozás bluetooth-on keresztül</string>
-  <string name="connect_via_bluetooth_no_location_permission">Nem folytatható hely engedélyek nélkül</string>
-  <string name="connect_via_bluetooth_start">Csatlakozás Bluetooth-on...</string>
-  <string name="connect_via_bluetooth_success">Sikeres csatlakozás Bluetooth-on.</string>
  <!--Private Groups-->
  <string name="groups_list_empty">Nincs megjeleníthető csoport</string>
-  <string name="groups_list_empty_action">Koppintson a + ikonra csoport létrehozásához, vagy kérje meg kapcsolatait, hogy osszanak meg csoportokat Önnel</string>
+  <string name="groups_list_empty_action">Érintse meg a + ikont csoport létrehozásához, vagy kérje meg kapcsolatait, hogy osszanak meg csoportokat Önnel</string>
  <string name="groups_created_by">Létrehozta %s</string>
  <plurals name="messages">
    <item quantity="one">%düzenet </item>
@@ -373,7 +379,7 @@ Kérjük frissítsen a legutolsó verzióra és próbálja újra.</string>
  <string name="groups_reveal_invisible">Kapcsolat viszony nem látható a csoportnak </string>
  <!--Forums-->
  <string name="no_forums">Nincs megjelenítendő fórum</string>
-  <string name="no_forums_action">Koppintson a + ikonra fórum létrehozásához, vagy kérje meg kapcsolatait, hogy osszanak meg fórumokat Önnel</string>
+  <string name="no_forums_action">Érintse meg a + ikont fórum létrehozásához, vagy kérje meg kapcsolatait, hogy osszanak meg fórumokat Önnel</string>
  <string name="create_forum_title">Fórum létrehozása</string>
  <string name="choose_forum_hint">Válasszon nevet a fórumának</string>
  <string name="create_forum_button">Fórum létrehozása</string>
@@ -476,7 +482,7 @@ Kapcsolatai, akivel megosztotta ezt a blogot, lehet nem kapnak többé frissít
  <string name="blogs_rss_feeds_manage_empty_state">Nincs megjelenítendő</string>
  <string name="blogs_rss_feeds_manage_error">Hiba történt a feed-jei betöltésével. Kérjük próbálja újra később.</string>
  <!--Settings Profile Picture-->
-  <string name="change_profile_picture">Koppintson a profilképe cseréjéhez</string>
+  <string name="change_profile_picture">Érintse meg a profilképe cseréjéhez</string>
  <string name="dialog_confirm_profile_picture_title">Profil kép cseréje</string>
  <string name="dialog_confirm_profile_picture_remark">Csak a kapcsolataid láthatják ezt a képet</string>
  <string name="change_profile_picture_failed_message">Sajnáljuk, de valami hiba történt a profil kép frissítése során</string>
@@ -581,8 +587,7 @@ Vigyázat: Ez végleg törli az identitásait, kapcsolatait és üzeneteit</stri
 		A kapcsolata ugyanúgy meg tudja változtatni ezt a beállítást az Ön és a saját részére.</string>
  <string name="learn_more">További információ</string>
  <string name="disappearing_messages_summary">Make future messages in this conversation automatically disappear after 7\u00A0days.</string>
-  <!--Settings Actions-->
-  <string name="pref_category_actions">Események</string>
+  <!--Settings Feedback-->
  <string name="send_feedback">Visszajelzés küldése</string>
  <!--Link Warning-->
  <string name="link_warning_title">Link figyelmeztetés</string>
@@ -591,6 +596,7 @@ Vigyázat: Ez végleg törli az identitásait, kapcsolatait és üzeneteit</stri
  <string name="link_warning_open_link">Link megnyitása</string>
  <!--Crash Reporter-->
  <string name="crash_report_title">Briar összeomlási jelentés</string>
+  <string name="briar_crashed">Sajnáljuk, a Briar összeomlott.</string>
  <string name="not_your_fault">Ez nem az Ön hibája.</string>
  <string name="please_send_report">Kérjük segítsen nekünk a Briar-t jobbá tenni, a hibajelentés elküldésével.</string>
  <string name="report_is_encrypted">Biztosítjuk, hogy a hibajelentés titkosított és biztonságos.</string>
@@ -645,23 +651,9 @@ Vigyázat: Ez végleg törli az identitásait, kapcsolatait és üzeneteit</stri
  <string name="lock_unlock_fingerprint_description">Érintse meg az ujjlenyomat olvasót a regisztrált ujjával a folytatáshoz</string>
  <string name="lock_unlock_password">Jelszó használata</string>
  <string name="lock_is_locked">A Briar zárolt</string>
-  <string name="lock_tap_to_unlock">Koppintson a zárolás feloldásához</string>
+  <string name="lock_tap_to_unlock">Érintse meg a zárolás feloldásához</string>
  <!--Connections Screen-->
  <string name="transports_help_text">A Briar Interneten, Wi-Fi-n vagy Bluetooth-on keresztül csatlakozhat kapcsolataihoz.\n\nAz összes internetkapcsolat a Tor hálózaton megy keresztül megy az adatvédelem érdekében.\n\nHa egy kapcsolatot több módszerrel is el lehet érni, Briar párhuzamosan használja azokat.</string>
-  <!--Share app offline-->
-  <string name="hotspot_notification_channel_title">Wifi hotspot</string>
-  <string name="hotspot_button_connected">Következő</string>
-  <string name="hotspot_tab_manual">Kézi</string>
-  <!--The placeholder to be inserted into the string 'hotspot_manual_wifi': People can connect by %s-->
-  <!--Wi-Fi setup-->
-  <!--The %s placeholder will be replaced with the translation of 'hotspot_scanning_a_qr_code'-->
-  <!--Download link-->
-  <!--The %s placeholder will be replaced with the translation of 'hotspot_scanning_a_qr_code'-->
-  <!--e.g. Download Briar 1.2.20-->
-  <string name="website_troubleshooting_title">Hibaelhárítás</string>
-  <!--error handling-->
-  <!--Transfer Data via Removable Drives-->
-  <string name="removable_drive_success_receive_title">Sikeres importálás</string>
  <!--Screenshots-->
  <!--This is a name to be used in screenshots. Feel free to change it to a local name.-->
  <string name="screenshot_alice">Alíz</string>
--- a/briar-android/src/main/res/values-is/strings.xml
+++ b/briar-android/src/main/res/values-is/strings.xml
@@ -20,16 +20,12 @@
  <string name="more_info">Nánari upplýsingar</string>
  <string name="don_t_ask_again">Ekki spyrja aftur</string>
  <string name="setup_huawei_text">Ýttu á hnappinn hér fyrir neðan og gakktu úr skugga um að Briar sé varið á skjánum \"Varin forrit\".</string>
-  <string name="setup_huawei_button">Vernda Briar</string>
+  <string name="setup_huawei_button">Verja Briar</string>
  <string name="setup_huawei_help">Ef Briar er ekki bætt á listann yfir varin forrit, getur það ekki keyrt í bakgrunni.</string>
  <string name="setup_huawei_app_launch_text">Ýttu á hnappinn hér fyrir neðan, opnaðu \"Ræsing forrits\" skjáinn og gakktu úr skugga um að Briar sé stillt á \"Stýra handvirkt\".</string>
  <string name="setup_huawei_app_launch_button">Opna rafhlöðustillingar</string>
  <string name="setup_huawei_app_launch_help">Ef Briar er ekki stillt á \"Stýra handvirkt\" í \"Ræsing forrits\" skjánum, mun það ekki geta keyrt í bakgrunni.</string>
-  <string name="setup_xiaomi_text">Til að keyra í bakgrunni þarf Briar að vera læst við listann yfir nýleg forrit.</string>
-  <string name="setup_xiaomi_button">Vernda Briar</string>
-  <string name="setup_xiaomi_help">Ef Briar er ekki læst við listann yfir nýleg forrit, mun það ekki geta keyrt í bakgrunni.</string>
-  <string name="setup_xiaomi_dialog_body_old">1. Opnaðu listann yfir nýleg forrit (einnig kallað forritaskiptir)\n\n2. Strjúktu niður myndina af Briar til að birta hengilástáknið\n\n3. Ef hengilásinn er ekki læstur, ýttu á hann til að læsa</string>
-  <string name="setup_xiaomi_dialog_body_new">1. Opnaðu listann yfir nýleg forrit (einnig kallað forritaskiptir)\n\n2. Ýttu og haltu niðri á myndina af Briar til að birta hengiláshnappinn\n\n3. Ef hengilásinn er ekki læstur, ýttu á hann til að læsa</string>
+  <string name="setup_xiaomi_button">Verja Briar</string>
  <string name="warning_dozed">%s gat ekki keyrt í bakgrunni</string>
  <!--Login-->
  <string name="enter_password">Lykilorð</string>
@@ -40,10 +36,13 @@
  <string name="forgotten_password">Ég hef gleymt lykilorðinu mínu</string>
  <string name="dialog_title_lost_password">Týnt lykilorð</string>
  <string name="dialog_message_lost_password">Notandaaðgangur þinn í Briar er geymdur dulritaður á tækinu þínu, ekki í tölvuskýi, þannig að við getum ekki endurstillt lykilorðið þitt. Myndirðu vilja eyða notandaaðgangnum þínum og byrja aftur?\n\nVarúð: Auðkennin þín, tengiliðir og skilaboð munu tapast óendurkræft.</string>
+  <string name="startup_failed_notification_title">Gat ekki ræst Briar.</string>
+  <string name="startup_failed_notification_text">Ýttu til að sjá meiri upplýsingar.</string>
  <string name="startup_failed_activity_title">Bilun í ræsingu Briar</string>
-  <string name="startup_failed_clock_error">Briar gat ekki farið af stað því klukka tækisins þíns er ekki rétt stillt.\n\nLeiðréttu klukku tækisins og prófaðu síðan aftur.</string>
-  <string name="startup_failed_data_too_old_error">Notandaaðgangurinn þinn var útbúinn með eldri útgáfu forritsins og er ekki hægt að opna hann með þessari útgáfu.\n\Þú þarft annað hvort að setja gömlu útgáfuna upp aftur, eða setja upp nýjan notandaaðgang með því að velja \'Ég hef gleymt lykilorðinu mínu\' þegar beðið er um lykilorð.</string>
-  <string name="startup_failed_data_too_new_error">Notandaaðgangurinn þinn var útbúinn með nýrri útgáfu forritsins og er ekki hægt að opna hann með þessari útgáfu.\n\Þú þarft að setja upp nýjustu útgáfuna og prófa svo aftur.</string>
+  <string name="startup_failed_db_error">Af einhverjum ástæðum er Briar-gagnagrunnurinn svo skemmdur að ekki er hægt að laga hann. Notandaaðgangurinn þinn, gögnin þín og allir tengiliðir hafa tapast. Því miður þarft þú að setja Briar upp aftur, eða setja upp nýjan notandaaðgang með því að velja \'Ég hef gleymt lykilorðinu mínu\' þegar beðið er um lykilorð.</string>
+  <string name="startup_failed_data_too_old_error">Notandaaðgangurinn þinn var útbúinn með eldri útgáfu forritsins og er ekki hægt að opna hann með þessari útgáfu. Þú þarft annað hvort að setja gömlu útgáfuna aftur, eða setja upp nýjan notandaaðgang með því að velja \'Ég hef gleymt lykilorðinu mínu\' þegar beðið er um lykilorð.</string>
+  <string name="startup_failed_data_too_new_error">Þessi útgáfa forritsins er of gömul. Uppfærðu í nýjustu útgáfuna og prófaðu síðan aftur.</string>
+  <string name="startup_failed_service_error">Briar tókst ekki að ræsa nauðsynlega forritsviðbót. Venjulega er nóg að setja Briar upp aftur til að leysa þetta vandamál. Hinsvegar, athugaðu að þá munt þú missa notandaaðganginn þinn ásamt öllum gögnum honum tengdum, því Briar notar ekki miðlæga þjóna til að geyma gögnin þín.</string>
  <plurals name="expiry_warning">
    <item quantity="one">Þetta er prufuútgáfa af Briar. Notandaaðgangurinn þinn mun renna út eftir %d dag og er ekki hægt að endurnýja hann.</item>
    <item quantity="other">Þetta er prufuútgáfa af Briar. Notandaaðgangurinn þinn mun renna út eftir %d daga og er ekki hægt að endurnýja hann.</item>
@@ -136,7 +135,6 @@
  <string name="open">Opna</string>
  <string name="change">Breyta</string>
  <string name="start">Byrja</string>
-  <string name="finish">Enda</string>
  <string name="no_data">Engin gögn</string>
  <string name="ellipsis">…</string>
  <string name="text_too_long">Textinn sem var settur inn er of langur</string>
@@ -146,7 +144,6 @@
  <string name="sorry">Því miður</string>
  <string name="error_start_activity">Er ekki tiltækt fyrir kerfið þitt</string>
  <string name="status_heading">Staða</string>
-  <string name="error">Villa</string>
  <!--Contacts and Private Conversations-->
  <string name="no_contacts">Engir tengiliðir til að birta</string>
  <string name="no_contacts_action">Ýttu á + táknið til að bæta við tengilið</string>
@@ -163,6 +160,15 @@
  <string name="set_contact_alias">Breyta nafni tengiliðar</string>
  <string name="set_contact_alias_hint">Nafn tengiliðar</string>
  <string name="menu_item_disappearing_messages">Sjálfeyðandi skilaboð</string>
+  <string name="menu_item_connect_via_bluetooth">Tengjast í gegnum Bluetooth</string>
+  <string name="dialog_title_connect_via_bluetooth">Tengjast í gegnum Bluetooth</string>
+  <string name="dialog_message_connect_via_bluetooth">Tengiliðurinn þinn þarf að vera nálægt til að þetta virki.\n\nÞú og tengiliðurinn ættuð bæði að ýta á \"Byrja\" á sama tíma.</string>
+  <string name="toast_connect_via_bluetooth_already_discovering">Þegar að reyna að tengjast í gegnum Bluetooth</string>
+  <string name="toast_connect_via_bluetooth_not_discoverable">Get ekki haldið áfram án Bluetooth</string>
+  <string name="toast_connect_via_bluetooth_no_location_permission">Get ekki haldið áfram án heimildar til að nota staðsetningu</string>
+  <string name="toast_connect_via_bluetooth_start">Tengist í gegnum Bluetooth…</string>
+  <string name="toast_connect_via_bluetooth_success">Tókst að tengjast í gegnum Bluetooth</string>
+  <string name="toast_connect_via_bluetooth_error">Gat ekki tengst í gegnum Bluetooth</string>
  <!--The first placeholder will show a duration like "7 days". The second placeholder at the end will add "Tap to learn more."-->
  <string name="auto_delete_msg_you_enabled">Skilaboðin þín munu hverfa eftir %1$s. %2$s</string>
  <!--The placeholder at the end will add "Tap to learn more."-->
@@ -214,7 +220,6 @@
  <string name="dialog_title_image_support">Þú getur núna sent myndir til þessa tengiliðar</string>
  <string name="dialog_message_image_support">Ýttu á þessa táknmynd til að hengja við myndir.</string>
  <string name="messaging_too_many_attachments_toast">Einungis fyrstu %d myndirnar verða sendar</string>
-  <string name="menu_contact">Hafa samband</string>
  <!--Adding Contacts-->
  <string name="add_contact_title">Bæta við nálægum tengilið</string>
  <string name="face_to_face">Þú verður að hitta persónuna sem þú vilt bæta við sem tengilið.\n\nÞetta kemur í veg fyrir að nokkur geti látist vera þú eða nokkur geti framvegis lesið skilaboðin þín.</string>
@@ -311,15 +316,6 @@
  <string name="introduction_response_accepted_received">%1$s samþykkti kynningu við %2$s.</string>
  <string name="introduction_response_declined_received">%1$s hafnaði kynningu við %2$s.</string>
  <string name="introduction_response_declined_received_by_introducee">%1$s segir að %2$s hafi hafnað kynningunni.</string>
-  <!--Connect via Bluetooth-->
-  <string name="menu_item_connect_via_bluetooth">Tengjast í gegnum Bluetooth</string>
-  <string name="connect_via_bluetooth_title">Tengjast í gegnum Bluetooth</string>
-  <string name="connect_via_bluetooth_already_discovering">Er þegar að reyna að tengjast með Bluetooth. Prófaðu aftur eftir dálitla stund.</string>
-  <string name="connect_via_bluetooth_no_location_permission">Get ekki haldið áfram án heimildar til að nota staðsetningu</string>
-  <string name="connect_via_bluetooth_start">Tengist í gegnum Bluetooth…</string>
-  <string name="connect_via_bluetooth_success">Tókst að tengjast í gegnum Bluetooth</string>
-  <string name="connect_via_bluetooth_error">Gat ekki tengst í gegnum Bluetooth.</string>
-  <string name="connect_via_bluetooth_error_not_supported">Bluetooth er ekki stutt af tækinu.</string>
  <!--Private Groups-->
  <string name="groups_list_empty">Engir hópar sem hægt er að birta</string>
  <string name="groups_list_empty_action">Ýttu á + táknið til að útbúa hóp, eða biddu tengiliðina þína um að deila hópi með þér</string>
@@ -578,8 +574,7 @@
 		Tengiliðurinn þinn getur líka breytt þessari stillingu fyrir ykkur báða.</string>
  <string name="learn_more">Fræðast frekar</string>
  <string name="disappearing_messages_summary">Láta öll frekari skilaboð í þessu samtali hverfa sjálfkrafa eftir 7\u00A0daga.</string>
-  <!--Settings Actions-->
-  <string name="pref_category_actions">Aðgerðir</string>
+  <!--Settings Feedback-->
  <string name="send_feedback">Senda umsögn</string>
  <!--Link Warning-->
  <string name="link_warning_title">Aðvörun vegna tengils</string>
@@ -588,7 +583,7 @@
  <string name="link_warning_open_link">Opna tengil</string>
  <!--Crash Reporter-->
  <string name="crash_report_title">Hrunskýrsla fyrir Briar</string>
-  <string name="briar_crashed">Því miður, Briar hefur hrunið</string>
+  <string name="briar_crashed">Því miður, Briar hefur hrunið.</string>
  <string name="not_your_fault">Það er ekki þér að kenna.</string>
  <string name="please_send_report">Hjálpaðu okkur við að bæta Briar með því að senda okkur hrunskýrslu.</string>
  <string name="report_is_encrypted">Við lofum að skýrslan sé dulrituð og send á öruggan máta.</string>
@@ -646,65 +641,6 @@
  <string name="lock_tap_to_unlock">Ýttu til að aflæsa</string>
  <!--Connections Screen-->
  <string name="transports_help_text">Briar getur tengst við tengiliðina þína í gegnum internet, Wi-Fi eða Bluetooth.\n\nAllar internettengingar fara í gegnum Tor-netkerfið til að gæta gagnaleyndar.\n\nEf hægt er að nálgast tengilið með mörgum leiðum, notar Briar þær samhliða.</string>
-  <!--Share app offline-->
-  <string name="hotspot_title">Deila þessu forriti án nettengingar</string>
-  <string name="hotspot_button_start_sharing">Ræsa tengipunkt</string>
-  <string name="hotspot_button_stop_sharing">Stöðva tengipunkt</string>
-  <string name="hotspot_progress_text_start">Set upp tengipunkt…</string>
-  <string name="hotspot_notification_channel_title">Þráðlaus Wi-Fi tengipunktur</string>
-  <string name="hotspot_notification_title">Deiling Briar án nettengingar</string>
-  <string name="hotspot_button_connected">Næsta</string>
-  <string name="permission_hotspot_location_request_body">Til að útbúa Wi-Fi-aðgangsstað, þarf Briar heimild til að nota staðsetningu þína.\n\nBriar geymir ekki staðsetningar eða deilir þeim með neinum.</string>
-  <string name="permission_hotspot_location_denied_body">Þú hefur hafnað aðgangi að staðsetningu, en Briar þarf þessa heimild til að geta útbúið Wi-Fi-aðgangsstað.\n\nÍhugaðu að veita þennan aðgang.</string>
-  <string name="wifi_settings_title">Wi-Fi-stillingar</string>
-  <string name="wifi_settings_request_enable_body">Til að útbúa Wi-Fi aðgangsstað þarf Briar að nota Wi-Fi. Virkjaðu það.</string>
-  <string name="hotspot_tab_manual">Handvirk</string>
-  <!--The placeholder to be inserted into the string 'hotspot_manual_wifi': People can connect by %s-->
-  <string name="hotspot_scanning_a_qr_code">skönnun QR-kóða</string>
-  <!--Wi-Fi setup-->
-  <!--The %s placeholder will be replaced with the translation of 'hotspot_scanning_a_qr_code'-->
-  <string name="hotspot_manual_wifi_ssid">Heiti netkerfis</string>
-  <string name="hotspot_no_peers_connected">Engin tæki tengd</string>
-  <plurals name="hotspot_peers_connected">
-    <item quantity="one">%s tæki tengt</item>
-    <item quantity="other">%s tæki tengd</item>
-  </plurals>
-  <!--Download link-->
-  <!--The %s placeholder will be replaced with the translation of 'hotspot_scanning_a_qr_code'-->
-  <string name="hotspot_manual_site_address">Vistfang (URL)</string>
-  <!--e.g. Download Briar 1.2.20-->
-  <string name="website_download_title">Sækja %s</string>
-  <string name="website_download_intro">Einhver í nágrenninu hefur deilt %s með þér.</string>
-  <string name="website_download_outro">Eftir að niðurhalinu er lokið, skaltu opna sóttu skrána og setja hana upp.</string>
-  <string name="website_troubleshooting_title">Lausn á vandamálum</string>
-  <string name="website_troubleshooting_1">Ef þú getur ekki sótt forritið, ættirðu að prófa það með öðrum vafra.</string>
-  <string name="hotspot_help_wifi_title">Vandamál við að tengjast við Wi-Fi:</string>
-  <string name="hotspot_help_wifi_1">Prófaðu að gera Wi-Fi óvirkt og virkja það aftur á báðum símunum og reyndu svo aftur.</string>
-  <string name="hotspot_help_site_title">Vandamál við að skoða staðvært vefsvæði:</string>
-  <string name="hotspot_help_site_3">Ef þú ert með eldveggjarhugbúnað í gangi, skaltu vera viss um að það sé ekki að loka fyrir aðgang.</string>
-  <string name="hotspot_help_site_4">Ef þú getur skoðað vefsvæðið en ekki sótt Briar-forritið, ættirðu að prófa það með öðrum vafra.</string>
-  <string name="hotspot_help_fallback_title">Virkar ekkert?</string>
-  <string name="hotspot_help_fallback_button">Vista forrit</string>
-  <!--error handling-->
-  <string name="hotspot_error_intro">Eitthvað fór úrskeiðis þegar reynt var að deila forritinu með Wi-Fi:</string>
-  <string name="hotspot_error_no_wifi_direct">Þetta tæki styður ekki beint Wi-Fi samband.</string>
-  <string name="hotspot_error_start_callback_failed">Tengipunktur ræstist ekki: villa %s</string>
-  <string name="hotspot_error_start_callback_failed_unknown">Tengipunktur ræstist ekki vegna óþekktrar villu, ástæðan er %d</string>
-  <string name="hotspot_error_start_callback_no_group_info">Tengipunktur ræstist ekki: engar hópupplýsingar</string>
-  <string name="hotspot_error_web_server_start">Villa við að ræsa vefþjón</string>
-  <string name="hotspot_flag_test">Aðvörun: Þetta forrit var sett upp með Android Studio og er EKKI hægt að setja upp á öðru tæki.</string>
-  <!--Transfer Data via Removable Drives-->
-  <string name="removable_drive_menu_title">Tengjast í gegnum útskiptanlegt drif</string>
-  <string name="removable_drive_title_send">Senda gögn</string>
-  <string name="removable_drive_title_receive">Taka við gögnum</string>
-  <string name="removable_drive_send_button">Veldu skrá til að flytja út</string>
-  <string name="removable_drive_ongoing">Bíddu eftir að verk sem er í gangi klárist</string>
-  <string name="removable_drive_receive_intro">Ýttu á hnappinn hér fyrir neðan til að velja skrána sem tengiliðurinn sendi þér.\n\nEf skráin er á útskiptanlegu drifi, skaltu tengja það núna.</string>
-  <string name="removable_drive_receive_button">Veldu skrá til að flytja inn</string>
-  <string name="removable_drive_success_send_title">Útflutningur tókst</string>
-  <string name="removable_drive_success_receive_title">Innflutningur tókst</string>
-  <string name="removable_drive_error_send_title">Villa við útflutning gagna</string>
-  <string name="removable_drive_error_receive_title">Villa í innflutningi gagna</string>
  <!--Screenshots-->
  <!--This is a name to be used in screenshots. Feel free to change it to a local name.-->
  <string name="screenshot_alice">Lísa</string>
--- a/briar-android/src/main/res/values-it/strings.xml
+++ b/briar-android/src/main/res/values-it/strings.xml
@@ -40,12 +40,13 @@
  <string name="forgotten_password">Ho dimenticato la password</string>
  <string name="dialog_title_lost_password">Password persa</string>
  <string name="dialog_message_lost_password">Il tuo account Briar si trova cifrato sul tuo dispositivo e non nel cloud, quindi non possiamo resettarti la tua password. Vorresti cancellare il tuo account e partire di nuovo?\n\nAttenzione: Le tue identità, contatti e messaggi verranno persi permanentemente.</string>
+  <string name="startup_failed_notification_title">Briar non è riuscito ad avviarsi</string>
+  <string name="startup_failed_notification_text">Tocca per maggiori informazioni.</string>
  <string name="startup_failed_activity_title">Fallimento Avvio Briar</string>
-  <string name="startup_failed_clock_error">Briar non ha potuto avviarsi perchè l\'orologio del tuo dispositivo è sbagliato.\n\nRegola correttamente l\'orologio e riprova.</string>
-  <string name="startup_failed_db_error">Briar non ha potuto aprire il database contenente il tuo account, i contatti e i messaggi.\n\nAggiorna all\'ultima versione dell\'app e riprova, o configura un nuovo account scegliendo \'Ho dimenticato la password\' quando richiesto.</string>
-  <string name="startup_failed_data_too_old_error">Il tuo account è stato creato con una vecchia versione dell\'app e non può essere aperto in questa versione.\n\nDevi reinstallare la vecchia versione oppure configurare un nuovo account scegliendo \'Ho dimenticato la password\' quando richiesto.</string>
-  <string name="startup_failed_data_too_new_error">Il tuo account è stato creato con una versione più recente dell\'app e non può esere aperto in questa versione.\n\nAggiorna all\'ultima versione e riprova.</string>
-  <string name="startup_failed_service_error">Briar non ha potuto avviare un componente necessario.\n\nAggiorna all\'ultima versione dell\'app e riprova.</string>
+  <string name="startup_failed_db_error">Per qualche motivo, il tuo database di Briar è danneggiato in modo irreparabile. Il tuo account, i tuoi dati e tutti i tuoi contatti sono perduti. Sfortunatamente devi reinstallare Briar o registrare un nuovo account scegliendo \'Ho dimenticato la password\'.</string>
+  <string name="startup_failed_data_too_old_error">Il tuo account è stato creato con una vecchia versione dell\'app e non può essere aperto in questa versione. Devi reinstallare la vecchia versione oppure impostare un nuovo account scegliendo \'Ho dimenticato la password\' alla richiesta di password.</string>
+  <string name="startup_failed_data_too_new_error">Questa versione dell\'app è troppo vecchia. Aggiornala alla versione più recente e riprova.</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 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>
@@ -138,7 +139,6 @@
  <string name="open">Apri</string>
  <string name="change">Cambia</string>
  <string name="start">Inizia</string>
-  <string name="finish">Fine</string>
  <string name="no_data">Nessun dato</string>
  <string name="ellipsis">...</string>
  <string name="text_too_long">Il testo inserito è troppo lungo</string>
@@ -148,7 +148,6 @@
  <string name="sorry">Scusa</string>
  <string name="error_start_activity">Non disponibile sul tuo sistema</string>
  <string name="status_heading">Stato</string>
-  <string name="error">Errore</string>
  <!--Contacts and Private Conversations-->
  <string name="no_contacts">Nessun contatto da mostrare</string>
  <string name="no_contacts_action">Tocca l\'icona + per aggiungere un contatto</string>
@@ -165,6 +164,15 @@
  <string name="set_contact_alias">Cambia il nome del contatto</string>
  <string name="set_contact_alias_hint">Nome contatto</string>
  <string name="menu_item_disappearing_messages">Messaggi dissolventi</string>
+  <string name="menu_item_connect_via_bluetooth">Connessione attraverso Bluetooth</string>
+  <string name="dialog_title_connect_via_bluetooth">Connessione attraverso Bluetooth</string>
+  <string name="dialog_message_connect_via_bluetooth">Per funzionare, il tuo contatto deve essere nelle vicinanze.\n\nDovreste entrambi premere \"Inizia\" nello stesso momento.</string>
+  <string name="toast_connect_via_bluetooth_already_discovering">Si sta già tentanto di connettersi via Bluetooth</string>
+  <string name="toast_connect_via_bluetooth_not_discoverable">Impossibile continuare senza Bluetooth</string>
+  <string name="toast_connect_via_bluetooth_no_location_permission">Impossibile continuare senza l\'autorizzazione per la geolocalizzazione</string>
+  <string name="toast_connect_via_bluetooth_start">Connessione via Bluetooth…</string>
+  <string name="toast_connect_via_bluetooth_success">Connessione via Bluetooth riuscita</string>
+  <string name="toast_connect_via_bluetooth_error">Connessione via Bluetooth fallita</string>
  <!--The first placeholder will show a duration like "7 days". The second placeholder at the end will add "Tap to learn more."-->
  <string name="auto_delete_msg_you_enabled">I tuoi messaggi spariranno dopo %1$s. %2$s</string>
  <!--The placeholder at the end will add "Tap to learn more."-->
@@ -216,7 +224,6 @@
  <string name="dialog_title_image_support">Ora puoi inviare immagini a questo contatto</string>
  <string name="dialog_message_image_support">Tocca questa icona per allegare immagini.</string>
  <string name="messaging_too_many_attachments_toast">Verranno inviate solo le prime %d immagini</string>
-  <string name="menu_contact">Contatti</string>
  <!--Adding Contacts-->
  <string name="add_contact_title">Aggiungi contatti vicino</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>
@@ -313,16 +320,6 @@
  <string name="introduction_response_accepted_received">%1$s ha accettato l\'introduzione a %2$s.</string>
  <string name="introduction_response_declined_received">%1$s ha declinato l\'introduzione a %2$s.</string>
  <string name="introduction_response_declined_received_by_introducee">%1$s dice che %2$s ha declinato l\'introduzione.</string>
-  <!--Connect via Bluetooth-->
-  <string name="menu_item_connect_via_bluetooth">Connessione attraverso Bluetooth</string>
-  <string name="connect_via_bluetooth_title">Connessione attraverso Bluetooth</string>
-  <string name="connect_via_bluetooth_intro">Nel caso le connessioni Bluetooth non funzionino automaticamente, puoi usare questa schermata per connetterti a mano.\n\nIl tuo contatto deve essere nelle vicinanze affinché funzioni.\n\nDovete premere entrambi \"Avvia\" nello stesso momento.</string>
-  <string name="connect_via_bluetooth_already_discovering">Si sta già tentando di connettersi via Bluetooth. Riprova fra poco.</string>
-  <string name="connect_via_bluetooth_no_location_permission">Impossibile continuare senza l\'autorizzazione per la geolocalizzazione</string>
-  <string name="connect_via_bluetooth_start">Connessione via Bluetooth…</string>
-  <string name="connect_via_bluetooth_success">Connessione via Bluetooth riuscita</string>
-  <string name="connect_via_bluetooth_error">Connessione via Bluetooth fallita.</string>
-  <string name="connect_via_bluetooth_error_not_supported">Il Bluetooth non è supportato dal dispositivo.</string>
  <!--Private Groups-->
  <string name="groups_list_empty">Nessun gruppo da mostrare</string>
  <string name="groups_list_empty_action">Tocca l\'icona + per creare un gruppo, o chiedi ai tuoi contatti di condividerne con te</string>
@@ -581,8 +578,7 @@
 		Anche il tuo contatto può cambiare questa impostazioni per entrambe le parti.</string>
  <string name="learn_more">Per saperne di più</string>
  <string name="disappearing_messages_summary">Fai sparire automaticamente i messaggi futuri di questa conversazione dopo 7\u00A0giorni.</string>
-  <!--Settings Actions-->
-  <string name="pref_category_actions">Azioni</string>
+  <!--Settings Feedback-->
  <string name="send_feedback">Invia feedback</string>
  <!--Link Warning-->
  <string name="link_warning_title">Attenzione Link</string>
@@ -649,90 +645,6 @@
  <string name="lock_tap_to_unlock">Tocca per sbloccare</string>
  <!--Connections Screen-->
  <string name="transports_help_text">Briar può connettersi ai tuoi contatti tramite internet, Wi-Fi o Bluetooth.\n\nTutte le connessioni internet passano attraverso la rete Tor per privacy.\n\nSe un contatto può essere raggiunto con più metodi, Briar li usa in parallelo.</string>
-  <!--Share app offline-->
-  <string name="hotspot_title">Condividi questa app offline</string>
-  <string name="hotspot_intro">Condividi questa app con qualcuno accanto senza connessione internet usando il Wi-Fi del tuo telefono.
-		\n\nIl tuo telefono avvierà un hotspot Wi-Fi. Le persone vicine possono connettersi all\'hotspot e scaricare l\'app Briar dal tuo telefono.</string>
-  <string name="hotspot_button_start_sharing">Avvia hotspot</string>
-  <string name="hotspot_button_stop_sharing">Ferma hotspot</string>
-  <string name="hotspot_progress_text_start">Impostazione hotspot…</string>
-  <string name="hotspot_notification_channel_title">Hotspot Wi-Fi</string>
-  <string name="hotspot_notification_title">Condivisione di Briar offline</string>
-  <string name="hotspot_button_connected">Avanti</string>
-  <string name="permission_hotspot_location_request_body">Per creare un hotspot Wi-Fi, Briar ha bisogno dell\'autorizzazione per accedere alla tua posizione.\n\nBriar non memorizza la tua posizione e non la condivide con nessuno.</string>
-  <string name="permission_hotspot_location_denied_body">Hai negato l\'accesso alla tua posizione, ma Briar ha bisogno di questa autorizzazione per creare un hotspot Wi-Fi.\n\nPrendi in considerazione di consentirla.</string>
-  <string name="wifi_settings_title">Impostazione Wi-Fi</string>
-  <string name="wifi_settings_request_enable_body">Per creare un hotspot Wi-Fi, Briar deve usare il Wi-Fi. Prima attivalo.</string>
-  <string name="hotspot_tab_manual">Manuale</string>
-  <!--The placeholder to be inserted into the string 'hotspot_manual_wifi': People can connect by %s-->
-  <string name="hotspot_scanning_a_qr_code">scansionando un codice QR</string>
-  <!--Wi-Fi setup-->
-  <!--The %s placeholder will be replaced with the translation of 'hotspot_scanning_a_qr_code'-->
-  <string name="hotspot_manual_wifi">Il tuo telefono sta fornendo un hotspot Wi-Fi. Le persone che vogliono scaricare Briar possono connettersi all\'hotspot aggiungendolo nelle impostazioni Wi-Fi del loro dispositivo con i dettagli sottostanti o %s. Quando sono connessi all\'hotspot, premi \'Avanti\'.</string>
-  <string name="hotspot_manual_wifi_ssid">Nome della rete</string>
-  <string name="hotspot_qr_wifi">Il tuo telefono sta fornendo un hotspot Wi-Fi. Le persone che vogliono scaricare Briar possono connettersi all\'hotspot scaricando questo codice QR. Quando sono connessi all\'hotspot, premi \'Avanti\'.</string>
-  <string name="hotspot_no_peers_connected">Nessun dispositivo connesso</string>
-  <plurals name="hotspot_peers_connected">
-    <item quantity="one">%s dispositivo connesso</item>
-    <item quantity="other">%s dispositivi connessi</item>
-  </plurals>
-  <!--Download link-->
-  <!--The %s placeholder will be replaced with the translation of 'hotspot_scanning_a_qr_code'-->
-  <string name="hotspot_manual_site">Il tuo telefono sta fornendo un hotspot Wi-Fi. Le persone connesse all\'hotspot possono scaricare Briar digitando il seguente collegamento in un browser web o %s.</string>
-  <string name="hotspot_manual_site_address">Indirizzo (URL)</string>
-  <string name="hotspot_qr_site">Il tuo telefono sta fornendo un hotspot Wi-Fi. Le persone connesse all\'hotspot possono scaricare Briar scansionando questo codice QR.</string>
-  <!--e.g. Download Briar 1.2.20-->
-  <string name="website_download_title">Scarica %s</string>
-  <string name="website_download_intro">Qualcuno nelle vicinanze ha condiviso %s con te.</string>
-  <string name="website_download_outro">Dopo il completamento del download, apri il file scaricato e installalo.</string>
-  <string name="website_troubleshooting_title">Risoluzione dei problemi</string>
-  <string name="website_troubleshooting_1">Se non puoi scaricare l\'app, prova con un browser web diverso.</string>
-  <string name="website_troubleshooting_2_old">Per installare l\'app scaricata, potresti dover concedere l\'installazione di app da \"Fonti sconosciute\" nelle impostazioni di sistema. Successivamente, potresti dover riscaricare l\'app. Consigliamo di disattivare l\'impostazione \"Fonti sconosciute\" dopo l\'installazione.</string>
-  <string name="website_troubleshooting_2_new">Per installare l\'app scaricata, potresti dover concedere l\'installazione di app sconosciute al tuo browser. Dopo avere installato l\'app, consigliamo di rimuovere quell\'autorizzazione al browser.</string>
-  <string name="hotspot_help_wifi_title">Problemi di connessione al Wi-Fi:</string>
-  <string name="hotspot_help_wifi_1">Prova a disattivare e riattivare il Wi-Fi su entrambi i telefoni e riprova.</string>
-  <string name="hotspot_help_wifi_2">Se il telefono ti segnala che il Wi-Fi non ha internet, digli che vuoi restare comunque connesso.</string>
-  <string name="hotspot_help_wifi_3">Riavvia il telefono su cui è in esecuzione l\'hotspot Wi-Fi, poi avvia Briar e riprova a condividere.</string>
-  <string name="hotspot_help_site_title">Problemi visitando il sito web locale:</string>
-  <string name="hotspot_help_site_1">Controlla di avere inserito l\'indirizzo esattamente come mostrato. Un piccolo errore può impedire il funzionamento.</string>
-  <string name="hotspot_help_site_2">Assicurati che il telefono sia ancora connesso al Wi-Fi giusto (vedi sopra) quando provi ad accedere al sito.</string>
-  <string name="hotspot_help_site_3">Se hai un\'app firewall, controlla che non stia bloccando l\'accesso.</string>
-  <string name="hotspot_help_site_4">Se puoi visitare il sito, ma non scaricare l\'app Briar, riprova con un browser web diverso.</string>
-  <string name="hotspot_help_fallback_title">Non funziona niente?</string>
-  <string name="hotspot_help_fallback_intro">Puoi provare a salvare l\'app come file .apk per condividerla in altri modi. Una volta trasferito il file sull\'altro dispositivo, può essere usato per installare Briar.
-		\n\nNota: per condividere via Bluetooth, potresti dover prima rinominare l\'estensione del file in .zip.</string>
-  <string name="hotspot_help_fallback_button">Salva app</string>
-  <!--error handling-->
-  <string name="hotspot_error_intro">Qualcosa è andato storto tentando di condividere l\'app via Wi-Fi:</string>
-  <string name="hotspot_error_no_wifi_direct">Il dispositivo non supporta il Wi-Fi Direct</string>
-  <string name="hotspot_error_start_callback_failed">Avvio dell\'hotspot fallito: errore %s</string>
-  <string name="hotspot_error_start_callback_failed_unknown">Avvio dell\'hotspot fallito con un errore sconosciuto, motivo %d</string>
-  <string name="hotspot_error_start_callback_no_group_info">Avvio dell\'hotspot fallito: nessuna info di gruppo</string>
-  <string name="hotspot_error_web_server_start">Errore di avvio del server web</string>
-  <string name="hotspot_error_web_server_serve">Errore di presentazione del sito.\n\nInvia una segnalazione (con dati anonimi) attraverso Briar se il problema persiste.</string>
-  <string name="hotspot_flag_test">Attenzione: questa app è stata installata con Android Studio e NON può essere installata su un altro dispositivo.</string>
-  <string name="hotspot_error_framework_busy">Impossibile avviare l\'hotspot.\n\nSe ne hai un altro in esecuzione o se stai condividendo la connessione internet via Wi-Fi, fermalo e poi riprova.</string>
-  <!--Transfer Data via Removable Drives-->
-  <string name="removable_drive_menu_title">Connessione tramite unità rimovibile</string>
-  <string name="removable_drive_intro">Se non riesci a connetterti al tuo contatto tramite Internet, Wi-Fi o Bluetooth, Briar può anche trasferire i messaggi su un\'unità rimovibile come una chiavetta USB o una scheda SD.</string>
-  <string name="removable_drive_explanation">Se non riesci a connetterti al tuo contatto tramite Internet, Wi-Fi o Bluetooth, Briar può anche trasferire i messaggi su un\'unità rimovibile come una chiavetta USB o una scheda SD.\n\nQuando usi il pulsante \"Invia dati\" , tutti i dati in attesa di essere inviati al contatto verranno scritti sull\'unità rimovibile. Ciò include messaggi privati, allegati, blog, forum e gruppi privati.\n\nTutto sarà crittografato prima di essere scritto sull\'unità rimovibile.\n\nQuando il tuo contatto riceve l\'unità rimovibile, può utilizzare il pulsante \"Ricevi dati\" per importare i messaggi in Briar.</string>
-  <string name="removable_drive_title_send">Invia dati</string>
-  <string name="removable_drive_title_receive">Ricevi dati</string>
-  <string name="removable_drive_send_intro">Tocca il pulsante sottostante per creare un nuovo file contenente i messaggi cifrati. Puoi scegliere dove verrà salvato il file.\n\nSe vuoi salvarlo in un supporto rimovibile, inseriscilo ora.</string>
-  <string name="removable_drive_send_no_data">Attualmente non ci sono messaggi in attesa di essere inviati a questo contatto.</string>
-  <string name="removable_drive_send_not_supported">Questo contatto sta usando una vecchia versione di Briar o un dispositivo obsoleto che non supporta questa funzionalità.</string>
-  <string name="removable_drive_send_button">Scegli file per esportare</string>
-  <string name="removable_drive_ongoing">Attendi il completamento del processo in corso</string>
-  <string name="removable_drive_receive_intro">Tocca il pulsante sottostante per scegliere il file che ti ha inviato il tuo contatto.\n\nSe si trova in un supporto rimovibile, inseriscilo ora.</string>
-  <string name="removable_drive_receive_button">Scegli file per importare</string>
-  <string name="removable_drive_success_send_title">Esportazione completata</string>
-  <string name="removable_drive_success_send_text">Dati esportati correttamente. Ora hai 28 giorni per trasportare il file al tuo contatto.\n\nSe il file si trova in un supporto rimovibile, usa la notifica nella barra di stato per rimuovere il supporto prima di scollegarlo.</string>
-  <string name="removable_drive_success_receive_title">Importazione riuscita</string>
-  <string name="removable_drive_success_receive_text">Tutti i messaggi cifrati contenuti in questo file sono stati ricevuti.</string>
-  <string name="removable_drive_error_send_title">Errore di esportazione dati</string>
-  <string name="removable_drive_error_send_text">Si è verificato un errore scrivendo i dati nel file.\n\nSe stai usando un supporto rimovibile, assicurati che sia inserito correttamente e riprova.\n\nSe l\'errore persiste, invia una segnalazione del problema al team di Briar.</string>
-  <string name="removable_drive_error_receive_title">Errore di importazione dati</string>
-  <string name="removable_drive_error_receive_text">Il file selezionato non contiene nulla che Briar possa riconoscere.\n\nControlla di avere scelto il file giusto.\n\nSe il tuo contatto aveva creato il file più di 28 giorni fa, Briar non sarà in grado di riconoscerlo.</string>
  <!--Screenshots-->
  <!--This is a name to be used in screenshots. Feel free to change it to a local name.-->
  <string name="screenshot_alice">Alice</string>
--- a/briar-android/src/main/res/values-ja/strings.xml
+++ b/briar-android/src/main/res/values-ja/strings.xml
@@ -31,15 +31,16 @@
  <string name="dialog_title_cannot_check_password">パスワードを確認できません</string>
  <string name="dialog_message_cannot_check_password">Briarはあなたのパスワードを確認できません。この問題を解決するため、デバイスの再起動を試してください。</string>
  <string name="sign_in_button">サインイン</string>
-  <string name="forgotten_password">パスワードを忘れました</string>
+  <string name="forgotten_password">パスワードを忘れました。</string>
  <string name="dialog_title_lost_password">パスワードを紛失</string>
  <string name="dialog_message_lost_password">あなたのBriarアカウントはクラウド上ではなく、暗号化さた上であなたのデバイスに保存さています。したがってBriarはパスワードをリセットできません。アカウントを削除しはじめからやりなおしますか？\n\n注意：あなたのID、連絡先、メッセージは永久に復元できません。</string>
+  <string name="startup_failed_notification_title">Briarを起動できません。</string>
+  <string name="startup_failed_notification_text">「詳細情報」をタップしてください。</string>
  <string name="startup_failed_activity_title">起動に失敗しました</string>
-  <string name="startup_failed_clock_error">デバイスの時計が不正なので、Briarは起動できませんでした。\n\nデバイスの時計を正しい時刻に設定して、再試行してください。</string>
-  <string name="startup_failed_db_error">Briarは、あなたのアカウント、連絡先、メッセージを含むデータベースを開くことができませんでした。\n\nアプリを最新版にアップグレードして再度お試しいただくか、パスワード入力画面で\'パスワードを忘れました\'を選択して新しいアカウントを設定してください。</string>
-  <string name="startup_failed_data_too_old_error">あなたのアカウントは古いバージョンのアプリで作成されたもので、このバージョンでは開くことができません。\n\n古いバージョンを再インストールするか、パスワード入力画面で\'パスワードを忘れました\'を選択して新しいアカウントを設定する必要があります。</string>
-  <string name="startup_failed_data_too_new_error">あなたのアカウントは、このアプリの新しいバージョンで作成されたもので、このバージョンでは開くことができません。\n\n最新のバージョンにアップグレードしてから再度お試しください。</string>
-  <string name="startup_failed_service_error">Briarは、必要なコンポーネントを起動できませんでした。\n\n最新版のアプリにアップグレードしてから再度お試しください。</string>
+  <string name="startup_failed_db_error">何らかの理由で、Briarデータベースが修復できないほど破損しています。 アカウント、データ、およびすべての連絡先が失われています。 残念ながら、パスワードプロンプトで「パスワードを忘れましました。」を選択して、Briarを再インストールするか、新しいアカウントを設定する必要があります。</string>
+  <string name="startup_failed_data_too_old_error">アカウントはこのアプリの古いバージョンで作成されたため、このバージョンで開くことはできません。 パスワードプロンプトで「パスワードを紛失しました。」を選択して、古いバージョンを再インストールするか、新しいアカウントを設定する必要があります。</string>
+  <string name="startup_failed_data_too_new_error">このバージョンのアプリは古すぎます。 最新バージョンにアップグレードして、もう一度試してみてください。</string>
+  <string name="startup_failed_service_error">プラグインの起動に失敗しました。Briarを再インストールすることで通常は直ります。Briarは中央サーバにデータを保存していないため、アカウントとそれに関連する情報は全て失われることに注意してください。</string>
  <plurals name="expiry_warning">
    <item quantity="other">これは、Briarのテストバージョンです。 アカウントは%d日で期限切れになり、更新できません。</item>
  </plurals>
@@ -64,9 +65,9 @@
  <string name="transports_onboarding_text">ここにタップすると、Briarがあなたの連絡先に接続する方法を制御できます。</string>
  <!--Transports: Tor-->
  <string name="transport_tor">インターネット</string>
-  <string name="tor_device_status_online_wifi">電話機はWi-Fiでインターネットにアクセスできます</string>
-  <string name="tor_device_status_online_mobile">電話機はモバイル データでインターネットにアクセスできます</string>
-  <string name="tor_device_status_offline">電話機がインターネットに接続できない</string>
+  <string name="tor_device_status_online_wifi">携帯電話はWi-Fiでインターネットにアクセスできます</string>
+  <string name="tor_device_status_online_mobile">携帯電話はモバイル データでインターネットにアクセスできます</string>
+  <string name="tor_device_status_offline">携帯電話がインターネットに接続できない</string>
  <string name="tor_plugin_status_enabling">Briarはインターネットに接続中</string>
  <string name="tor_plugin_status_active">Briarはインターネットに接続しました</string>
  <string name="tor_plugin_status_inactive">Briarはインターネットに接続不可能</string>
@@ -77,16 +78,16 @@
  <!--Transports: Wi-Fi-->
  <string name="transport_lan">Wi-Fi</string>
  <string name="transport_lan_long">同じWi-Fiネットワーク</string>
-  <string name="lan_device_status_on">電話機はWi-Fiに接続されました</string>
-  <string name="lan_device_status_off">電話機はWi-Fiに接続されていません</string>
+  <string name="lan_device_status_on">携帯電話はWi-Fiに接続されました</string>
+  <string name="lan_device_status_off">携帯電話はWi-Fiに接続されていません</string>
  <string name="lan_plugin_status_enabling">BriarはWi-Fiネットワークに接続中</string>
  <string name="lan_plugin_status_active">BriarはWi-Fiネットワークに接続されました</string>
  <string name="lan_plugin_status_inactive">BriarはWi-Fiネットワークに接続不可能</string>
  <string name="lan_plugin_status_disabled">BriarはWi-Fiネットワークを使用しないように設定されました</string>
  <!--Transports: Bluetooth-->
  <string name="transport_bt">Bluetooth</string>
-  <string name="bt_device_status_on">電話機のBluetoothはオンにされました</string>
-  <string name="bt_device_status_off">電話機のBluetoothはオフにされました</string>
+  <string name="bt_device_status_on">携帯電話のBluetoothはオンにされました</string>
+  <string name="bt_device_status_off">携帯電話のBluetoothはオフにされました</string>
  <string name="bt_plugin_status_enabling">BriarはBluetoothに接続中</string>
  <string name="bt_plugin_status_active">BriarはBluetoothに接続しました</string>
  <string name="bt_plugin_status_inactive">BriarはBluetoothに接続不可能</string>
@@ -127,7 +128,6 @@
  <string name="open">開く</string>
  <string name="change">変更</string>
  <string name="start">開始</string>
-  <string name="finish">終了</string>
  <string name="no_data">データなし</string>
  <string name="ellipsis">...</string>
  <string name="text_too_long">入力された文章が長すぎます。</string>
@@ -137,7 +137,6 @@
  <string name="sorry">申し訳ありません</string>
  <string name="error_start_activity">あなたのシステム上で利用不可能</string>
  <string name="status_heading">状態</string>
-  <string name="error">エラー</string>
  <!--Contacts and Private Conversations-->
  <string name="no_contacts">表示する連絡先がありません</string>
  <string name="no_contacts_action">「＋」アイコンをタップして連絡先を追加</string>
@@ -154,6 +153,15 @@
  <string name="set_contact_alias">連絡先を変更</string>
  <string name="set_contact_alias_hint">連絡先名</string>
  <string name="menu_item_disappearing_messages">消えたメッセージ</string>
+  <string name="menu_item_connect_via_bluetooth">Bluetooth経由で接続する</string>
+  <string name="dialog_title_connect_via_bluetooth">Bluetooth経由で接続する</string>
+  <string name="dialog_message_connect_via_bluetooth">この機能を利用するには、あなたの連絡先が近くにある必要があります。\n\nあなたとあなたの連絡先が同時に\"開始\"を押してください。</string>
+  <string name="toast_connect_via_bluetooth_already_discovering">Bluetooth経由の接続を既に試行中です</string>
+  <string name="toast_connect_via_bluetooth_not_discoverable">Bluetoothなくして続行不可能</string>
+  <string name="toast_connect_via_bluetooth_no_location_permission">位置情報の権限なくして続行不可能</string>
+  <string name="toast_connect_via_bluetooth_start">Bluetooth経由で接続中…</string>
+  <string name="toast_connect_via_bluetooth_success">Bluetooth経由で接続に成功</string>
+  <string name="toast_connect_via_bluetooth_error">Bluetooth経由で接続不可能</string>
  <!--The first placeholder will show a duration like "7 days". The second placeholder at the end will add "Tap to learn more."-->
  <!--The placeholder at the end will add "Tap to learn more."-->
  <!--The first placeholder will show a contact's name. The second placeholder will show a duration like "7 days". The third placeholder at the end will add "Tap to learn more."-->
@@ -195,7 +203,6 @@
  <string name="dialog_title_image_support">この連絡先に画像を送信できるようになりました</string>
  <string name="dialog_message_image_support">このアイコンをタップして画像を添付します。</string>
  <string name="messaging_too_many_attachments_toast">最初の%d個の画像のみが送信されます。</string>
-  <string name="menu_contact">連絡先</string>
  <!--Adding Contacts-->
  <string name="add_contact_title">近くの人を連絡先に追加する</string>
  <string name="face_to_face">連絡先として追加したい人と会う必要があります。\n\nこれにより、だれかがあなたになりすましたり、メッセージを読んだりするのを防ぐことができます。</string>
@@ -231,8 +238,8 @@
  <string name="link_clip_label">Briarリンク</string>
  <string name="link_copied_toast">リンクをコピーしました</string>
  <string name="adding_contact_error">連絡先への追加中にエラーが発生しました。</string>
-  <string name="pending_contact_requests_snackbar">保留中の連絡先への追加要求があります</string>
-  <string name="pending_contact_requests">連絡先追加要求</string>
+  <string name="pending_contact_requests_snackbar">保留中の連絡先への追加リクエストがあります</string>
+  <string name="pending_contact_requests">連絡先追加リクエスト</string>
  <string name="no_pending_contacts">保留中の連絡先追加リクエストはありません</string>
  <string name="waiting_for_contact_to_come_online">連絡相手がオンラインになるのを待っています…</string>
  <string name="connecting">接続中…</string>
@@ -291,15 +298,6 @@
  <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>
-  <!--Connect via Bluetooth-->
-  <string name="menu_item_connect_via_bluetooth">Bluetooth経由で接続する</string>
-  <string name="connect_via_bluetooth_title">Bluetooth経由で接続する</string>
-  <string name="connect_via_bluetooth_intro">Bluetooth接続が自動的に行われない場合は、この画面を使って手動で接続することができます。\n\nこの機能を利用するには、あなたの連絡先が近くにある必要があります。\n\nあなたと連絡先が同時に\"開始\"を押してください。</string>
-  <string name="connect_via_bluetooth_no_location_permission">位置情報の権限なくして続行不可能</string>
-  <string name="connect_via_bluetooth_start">Bluetooth経由で接続中…</string>
-  <string name="connect_via_bluetooth_success">Bluetooth経由で接続に成功</string>
-  <string name="connect_via_bluetooth_error">Bluetooth経由で接続不可能。</string>
-  <string name="connect_via_bluetooth_error_not_supported">Bluetoothはデバイスによってサポートされていません。</string>
  <!--Private Groups-->
  <string name="groups_list_empty">表示するグループがありません</string>
  <string name="groups_list_empty_action">「＋」アイコンをタップしてグループを作成するか、連絡先に登録している誰かにグループを共有してもらう</string>
@@ -312,7 +310,7 @@
  <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_invitation_button">招待する</string>
  <string name="groups_create_group_hint">プライベートグループに名前をつける</string>
  <string name="groups_invitation_sent">グループ招待状が送信されました</string>
  <string name="groups_member_list">メンバー一覧</string>
@@ -439,8 +437,6 @@
  <string name="blogs_rss_feeds_import_button">インポート</string>
  <string name="blogs_rss_feeds_import_hint">RSSフィードのURLを入力してください</string>
  <string name="blogs_rss_feeds_import_error">申し訳ありません！ フィードのインポート中にエラーが発生しました。</string>
-  <string name="blogs_rss_feeds_import_exists">そのフィードは既にインポートされています。</string>
-  <string name="blogs_rss_feeds">RSSフィード</string>
  <string name="blogs_rss_feeds_manage_imported">インポート済み：</string>
  <string name="blogs_rss_feeds_manage_author">著者:</string>
  <string name="blogs_rss_feeds_manage_updated">最終更新:</string>
@@ -471,7 +467,7 @@
  <string name="tor_enable_title">インターネット経由で連絡先に接続</string>
  <string name="tor_enable_summary">全接続をプライバシーのためにTorネットワークを通す</string>
  <string name="tor_network_setting">Torネットワークの接続方法</string>
-  <string name="tor_network_setting_automatic">位置情報に基づいて自動的に接続する</string>
+  <string name="tor_network_setting_automatic">場所に基づいて自動的に接続する</string>
  <string name="tor_network_setting_without_bridges">ブリッジなしでTorネットワークを使用する</string>
  <string name="tor_network_setting_with_bridges">ブリッジを通してTorネットワークを使用する</string>
  <string name="tor_network_setting_never">インターネットに接続しない</string>
@@ -522,7 +518,7 @@
  <!--Settings Notifications-->
  <string name="notification_settings_title">通知</string>
  <string name="notify_sign_in_title">サインインするように通知する</string>
-  <string name="notify_sign_in_summary">電話機の起動時またはアプリの更新時にリマインダーを表示する</string>
+  <string name="notify_sign_in_summary">電話の起動時またはアプリの更新時にリマインダーを表示する</string>
  <string name="notify_private_messages_setting_title">プライベート・メッセージ</string>
  <string name="notify_private_messages_setting_summary">プライベートメッセージのアラートを表示する</string>
  <string name="notify_private_messages_setting_summary_26">プライベートメッセージのアラートを設定する</string>
@@ -544,8 +540,7 @@
  <!--Conversation Settings-->
  <string name="disappearing_messages_title">消えたメッセージ</string>
  <string name="learn_more">詳細情報</string>
-  <!--Settings Actions-->
-  <string name="pref_category_actions">操作</string>
+  <!--Settings Feedback-->
  <string name="send_feedback">フィードバックを送信</string>
  <!--Link Warning-->
  <string name="link_warning_title">リンクの警告</string>
@@ -554,7 +549,7 @@
  <string name="link_warning_open_link">リンクを開く</string>
  <!--Crash Reporter-->
  <string name="crash_report_title">Briarのクラッシュレポート</string>
-  <string name="briar_crashed">申し訳ありませんが、Briarはクラッシュしました</string>
+  <string name="briar_crashed">申し訳ありませんが、Briarはクラッシュしました。</string>
  <string name="not_your_fault">これはあなたのせいではありません。</string>
  <string name="please_send_report">クラッシュレポートを送信して、より良いBriarの開発にご協力ください。</string>
  <string name="report_is_encrypted">レポートは暗号化され、安全に送信されることをお約束します。</string>
@@ -579,7 +574,6 @@
  <string name="dev_report_sending">フィードバックを送信中…</string>
  <string name="dev_report_sent">フィードバックを送信しました</string>
  <string name="dev_report_saved">レポートを保存しました。 次回、Briarにログインしたときに送信されます。</string>
-  <string name="dev_report_error">エラー：レポート送信に失敗</string>
  <!--Sign Out-->
  <string name="progress_title_logout">Briarからサインアウト中…</string>
  <!--Screen Filters & Tapjacking-->
@@ -587,7 +581,6 @@
  <string name="screen_filter_body">別のアプリがBriarの画面上に描画しています。 セキュリティを保護するために、Briarは、別のアプリがBriarの画面上に描画している場合、タッチに応答しません。\n\n次のアプリが上に描画されている可能性があります：\n\n%1$s</string>
  <string name="screen_filter_body_api_30">他のアプリがBriarの上に描画されています。セキュリティ保護のため、他のアプリが上に描画しているときは、Briarに触れても反応しません。\n\n以下のアプリを確認して、原因のアプリを見つけてください。</string>
  <string name="screen_filter_allow">これらのアプリがBriarの画面上に描画できるようにする</string>
-  <string name="screen_filter_review_apps">アプリを確認</string>
  <!--Permission Requests-->
  <string name="permission_camera_title">カメラへのアクセス許可</string>
  <string name="permission_camera_request_body">QRコードをスキャンするには、Briarはカメラにアクセスする必要があります。</string>
@@ -596,10 +589,6 @@
  <string name="permission_camera_location_title">カメラと位置情報</string>
  <string name="permission_camera_location_request_body">QRコードをスキャンするには、Briarはカメラにアクセスする必要があります。\n\nBluetoothデバイスを検出するには、Briarは現在地情報にアクセスする許可が必要です。\n\nBriarは現在地を保存したり、誰とも共有したりしません。</string>
  <string name="permission_camera_denied_body">カメラへのアクセスをが拒否されましたが、連絡先を追加するにはカメラを使用する必要があります。\n\nカメラへのアクセスの許可を考えてください。</string>
-  <string name="permission_location_denied_body">あなたの位置情報にアクセスすることを拒否しましたが、BriarはBluetoothデバイスを発見するのに、この権限が必要です。\n\nアクセス権を付与することを考慮願います。</string>
-  <string name="permission_location_setting_title">位置情報設定</string>
-  <string name="permission_location_setting_body">デバイスの位置情報設定は、Bluetoothを介して他のデバイスを見つけるために、オンにする必要があります。続けるには位置情報を有効にしてください。その後、位置情報を無効にできます。</string>
-  <string name="permission_location_setting_button">位置情報を有効化</string>
  <string name="qr_code">QRコード</string>
  <string name="show_qr_code_fullscreen">QRコードを全画面表示する</string>
  <!--App Locking-->
@@ -611,68 +600,6 @@
  <string name="lock_tap_to_unlock">タップしてロック解除</string>
  <!--Connections Screen-->
  <string name="transports_help_text">Briarは、インターネット、Wi-Fi、Bluetoothを介して連絡先に接続することができます。\n\nすべてのインターネット接続は、プライバシー保護のためにTorネットワークを経由します。\n\n複数の方法で連絡が取れる場合、Briarはそれらを並行して使用します。</string>
-  <!--Share app offline-->
-  <string name="hotspot_title">このアプリをオフラインで共有</string>
-  <string name="hotspot_intro">あなたの電話機のWi-Fiを使用して、インターネット接続なしで、近くの誰かとこのアプリを共有します。
-		\n\nあなたの電話機はWi-Fiホットスポットになります。近くの人はホットスポットへ接続し、あなたの電話機からBriarアプリをダウンロードできます。</string>
-  <string name="hotspot_button_start_sharing">ホットスポットを開始</string>
-  <string name="hotspot_button_stop_sharing">ホットスポットを停止</string>
-  <string name="hotspot_progress_text_start">ホットスポットを設定する…</string>
-  <string name="hotspot_notification_channel_title">Wi-Fiホットスポット</string>
-  <string name="hotspot_notification_title">Briarをオフラインで共有</string>
-  <string name="hotspot_button_connected">次へ</string>
-  <string name="permission_hotspot_location_request_body">Wi-Fiホットスポットを作るには、Briarはあなたの位置情報にアクセスする権限が必要です。\n\nBriarはあなたの位置情報を保存せず、誰かに共有することもありません。</string>
-  <string name="permission_hotspot_location_denied_body">あなたの位置情報にアクセスすることを拒否しましたが、BriarはWi-Fiホットスポットを作るのに、この権限が必要です。\n\nアクセス権を付与することを考慮願います。</string>
-  <string name="wifi_settings_title">Wi-Fi設定</string>
-  <string name="wifi_settings_request_enable_body">Wi-Fiホットスポットを作るには、BriarWi-Fiの使用が必要です。有効にしてください。</string>
-  <string name="hotspot_tab_manual">手動</string>
-  <!--The placeholder to be inserted into the string 'hotspot_manual_wifi': People can connect by %s-->
-  <string name="hotspot_scanning_a_qr_code">QRコードをスキャン</string>
-  <!--Wi-Fi setup-->
-  <!--The %s placeholder will be replaced with the translation of 'hotspot_scanning_a_qr_code'-->
-  <string name="hotspot_manual_wifi">あなたの電話機はWi-Fiホットスポットを提供しています。Briarのダウンロードを希望する人は、以下の方法で端末のWi-Fi設定に追加するか、または %s によるホットスポットに接続してください。そのホットスポットに接続されたら、\'Next\'を押してください。</string>
-  <string name="hotspot_manual_wifi_ssid">ネットワーク名</string>
-  <string name="hotspot_qr_wifi">あなたの電話機はWi-Fiホットスポットを提供しています。Briarのダウンロードを希望する人は、このQRコードをスキャンしてホットスポットに接続してください。そのホットスポットに接続されたら、\'Next\'を押してください。</string>
-  <string name="hotspot_no_peers_connected">接続されたデバイスなし</string>
-  <plurals name="hotspot_peers_connected">
-    <item quantity="other">%s機の接続されたデバイス</item>
-  </plurals>
-  <!--Download link-->
-  <!--The %s placeholder will be replaced with the translation of 'hotspot_scanning_a_qr_code'-->
-  <string name="hotspot_manual_site">あなたの電話機はWi-Fiホットスポットを提供しています。ホットスポットに接続された人は、ウェブブラウザまたは %s 内で以下のリンクを入力して、Briarをダウンロードできます。</string>
-  <string name="hotspot_manual_site_address">アドレス（URL）</string>
-  <string name="hotspot_qr_site">あなたの電話機はWi-Fiホットスポットを提供しています。ホットスポットに接続された人は、このQRコードをスキャンして、Briarをダウンロードできます。</string>
-  <!--e.g. Download Briar 1.2.20-->
-  <string name="website_download_title">%s をダウンロードする</string>
-  <string name="website_download_intro">近くの誰かが、あなたと %s を共有しました。</string>
-  <string name="website_download_outro">ダウンロードが完了した後に、ダウンロードしたファイルを開いて、インストールしてください。</string>
-  <string name="website_troubleshooting_title">トラブルシューティング</string>
-  <string name="website_troubleshooting_1">アプリをインストールできない場合、別のブラウザアプリで試してください。</string>
-  <string name="website_troubleshooting_2_old">ダウンロードしたアプリをインストールするには、システム設定で\"提供元不明\"のアプリのインストールを許可する必要がある場合があります。その後、再度アプリのダウンロードが必要になる場合があります。アプリをインストールした後は、\"提供元不明\"の設定を解除することをお勧めします。</string>
-  <string name="website_troubleshooting_2_new">ダウンロードしたアプリをインストールするには、ブラウザに不明なアプリのインストールを許可する必要がある場合があります。アプリをインストールした後は、ブラウザの不明なアプリのインストール許可を解除することをお勧めします。</string>
-  <string name="hotspot_help_wifi_title">W-Fi接続の問題:</string>
-  <string name="hotspot_help_wifi_1">双方の電話機でWi-Fiを無効にして、再び有効にするのを試してください。</string>
-  <string name="hotspot_help_wifi_2">もし携帯電話が「Wi-Fiにはインターネットがない」と不満を訴えてきたら、「とにかく接続していたい」と伝えてください。</string>
-  <string name="hotspot_help_site_title">ローカルのウェブサイト訪問の問題:</string>
-  <string name="hotspot_help_site_1">表示されている通りにアドレスを入力したかどうかを再確認してください。小さなミスで失敗することがあります。</string>
-  <string name="hotspot_help_site_2">サイトにアクセスする際に、電話機が正しいWi-Fi（上記を参照）に接続されていることを確認してください。</string>
-  <string name="hotspot_help_site_3">ファイアウォールアプリを使用している場合は、それがアクセスをブロックしていないか確認してください。</string>
-  <string name="hotspot_help_site_4">サイトにはアクセスできるが、Briarアプリがダウンロードできない場合は、別のウェブブラウザアプリで試してみてください。</string>
-  <string name="hotspot_help_fallback_title">どれもうまくいきませんか?</string>
-  <string name="hotspot_help_fallback_intro">他の方法で共有するために、アプリを.apkファイルとして保存してみてください。そのファイルをもう一方のデバイスに転送すれば、Briarをインストールすることができます。
-		\n\nヒント: Bluetoothで共有する場合は、まずファイル名を.zipで終わるように名前変更する必要があるかもしれません。</string>
-  <string name="hotspot_help_fallback_button">アプリを保存する</string>
-  <!--error handling-->
-  <string name="hotspot_error_intro">Wi-Fiでアプリを共有しようとしたときに、何か問題が発生しました。</string>
-  <string name="hotspot_error_no_wifi_direct">デバイスはWi-Fiダイレクトをサポートしていません</string>
-  <string name="hotspot_error_start_callback_failed">ホットスポットの開始に失敗しました: エラー %s</string>
-  <string name="hotspot_error_start_callback_no_group_info">ホットスポットの開始に失敗しました: グループ情報なし</string>
-  <string name="hotspot_error_web_server_start">ウェブサーバー起動エラー</string>
-  <string name="hotspot_error_web_server_serve">ウェブサイトの表示にエラーが発生しました。\n\n問題が解決しない場合は、Briarアプリから（匿名のデータで）フィードバックを送ってください。</string>
-  <string name="hotspot_flag_test">警告: このアプリはAndroid Studioでインストールされたものであり、他の端末にインストールすることはできません。</string>
-  <string name="hotspot_error_framework_busy">ホットスポットの起動ができません。\n\n他のホットスポットを起動している場合や、Wi-Fiでインターネット接続を共有している場合は、そのホットスポットを停止してから再度試してみてください。</string>
-  <!--Transfer Data via Removable Drives-->
-  <string name="removable_drive_success_receive_title">インポート成功</string>
  <!--Screenshots-->
  <!--This is a name to be used in screenshots. Feel free to change it to a local name.-->
  <string name="screenshot_alice">アリス</string>
--- a/briar-android/src/main/res/values-ko/strings.xml
+++ b/briar-android/src/main/res/values-ko/strings.xml
@@ -1,5 +1,5 @@
 <?xml version='1.0' encoding='UTF-8'?>
-<resources>
+<resources xmlns:tools="http://schemas.android.com/tools">
  <!--Setup-->
  <string name="setup_title">Briar에 오신 것을 환영합니다</string>
  <string name="setup_name_explanation">별명은 게시한 모든 컨텐츠 옆에 보여지게 됩니다. 별명은 계정을 만든 후에는 바꿀 수 없습니다.</string>
@@ -150,7 +150,7 @@
  <string name="set_contact_alias">연락처 이름 바꾸기</string>
  <string name="set_contact_alias_hint">연락처 이름</string>
  <string name="menu_item_connect_via_bluetooth">블루투스로 연결하기</string>
-  <string name="connect_via_bluetooth_title">블루투스로 연결하기</string>
+  <string name="dialog_title_connect_via_bluetooth">블루투스로 연결하기</string>
  <!--The first placeholder will show a duration like "7 days". The second placeholder at the end will add "Tap to learn more."-->
  <!--The placeholder at the end will add "Tap to learn more."-->
  <!--The first placeholder will show a contact's name. The second placeholder will show a duration like "7 days". The third placeholder at the end will add "Tap to learn more."-->
--- a/briar-android/src/main/res/values-lt/strings.xml
+++ b/briar-android/src/main/res/values-lt/strings.xml
@@ -40,12 +40,13 @@
  <string name="forgotten_password">Aš pamiršau savo slaptažodį</string>
  <string name="dialog_title_lost_password">Prarastas slaptažodis</string>
  <string name="dialog_message_lost_password">Jūsų Briar paskyra yra saugoma šifruotu pavidalu jūsų įrenginyje, o ne debesijoje, taigi, negalime atstatyti jūsų slaptažodžio. Ar norėtumėte ištrinti savo paskyrą ir pradėti iš naujo?\n\nDėmesio: Jūsų tapatybės, žinutės ir adresatai bus prarasti visiems laikams.</string>
+  <string name="startup_failed_notification_title">Nepavyko paleisti Briar</string>
+  <string name="startup_failed_notification_text">Bakstelėkite išsamesnei informacijai.</string>
  <string name="startup_failed_activity_title">Briar paleidimo nesėkmė</string>
-  <string name="startup_failed_clock_error">Briar nepavyko pasileisti, nes jūsų įrenginio laikrodis rodo neteisingą laiką.\n\nNustatykite savo įrenginyje teisingą laiką ir bandykite dar kartą.</string>
-  <string name="startup_failed_db_error">Briar nepavyko atverti duomenų bazės su jūsų paskyra, adresatais ir žinutėmis.\n\nAtnaujinkite programėlę į naujausią versiją ir bandykite dar kartą arba nusistatykite naują paskyrą, slaptažodžio užklausos ekrane pasirinkę „Aš pamiršau savo slaptažodį“.</string>
-  <string name="startup_failed_data_too_old_error">Jūsų paskyra buvo sukurta naudojant seną šios programėlės versiją ir negali būti atverta naudojant šią versiją.\n\nJūs privalote arba iš naujo įsidiegti seną versiją, arba nusistatyti naują paskyrą, slaptažodžio užklausos ekrane pasirinkę „Aš pamiršau savo slaptažodį“.</string>
-  <string name="startup_failed_data_too_new_error">Jūsų paskyra buvo sukurta naudojant naujesnę šios programėlės versiją ir negali būti atverta naudojant šią versiją.\n\nAtnaujinkite programėlę į naujausią versiją ir bandykite dar kartą.</string>
-  <string name="startup_failed_service_error">Briar nepavyko paleisti reikiamo komponento.\n\nAtnaujinkite programėlę į naujausią versiją ir bandykite dar kartą.</string>
+  <string name="startup_failed_db_error">Dėl kažkokių priežasčių, jūsų Briar duomenų bazė yra nepataisomai sugadinta. Jūsų paskyra, jūsų duomenys ir visi jūsų adresatai yra prarasti. Dėja, turite iš naujo įdiegti Briar arba nusistatyti naują paskyrą, slaptažodžio užklausoje, pasirinkdami \"Aš pamiršau savo slaptažodį\".</string>
+  <string name="startup_failed_data_too_old_error">Jūsų paskyra buvo sukurta, naudojant seną šios programėlės versiją, ir negali būti atverta naudojant šią versiją. Jūs privalote arba iš naujo įdiegti seną versiją, arba nusistatyti naują paskyrą, slaptažodžio užklausoje, pasirinkdami \"Aš pamiršau savo slaptažodį\".</string>
+  <string name="startup_failed_data_too_new_error">Ši programėlės versija yra per sena. Atnaujinkite į naujausią versiją ir bandykite dar kartą.</string>
+  <string name="startup_failed_service_error">Briar nepavyko paleisti reikiamo įskiepio. Briar įdiegimas iš naujo, įprastai, išsprendžia šią problemą. Vis dėlto, turėkite omenyje, kad kadangi Briar duomenų laikymui nenaudoja centrinių serverių, jūs tokiu atveju prarasite savo paskyrą ir visus su ja susietus duomenis.</string>
  <plurals name="expiry_warning">
    <item quantity="one">Tai yra bandomoji Briar versija. Jūsų paskyros galiojimas pasibaigs po %d dienos ir negalės būti pratęstas.</item>
    <item quantity="few">Tai yra bandomoji Briar versija. Jūsų paskyros galiojimas pasibaigs po %d dienų ir negalės būti pratęstas.</item>
@@ -148,7 +149,6 @@
  <string name="open">Atverti</string>
  <string name="change">Pakeisti</string>
  <string name="start">Pradėti</string>
-  <string name="finish">Užbaigti</string>
  <string name="no_data">Nėra duomenų</string>
  <string name="ellipsis">…</string>
  <string name="text_too_long">Įvestas tekstas yra per ilgas</string>
@@ -158,7 +158,6 @@
  <string name="sorry">Atsiprašome</string>
  <string name="error_start_activity">Jūsų sistemoje neprieinama</string>
  <string name="status_heading">Būsena:</string>
-  <string name="error">Klaida</string>
  <!--Contacts and Private Conversations-->
  <string name="no_contacts">Nėra rodytinų adresatų</string>
  <string name="no_contacts_action">Norėdami pridėti adresatą, bakstelėkite + piktogramą</string>
@@ -175,6 +174,15 @@
  <string name="set_contact_alias">Pakeisti adresato vardą</string>
  <string name="set_contact_alias_hint">Adresato vardas</string>
  <string name="menu_item_disappearing_messages">Išnykstančios žinutės</string>
+  <string name="menu_item_connect_via_bluetooth">Prisijungti per Bluetooth</string>
+  <string name="dialog_title_connect_via_bluetooth">Prisijungti per Bluetooth</string>
+  <string name="dialog_message_connect_via_bluetooth">Norint, kad tai suveiktų, jūsų adresatas privalo būti šalia jūsų.\n\nJūs ir jūsų adresatas abu vienu metu turėtumėte paspausti „Pradėti“.</string>
+  <string name="toast_connect_via_bluetooth_already_discovering">Jau bandoma prisijungti per Bluetooth</string>
+  <string name="toast_connect_via_bluetooth_not_discoverable">Nepavyksta tęsti be Bluetooth</string>
+  <string name="toast_connect_via_bluetooth_no_location_permission">Nepavyksta tęsti be įrenginio vietovės leidimo</string>
+  <string name="toast_connect_via_bluetooth_start">Jungiamasi per Bluetooth…</string>
+  <string name="toast_connect_via_bluetooth_success">Sėkmingai prisijungta per Bluetooth</string>
+  <string name="toast_connect_via_bluetooth_error">Nepavyko prisijungti per Bluetooth</string>
  <!--The first placeholder will show a duration like "7 days". The second placeholder at the end will add "Tap to learn more."-->
  <string name="auto_delete_msg_you_enabled">Jūsų žinutės išnyks po %1$s. %2$s</string>
  <!--The placeholder at the end will add "Tap to learn more."-->
@@ -232,7 +240,6 @@
  <string name="dialog_title_image_support">Dabar šiam adresatui galite siųsti paveikslus</string>
  <string name="dialog_message_image_support">Bakstelėkite šią piktogramą, norėdami pridėti paveikslus.</string>
  <string name="messaging_too_many_attachments_toast">Bus išsiųsti tik %d pirmi paveikslai</string>
-  <string name="menu_contact">Susisiekti</string>
  <!--Adding Contacts-->
  <string name="add_contact_title">Pridėti šalia esantį adresatą</string>
  <string name="face_to_face">Jūs privalote susitikti gyvai su asmeniu, kurį norite pridėti kaip adresatą.\n\nTai neleis bet kam apsimetinėti jumis ar ateityje skaityti jūsų žinučių.</string>
@@ -331,16 +338,6 @@
  <string name="introduction_response_accepted_received">%1$s priėmė supažindinimą su %2$s.</string>
  <string name="introduction_response_declined_received">%1$s atmetė supažindinimą su %2$s.</string>
  <string name="introduction_response_declined_received_by_introducee">%1$s sako, kad %2$s atmetė supažindinimą.</string>
-  <!--Connect via Bluetooth-->
-  <string name="menu_item_connect_via_bluetooth">Prisijungti per Bluetooth</string>
-  <string name="connect_via_bluetooth_title">Prisijungti per Bluetooth</string>
-  <string name="connect_via_bluetooth_intro">Tuo atveju, jei Bluetooth ryšiai neveikia automatiškai, galite naudoti šį langą, kad prisijungtumėte rankiniu būdu.\n\nTam, kad tai suveiktų, jūsų adresatas turi būti šalia jūsų.\n\nJūs ir jūsų adresatas vienu metu turėtumėte paspausti „Pradėti“.</string>
-  <string name="connect_via_bluetooth_already_discovering">Jau bandoma jungtis per Bluetooth. Netrukus bandykite dar kartą.</string>
-  <string name="connect_via_bluetooth_no_location_permission">Nepavyksta tęsti be įrenginio vietovės leidimo</string>
-  <string name="connect_via_bluetooth_start">Jungiamasi per Bluetooth…</string>
-  <string name="connect_via_bluetooth_success">Sėkmingai prisijungta per Bluetooth</string>
-  <string name="connect_via_bluetooth_error">Nepavyko prisijungti per Bluetooth.</string>
-  <string name="connect_via_bluetooth_error_not_supported">Įrenginys nepalaiko Bluetooth.</string>
  <!--Private Groups-->
  <string name="groups_list_empty">Nėra rodytinų grupių</string>
  <string name="groups_list_empty_action">Norėdami sukurti grupę ar paprašyti savo adresatų pradėti su jumis bendrinti grupes, bakstelėkite + piktogramą</string>
@@ -607,8 +604,7 @@
 		Jūsų adresatas taip pat gali keisti šį nustatymą jums abiems.</string>
  <string name="learn_more">Sužinoti daugiau</string>
  <string name="disappearing_messages_summary">Padaryti, kad būsimos žinutės šiame pokalbyje automatiškai išnyktų po 7\u00A0dienų.</string>
-  <!--Settings Actions-->
-  <string name="pref_category_actions">Veiksmai</string>
+  <!--Settings Feedback-->
  <string name="send_feedback">Siųsti atsiliepimą</string>
  <!--Link Warning-->
  <string name="link_warning_title">Įspėjimas apie nuorodą</string>
@@ -617,7 +613,7 @@
  <string name="link_warning_open_link">Atverti nuorodą</string>
  <!--Crash Reporter-->
  <string name="crash_report_title">Briar strigties ataskaita</string>
-  <string name="briar_crashed">Apgailestaujame, Briar užstrigo</string>
+  <string name="briar_crashed">Atleiskite, Briar užstrigo.</string>
  <string name="not_your_fault">Tai nėra jūsų kaltė.</string>
  <string name="please_send_report">Padėkite mums sukurti geresnę Briar, išsiųsdami mums strigties ataskaitą.</string>
  <string name="report_is_encrypted">Mes pažadame, kad ataskaita yra šifruota ir išsiunčiama saugiai.</string>
@@ -675,92 +671,6 @@
  <string name="lock_tap_to_unlock">Bakstelėkite, norėdami atrakinti</string>
  <!--Connections Screen-->
  <string name="transports_help_text">Briar gali jungtis prie jūsų adresatų per internetą, belaidį (Wi-Fi) tinklą ar Bluetooth ryšį.\n\nPrivatumo sumetimais, visi ryšiai jungiasi per Tor tinklą.\n\nJei adresatas gali būti pasiekiamas keliais būdais, tuomet Briar naudoja juos lygiagrečiai.</string>
-  <!--Share app offline-->
-  <string name="hotspot_title">Bendrinti šią programėlę nenaudojant interneto</string>
-  <string name="hotspot_intro">Bendrinti šią programėlę su žmogumi, kuris neturi interneto ryšio, naudojant jūsų telefono belaidį (Wi-Fi) ryšį.
-		\n\nJūsų telefonas įjungs belaidį (Wi-Fi) prieigos tašką. Šalia esantys žmonės galės prisijungti prie prieigos taško ir atsisiųsti iš jūsų telefono Briar programėlę.</string>
-  <string name="hotspot_button_start_sharing">Įjungti prieigos tašką</string>
-  <string name="hotspot_button_stop_sharing">Išjungti prieigos tašką</string>
-  <string name="hotspot_progress_text_start">Nustatomas prieigos taškas…</string>
-  <string name="hotspot_notification_channel_title">Belaidis (Wi-Fi) prieigos taškas</string>
-  <string name="hotspot_notification_title">Bendrinama Briar nenaudojant interneto</string>
-  <string name="hotspot_button_connected">Kitas</string>
-  <string name="permission_hotspot_location_request_body">Tam, kad galėtų sukurti belaidį (Wi-Fi) prieigos tašką, Briar reikia gauti prieigą prie jūsų įrenginio vietovės.\n\nBriar nesaugo jūsų įrenginio vietovės ir su niekuo jos nebendrina.</string>
-  <string name="permission_hotspot_location_denied_body">Jūs uždraudėte prieigą prie įrenginio vietovės, tačiau norint sukurti belaidį (Wi-Fi) prieigos tašką, Briar reikia šio leidimo.\n\nApsvarstykite galimybę sutekti prieigą prie įrenginio vietovės.</string>
-  <string name="wifi_settings_title">Belaidžio (Wi-Fi) nustatymas</string>
-  <string name="wifi_settings_request_enable_body">Tam, kad sukurtų belaidį (Wi-Fi) prieigos tašką, Briar turi naudoti belaidį (Wi-Fi) ryšį. Įjunkite jį.</string>
-  <string name="hotspot_tab_manual">Rankinis</string>
-  <!--The placeholder to be inserted into the string 'hotspot_manual_wifi': People can connect by %s-->
-  <string name="hotspot_scanning_a_qr_code">skenuodami QR kodą</string>
-  <!--Wi-Fi setup-->
-  <!--The %s placeholder will be replaced with the translation of 'hotspot_scanning_a_qr_code'-->
-  <string name="hotspot_manual_wifi">Jūsų telefonas teikia belaidį (Wi-Fi) prieigos tašką. Žmonės, norintys atsisiųsti Briar, gali prisijungti prie prieigos taško ir pridėti jį savo įrenginio belaidžio (Wi-Fi) ryšio nustatymuose naudodami informaciją žemiau arba %s. Prisijungę prie prieigos taško, jie turi paspausti „Kitas“.</string>
-  <string name="hotspot_manual_wifi_ssid">Tinklo pavadinimas</string>
-  <string name="hotspot_qr_wifi">Jūsų telefonas teikia belaidį (Wi-Fi) prieigos tašką. Žmonės, norintys atsisiųsti Briar, gali prisijungti prie prieigos taško skenuodami šį QR kodą. Prisijungę prie prieigos taško, jie turi paspausti „Kitas“.</string>
-  <string name="hotspot_no_peers_connected">Nėra prisijungusių įrenginių</string>
-  <plurals name="hotspot_peers_connected">
-    <item quantity="one">%s prisijungęs įrenginys</item>
-    <item quantity="few">%s prisijungę įrenginiai</item>
-    <item quantity="many">%s prisijungusių įrenginių</item>
-    <item quantity="other">%s prisijungęs įrenginys</item>
-  </plurals>
-  <!--Download link-->
-  <!--The %s placeholder will be replaced with the translation of 'hotspot_scanning_a_qr_code'-->
-  <string name="hotspot_manual_site">Jūsų telefonas teikia belaidį (Wi-Fi) prieigos tašką. Žmonės, prisijungę prie prieigos taško, gali atsisiųsti Briar, įrašydami saityno naršyklėje šią nuorodą arba %s.</string>
-  <string name="hotspot_manual_site_address">Adresas (URL)</string>
-  <string name="hotspot_qr_site">Jūsų telefonas teikia belaidį (Wi-Fi) prieigos tašką. Žmonės, prisijungę prie prieigos taško, gali atsisiųsti Briar, skenuodami šį QR kodą.</string>
-  <!--e.g. Download Briar 1.2.20-->
-  <string name="website_download_title">Atsisiųsti %s</string>
-  <string name="website_download_intro">Kažkas iš šalia esančių pradėjo bendrinti su jumis %s.</string>
-  <string name="website_download_outro">Kai atsisiuntimas pasibaigs, atverkite atsisiųstą failą ir jį įdiekite.</string>
-  <string name="website_troubleshooting_title">Nesklandumų šalinimas</string>
-  <string name="website_troubleshooting_1">Jei negalite atsisiųsti programėlės, pabandykite naudoti kitą saityno naršyklės programėlę.</string>
-  <string name="website_troubleshooting_2_old">Norint įsidiegti atsisiųstą programėlę, jums sistemos nustatymuose gali tekti leisti programėlių iš „Nežinomų šaltinių“ diegimą. Po to, jums gali tekti atsisiųsti programėlę iš naujo. Kai įsidiegsite programėlę, rekomenduojame išjungti „Nežinomų šaltinių“ nustatymą.</string>
-  <string name="website_troubleshooting_2_new">Norint įsidiegti atsisiųstą programėlę, jums gali tekti leisti savo naršyklei diegti nežinomas programėles. Kai įsidiegsite programėlę, rekomenduojame pašalinti naršyklės leidimą diegti nežinomas programėles.</string>
-  <string name="hotspot_help_wifi_title">Problemos jungiantis prie belaidžio (Wi-Fi):</string>
-  <string name="hotspot_help_wifi_1">Pabandykite abiejuose telefonuose išjungti ir vėl įjungti belaidį (Wi-Fi) ryšį ir bandykite dar kartą.</string>
-  <string name="hotspot_help_wifi_2">Jeigu jūsų telefonas skundžiasi, jog belaidžiame (Wi-Fi) tinkle nėra interneto ryšio, nurodykite jam, kad norite likti prisijungę.</string>
-  <string name="hotspot_help_wifi_3">Paleiskite telefoną, kuriame įjungtas belaidis (Wi-Fi) prieigos taškas, iš naujo, o tuomet paleiskite Briar ir bandykite bendrinti dar kartą.</string>
-  <string name="hotspot_help_site_title">Iškilo problemų apsilankant vietinėje svetainėje:</string>
-  <string name="hotspot_help_site_1">Dar kartą įsitikinkite, kad tiksliai įvedėte nurodytą adresą. Maža klaida gali sukelti nesėkmę.</string>
-  <string name="hotspot_help_site_2">Bandydami pasiekti šią svetainę, įsitikinkite, kad jūsų telefonas vis dar yra prisijungęs prie teisingo belaidžio (Wi-Fi) ryšio (žiūrėkite aukščiau).</string>
-  <string name="hotspot_help_site_3">Jei turite užkardos programėlę, įsitikinkite, kad ji neblokuoja prieigos.</string>
-  <string name="hotspot_help_site_4">Jei galite apsilankyti svetainėje, bet negalite atsisiųsti Briar programėlės, pabandykite naudoti kitą saityno naršyklės programėlę.</string>
-  <string name="hotspot_help_fallback_title">Niekas neveikia?</string>
-  <string name="hotspot_help_fallback_intro">Galite pabandyti įsirašyti programėlę kaip .apk failą, kad bendrintumėte ją kitokiu būdu. Perkėlus failą į kitą įrenginį, jis gali būti naudojamas, kad būtų įdiegta Briar.
-		\n\nPatarimas: Norėdami bendrinti failą per Bluetooth, iš pradžių, jums gali tekti pervadinti failą taip, kad jis baigtųsi .zip prievardžiu.</string>
-  <string name="hotspot_help_fallback_button">Įsirašyti programėlę</string>
-  <!--error handling-->
-  <string name="hotspot_error_intro">Kažkas nutiko bandant bendrinti programėlę per belaidį (Wi-Fi) ryšį:</string>
-  <string name="hotspot_error_no_wifi_direct">Įrenginys nepalaiko „Wi-Fi Direct“</string>
-  <string name="hotspot_error_start_callback_failed">Nepavyko įjungti prieigos taško: klaida %s</string>
-  <string name="hotspot_error_start_callback_failed_unknown">Nepavyko įjungti prieigos taško dėl nežinomos klaidos, priežastis %d</string>
-  <string name="hotspot_error_start_callback_no_group_info">Nepavyko įjungti prieigos taško: nėra informacijos apie grupę</string>
-  <string name="hotspot_error_web_server_start">Klaida paleidžiant saityno serverį</string>
-  <string name="hotspot_error_web_server_serve">Klaida pateikiant svetainę.\n\nJei problema išlieka, išsiųskite atsiliepimą (su anoniminiais duomenimis) per Briar programėlę.</string>
-  <string name="hotspot_flag_test">Įspėjimas: Ši programėlė buvo įdiegta naudojant „Android Studio“ ir NEGALI būti įdiegta kitame įrenginyje.</string>
-  <string name="hotspot_error_framework_busy">Nepavyko įjungti prieigos taško.\n\nJei turite veikiantį kitą prieigos tašką arba, jei bendrinate interneto ryšį per belaidį (Wi-Fi) ryšį, pabandykite to nebedaryti ir po to, bandykite dar kartą.</string>
-  <!--Transfer Data via Removable Drives-->
-  <string name="removable_drive_menu_title">Prisijungti per keičiamąjį diską</string>
-  <string name="removable_drive_intro">Jei negalite prisijungti prie savo adresato per internetą, belaidį (Wi-Fi) ar Bluetooth, Briar taip pat gali perkelti žinutes į keičiamąjį diską, pavyzdžiui, USB atmintuką ar SD kortelę.</string>
-  <string name="removable_drive_explanation">Jei negalite prisijungti prie savo adresato per internetą, belaidį (Wi-Fi) ar Bluetooth, Briar taip pat gali perkelti žinutes į keičiamąjį diską, pavyzdžiui, USB atmintuką ar SD kortelę.\n\nKai naudojate mygtuką „Siųsti duomenis“, bet kokie duomenys, laukiantys, kad būtų išsiųsti adresatui, bus įrašyti į keičiamąjį diską. Į juos įeina privačios žinutės, priedai, tinklaraščiai, forumai ir privačios grupės.\n\nVisa tai, prieš įrašant į keičiamąjį diską, bus užšifruota.\n\nJūsų adresatas, gavęs keičiamąjį diską, galės naudoti mygtuką „Gauti duomenis“, kad importuotų žinutes į Briar.</string>
-  <string name="removable_drive_title_send">Siųsti duomenis</string>
-  <string name="removable_drive_title_receive">Gauti duomenis</string>
-  <string name="removable_drive_send_intro">Bakstelėkite mygtuką žemiau, kad sukurtumėte naują failą su šifruotomis žinutėmis. Galite pasirinkti, kur failą įrašyti.\n\nJei norite įrašyti failą į keičiamąjį diską, tuomet įdėkite diską dabar.</string>
-  <string name="removable_drive_send_no_data">Šiuo metu nėra žinučių, kurios laukia būti išsiųstos šiam adresatui.</string>
-  <string name="removable_drive_send_not_supported">Šis adresatas naudoja seną Briar versiją arba įrenginį, kuris nepalaiko šios ypatybės.</string>
-  <string name="removable_drive_send_button">Pasirinkti eksportuojamą failą</string>
-  <string name="removable_drive_ongoing">Palaukite, kol bus užbaigta vykdoma užduotis</string>
-  <string name="removable_drive_receive_intro">Bakstelėkite žemiau esantį mygtuką, kad pasirinktumėte adresato jums išsiųsta failą.\n\nJeigu failas yra keičiamajame diske, tuomet įdėkite diską dabar.</string>
-  <string name="removable_drive_receive_button">Pasirinkti importuojamą failą</string>
-  <string name="removable_drive_success_send_title">Eksportavimas sėkmingas</string>
-  <string name="removable_drive_success_send_text">Duomenys sėkmingai eksportuoti. Dabar, turite 28 dienas, kad nugabentumėte failą adresatui.\n\nJeigu failas yra keičiamajame diske, naudokite pranešimą būsenos juostoje, kad prieš ištraukdami diską, saugiai jį išstumtumėte.</string>
-  <string name="removable_drive_success_receive_title">Importavimas sėkmingas</string>
-  <string name="removable_drive_success_receive_text">Gautos visos šiame faile esančios šifruotos žinutės.</string>
-  <string name="removable_drive_error_send_title">Klaida eksportuojant duomenis</string>
-  <string name="removable_drive_error_send_text">Įvyko klaida rašant duomenis į failą.\n\nJei naudojate keičiamąjį diską, įsitikinkite, jog jis yra tinkamai įkištas ir bandykite dar kartą.\n\nJei klaida išlieka, atsiųskite atsiliepimą, kad praneštumėte Briar komandai apie šią klaidą.</string>
-  <string name="removable_drive_error_receive_title">Klaida importuojant duomenis</string>
-  <string name="removable_drive_error_receive_text">Pasirinktame faile nebuvo nieko tokio, ką Briar galėtų atpažinti.\n\nĮsitikinkite, kad pasirinkote teisingą failą.\n\nJeigu jūsų adresatas sukūrė failą daugiau kaip prieš 28 dienas, tuomet Briar negalės jo atpažinti.</string>
  <!--Screenshots-->
  <!--This is a name to be used in screenshots. Feel free to change it to a local name.-->
  <string name="screenshot_alice">Jurgita</string>
--- a/briar-android/src/main/res/values-mk/strings.xml
+++ b/briar-android/src/main/res/values-mk/strings.xml
@@ -1,5 +1,5 @@
 <?xml version='1.0' encoding='UTF-8'?>
-<resources>
+<resources xmlns:tools="http://schemas.android.com/tools">
  <!--Setup-->
  <string name="setup_title">Добредојде во Briar</string>
  <string name="setup_name_explanation">Вашето корисничко име ќе се појави до секоја содржина која ќе ја објавите. Истото не можете да го промените откога ќе ја креирате вашата сметка.</string>
@@ -154,7 +154,7 @@
  <string name="set_contact_alias">Промена на име на контакт</string>
  <string name="set_contact_alias_hint">Име на контакт</string>
  <string name="menu_item_connect_via_bluetooth">Поврзи се преку Bluetooth</string>
-  <string name="connect_via_bluetooth_title">Поврзи се преку Bluetooth</string>
+  <string name="dialog_title_connect_via_bluetooth">Поврзи се преку Bluetooth</string>
  <!--The first placeholder will show a duration like "7 days". The second placeholder at the end will add "Tap to learn more."-->
  <!--The placeholder at the end will add "Tap to learn more."-->
  <!--The first placeholder will show a contact's name. The second placeholder will show a duration like "7 days". The third placeholder at the end will add "Tap to learn more."-->
--- a/briar-android/src/main/res/values-my/strings.xml
+++ b/briar-android/src/main/res/values-my/strings.xml
@@ -2,10 +2,10 @@
 <resources xmlns:tools="http://schemas.android.com/tools">
  <!--Setup-->
  <string name="setup_title">Briar မှ ကြိုဆိုပါသည်</string>
-  <string name="setup_name_explanation">သင့်နာမည်ပြောင်သည် သင်တင်ထားသမျှ၏ဘေးတွင် ပေါ်နေပါလိမ့်မည်။ သို့ပါ၍ သင့်နာမည်ပြောင်အား အကောင့်ဖွင့်ပြီးနောက် ပြောင်း၍မရတော့ပါ။</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_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>
@@ -22,35 +22,36 @@
  <string name="setup_huawei_text">အောက်ပါခလုတ်ကိုနှိပ်၍ \"ကာကွယ်မှုပေးထားသောအက်ပ်များ\" စခရင်တွင် Briar ကို ကာကွယ်ထားကြောင်း သေချာစေပါ။</string>
  <string name="setup_huawei_button">Briar ကို ကာကွယ်မည်</string>
  <string name="setup_huawei_help">ကာကွယ်မှုပေးထားသောအက်ပ်များစာရင်းတွင် ထည့်မထားလျှင် Briar ကို နောက်ကွယ်တွင် ဖွင့်ထားနိုင်မည်မဟုတ်ပါ။</string>
-  <string name="setup_huawei_app_launch_text">အောက်ပါခလုတ်ကိုနှိပ်ပြီး \"အက်ပ်စတင်ခြင်း\" စခရင်ကို ဖွင့်၍ Briar ကို \"ကိုယ်တိုင်စီမံမည်\" ဟု သတ်မှတ်ပါ။</string>
-  <string name="setup_huawei_app_launch_button">ဘတ္ထရီဆက်တင်များကို ဖွင့်မည်</string>
-  <string name="setup_huawei_app_launch_help">\"အက်ပ်စတင်ခြင်း\" စခရင်တွင် \"ကိုယ်တိုင်စီမံမည်\" ဟု သတ်မှတ်မထားလျှင် Briar ကို နောက်ကွယ်တွင် ဖွင့်ထားနိုင်မည်မဟုတ်ပါ။</string>
-  <string name="setup_xiaomi_text">ဖွင့်ထားသောအက်ပ်များစာရင်းတွင် Briar ကို လော့ခ်ချထားမှ နောက်ကွယ်တွင် ဖွင့်ထားနိုင်မည်။</string>
-  <string name="setup_xiaomi_button">Briar ကို ကာကွယ်ထားမည်</string>
-  <string name="setup_xiaomi_help">ဖွင့်ထားသောအက်ပ်များစာရင်းတွင် လော့ခ်ချမထားပါက Briar ကို နောက်ကွယ်တွင် ဖွင့်ထားနိုင်မည်မဟုတ်ပါ။</string>
-  <string name="setup_xiaomi_dialog_body_old">၁။ ဖွင့်ထားသောအက်ပ်များစာရင်း (တစ်နည်းအားဖြင့် အက်ပ်ပြောင်းရာ) ကို ဖွင့်ပါ\n\n၂။ သော့ခလောက်အိုင်ကွန်ပေါ်လာရန် Briar ပုံပေါ်မှ ပွတ်ဆွဲချပါ\n\n၃။ သော့ခတ်မထားပါက သော့ခတ်ရန်နှိပ်လိုက်ပါ</string>
-  <string name="setup_xiaomi_dialog_body_new">၁။ ဖွင့်ထားသောအက်ပ်များစာရင်း (တစ်နည်းအားဖြင့် အက်ပ်ပြောင်းရာ) ကို ဖွင့်ပါ\n\n၂။ သော့ခလောက်ခလုတ်ပေါ်လာသည်အထိ Briar ပုံကို နှိပ်ထားပါ\n\n၃။ သော့ခတ်မထားပါက သော့ခတ်ရန်နှိပ်လိုက်ပါ</string>
-  <string name="warning_dozed">%s ကို နောက်ကွယ်တွင် ဖွင့်မထားနိုင်ပါ</string>
+  <string name="setup_huawei_app_launch_text">အောက်က ခလုတ်ကို နှိပ်၍ \"အပ္ပလီကေးရှင်း ဖွင့်ရန်\" စကင်ရင်ကို ဖွင့်ပါ၊ ပြီးလျှင် Briar ကို \"ကိုယ်တိုင်စီမံမယ်\" လို့ သတ်မှတ်ပါ။</string>
+  <string name="setup_huawei_app_launch_button">ဘက်ထရီအပြင်အဆင်များကို ဖွင့်ပါ</string>
+  <string name="setup_huawei_app_launch_help">Briar ကို \"အပ္ပလီကေးရှင်း ဖွင့်ရန်\" စကင်ရင်ပေါ်တွင် \"ကိုယ်တိုင်စီမံမယ်\" လို့မသတ်မှတ်ထားလျှင် နောက်ခံတွင် ၎င်းကို လည်ပတ်၍ မရနိုင်ပါ။</string>
+  <string name="setup_xiaomi_text">နောက်ခံတွင်အလုပ်လုပ်စေရန် လတ်တလောအက်ပလီကေးရှင်းများစာရင်းတွင် Briar အား သော့ခတ်ထားရန် လိုအပ်သည်။</string>
+  <string name="setup_xiaomi_button">Briar ကို ကာကွယ်ပါ</string>
+  <string name="setup_xiaomi_help">အကယ်၍ Briar ကို သော့မခတ်ထားပါက၊ ထိုအက်ပလီကေးရှင်းသည် နောက်ခံတွင် အလုပ်လုပ်နေနိုင်မည် မဟုတ်ပါ။</string>
+  <string name="setup_xiaomi_dialog_body_old">၁။ လတ်တလောအက်ပ်များစာရင်းကိုဖွင့်ပါ (ဒါ့အပြင် app switcher လို့လည်းခေါ်ပါသည်) \n\n2. သော့ခလောက်အိုင်ကွန်ကို \n\n3. ပြသရန် Briar ၏ပုံကို အောက်ကိုတွန်းပါ။ </string>
+  <string name="setup_xiaomi_dialog_body_new">၁။ လတ်တလော အက်ပလီကေးရှင်းများစာရင်း (ဒါ့အပြင် အက်ပလီကေးရှင်းခလုတ်ဟုလည်းခေါ်သည်) ကိုလည်းဖွင့်ပါ \n\n2 ။ အဆိုပါသော့ခလောက်ခလုတ်မှ \n\n3 ပေါ်လာသည်အထိ Briar ၏ ပုံကို နှိပ်၍ ဖိထားပါ။ အကယ်၍ သော့ခလောက်သည် သော့ခတ်ထားခြင်းမရှိပါက ၎င်းကိုသော့ခတ်ရန် ပွတ်ဆွဲပါ။ </string>
+  <string name="warning_dozed">%s ကို နောက်ကွယ်တွင် မဖွင့်ထားနိုင်ပါ</string>
  <!--Login-->
  <string name="enter_password">စကားဝှက်</string>
  <string name="try_again">စကားဝှက်မှားနေသည်၊ ထပ်စမ်းကြည့်ပါ</string>
  <string name="dialog_title_cannot_check_password">စကားဝှက်ကို စစ်ဆေး၍မရပါ</string>
-  <string name="dialog_message_cannot_check_password">Briar က သင့်စကားဝှက်ကို မစစ်ဆေးနိုင်ပါ။ ဤပြဿနာကို ဖြေရှင်းရန် သင့်ကိရိယာကို ပိတ်၍ပြန်ဖွင့်ကြည့်ပါ။</string>
+  <string name="dialog_message_cannot_check_password">Briar က သင့်စကားဝှက်ကို မစစ်ဆေးနိုင်ပါ။ ဤပြဿနာကို ဖြေရှင်းရန် သင့်ကိရိယာကို ပိတ်ပြီးပြန်ဖွင့်ကြည့်ပါ။</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">သင့် Briar အကောင့်ကို ကလောက်တွင်မဟုတ်ဘဲ သင့်ကိရိယာတွင်သာ လျှို့ဝှက်ကုဒ်ပြောင်းသိမ်းဆည်းထားသောကြောင့် သင့်စကားဝှက်ကို ပြန်လည်သတ်မှတ်မပေးနိုင်ပါ။ သင့်အကောင့်ကို ဖျက်ပစ်ပြီး အသစ်ပြန်ဖွင့်ချင်ပါသလား။\n\nသတိ - သင့်ကိုယ်ပိုင်အချက်အလက်များ၊ အဆက်အသွယ်များနှင့် မက်ဆေ့ချ်များအားလုံး အပြီးပျက်သွားပါလိမ့်မည်။</string>
+  <string name="startup_failed_notification_title">Briar မစတင်နိုင်ပါ</string>
+  <string name="startup_failed_notification_text">အချက်အလက်များကို ပိုမိုကြည့်ရှုရန် နှိပ်ပါ။</string>
  <string name="startup_failed_activity_title">Briar မစတင်နိုင်ပါ</string>
-  <string name="startup_failed_clock_error">သင့်ကိရိယာ၏နာရီသည် မှားနေပါသဖြင့် Briar မစတင်နိုင်ပါ။\n\nသင့်ကိရိယာ၏နာရီကို အချိန်မှန်အောင်တိုက်ပြီး ပြန်စမ်းကြည့်ပါ။</string>
-  <string name="startup_failed_db_error">Briar သည် သင့်အကောင့်၊ သင့်အဆက်အသွယ်များနှင့် သင့်မက်ဆေ့ချ်များပါရှိသော အချက်အလက်အစုကို မဖွင့်နိုင်ပါ။\n\nအက်ပ်နောက်ဆုံးဗားရှင်းသို့ အဆင့်မြှင့်ပြီး ထပ်စမ်းကြည့်ပါ (သို့) စကားဝှက်တောင်းသည့်နေရာတွင် \'ကျွန်ုပ်၏စကားဝှက်ကို မေ့သွားပါသည်\' ကို ရွေးချယ်ပြီး အကောင့်အသစ်တစ်ခု ဖွင့်နိုင်ပါသည်။</string>
-  <string name="startup_failed_data_too_old_error">သင့်အကောင့်ကို ဤအက်ပ်၏ဗားရှင်းအဟောင်းတစ်ခုဖြင့် ဖွင့်ခဲ့သောကြောင့် ယခုဗားရှင်းဖြင့် ဖွင့်၍မရပါ။\n\nဗားရှင်းအဟောင်းကို ပြန်ထည့်သွင်းရပါမည် (သို့) စကားဝှက်တောင်းသည့်နေရာတွင် \'ကျွန်ုပ်၏စကားဝှက်ကို မေ့သွားပါသည်\' ကို ရွေးချယ်ပြီး အကောင့်အသစ်တစ်ခု ဖွင့်နိုင်ပါသည်။</string>
-  <string name="startup_failed_data_too_new_error">သင့်အကောင့်ကို ဤအက်ပ်ဗားရှင်းထက်နောက်ကျသောဗားရှင်းတစ်ခုဖြင့် ဖွင့်ခဲ့သောကြောင့် ယခုဗားရှင်းဖြင့် ဖွင့်၍မရပါ။\n\nနောက်ဆုံးဗားရှင်းသို့ အဆင့်မြှင့်ပြီး ထပ်စမ်းကြည့်ပါ။</string>
-  <string name="startup_failed_service_error">Briar သည် လိုအပ်သည့် အစိတ်အပိုင်းတစ်ခုကို မဖွင့်နိုင်ပါ။\n\nအက်ပ်နောက်ဆုံးဗားရှင်းသို့ အဆင့်မြှင့်ပြီး ထပ်စမ်းကြည့်ပါ။</string>
+  <string name="startup_failed_db_error">အကြောင်းကြောင်းကြောင့် သင့် Briar အချက်အလက်အစုတစ်ခုလုံး လုံးဝပျက်စီးသွားပါသည်။ သင့်အကောင့်၊ သင့်အချက်အလက်နှင့် သင့်အဆက်အသွယ်အကုန်လုံး ပျောက်ဆုံးသွားပါသည်။ ကံမကောင်းစွာဘဲ သင့်အနေဖြင့် Briar ကို ပြန်လည်ထည့်သွင်းရပါမည် (သို့) စကားဝှက်တောင်းသည့်နေရာတွင် \'ကျွန်ုပ်၏စကားဝှက်ကို မေ့သွားပါသည်\' ကို ရွေးချယ်ပြီး အကောင့်အသစ်တစ်ခု ဖွင့်နိုင်ပါသည်။</string>
+  <string name="startup_failed_data_too_old_error">သင့်အကောင့်ကို ဤအက်ပ်၏ဗားရှင်းအဟောင်းတစ်ခုဖြင့် ဖွင့်ခဲ့သောကြောင့် ယခုဗားရှင်းဖြင့် ဖွင့်၍မရပါ။ ဗားရှင်းအဟောင်းကို ပြန်ထည့်သွင်းရပါမည် (သို့) စကားဝှက်တောင်းသည့်နေရာတွင် \'ကျွန်ုပ်၏စကားဝှက်ကို မေ့သွားပါသည်\' ကို ရွေးချယ်ပြီး အကောင့်အသစ်တစ်ခု ဖွင့်နိုင်ပါသည်။</string>
+  <string name="startup_failed_data_too_new_error">ဤအက်ပ်ဗားရှင်းသည် အလွန်ဟောင်းနေသောကြောင့် နောက်ဆုံးဗားရှင်းမြှင့်ပြီး ထပ်စမ်းကြည့်ပါ။</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_date_reached">ဤဆော့ဖ်ဝဲသည် သက်တမ်းကုန်သွားပါပြီ။\nစမ်းသပ်အသုံးပြုခြင်းအတွက် ကျေးဇူးတင်ပါသည်။</string>
-  <string name="download_briar">Briar ကို ဆက်လက်အသုံးပြုရန် နောက်ဆုံးထွက်ထားသည်ကို ဒေါင်းလုဒ်လုပ်ပါ။</string>
+  <string name="download_briar">Briar ကို ဆက်လက်အသုံးပြုလိုပါက နောက်ဆုံးထွက်ထားသည်ကို ဒေါင်းလုဒ်လုပ်ပါ။</string>
  <string name="create_new_account">အကောင့်အသစ်ဖွင့်ရန် လိုအပ်သော်လည်း သုံးလက်စနာမည်ပြောင်ကို ဆက်သုံးနိုင်ပါသည်။</string>
  <string name="download_briar_button">နောက်ဆုံးထွက်ထားသည်ကို ဒေါင်းလုဒ်လုပ်မည်</string>
  <string name="startup_open_database">အချက်အလက်အစုကို ပြန်ဖြည်နေသည်…</string>
@@ -142,7 +143,6 @@
  <string name="sorry">ဝမ်းနည်းပါတယ်</string>
  <string name="error_start_activity">သင်၏စနစ်တွင် မရရှိနိုင်ပါ</string>
  <string name="status_heading">အခြေအနေ -</string>
-  <string name="error">ချို့ယွင်းချက်</string>
  <!--Contacts and Private Conversations-->
  <string name="no_contacts">ပြသစရာအဆက်အသွယ် မရှိပါ</string>
  <string name="no_contacts_action">+ (အပေါင်းအိုင်ကွန်) အား နှိပ်၍ အဆက်အသွယ်ကို ထည့်သွင်းပါ</string>
@@ -159,6 +159,15 @@
  <string name="set_contact_alias">အဆက်အသွယ်အမည်အား ပြောင်းမယ်</string>
  <string name="set_contact_alias_hint">အဆက်အသွယ်အမည်</string>
  <string name="menu_item_disappearing_messages">ပျောက်ကွယ် မက်ဆေ့ချ်များ</string>
+  <string name="menu_item_connect_via_bluetooth">ဘလူးတုသ် နှင့် ချိတ်မယ်</string>
+  <string name="dialog_title_connect_via_bluetooth">ဘလူးတုသ် နှင့် ချိတ်မယ်</string>
+  <string name="dialog_message_connect_via_bluetooth">လုပ်ဆောင်ချက် အောင်မြင်နိုင်ရန် သင်၏ အဆက်အသွယ်သည် အနီးအနားတွင်ရှိရပါမည်။ \n\n သင် နှင့် သင်၏ အဆက်အသွယ် နှစ်ဦးစလုံးသည် \"စတင်ရန်\" ကို တစ်ပြိုင်တည်း နှိပ်ရပါမည်။</string>
+  <string name="toast_connect_via_bluetooth_already_discovering">ဘလူးတုသ် နှင့် ချိတ်ဆက်ရန် ကြိုးစားနေပါသည်</string>
+  <string name="toast_connect_via_bluetooth_not_discoverable">ဘလူးတုသ် မပါဘဲ ဆက်လက်မလုပ်ဆောင်နိုင်ပါ</string>
+  <string name="toast_connect_via_bluetooth_no_location_permission">တည်နေရာသုံးခွင့် မပါဘဲ ဆက်လက်မလုပ်ဆောင်နိုင်ပါ</string>
+  <string name="toast_connect_via_bluetooth_start">ဘလူးတုသ် နှင့် ချိတ်ဆက်နေသည်...</string>
+  <string name="toast_connect_via_bluetooth_success">ဘလူးတုသ် နှင့် အောင်မြင်စွာ ချိတ်ဆက်ပြီး</string>
+  <string name="toast_connect_via_bluetooth_error">ဘလူးတုသ် နှင့် ချိတ်ဆက်၍မရပါ</string>
  <!--The first placeholder will show a duration like "7 days". The second placeholder at the end will add "Tap to learn more."-->
  <string name="auto_delete_msg_you_enabled">သင်၏မက်ဆေ့ချ်များသည် %1$s အကြာတွင် ပျောက်ကွယ်သွားပါမည်။ %2$s</string>
  <!--The placeholder at the end will add "Tap to learn more."-->
@@ -207,7 +216,6 @@
  <string name="dialog_title_image_support">ရုပ်ပုံများကို ဤအဆက်အသွယ်လိပ်စာသို့ ပို့လို့ရပါပြီ</string>
  <string name="dialog_message_image_support">ဤအိုင်ကွန်ကို နှိပ်ပြီး ရုပ်ပုံများကို ပူးတွဲပါ</string>
  <string name="messaging_too_many_attachments_toast">ပထမဆုံး %d ရုပ်ပုံများသာလျှင် ပို့ပါမည်</string>
-  <string name="menu_contact">အဆက်အသွယ်</string>
  <!--Adding Contacts-->
  <string name="add_contact_title">အနီးနားရှိ အဆက်အသွယ်အား ထည့်သွင်းမယ်</string>
  <string name="face_to_face">သင်သည် ဤလူပုဂ္ဂိုလ်အား အပြင်မှာတွေ့ရှိမှသာလျှင် ၎င်း၏အဆက်အသွယ်ကို ပေါင်းထည့်လို့ရပါမည်။ \n\n ဒါမှသာလျှင် နောင်တွင် အခြားလူများ သင့်အား အယောင်ဆောင်ခြင်း သို့မဟုတ် သင့်မက်ဆေ့ချ်များဖတ်ရှုခြင်း တို့ကို တားဆီးနိုင်ပါမည်။</string>
@@ -303,12 +311,6 @@
  <string name="introduction_response_accepted_received">%2$s နှင့် မိတ်ဆက်ခြင်းကို %1$s က လက်ခံခဲ့ပါသည်။</string>
  <string name="introduction_response_declined_received">%2$s နှင့် မိတ်ဆက်ခြင်းကို %1$s က ငြင်းဆိုခဲ့ပါသည်။</string>
  <string name="introduction_response_declined_received_by_introducee">%2$s မှ မိတ်ဆက်ခြင်းအား ငြင်းဆိုခဲ့သည်ကို %1$s မှ ပြောပါသည်။</string>
-  <!--Connect via Bluetooth-->
-  <string name="menu_item_connect_via_bluetooth">ဘလူးတုသ် နှင့် ချိတ်မယ်</string>
-  <string name="connect_via_bluetooth_title">ဘလူးတုသ် နှင့် ချိတ်မယ်</string>
-  <string name="connect_via_bluetooth_no_location_permission">တည်နေရာသုံးခွင့် မပါဘဲ ဆက်လက်မလုပ်ဆောင်နိုင်ပါ</string>
-  <string name="connect_via_bluetooth_start">ဘလူးတုသ် နှင့် ချိတ်ဆက်နေသည်...</string>
-  <string name="connect_via_bluetooth_success">ဘလူးတုသ် နှင့် အောင်မြင်စွာ ချိတ်ဆက်ပြီး</string>
  <!--Private Groups-->
  <string name="groups_list_empty">ပြသစရာအဖွဲ့များမရှိ</string>
  <string name="groups_list_empty_action">+ (အပေါင်းအိုင်ကွန်) အား နှိပ်၍ အဖွဲ့ဖန်တီးပါ သို့မဟုတ် သင့် အဆက်အသွယ်များကို သင့်စီသို့ အဖွဲ့များ ဝေမျှရန် တောင်းဆိုပါ</string>
@@ -563,8 +565,7 @@
 		 သင်၏အဆက်အသွယ်လည်း ၎င်းအပြင်အဆင်ကို ၎င်းတို့ နှစ်ဦးစလုံးအတွက် ပြောင်းလဲနိုင်ပါသည်။</string>
  <string name="learn_more">ထပ်မံလေ့လာမယ်</string>
  <string name="disappearing_messages_summary">၎င်းစကားပြောဆိုမှုထဲရှိ နောင်မက်ဆေ့ချ်များကို 7\u00A0 ရက်အကြာတွင် အလိုအလျောက် ဖျောက်ကွယ်မယ်။</string>
-  <!--Settings Actions-->
-  <string name="pref_category_actions">ဆောင်ရွက်ချက်များ</string>
+  <!--Settings Feedback-->
  <string name="send_feedback">တုံ့ပြန်ချက် ပေးပို့မယ်</string>
  <!--Link Warning-->
  <string name="link_warning_title">လင့်ခ် သတိပေးချက်</string>
@@ -573,6 +574,7 @@
  <string name="link_warning_open_link">လင့်ခ်ဖွင့်မယ်</string>
  <!--Crash Reporter-->
  <string name="crash_report_title">Briar ပျက်ယွင်းမှုတိုင်ကြားခြင်း</string>
+  <string name="briar_crashed">ဝမ်းနည်းပါတယ်၊ Briar ပျက်သွားပါသည်။</string>
  <string name="not_your_fault">သင့်အမှားမဟုတ်ပါ။</string>
  <string name="please_send_report">ပျက်ကွက်မှု တိုင်ကြားစာ ပေးပို့၍ ကျွန်ုပ်တို့်အား Briar အပ္ပလီကေးရှင်း တိုးတက်ရန် ကူညီပေးပါ။</string>
  <string name="report_is_encrypted">သင်၏တိုင်ကြားမှုကို လျှို့ဝှက်ကုဒ်ပြောင်း၍ လုံခြုံစွာပို့ကြောင်း ကတိပြုပါသည်။</string>
@@ -630,19 +632,6 @@
  <string name="lock_tap_to_unlock">နှိပ်၍ သော့ဖွင့်မယ်</string>
  <!--Connections Screen-->
  <string name="transports_help_text">Briar သည် သင့်အဆက်အသွယ်များကို အင်တာနက်၊ ဝိုင်ဖိုင်၊ သို့မဟုတ် ဘလူးတုသ် မှတစ်ဆင့် ချိတ်ဆက်နိုင်ပါသည်။ \n\n အင်တာနက်ချိတ်ဆက်မှုအားလုံးသည် လုံခြုံရေးအတွက် Tor ကွန်ယက်မှတစ်ဆင့် ဖြတ်သန်းပါသည်။ \n\n အဆက်အသွယ်တစ်ဦးကို နည်းမျိုးစုံနှင့် ဆက်သွယ်နိုင်ခဲ့လျှင် Briar သည် နည်းမျိုးစုံအား တစ်ပြိုင်နက်တည်း အသုံးပြုနေပါသည်။</string>
-  <!--Share app offline-->
-  <string name="hotspot_notification_channel_title">ဝိုင်ဖိုင် ဟော့စပေါ့</string>
-  <string name="hotspot_button_connected">ရှေ့သို့</string>
-  <!--The placeholder to be inserted into the string 'hotspot_manual_wifi': People can connect by %s-->
-  <!--Wi-Fi setup-->
-  <!--The %s placeholder will be replaced with the translation of 'hotspot_scanning_a_qr_code'-->
-  <!--Download link-->
-  <!--The %s placeholder will be replaced with the translation of 'hotspot_scanning_a_qr_code'-->
-  <!--e.g. Download Briar 1.2.20-->
-  <string name="website_troubleshooting_title">အကူအညီ</string>
-  <!--error handling-->
-  <!--Transfer Data via Removable Drives-->
-  <string name="removable_drive_success_receive_text">ဤဖိုင်တွင်ပါဝင်သည့် လျှို့ဝှက်ကုဒ်ပြောင်းမက်ဆေ့ချ်အားလုံးကို လက်ခံရရှိပါပြီ။</string>
  <!--Screenshots-->
  <!--This is a name to be used in screenshots. Feel free to change it to a local name.-->
  <string name="screenshot_alice">Alice</string>
--- a/briar-android/src/main/res/values-nl/strings.xml
+++ b/briar-android/src/main/res/values-nl/strings.xml
@@ -33,7 +33,13 @@
  <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 herstellen. 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">Tik voor meer informatie.</string>
  <string name="startup_failed_activity_title">Opstarten Briar mislukt</string>
+  <string name="startup_failed_db_error">Om de een of andere reden is je Briar-database corrupt geraakt en niet meer te repareren. Je account, je gegevens en al je contacten zijn verloren. Helaas zul je Briar moeten herinstalleren en een nieuw account aan moeten maken met \'Ik ben mijn wachtwoord vergeten\' als om je wachtwoord wordt gevraagd.</string>
+  <string name="startup_failed_data_too_old_error">Je account was aangemaakt met een oude versie van deze app en kan met deze versie niet worden geopend. Je moet de oude versie installeren of een nieuw account aanmaken door \'Ik ben mijn wachtwoord vergeten\' te kiezen als om je wachtwoord wordt gevraagd.</string>
+  <string name="startup_failed_data_too_new_error">Deze versie van de is app is te oud. Upgrade alsjeblieft naar de laatste versie en probeer het nog een keer.</string>
+  <string name="startup_failed_service_error">Briar kon de vereiste plug-in niet starten. Herinstalleren van Briar lost dit probleem meestal op. Let alsjeblieft op dat 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>
@@ -126,7 +132,6 @@
  <string name="open">Open</string>
  <string name="change">Wijzigen</string>
  <string name="start">Beginnen</string>
-  <string name="finish">Einde</string>
  <string name="no_data">Geen gegevens</string>
  <string name="ellipsis">…</string>
  <string name="text_too_long">De ingevoerde tekst is te lang</string>
@@ -136,7 +141,6 @@
  <string name="sorry">Excuses</string>
  <string name="error_start_activity">Onbeschikbaar op jouw systeem</string>
  <string name="status_heading">Status:</string>
-  <string name="error">Fout</string>
  <!--Contacts and Private Conversations-->
  <string name="no_contacts">Er zijn geen contacten om te tonen</string>
  <string name="no_contacts_action">Tik op het +-icoon om een contact toe te voegen</string>
@@ -150,6 +154,8 @@
  <string name="image_attach_error_invalid_mime_type">Bestandsformaat wordt niet ondersteund: %s</string>
  <string name="set_contact_alias">Verander naam van contact</string>
  <string name="set_contact_alias_hint">Contactnaam</string>
+  <string name="menu_item_connect_via_bluetooth">Verbind via Bluetooth</string>
+  <string name="dialog_title_connect_via_bluetooth">Verbind via Bluetooth</string>
  <!--The first placeholder will show a duration like "7 days". The second placeholder at the end will add "Tap to learn more."-->
  <!--The placeholder at the end will add "Tap to learn more."-->
  <!--The first placeholder will show a contact's name. The second placeholder will show a duration like "7 days". The third placeholder at the end will add "Tap to learn more."-->
@@ -180,7 +186,6 @@
  <string name="dialog_title_image_support">Je kan nu afbeeldingen naar dit contact sturen</string>
  <string name="dialog_message_image_support">Tik op dit icoon om afbeelding bij te sluiten.</string>
  <string name="messaging_too_many_attachments_toast">Alleen de eerste %d afbeeldingen worden verstuurd</string>
-  <string name="menu_contact">Contact</string>
  <!--Adding Contacts-->
  <string name="add_contact_title">Voeg contact in de buurt 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>
@@ -276,9 +281,6 @@
  <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>
-  <!--Connect via Bluetooth-->
-  <string name="menu_item_connect_via_bluetooth">Verbind via Bluetooth</string>
-  <string name="connect_via_bluetooth_title">Verbind via Bluetooth</string>
  <!--Private Groups-->
  <string name="groups_list_empty">Er zijn geen groepen om te tonen</string>
  <string name="groups_list_empty_action">Tik op het +-icoon om een groep aan te maken of vraag een van je contacten om een groep met je te delen</string>
@@ -522,8 +524,7 @@
  <string name="cannot_load_ringtone">Kan meldingsgeluid niet laden</string>
  <!--Conversation Settings-->
  <string name="learn_more">Meer info</string>
-  <!--Settings Actions-->
-  <string name="pref_category_actions">Acties</string>
+  <!--Settings Feedback-->
  <string name="send_feedback">Verstuur feedback</string>
  <!--Link Warning-->
  <string name="link_warning_title">Linkwaarschuwing</string>
@@ -532,6 +533,7 @@
  <string name="link_warning_open_link">Open link</string>
  <!--Crash Reporter-->
  <string name="crash_report_title">Briar Crashrapport</string>
+  <string name="briar_crashed">Excuses, Briar is gecrasht.</string>
  <string name="not_your_fault">Dit is niet jouw schuld</string>
  <string name="please_send_report">Help ons alsjeblieft 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>
@@ -585,20 +587,6 @@
  <string name="lock_tap_to_unlock">Tik om te ontgrendelen</string>
  <!--Connections Screen-->
  <string name="transports_help_text">Briar kan met je contacten verbinden via het internet, wifi of bluetooth.\n\nAlle internetverbindingen gaan voor privacy door het Tornetwerk.\n\nAls een contact via meerdere methoden te bereiken is, zal Briar die parallel gebruiken.</string>
-  <!--Share app offline-->
-  <string name="hotspot_notification_channel_title">Wifi-hotspot</string>
-  <string name="hotspot_button_connected">Volgende</string>
-  <string name="hotspot_tab_manual">Handmatig</string>
-  <!--The placeholder to be inserted into the string 'hotspot_manual_wifi': People can connect by %s-->
-  <!--Wi-Fi setup-->
-  <!--The %s placeholder will be replaced with the translation of 'hotspot_scanning_a_qr_code'-->
-  <!--Download link-->
-  <!--The %s placeholder will be replaced with the translation of 'hotspot_scanning_a_qr_code'-->
-  <!--e.g. Download Briar 1.2.20-->
-  <string name="website_troubleshooting_title">Probleem oplossen</string>
-  <!--error handling-->
-  <!--Transfer Data via Removable Drives-->
-  <string name="removable_drive_success_receive_title">Importeren geslaagd</string>
  <!--Screenshots-->
  <!--This is a name to be used in screenshots. Feel free to change it to a local name.-->
  <string name="screenshot_alice">Veerle</string>
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Ivana	543eda68b2	Update feature_request	2021-08-25 10:33:28 +00:00
Ivana	5033febaed	Update feature_request	2021-08-25 10:12:57 +00:00
Ivana	c13b40ec2e	Add new file	2021-08-25 10:12:08 +00:00
Ivana	b74f635ba7	Update bug_report.md	2021-08-24 09:23:02 +00:00
Ivana	5a6c1cc0e9	Update bug_report.md	2021-08-24 09:22:39 +00:00
Ivana	a45669a750	Update bug_report.md	2021-08-24 09:21:19 +00:00
Ivana	5dd183ce47	Update bug_report.md	2021-08-24 09:19:54 +00:00
Ivana	32d121566e	Add new file - contains bug_report description template	2021-08-24 08:47:16 +00:00
Ivana	c76da20620	Add new directory issue_templates	2021-08-24 08:24:46 +00:00
Ivana	9b1d6d936e	Add new directory	2021-08-24 08:16:11 +00:00