Bump version numbers for 1.3.8 release.

Merge branch 'fix-headless-build' into 'master'
Remove jar signatures to avoid SecurityException when repacking headless jar See merge request briar/briar!1532
2026-02-12 02:39:05 +01:00 · 2021-08-31 15:38:11 +01:00 · 2021-08-31 14:37:13 +00:00 · 2021-08-31 15:02:43 +01:00 · 2021-08-31 14:16:43 +01:00 · 2021-08-31 14:15:47 +01:00
78 changed files with 2052 additions and 854 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
@@ -1,35 +0,0 @@
-# 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
@@ -1,15 +0,0 @@
-# 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,15 +31,6 @@
      <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" />
@@ -197,9 +188,9 @@
    </codeStyleSettings>
    <codeStyleSettings language="kotlin">
      <option name="CODE_STYLE_DEFAULTS" value="KOTLIN_OFFICIAL" />
-      <option name="PARAMETER_ANNOTATION_WRAP" value="1" />
-      <option name="VARIABLE_ANNOTATION_WRAP" value="1" />
-      <option name="ENUM_CONSTANTS_WRAP" value="1" />
+      <indentOptions>
+        <option name="CONTINUATION_INDENT_SIZE" value="4" />
+      </indentOptions>
    </codeStyleSettings>
  </code_scheme>
 </component>
--- a/bramble-android/build.gradle
+++ b/bramble-android/build.gradle
@@ -15,8 +15,8 @@ android {
 	defaultConfig {
 		minSdkVersion 16
 		targetSdkVersion 30
-		versionCode 10306
-		versionName "1.3.6"
+		versionCode 10308
+		versionName "1.3.8"
 		consumerProguardFiles 'proguard-rules.txt'

 		testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
--- a/bramble-api/src/main/java/org/briarproject/bramble/api/FeatureFlags.java
+++ b/bramble-api/src/main/java/org/briarproject/bramble/api/FeatureFlags.java
@@ -11,8 +11,6 @@ public interface FeatureFlags {

 	boolean shouldEnableDisappearingMessages();

-	boolean shouldEnableConnectViaBluetooth();
-
 	boolean shouldEnableTransferData();

 	boolean shouldEnableShareAppViaOfflineHotspot();
--- a/bramble-core/src/test/java/org/briarproject/bramble/test/TestFeatureFlagModule.java
+++ b/bramble-core/src/test/java/org/briarproject/bramble/test/TestFeatureFlagModule.java
@@ -25,11 +25,6 @@ public class TestFeatureFlagModule {
 				return true;
 			}

-			@Override
-			public boolean shouldEnableConnectViaBluetooth() {
-				return true;
-			}
-
 			@Override
 			public boolean shouldEnableTransferData() {
 				return true;
--- a/briar-android/artwork/bluetooth.svg
+++ b/briar-android/artwork/bluetooth.svg
@@ -1,15 +1,28 @@
 <?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: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">
+<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" />
  <defs
     id="defs4" />
  <metadata
@@ -26,22 +39,23 @@
  </metadata>
  <path
     id="path4201"
-     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" />
+     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" />
  <path
     id="path4201-1"
-     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" />
+     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" />
  <path
     id="rect4270"
-     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" />
+     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" />
  <path
     id="path4844"
-     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" />
+     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" />
 </svg>
--- a/briar-android/build.gradle
+++ b/briar-android/build.gradle
@@ -26,8 +26,8 @@ android {
 	defaultConfig {
 		minSdkVersion 16
 		targetSdkVersion 30
-		versionCode 10306
-		versionName "1.3.6"
+		versionCode 10308
+		versionName "1.3.8"
 		applicationId "org.briarproject.briar.android"

 		vectorDrawables.useSupportLibrary = true
--- a/briar-android/src/main/AndroidManifest.xml
+++ b/briar-android/src/main/AndroidManifest.xml
@@ -462,6 +462,17 @@
 			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,6 +35,7 @@ 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;
@@ -236,4 +237,6 @@ 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
@@ -35,6 +35,7 @@ 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;
@@ -89,6 +90,7 @@ 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,
@@ -311,11 +313,6 @@ public class AppModule {
 				return true;
 			}

-			@Override
-			public boolean shouldEnableConnectViaBluetooth() {
-				return IS_DEBUG_BUILD;
-			}
-
 			@Override
 			public boolean shouldEnableTransferData() {
 				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,9 +238,6 @@ public interface ActivityComponent {

 	void inject(ConversationSettingsDialog dialog);

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

 	void inject(RssFeedManageFragment fragment);
@@ -248,4 +245,6 @@ 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
@@ -0,0 +1,87 @@
+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
@@ -0,0 +1,109 @@
+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
@@ -0,0 +1,29 @@
+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
@@ -0,0 +1,98 @@
+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
@@ -0,0 +1,19 @@
+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
@@ -0,0 +1,23 @@
+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,19 +1,20 @@
-package org.briarproject.briar.android.conversation;
+package org.briarproject.briar.android.contact.connect;

-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;
@@ -21,23 +22,22 @@ 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.ContactItem;
+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 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 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.Objects.requireNonNull;
 import static java.util.concurrent.TimeUnit.SECONDS;
 import static java.util.logging.Level.WARNING;
 import static java.util.logging.Logger.getLogger;
@@ -46,48 +46,50 @@ 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;

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

-	private final Logger LOG = getLogger(BluetoothConnecter.class.getName());
+	private final Logger LOG =
+			getLogger(ConnectViaBluetoothViewModel.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;
-
-	private Permission locationPermission = Permission.UNKNOWN;
+	@Nullable
 	private ContactId contactId = null;

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

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

 	/**
-	 * Call this when the using activity or fragment starts,
-	 * because permissions might have changed while it was stopped.
+	 * Set this as soon as it becomes available.
+	 */
+	void setContactId(ContactId contactId) {
+		this.contactId = contactId;
+	}
+
+	/**
+	 * Call this when the using activity or fragment starts.
 	 */
 	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.
@@ -116,94 +120,52 @@ class BluetoothConnecter implements EventListener {
 	}

 	@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 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;
 		}
+		return true;
 	}

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

-	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 isDiscovering() {
+		// we should not be calling this if isBluetoothNotSupported() is true
+		return requireNonNull(bluetoothPlugin).isDiscovering();
 	}

-	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();
+	private boolean isConnectedViaBluetooth() {
+		return connectionRegistry.isConnected(requireNonNull(contactId), ID);
 	}

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

-	@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);
-			}
-		}
-	}
+		state.setEvent(new Connecting());

-	private void connect() {
 		bluetoothPlugin.disablePolling();
 		pluginManager.setPluginEnabled(ID, true);
-
 		ioExecutor.execute(() -> {
 			try {
 				if (!waitForBluetoothActive()) {
-					showToast(R.string.bt_plugin_status_inactive);
+					state.postEvent(new ConnectViaBluetoothState.Error(
+							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;
@@ -226,7 +188,7 @@ class BluetoothConnecter implements EventListener {
 						LOG.info("Could connect, handling connection");
 						connectionManager
 								.manageOutgoingConnection(contactId, ID, conn);
-						showToast(R.string.toast_connect_via_bluetooth_success);
+						state.postEvent(new Success());
 					}
 				} finally {
 					eventBus.removeListener(this);
@@ -237,8 +199,23 @@ class BluetoothConnecter implements EventListener {
 		});
 	}

+	@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 {
@@ -264,9 +241,9 @@ class BluetoothConnecter implements EventListener {
 		final long sleep = 250;
 		try {
 			while (left > 0) {
-				if (isConnectedViaBluetooth(contactId)) {
+				if (isConnectedViaBluetooth()) {
 					LOG.info("Failed to connect, but contact connected");
-					// no Toast needed here, as it gets shown when
+					// no success state needed here, as it gets shown when
 					// ConnectionOpenedEvent is received
 					return;
 				}
@@ -277,13 +254,19 @@ class BluetoothConnecter implements EventListener {
 			Thread.currentThread().interrupt();
 		}
 		LOG.warning("Failed to connect");
-		showToast(R.string.toast_connect_via_bluetooth_error);
+		state.postEvent(new ConnectViaBluetoothState.Error(
+				R.string.connect_via_bluetooth_error));
 	}

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

 }
--- 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
@@ -1,151 +0,0 @@
-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,6 +48,7 @@ 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;
@@ -104,7 +105,6 @@ 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,9 +379,6 @@ 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 && featureFlags.shouldEnableTransferData()) {
 			menu.findItem(R.id.action_transfer_data).setVisible(true);
@@ -422,9 +419,9 @@ public class ConversationActivity extends BriarActivity
 			onAutoDeleteTimerNoticeClicked();
 			return true;
 		} else if (itemId == R.id.action_connect_via_bluetooth) {
-			FragmentManager fm = getSupportFragmentManager();
-			new BluetoothConnecterDialogFragment().show(fm,
-					BluetoothConnecterDialogFragment.TAG);
+			Intent intent = new Intent(this, ConnectViaBluetoothActivity.class);
+			intent.putExtra(CONTACT_ID, contactId.getInt());
+			startActivity(intent);
 			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,7 +101,6 @@ 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;
@@ -140,8 +139,7 @@ public class ConversationViewModel extends DbViewModel
 			AttachmentRetriever attachmentRetriever,
 			AttachmentCreator attachmentCreator,
 			AutoDeleteManager autoDeleteManager,
-			ConversationManager conversationManager,
-			BluetoothConnecter bluetoothConnecter) {
+			ConversationManager conversationManager) {
 		super(application, dbExecutor, lifecycleManager, db, androidExecutor);
 		this.db = db;
 		this.eventBus = eventBus;
@@ -154,7 +152,6 @@ 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);
@@ -414,10 +411,6 @@ 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,6 +25,7 @@ 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
@@ -81,7 +82,12 @@ public class FinalFragment extends Fragment {
 		int color = getResources().getColor(args.getInt(ARG_ICON_TINT));
 		ColorStateList tint = ColorStateList.valueOf(color);
 		ImageViewCompat.setImageTintList(iconView, tint);
-		textView.setText(args.getInt(ARG_TEXT));
+		int textRes = args.getInt(ARG_TEXT);
+		if (textRes == 0) {
+			textView.setVisibility(GONE);
+		} else {
+			textView.setText(textRes);
+		}

 		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,6 +52,7 @@ 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
@@ -334,7 +335,8 @@ class HotspotManager {
 		ioExecutor.execute(() -> {
 			String content = createWifiLoginString(group.getNetworkName(),
 					group.getPassphrase());
-			Bitmap qrCode = QrCodeUtils.createQrCode(dm, content);
+			Bitmap qrCode = QrCodeUtils.createQrCode(
+					(int) (dm.heightPixels * HOTSPOT_QRCODE_FACTOR), content);
 			NetworkConfig config = new NetworkConfig(group.getNetworkName(),
 					group.getPassphrase(), qrCode);
 			listener.onHotspotStarted(config);
@@ -437,9 +439,8 @@ 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 =
-			"2346789ABCDEFGHJKLMNPQRTUVWXYZabcdefghijkmnopqrstuvwxyz";
+	// exclude chars that are easy to confuse: 0 (O), 5 (S), 1 l (I)
+	private static final String chars = "2346789abcdefghijkmnopqrstuvwxyz";

 	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,6 +27,7 @@ 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
@@ -83,7 +84,8 @@ class WebServerManager {
 			}
 			url = "http://" + address.getHostAddress() + ":" + PORT;
 		}
-		Bitmap qrCode = QrCodeUtils.createQrCode(dm, url);
+		Bitmap qrCode = QrCodeUtils.createQrCode(
+				(int) (dm.heightPixels * HOTSPOT_QRCODE_FACTOR), 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,6 +11,7 @@ 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;

@@ -51,6 +52,10 @@ 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());

@@ -75,4 +80,10 @@ 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/util/QrCodeUtils.java
+++ b/briar-android/src/main/java/org/briarproject/briar/android/util/QrCodeUtils.java
@@ -26,13 +26,19 @@ 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) {
-		int smallestDimen = Math.min(dm.widthPixels, dm.heightPixels);
+		return createQrCode(Math.min(dm.widthPixels, dm.heightPixels), input);
+	}
+
+	@Nullable
+	public static Bitmap createQrCode(int edgeLen, String input) {
 		try {
 			// Generate QR code
 			BitMatrix encoded = new QRCodeWriter().encode(input, QR_CODE,
-					smallestDimen, smallestDimen);
+					edgeLen, edgeLen);
 			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
@@ -0,0 +1,21 @@
+<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/layout/fragment_bluetooth_intro.xml
+++ b/briar-android/src/main/res/layout/fragment_bluetooth_intro.xml
@@ -0,0 +1,51 @@
+<?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
@@ -0,0 +1,43 @@
+<?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_manual.xml
+++ b/briar-android/src/main/res/layout/fragment_hotspot_manual.xml
@@ -4,6 +4,7 @@
 	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,6 +4,7 @@
 	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,6 +20,7 @@
 		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,14 +31,28 @@
 			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/sendButton"
+			app:layout_constraintBottom_toTopOf="@+id/buttonLearnMore"
 			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 xmlns:tools="http://schemas.android.com/tools">
+<resources>
  <!--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="dialog_title_connect_via_bluetooth">الإتصال عبر بلوتوث</string>
+  <string name="connect_via_bluetooth_title">الإتصال عبر بلوتوث</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,13 +40,12 @@
  <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_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>
+  <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>
  <plurals name="expiry_warning">
    <item quantity="one">Това е тестова версия на Briar. Вашият акаунт ще бъде изтече след %d ден и не може да бъде подновена.</item>
    <item quantity="other">Това е изпитателно издание на Briar. Валидността на профила ще изтече след %d дена и не може да бъде подновена.</item>
@@ -139,6 +138,7 @@
  <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,6 +148,7 @@
  <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>
@@ -161,18 +162,9 @@
  <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."-->
@@ -208,9 +200,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>
@@ -224,6 +216,7 @@
  <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>
@@ -300,7 +293,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>
@@ -320,6 +313,12 @@
  <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_no_location_permission">Не може да продължи без разрешение за местоположение</string>
+  <string name="connect_via_bluetooth_start">Свързване чрез Bluetooth…</string>
+  <string name="connect_via_bluetooth_success">Успешно свързване чрез Bluetooth</string>
  <!--Private Groups-->
  <string name="groups_list_empty">Няма групи</string>
  <string name="groups_list_empty_action">Докоснете иконата с +, за да създадете своя или поискайте от контактите си да споделят група с вас</string>
@@ -344,10 +343,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>
@@ -419,10 +418,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-->
@@ -437,7 +436,7 @@
  <string name="blogs_feed_empty_state">Няма публикации</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>
@@ -469,7 +468,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>
@@ -574,7 +573,8 @@
 \n\nАко вие промените настройката промяната ще влезе в действие веднага, още върху следващото ви съобщение, а при вашите контакти след получаването му. Контактите ви също могат да правят промяна на тази настройка, което ще се отрази и на двама ви.</string>
  <string name="learn_more">Научете повече</string>
  <string name="disappearing_messages_summary">Бъдещите съобщения в разговора изчезват след 7\u00A0дни</string>
-  <!--Settings Feedback-->
+  <!--Settings Actions-->
+  <string name="pref_category_actions">Действия</string>
  <string name="send_feedback">Изпращане на отзив</string>
  <!--Link Warning-->
  <string name="link_warning_title">Предупреждение за препратка</string>
@@ -583,10 +583,9 @@
  <string name="link_warning_open_link">Отваряне</string>
  <!--Crash Reporter-->
  <string name="crash_report_title">Доклад на срив</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>
@@ -641,6 +640,36 @@
  <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_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'-->
+  <string name="hotspot_manual_wifi_ssid">Наименование на мрежата</string>
+  <!--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_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,13 +40,7 @@
  <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>
@@ -139,6 +133,7 @@
  <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>
@@ -148,6 +143,7 @@
  <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>
@@ -164,15 +160,6 @@
  <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."-->
@@ -225,6 +212,7 @@ 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>
@@ -321,6 +309,12 @@ 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>
@@ -569,7 +563,8 @@ 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 Feedback-->
+  <!--Settings Actions-->
+  <string name="pref_category_actions">Accions</string>
  <string name="send_feedback">Envieu comentaris</string>
  <!--Link Warning-->
  <string name="link_warning_title">Avís d\'enllaç</string>
@@ -578,7 +573,6 @@ 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>
@@ -618,6 +612,18 @@ 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,13 +40,12 @@
  <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_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>
+  <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>
  <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>
@@ -139,6 +138,7 @@
  <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,6 +148,7 @@
  <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>
@@ -164,15 +165,6 @@
  <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."-->
@@ -224,6 +216,7 @@
  <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>
@@ -320,6 +313,16 @@
  <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>
@@ -578,7 +581,8 @@
 		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 Feedback-->
+  <!--Settings Actions-->
+  <string name="pref_category_actions">Aktionen</string>
  <string name="send_feedback">Feedback senden</string>
  <!--Link Warning-->
  <string name="link_warning_title">Link-Warnung</string>
@@ -587,7 +591,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>
@@ -626,7 +630,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>
@@ -645,6 +649,86 @@
  <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_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,13 +40,12 @@
  <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_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>
+  <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>
  <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>
@@ -139,6 +138,7 @@
  <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,6 +148,7 @@
  <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>
@@ -164,15 +165,6 @@
  <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."-->
@@ -224,6 +216,7 @@
  <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>
@@ -320,6 +313,12 @@
  <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_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>
  <!--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>
@@ -578,7 +577,8 @@
 		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 Feedback-->
+  <!--Settings Actions-->
+  <string name="pref_category_actions">Acciones</string>
  <string name="send_feedback">Enviar comentario</string>
  <!--Link Warning-->
  <string name="link_warning_title">Advertencia sobre el enlace</string>
@@ -587,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 ha fallado.</string>
+  <string name="briar_crashed">Lo sentimos, Briar se colgó.</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>
@@ -645,6 +645,32 @@
  <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="hotspot_tab_manual">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'-->
+  <string name="hotspot_manual_wifi_ssid">Nombre de red</string>
+  <string name="hotspot_no_peers_connected">No hay dispositivos conectados</string>
+  <!--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">Resolución de problemas</string>
+  <!--error handling-->
+  <!--Transfer Data via Removable Drives-->
+  <string name="removable_drive_success_receive_title">Importado con éxito</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 xmlns:tools="http://schemas.android.com/tools">
+<resources>
  <!--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="dialog_title_connect_via_bluetooth">Konektatu Bluetooth bidez</string>
+  <string name="connect_via_bluetooth_title">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,13 +44,7 @@
  <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>
@@ -145,6 +139,7 @@
  <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>
@@ -154,6 +149,7 @@
  <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>
@@ -170,15 +166,6 @@
  <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."-->
@@ -232,6 +219,7 @@
  <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">برای اضافه کردن فرد به عنوان مخاطب باید با او به صورت حضوری ملاقات کنید.
@@ -338,6 +326,12 @@
  <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>
@@ -618,7 +612,8 @@
 		 همچنین مخاطب شما می‌تواند این تنظیمات را برای شما تغییر دهد.</string>
  <string name="learn_more">اطلاعات بیشتر</string>
  <string name="disappearing_messages_summary">پس از این پیام‌های این گفتگو را بعد از 7\u00A0 روز ناپدید کن.</string>
-  <!--Settings Feedback-->
+  <!--Settings Actions-->
+  <string name="pref_category_actions">فعالیتها </string>
  <string name="send_feedback">ارسال بازخورد</string>
  <!--Link Warning-->
  <string name="link_warning_title">هشدار پیوند</string>
@@ -627,7 +622,6 @@
  <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>
@@ -697,6 +691,19 @@ 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,13 +40,7 @@
  <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>
@@ -139,6 +133,7 @@
  <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>
@@ -148,6 +143,7 @@
  <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>
@@ -164,15 +160,6 @@
  <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."-->
@@ -224,6 +211,7 @@
  <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>
@@ -320,6 +308,12 @@
  <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>
@@ -580,7 +574,8 @@ 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 Feedback-->
+  <!--Settings Actions-->
+  <string name="pref_category_actions">Actions</string>
  <string name="send_feedback">Envoyer une rétroaction</string>
  <!--Link Warning-->
  <string name="link_warning_title">Avertissement de lien</string>
@@ -589,7 +584,6 @@ 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>
@@ -647,6 +641,20 @@ 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,13 +33,7 @@
  <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>
@@ -132,6 +126,7 @@
  <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>
@@ -141,6 +136,7 @@
  <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>
@@ -157,14 +153,6 @@
  <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."-->
@@ -216,6 +204,7 @@
  <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>
@@ -312,6 +301,12 @@
  <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>
@@ -569,7 +564,8 @@
 		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 Feedback-->
+  <!--Settings Actions-->
+  <string name="pref_category_actions">Accións</string>
  <string name="send_feedback">Envía a avaliación</string>
  <!--Link Warning-->
  <string name="link_warning_title">Aviso de ligazón</string>
@@ -578,7 +574,6 @@
  <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>
@@ -636,6 +631,19 @@
  <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,13 +33,7 @@
  <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>
@@ -142,6 +136,7 @@
  <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>
@@ -151,6 +146,7 @@
  <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>
@@ -164,8 +160,6 @@
  <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."-->
@@ -196,6 +190,7 @@
  <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>
@@ -293,6 +288,9 @@
  <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>
@@ -548,7 +546,8 @@
  <string name="cannot_load_ringtone">לא ניתן לטעון צלצול</string>
  <!--Conversation Settings-->
  <string name="learn_more">למד עוד</string>
-  <!--Settings Feedback-->
+  <!--Settings Actions-->
+  <string name="pref_category_actions">פעולות</string>
  <string name="send_feedback">שלח משוב</string>
  <!--Link Warning-->
  <string name="link_warning_title">אזהרת קישור</string>
@@ -557,7 +556,6 @@
  <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>
@@ -611,6 +609,18 @@
  <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 xmlns:tools="http://schemas.android.com/tools">
+<resources>
  <!--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="dialog_title_connect_via_bluetooth">ब्लूटूथ के माध्यम से कनेक्ट करें</string>
+  <string name="connect_via_bluetooth_title">ब्लूटूथ के माध्यम से कनेक्ट करें</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 é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_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_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 é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_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_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, é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="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="warning_dozed">%s nem tud futni a háttérben</string>
  <!--Login-->
  <string name="enter_password">Jelszó</string>
@@ -40,13 +40,7 @@
  <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>
@@ -69,7 +63,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">Érintse meg itt, hogy beállíthassa, hogyan csatlakozzon a Tor kapcsolataihoz.</string>
+  <string name="transports_onboarding_text">Koppintson ide, 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>
@@ -101,7 +95,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">Érintse meg az újra belépéshez.</string>
+  <string name="reminder_notification_text">Koppintson 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>
@@ -139,6 +133,7 @@
  <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>
@@ -148,9 +143,10 @@
  <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">Érintse meg a + gombot kapcsolatok hozzáadásához</string>
+  <string name="no_contacts_action">Koppintson a + gombra a 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>
@@ -164,15 +160,6 @@
  <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."-->
@@ -193,7 +180,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">Érintse meg a további információkért.</string>
+  <string name="tap_to_learn_more">Koppintson 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>
@@ -224,8 +211,9 @@ 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">Érintse meg az ikont képek csatolásához.</string>
+  <string name="dialog_message_image_support">Koppintson az ikonra 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>
@@ -323,9 +311,15 @@ 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">Érintse meg a + ikont csoport létrehozásához, vagy kérje meg kapcsolatait, hogy osszanak meg csoportokat Önnel</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_created_by">Létrehozta %s</string>
  <plurals name="messages">
    <item quantity="one">%düzenet </item>
@@ -379,7 +373,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">Érintse meg a + ikont fórum létrehozásához, vagy kérje meg kapcsolatait, hogy osszanak meg fórumokat Önnel</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="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>
@@ -482,7 +476,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">Érintse meg a profilképe cseréjéhez</string>
+  <string name="change_profile_picture">Koppintson 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>
@@ -587,7 +581,8 @@ 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 Feedback-->
+  <!--Settings Actions-->
+  <string name="pref_category_actions">Események</string>
  <string name="send_feedback">Visszajelzés küldése</string>
  <!--Link Warning-->
  <string name="link_warning_title">Link figyelmeztetés</string>
@@ -596,7 +591,6 @@ 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>
@@ -651,9 +645,23 @@ 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">Érintse meg a zárolás feloldásához</string>
+  <string name="lock_tap_to_unlock">Koppintson 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
@@ -36,13 +36,7 @@
  <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_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>
@@ -135,6 +129,7 @@
  <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>
@@ -144,6 +139,7 @@
  <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>
@@ -160,15 +156,6 @@
  <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."-->
@@ -220,6 +207,7 @@
  <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>
@@ -316,6 +304,12 @@
  <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_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>
  <!--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>
@@ -574,7 +568,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 Feedback-->
+  <!--Settings Actions-->
  <string name="send_feedback">Senda umsögn</string>
  <!--Link Warning-->
  <string name="link_warning_title">Aðvörun vegna tengils</string>
@@ -583,7 +577,6 @@
  <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="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>
@@ -641,6 +634,17 @@
  <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_button_connected">Næsta</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">Lausn á vandamálum</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">Lísa</string>
--- a/briar-android/src/main/res/values-it/strings.xml
+++ b/briar-android/src/main/res/values-it/strings.xml
@@ -40,13 +40,12 @@
  <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_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>
+  <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>
  <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>
@@ -139,6 +138,7 @@
  <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,6 +148,7 @@
  <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>
@@ -164,15 +165,6 @@
  <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."-->
@@ -224,6 +216,7 @@
  <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>
@@ -320,6 +313,16 @@
  <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>
@@ -578,7 +581,8 @@
 		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 Feedback-->
+  <!--Settings Actions-->
+  <string name="pref_category_actions">Azioni</string>
  <string name="send_feedback">Invia feedback</string>
  <!--Link Warning-->
  <string name="link_warning_title">Attenzione Link</string>
@@ -645,6 +649,86 @@
  <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_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_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
@@ -34,13 +34,7 @@
  <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_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>
@@ -65,9 +59,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>
@@ -78,16 +72,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>
@@ -128,6 +122,7 @@
  <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,6 +132,7 @@
  <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>
@@ -153,15 +149,6 @@
  <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."-->
@@ -203,6 +190,7 @@
  <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,8 +226,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>
@@ -298,6 +286,12 @@
  <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_no_location_permission">位置情報の権限なくして続行不可能</string>
+  <string name="connect_via_bluetooth_start">Bluetooth経由で接続中…</string>
+  <string name="connect_via_bluetooth_success">Bluetooth経由で接続に成功</string>
  <!--Private Groups-->
  <string name="groups_list_empty">表示するグループがありません</string>
  <string name="groups_list_empty_action">「＋」アイコンをタップしてグループを作成するか、連絡先に登録している誰かにグループを共有してもらう</string>
@@ -310,7 +304,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>
@@ -437,6 +431,8 @@
  <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>
@@ -467,7 +463,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>
@@ -518,7 +514,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>
@@ -538,9 +534,9 @@
  <string name="choose_ringtone_title">着信音を選択</string>
  <string name="cannot_load_ringtone">着信音を読み込めません</string>
  <!--Conversation Settings-->
-  <string name="disappearing_messages_title">消えたメッセージ</string>
  <string name="learn_more">詳細情報</string>
-  <!--Settings Feedback-->
+  <!--Settings Actions-->
+  <string name="pref_category_actions">操作</string>
  <string name="send_feedback">フィードバックを送信</string>
  <!--Link Warning-->
  <string name="link_warning_title">リンクの警告</string>
@@ -549,7 +545,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>
@@ -574,6 +570,7 @@
  <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-->
@@ -589,6 +586,10 @@
  <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-->
@@ -600,6 +601,45 @@
  <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>
+  <!--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-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 xmlns:tools="http://schemas.android.com/tools">
+<resources>
  <!--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="dialog_title_connect_via_bluetooth">블루투스로 연결하기</string>
+  <string name="connect_via_bluetooth_title">블루투스로 연결하기</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,13 +40,12 @@
  <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_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>
+  <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>
  <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>
@@ -149,6 +148,7 @@
  <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,6 +158,7 @@
  <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>
@@ -174,15 +175,6 @@
  <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."-->
@@ -240,6 +232,7 @@
  <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>
@@ -338,6 +331,12 @@
  <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_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>
  <!--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>
@@ -604,7 +603,8 @@
 		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 Feedback-->
+  <!--Settings Actions-->
+  <string name="pref_category_actions">Veiksmai</string>
  <string name="send_feedback">Siųsti atsiliepimą</string>
  <!--Link Warning-->
  <string name="link_warning_title">Įspėjimas apie nuorodą</string>
@@ -613,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">Atleiskite, Briar užstrigo.</string>
+  <string name="briar_crashed">Apgailestaujame, 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>
@@ -671,6 +671,88 @@
  <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_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_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 xmlns:tools="http://schemas.android.com/tools">
+<resources>
  <!--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="dialog_title_connect_via_bluetooth">Поврзи се преку Bluetooth</string>
+  <string name="connect_via_bluetooth_title">Поврзи се преку 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
@@ -40,13 +40,7 @@
  <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="other">ဤအရာသည် Briar ၏ စမ်းသပ်ဆဲဗားရှင်းဖြစ်ပါသည်။ သင့်အကောင့်သည် %d ရက်နေ့တွင် သက်တမ်းကုန်ဆုံးမည်ဖြစ်ပြီး သက်တမ်းတိုး၍မရနိုင်ပါ။</item>
  </plurals>
@@ -143,6 +137,7 @@
  <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,15 +154,6 @@
  <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."-->
@@ -216,6 +202,7 @@
  <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>
@@ -311,6 +298,12 @@
  <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>
@@ -565,7 +558,8 @@
 		 သင်၏အဆက်အသွယ်လည်း ၎င်းအပြင်အဆင်ကို ၎င်းတို့ နှစ်ဦးစလုံးအတွက် ပြောင်းလဲနိုင်ပါသည်။</string>
  <string name="learn_more">ထပ်မံလေ့လာမယ်</string>
  <string name="disappearing_messages_summary">၎င်းစကားပြောဆိုမှုထဲရှိ နောင်မက်ဆေ့ချ်များကို 7\u00A0 ရက်အကြာတွင် အလိုအလျောက် ဖျောက်ကွယ်မယ်။</string>
-  <!--Settings Feedback-->
+  <!--Settings Actions-->
+  <string name="pref_category_actions">ဆောင်ရွက်ချက်များ</string>
  <string name="send_feedback">တုံ့ပြန်ချက် ပေးပို့မယ်</string>
  <!--Link Warning-->
  <string name="link_warning_title">လင့်ခ် သတိပေးချက်</string>
@@ -574,7 +568,6 @@
  <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>
@@ -632,6 +625,18 @@
  <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-->
  <!--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,13 +33,7 @@
  <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>
@@ -132,6 +126,7 @@
  <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>
@@ -141,6 +136,7 @@
  <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>
@@ -154,8 +150,6 @@
  <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."-->
@@ -186,6 +180,7 @@
  <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>
@@ -281,6 +276,9 @@
  <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>
@@ -524,7 +522,8 @@
  <string name="cannot_load_ringtone">Kan meldingsgeluid niet laden</string>
  <!--Conversation Settings-->
  <string name="learn_more">Meer info</string>
-  <!--Settings Feedback-->
+  <!--Settings Actions-->
+  <string name="pref_category_actions">Acties</string>
  <string name="send_feedback">Verstuur feedback</string>
  <!--Link Warning-->
  <string name="link_warning_title">Linkwaarschuwing</string>
@@ -533,7 +532,6 @@
  <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>
@@ -587,6 +585,20 @@
  <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/briar-android/src/main/res/values-oc/strings.xml
+++ b/briar-android/src/main/res/values-oc/strings.xml
@@ -1,5 +1,5 @@
 <?xml version='1.0' encoding='UTF-8'?>
-<resources xmlns:tools="http://schemas.android.com/tools">
+<resources>
  <!--Setup-->
  <string name="setup_title">La benvenguda a Briar</string>
  <string name="setup_name_explanation">Vòstre escais-nom serà mostrat al costat de cada de vòstra publicacion. Poiretz pas lo cambiar aprèp la creacion del compte.</string>
@@ -130,7 +130,7 @@ Volètz suprimir vòstre compte e ne crear un nòu ?\n
  <string name="set_contact_alias">Cambiar lo nom del contacte</string>
  <string name="set_contact_alias_hint">Nom del contacte</string>
  <string name="menu_item_connect_via_bluetooth">Se connectar per Bluetooth</string>
-  <string name="dialog_title_connect_via_bluetooth">Se connectar per Bluetooth</string>
+  <string name="connect_via_bluetooth_title">Se connectar 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."-->
  <!--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-pl/strings.xml
+++ b/briar-android/src/main/res/values-pl/strings.xml
@@ -1,5 +1,5 @@
 <?xml version='1.0' encoding='UTF-8'?>
-<resources xmlns:tools="http://schemas.android.com/tools">
+<resources>
  <!--Setup-->
  <string name="setup_title">Witaj w Briar</string>
  <string name="setup_name_explanation">Twoja nazwa użytkownika będzie wyświetlana przy każdej zamieszczonej przez Ciebie treści. Nie można jej zmienić po tworzeniu konta.</string>
@@ -145,7 +145,7 @@
  <string name="set_contact_alias_hint">Nazwa kontaktu</string>
  <string name="menu_item_disappearing_messages">Znikające wiadomości</string>
  <string name="menu_item_connect_via_bluetooth">Połącz przez Bluetooth</string>
-  <string name="dialog_title_connect_via_bluetooth">Połącz przez Bluetooth</string>
+  <string name="connect_via_bluetooth_title">Połącz przez 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-pt-rBR/strings.xml
+++ b/briar-android/src/main/res/values-pt-rBR/strings.xml
@@ -33,13 +33,7 @@
  <string name="forgotten_password">Esqueci minha senha</string>
  <string name="dialog_title_lost_password">Perdeu a senha</string>
  <string name="dialog_message_lost_password">Sua conta Briar é armazenada em seu dispositivo e criptografada, não na Nuvem, assim não podemos recuperar a senha. Você quer deletar sua conta e começar de novo?\n\nAtenção: Isso irá apagar permanentemente suas identidades, contatos e mensagens</string>
-  <string name="startup_failed_notification_title">Briar não pode iniciar</string>
-  <string name="startup_failed_notification_text">Pressione para mais informações.</string>
  <string name="startup_failed_activity_title">Inicialização do Briar falhou</string>
-  <string name="startup_failed_db_error">Por algum motivo, o banco de dados do seu Briar está corrompido e não é possível repará-lo. Sua conta, seus dados e seus contatos foram perdidos. Infelizmente, você precisará reinstalar o Briar ou criar uma nova conta escolhendo a opção \'Esqueci minha senha\'.</string>
-  <string name="startup_failed_data_too_old_error">Sua conta foi criada numa versão mais antiga do aplicativo e não pode ser aberta nesta versão. Você pode reinstalar a versão antiga ou criar uma conta nova escolhendo a opção \"Esqueci minha senha\".</string>
-  <string name="startup_failed_data_too_new_error">A versão deste aplicativo é muito antiga. Por favor, atualize para a versão mais nova e tente novamente.</string>
-  <string name="startup_failed_service_error">O Briar não pode iniciar devido a um plugin. Reinstalar o Briar geralmente resolve esse problema. Porém, note que ao fazer isso você perderá sua conta e todos os dados associados a ela,  já que o Briar não usa um servidor central para armazenar seus dados.</string>
  <plurals name="expiry_warning">
    <item quantity="one">Esta é uma versão de teste do Briar. Sua conta irá expirar em %d dia e não poderá ser renovada.</item>
    <item quantity="other">Esta é uma versão de teste do Briar. Sua conta irá expirar em %d dias e não poderá ser renovada.</item>
@@ -132,6 +126,7 @@
  <string name="open">Abrir</string>
  <string name="change">Alterar</string>
  <string name="start">Início</string>
+  <string name="finish">Terminar</string>
  <string name="no_data">Nenhum dado</string>
  <string name="ellipsis">…</string>
  <string name="text_too_long">O texto entrado é muito grande</string>
@@ -141,6 +136,7 @@
  <string name="sorry">Sentimos muito</string>
  <string name="error_start_activity">Indisponível no seu sistema</string>
  <string name="status_heading">Status:</string>
+  <string name="error">Erro</string>
  <!--Contacts and Private Conversations-->
  <string name="no_contacts">Sem contatos para exibir</string>
  <string name="no_contacts_action">Toque no ícone + para adicionar um contato</string>
@@ -154,8 +150,6 @@
  <string name="image_attach_error_invalid_mime_type">Formato da imagem não suportado: %s</string>
  <string name="set_contact_alias">Alterar nome do contato</string>
  <string name="set_contact_alias_hint">Nome de contato</string>
-  <string name="menu_item_connect_via_bluetooth">Conectar via Bluetooth</string>
-  <string name="dialog_title_connect_via_bluetooth">Conectar 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."-->
@@ -186,6 +180,7 @@
  <string name="dialog_title_image_support">Você agora pode enviar imagens para esse contato</string>
  <string name="dialog_message_image_support">Toque nesse ícone para anexar imagens.</string>
  <string name="messaging_too_many_attachments_toast">Apenas as primeiras %d imagens serão enviadas</string>
+  <string name="menu_contact">Contato</string>
  <!--Adding Contacts-->
  <string name="add_contact_title">Adicionar contato que está próximo</string>
  <string name="face_to_face">Você deve estar frente-a-frente com a pessoa que deseja adicionar como contato.\n\nIsso evita que alguém se passe por você ou leia suas mensagens no futuro.</string>
@@ -281,6 +276,9 @@
  <string name="introduction_response_accepted_received">%1$s aceitou ser apresentado a %2$s.</string>
  <string name="introduction_response_declined_received">%1$s recusou ser apresentado a %2$s.</string>
  <string name="introduction_response_declined_received_by_introducee">%1$s disse que %2$s recusou a apresentação.</string>
+  <!--Connect via Bluetooth-->
+  <string name="menu_item_connect_via_bluetooth">Conectar via Bluetooth</string>
+  <string name="connect_via_bluetooth_title">Conectar via Bluetooth</string>
  <!--Private Groups-->
  <string name="groups_list_empty">Sem grupos para exibir</string>
  <string name="groups_list_empty_action">Toque no ícone + para criar um grupo, ou peça a seus contatos para compartilhar grupos com você</string>
@@ -520,7 +518,8 @@
  <string name="cannot_load_ringtone">Não foi possível carregar o toque</string>
  <!--Conversation Settings-->
  <string name="learn_more">Saiba Mais</string>
-  <!--Settings Feedback-->
+  <!--Settings Actions-->
+  <string name="pref_category_actions">Ações</string>
  <string name="send_feedback">Enviar feedback</string>
  <!--Link Warning-->
  <string name="link_warning_title">Aviso sobre Link</string>
@@ -529,7 +528,6 @@
  <string name="link_warning_open_link">Abrir Link</string>
  <!--Crash Reporter-->
  <string name="crash_report_title">Relatório de falhas do Briar</string>
-  <string name="briar_crashed">Briar encerrou de maneira inesperada</string>
  <string name="not_your_fault">Isso não é sua culpa.</string>
  <string name="please_send_report">Nós ajude a construir um Briar melhor enviando um relatório de falhas.</string>
  <string name="report_is_encrypted">Nós prometemos que o relatório é criptografado e enviado de forma segura.</string>
@@ -583,6 +581,19 @@
  <string name="lock_tap_to_unlock">Toque para desbloquear</string>
  <!--Connections Screen-->
  <string name="transports_help_text">Briar pode se conectar aos seus contatos via Internet, Wi-Fi ou Bluetooth.\n\nTodas as conexões com a Internet acontecem via rede do Tor, por privacidade.\n\nSe um contato pode ser alcançado de várias formas, Briar as utilizará em paralelo.</string>
+  <!--Share app offline-->
+  <string name="hotspot_button_connected">Próximo</string>
+  <string name="hotspot_tab_manual">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">Solução de Problemas</string>
+  <!--error handling-->
+  <!--Transfer Data via Removable Drives-->
+  <string name="removable_drive_success_receive_title">Importação bem sucedida</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-ro/strings.xml
+++ b/briar-android/src/main/res/values-ro/strings.xml
@@ -3,7 +3,7 @@
  <!--Setup-->
  <string name="setup_title">Bine ați venit la Briar</string>
  <string name="setup_name_explanation">Numele dumneavoastră va fi afișat lângă orice conținut trimis. Nu îl veți putea schimba după crearea contului.</string>
-  <string name="setup_next">Următorul</string>
+  <string name="setup_next">Înainte</string>
  <string name="setup_password_intro">Alegeți o parolă</string>
  <string name="setup_password_explanation">Contul dvs. Briar este stocat criptat pe dispozitiv, nu în cloud. Dacă vă uitați parola sau ștergeți Briar, nu veți putea să vă recuperați contul.\n\nAlegeți o parolă lungă greu de ghicit, de exemplu, patru cuvinte aleatorii sau zece litere, numere și simboluri aleatoare.</string>
  <string name="setup_doze_title">Conexiuni în fundal</string>
@@ -22,8 +22,14 @@
  <string name="setup_huawei_text">Vă rugăm să apăsați butonul de mai jos și să vă asigurați că Briar este marcat ca protejat în fereastra de \"Aplicații protejate\".</string>
  <string name="setup_huawei_button">Protejează Briar</string>
  <string name="setup_huawei_help">Dacă Briar nu este adăugat în lista de aplicații protejate, nu va fi capabil să ruleze în fundal.</string>
+  <string name="setup_huawei_app_launch_text">Vă rugăm să atingeți butonul de mai jos, să deschideți ecranul \"Lansare app\" și să vă asigurați că Briar este setat la \"Gestionare manuală\".</string>
  <string name="setup_huawei_app_launch_button">Deschide setările de baterie</string>
+  <string name="setup_huawei_app_launch_help">Dacă Briar nu este setat la \" Gestionare manuală\" în ecranul \"Lansare app\", nu va putea rula în fundal.</string>
+  <string name="setup_xiaomi_text">Pentru a funcționa în fundal, Briar trebuie să fie blocat în lista de aplicații recente.</string>
  <string name="setup_xiaomi_button">Protejează Briar</string>
+  <string name="setup_xiaomi_help">Dacă Briar nu este blocat în lista de aplicații recente, acesta nu va putea rula în fundal.</string>
+  <string name="setup_xiaomi_dialog_body_old">1. Deschideți lista de aplicații recente (denumită și comutatorul de app-uri)\n\n2. Trageți cu degetul în jos pe imaginea lui Briar pentru a afișa pictograma lacătului\n\n\n3. Dacă lacătul nu este blocat, atingeți pentru a-l bloca</string>
+  <string name="setup_xiaomi_dialog_body_new">1. Deschideți lista de aplicații recente (denumită și comutatorul de app-uri)\n\n2. Țineți apăsată imaginea lui Briar până când apare butonul cu lacăt\n\n3. Dacă lacătul nu este blocat, apăsați pentru a-l bloca</string>
  <string name="warning_dozed">%s nu poate rula în fundal</string>
  <!--Login-->
  <string name="enter_password">Parola</string>
@@ -34,13 +40,12 @@
  <string name="forgotten_password">Am uitat parola</string>
  <string name="dialog_title_lost_password">Parolă uitată</string>
  <string name="dialog_message_lost_password">Contul dvs. Briar este stocat criptat pe dispozitiv, nu în cloud. Dacă vă uitați parola sau ștergeți Briar, nu veți putea să vă recuperați contul. Doriți să vă ștergeți contul și să începeți din nou?\n\nAtenție: identitățile, contactele și mesajele dvs. vor fi pierdute definitiv.</string>
-  <string name="startup_failed_notification_title">Briar nu a putut fi pornit</string>
-  <string name="startup_failed_notification_text">Atingeți pentru informații suplimentare.</string>
  <string name="startup_failed_activity_title">Eroare de pornire Briar</string>
-  <string name="startup_failed_db_error">Din anumite motive, baza dvs. de date Briar este deteriorată fără vreo posibilitate de a o recupera. Contul dvs., datele dvs. și toate persoanele de contact sunt pierdute. Din nefericire, trebuie să reinstalați Briar sau să creați un nou cont, selectând \"Am uitat parola\" la promptul de parolă.</string>
-  <string name="startup_failed_data_too_old_error">Contul dvs. a fost creat cu o versiune veche a acestei aplicații și nu poate fi deschis cu această versiune. Trebuie fie să reinstalați versiunea veche, fie să configurați un nou cont, selectând \"Am uitat parola\" la solicitarea de a introduce parola.</string>
-  <string name="startup_failed_data_too_new_error">Această versiune a aplicației este prea veche. Vă rugăm să actualizați la cea mai nouă versiune și să încercați din nou.</string>
-  <string name="startup_failed_service_error">Briar nu a reușit să pornească un plugin necesar. Reinstalarea lui Briar rezolvă de obicei această problemă. Cu toate acestea, rețineți că după aceasta veți pierde contul și toate datele asociate, deoarece Briar nu utilizează servere centralizate pentru a stoca date.</string>
+  <string name="startup_failed_clock_error">Briar nu a putut porni deoarece ceasul dispozitivului dvs. este greșit.\n\nVă rugăm să setați ceasul dispozitivului dvs. la ora corectă și să încercați din nou.</string>
+  <string name="startup_failed_db_error">Briar nu a reușit să deschidă baza de date care conține contul dvs., contactele și mesajele dvs.\n\nVă rugăm să faceți upgrade la cea mai recentă versiune a app-ului și să încercați din nou, sau să configurați un cont nou alegând \"Mi-am uitat parola\" la solicitarea parolei.</string>
+  <string name="startup_failed_data_too_old_error">Contul dvs. a fost creat cu o versiune veche a acestui app și nu poate fi deschis cu această versiune.\n\nTrebuie fie să reinstalați versiunea veche, fie să creați un cont nou alegând \"Mi-am uitat parola\" la solicitarea de parolă.</string>
+  <string name="startup_failed_data_too_new_error">Contul dvs. a fost creat cu o versiune mai nouă a acestui app și nu poate fi deschis cu această versiune.\n\nVă rugăm să faceți upgrade la cea mai recentă versiune și să încercați din nou.</string>
+  <string name="startup_failed_service_error">Briar nu a reușit să pornească o componentă necesară.\n\nVă rugăm să faceți upgrade la cea mai recentă versiune a acestui app și să încercați din nou.</string>
  <plurals name="expiry_warning">
    <item quantity="one">Aceasta este o versiune de test pentru Briar. Contul dumneavoastră va expira în %d zi și nu se poate reînnoi</item>
    <item quantity="few">Aceasta este o versiune de test pentru Briar. Contul dumneavoastră va expira în %d zile și nu se poate reînnoi.</item>
@@ -67,16 +72,16 @@
  <string name="transports_onboarding_text">Atingeți aici pentru a controla modul în care Briar se conectează la contacte</string>
  <!--Transports: Tor-->
  <string name="transport_tor">Internet</string>
-  <string name="tor_device_status_online_wifi">Telefonul are acces la internet prin Wi-Fi</string>
-  <string name="tor_device_status_online_mobile">Telefonul are acces la internet prin date mobile</string>
-  <string name="tor_device_status_offline">Telefonul nu are acces la internet</string>
-  <string name="tor_plugin_status_enabling">Briar se conectează la internet</string>
-  <string name="tor_plugin_status_active">Briar este conectat la internet</string>
-  <string name="tor_plugin_status_inactive">Briar nu se poate conecta la internet</string>
-  <string name="tor_plugin_status_disabled">Briar este configurat să nu se conecteze la internet</string>
+  <string name="tor_device_status_online_wifi">Telefonul are acces la Internet prin Wi-Fi</string>
+  <string name="tor_device_status_online_mobile">Telefonul are acces la Internet prin date mobile</string>
+  <string name="tor_device_status_offline">Telefonul nu are acces la Internet</string>
+  <string name="tor_plugin_status_enabling">Briar se conectează la Internet</string>
+  <string name="tor_plugin_status_active">Briar este conectat la Internet</string>
+  <string name="tor_plugin_status_inactive">Briar nu se poate conecta la Internet</string>
+  <string name="tor_plugin_status_disabled">Briar este configurat să nu se conecteze la Internet</string>
  <string name="tor_plugin_status_disabled_mobile_data">Briar este configurat să nu folosească date mobile</string>
-  <string name="tor_plugin_status_disabled_battery">Briar este configurat să nu folosească internetul când utilizează bateria</string>
-  <string name="tor_plugin_status_disabled_country_blocked">Briar este configurat să nu folosească internetul în această țară</string>
+  <string name="tor_plugin_status_disabled_battery">Briar este configurat să nu folosească Internetul când utilizează bateria</string>
+  <string name="tor_plugin_status_disabled_country_blocked">Briar este configurat să nu folosească Internetul în această țară</string>
  <!--Transports: Wi-Fi-->
  <string name="transport_lan">Wi-Fi</string>
  <string name="transport_lan_long">Aceeași rețea Wi-Fi</string>
@@ -138,6 +143,7 @@
  <string name="open">Deschide</string>
  <string name="change">Modifică</string>
  <string name="start">Start</string>
+  <string name="finish">Termină</string>
  <string name="no_data">Fără date</string>
  <string name="ellipsis">…</string>
  <string name="text_too_long">Textul introdus este prea lung</string>
@@ -147,12 +153,15 @@
  <string name="sorry">Ne pare rău</string>
  <string name="error_start_activity">Indisponibil pentru sistemul dumneavoastră</string>
  <string name="status_heading">Status:</string>
+  <string name="error">Eroare</string>
  <!--Contacts and Private Conversations-->
  <string name="no_contacts">Niciun contact de arătat</string>
  <string name="no_contacts_action">Atingeți iconița + pentru a adăuga un contact</string>
  <string name="date_no_private_messages">Fără mesaje.</string>
  <string name="no_private_messages">Niciun mesaj de arătat</string>
  <string name="message_hint">Mesaj nou:</string>
+  <string name="message_hint_auto_delete">Mesaj nou care dispare</string>
+  <string name="message_error">Eroare la trimiterea mesajului</string>
  <string name="image_caption_hint">Adaugă un subtitlu (opțional)</string>
  <string name="image_attach">Atașează imagine</string>
  <string name="image_attach_error">Nu s-au putut atașa imaginile</string>
@@ -161,11 +170,12 @@
  <string name="set_contact_alias">Schimbă nume contact</string>
  <string name="set_contact_alias_hint">Nume contact</string>
  <string name="menu_item_disappearing_messages">Mesaje ce dispar</string>
-  <string name="menu_item_connect_via_bluetooth">Conectare prin Bluetooth</string>
-  <string name="dialog_title_connect_via_bluetooth">Conectare prin 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">Mesajele dvs. vor dispărea după %1$s. %2$s</string>
  <!--The placeholder at the end will add "Tap to learn more."-->
+  <string name="auto_delete_msg_you_disabled">Mesajele dvs. nu vor dispărea. %1$s</string>
  <!--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."-->
+  <string name="auto_delete_msg_contact_enabled">%1$s\'s din mesaje vor dispărea după ce %2$s. %3$s</string>
  <plurals name="duration_minutes">
    <item quantity="one">%d minut</item>
    <item quantity="few">%d minute</item>
@@ -182,7 +192,11 @@
    <item quantity="other">%d de zile</item>
  </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\'s din mesaje nu vor dispărea . %2$s</string>
  <string name="tap_to_learn_more">Atingeți pentru mai mult.</string>
+  <string name="auto_delete_changed_warning_title">Mesaje dispărute modificate</string>
+  <string name="auto_delete_changed_warning_message_enabled">Din momentul în care ați început să compuneți mesajul, mesajele care dispar au fost activate.</string>
+  <string name="auto_delete_changed_warning_message_disabled">De când ați început să vă compuneți mesajul, mesajele care dispar au fost dezactivate.</string>
  <string name="auto_delete_changed_warning_send">Trimite oricum</string>
  <string name="delete_all_messages">Șterge toate mesajele</string>
  <string name="dialog_title_delete_all_messages">Confirmare ștergere mesaj</string>
@@ -210,6 +224,7 @@
  <string name="dialog_title_image_support">Acum puteți trimite imagini către acest contact</string>
  <string name="dialog_message_image_support">Atingeți această iconiță pentru a atașa imagini</string>
  <string name="messaging_too_many_attachments_toast">Doar primele %d imagini vor fi trimise</string>
+  <string name="menu_contact">Contact</string>
  <!--Adding Contacts-->
  <string name="add_contact_title">Adaugă un contact din apropiere</string>
  <string name="face_to_face">Trebuie să vă întâlniți cu persoana pe care doriți să o adăugați la contacte.\n\nAcest pas împiedică alte persoane să vă fure identitatea sau să vă citească mesajele în viitor.</string>
@@ -269,7 +284,7 @@
    <item quantity="few">%d contacte noi adăugate.</item>
    <item quantity="other">%d de contacte noi adăugate.</item>
  </plurals>
-  <string name="offline_state">Nu este disponibilă o conexiune la internet</string>
+  <string name="offline_state">Nu este disponibilă o conexiune la Internet</string>
  <string name="duplicate_link_dialog_title">Adresă duplicat</string>
  <string name="duplicate_link_dialog_text_1">Deja aveți un contact în așteptare cu această adresă: %s</string>
  <string name="duplicate_link_dialog_text_1_contact">Deja aveți un contact cu această adresă: %s</string>
@@ -303,9 +318,16 @@
  <string name="introduction_response_accepted_sent">Ați acceptat recomandarea pentru %1$s.</string>
  <string name="introduction_response_accepted_sent_info">Înainte de a adăuga %1$s ca persoane de contact, este necesar ca și ei să accepte solicitarea. Aceasta poate dura ceva timp.</string>
  <string name="introduction_response_declined_sent">Ați refuzat recomandarea pentru %1$s.</string>
+  <string name="introduction_response_declined_auto">Introducerea la %1$s a fost automat declinată.</string>
  <string name="introduction_response_accepted_received">%1$s a acceptat recomandarea pentru %2$s.</string>
  <string name="introduction_response_declined_received">%1$s a refuzat recomandarea pentru %2$s.</string>
  <string name="introduction_response_declined_received_by_introducee">%1$s spune că %2$s a refuzat recomandarea.</string>
+  <!--Connect via Bluetooth-->
+  <string name="menu_item_connect_via_bluetooth">Conectare prin Bluetooth</string>
+  <string name="connect_via_bluetooth_title">Conectare prin Bluetooth</string>
+  <string name="connect_via_bluetooth_no_location_permission">Nu se poate continua fără permisiunea locației</string>
+  <string name="connect_via_bluetooth_start">Conectarea prin Bluetooth...</string>
+  <string name="connect_via_bluetooth_success">Conectat cu succes prin Bluetooth</string>
  <!--Private Groups-->
  <string name="groups_list_empty">Nici un grup de arătat</string>
  <string name="groups_list_empty_action">Atingeți iconița + pentru a crea un grup sau rugați-vă contactele să partajele grupuri cu dumneavoastră</string>
@@ -351,6 +373,7 @@
  </plurals>
  <string name="groups_invitations_response_accepted_sent">Ați acceptat invitația în grup de la %s.</string>
  <string name="groups_invitations_response_declined_sent">Ați refuzat invitația în grup pentru %s.</string>
+  <string name="groups_invitations_response_declined_auto">Invitația grupului de la %s a fost refuzată automat.</string>
  <string name="groups_invitations_response_accepted_received">%s a acceptat invitația în grup.</string>
  <string name="groups_invitations_response_declined_received">%s a refuzat invitația în grup.</string>
  <string name="sharing_status_groups">Doar persoana care a creat grupul poate invita noi membrii. Mai jos vedeți membrii actuali ai grupului.</string>
@@ -402,6 +425,7 @@
  <string name="forum_invitation_already_sharing">Deja partajat</string>
  <string name="forum_invitation_response_accepted_sent">Ați acceptat invitația la forum de la %s.</string>
  <string name="forum_invitation_response_declined_sent">Ați refuzat invitația la forum de la %s.</string>
+  <string name="forum_invitation_response_declined_auto">Invitația forumului de la %s a fost refuzată automat.</string>
  <string name="forum_invitation_response_accepted_received">%s a acceptat invitația la forum.</string>
  <string name="forum_invitation_response_declined_received">%s a refuzat invitația la forum.</string>
  <string name="sharing_status">Stare partajare</string>
@@ -437,6 +461,7 @@
  <string name="blogs_sharing_snackbar">Blog partajat cu contactele alese</string>
  <string name="blogs_sharing_response_accepted_sent">Ați acceptat invitația la blog de la %s.</string>
  <string name="blogs_sharing_response_declined_sent">Ați refuzat invitația la blog de la %s.</string>
+  <string name="blogs_sharing_response_declined_auto">Invitația blogului de la %s a fost refuzată automat.</string>
  <string name="blogs_sharing_response_accepted_received">%s a acceptat invitația la blog.</string>
  <string name="blogs_sharing_response_declined_received">%s a refuzat invitația la blog.</string>
  <string name="blogs_sharing_invitation_received">%1$s a partajat blogul \"%2$s\" cu dumneavoastră.</string>
@@ -554,8 +579,19 @@
  <string name="cannot_load_ringtone">Nu se poate încărca sunetul</string>
  <!--Conversation Settings-->
  <string name="disappearing_messages_title">Mesaje ce dispar</string>
+  <string name="disappearing_messages_explanation_long">Activarea acestei setări va face ca noile
+mesajele din această conversație să dispară automat după 7 zile.
+\n\nCuantitatea inversă pentru copia expeditorului mesajului începe după ce acesta a fost livrat.
+Numărătoarea inversă începe pentru destinatar după ce acesta a citit mesajul.
+\n\nMesajele care vor dispărea sunt marcate cu o pictogramă de bombă.
+\n\nRețineți că destinatarii pot face în continuare copii ale mesajelor pe care le trimiteți.
+\n\nDacă modificați această setare, ea se va aplica imediat mesajelor dvs. noi și la mesajele dvs.
+mesajelor contactelor odată ce acestea primesc următorul mesaj al dumneavoastră.
+De asemenea, contactul dvs. poate modifica această setare pentru amândoi.</string>
  <string name="learn_more">Află mai mult</string>
-  <!--Settings Feedback-->
+  <string name="disappearing_messages_summary">Faceți ca mesajele viitoare din această conversație să dispară automat după 7 zile.</string>
+  <!--Settings Actions-->
+  <string name="pref_category_actions">Actiuni</string>
  <string name="send_feedback">Trimiteți feed-back</string>
  <!--Link Warning-->
  <string name="link_warning_title">Avertizare adresă</string>
@@ -564,7 +600,7 @@
  <string name="link_warning_open_link">Deschide adresă</string>
  <!--Crash Reporter-->
  <string name="crash_report_title">Raport de erori Briar</string>
-  <string name="briar_crashed">Ne pare rău, Briar a întâmpinat o eroare.</string>
+  <string name="briar_crashed">Ne pare rău, Briar a întâmpinat o eroare</string>
  <string name="not_your_fault">Nu este vina dumneavoastră.</string>
  <string name="please_send_report">Vă rugăm să ne ajutați să facem Briar mai bun trimițându-ne raportul de erori.</string>
  <string name="report_is_encrypted">Vă promitem ca raportul este criptat și este trimis securizat.</string>
@@ -621,7 +657,88 @@
  <string name="lock_is_locked">Briar este blocat</string>
  <string name="lock_tap_to_unlock">Atingeți pentru a debloca</string>
  <!--Connections Screen-->
-  <string name="transports_help_text">Briar se poate conecta la contactele dumneavoastră prin internet, Wi-Fi sau Bluetooth.\n\nToate conexiunile la internet trec prin rețeaua Tor din motive de confidențialitate.\n\nDacă un contact poate fi accesat prin metode multiple, Briar le va folosi în mod paralel.</string>
+  <string name="transports_help_text">Briar se poate conecta la contactele dumneavoastră prin Internet, Wi-Fi sau Bluetooth.\n\nToate conexiunile la internet trec prin rețeaua Tor din motive de confidențialitate.\n\nDacă un contact poate fi accesat prin metode multiple, Briar le va folosi în mod paralel.</string>
+  <!--Share app offline-->
+  <string name="hotspot_title">Partajează această aplicație fără Internet</string>
+  <string name="hotspot_intro">Partajați această aplicație cu cineva din apropiere fără Internet folosind conexiunea Wi-Fi a dispozitivului.
+		\n\nDispozitivul dumneavoastră va porni un hotspot Wi-Fi. Persoanele din apropiere se pot conecta la hotspot și pot descărca aplicația Briar de pe dispozitivul dumneavoastră.</string>
+  <string name="hotspot_button_start_sharing">Pornește hotspot</string>
+  <string name="hotspot_button_stop_sharing">Oprește hotspot</string>
+  <string name="hotspot_progress_text_start">Configurare hotspot...</string>
+  <string name="hotspot_notification_channel_title">Hotspot Wi-Fi</string>
+  <string name="hotspot_notification_title">Se partajează Brian fără internet</string>
+  <string name="hotspot_button_connected">Înainte</string>
+  <string name="permission_hotspot_location_request_body">Pentru a crea un hotspot Wi-Fi, Briar are nevoie de permisiunea de a vă accesa locația.\n\nBriar nu vă stochează locația și nici nu o partajează cu cineva.</string>
+  <string name="permission_hotspot_location_denied_body">Ați refuzat accesul la locație, dar Briar are nevoie de această permisiune pentru a creat un hotspot Wi-Fi.\n\nVă rugăm să luați în considerare acordarea accesului.</string>
+  <string name="wifi_settings_title">Setări Wi-Fi</string>
+  <string name="wifi_settings_request_enable_body">Pentru a crea un hotspot Wi-Fi, Briar are nevoie să folosească Wi-Fi. Vă rugăm să-l activați.</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">scanează cod 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">Dispozitivul dumneavoastră oferă un hotspot Wi-Fi. Persoanele care vor să descarce Briar se pot conecta la hotspot adăugându-l la setările Wi-Fi folosind detaliile de mai jos sau %s. Când s-au conectat la hotspot apăsați \'Înainte\'.</string>
+  <string name="hotspot_manual_wifi_ssid">Nume rețea</string>
+  <string name="hotspot_qr_wifi">Dispozitivul dumneavoastră oferă un hotspot Wi-Fi. Persoanele care vor să descarce Briar se pot conecta la hotspot scanând acest codul QR. Când s-au conectat la hotspot apăsați \'Înainte\'.</string>
+  <string name="hotspot_no_peers_connected">Nici un dispozitiv conectat</string>
+  <plurals name="hotspot_peers_connected">
+    <item quantity="one">%s dispozitiv conectat</item>
+    <item quantity="few">%s dispozitive conectate</item>
+    <item quantity="other">%s de dispozitive conectate</item>
+  </plurals>
+  <!--Download link-->
+  <!--The %s placeholder will be replaced with the translation of 'hotspot_scanning_a_qr_code'-->
+  <string name="hotspot_manual_site">Dispozitivul dumneavoastră oferă un hotspot Wi-Fi. Persoanele care sunt conectate la hotspot pot descărca Briar accesând în browser următoarea adresă sau %s.</string>
+  <string name="hotspot_manual_site_address">Adresă (URL)</string>
+  <string name="hotspot_qr_site">Dispozitivul dumneavoastră oferă un hotspot Wi-Fi. Persoanele care sunt conectate la hotspot pot descărca Briar scanând acest cod QR.</string>
+  <!--e.g. Download Briar 1.2.20-->
+  <string name="website_download_title">Descărcare %s</string>
+  <string name="website_download_intro">Cineva din apropiere a partajat %scu dumneavoastră.</string>
+  <string name="website_download_outro">După ce descărcarea a luat sfârșit, deschideți și instalați fișierul descărcat.</string>
+  <string name="website_troubleshooting_title">Depanare</string>
+  <string name="website_troubleshooting_1">Dacă nu puteți descărca aplicația încercați cu un alt browser.</string>
+  <string name="website_troubleshooting_2_old">Pentru a instala aplicația descărcată s-ar putea să trebuiască să permiteți instalarea de aplicații din \"Surse necunoscute\" în setările sistemului. Apoi poate trebui să descărcați aplicația din nou. Vă recomandăm să dezactivați setarea \"Surse necunoscute\" după ce ați instalat aplicația.</string>
+  <string name="website_troubleshooting_2_new">Pentru a instala aplicația descărcată s-ar putea să trebuiască să permiteți browserului să instaleze aplicații necunoscute. După instalare vă recomandăm să eliminați permisiunea browserului să instaleze aplicații necunoscute.</string>
+  <string name="hotspot_help_wifi_title">Probleme la conectarea Wi-Fi:</string>
+  <string name="hotspot_help_wifi_1">Încercați să dezactivați și să reactivați Wi-Fi pe ambele dispozitive și reîncercați.</string>
+  <string name="hotspot_help_wifi_2">Dacă dispozitivul se plânge că nu este accesibil Internetul prin Wi-Fi, spuneți-i că doriți să rămână conectat oricum.</string>
+  <string name="hotspot_help_site_title">Problemă la vizitarea siteului local:</string>
+  <string name="hotspot_help_site_1">Verificați că ați introdus adresa exact cum este afișată. O mică eroare poate să o facă să eșueze.</string>
+  <string name="hotspot_help_site_2">Asigurați-vă că dispozitivul este încă conectat la Wi-Fi-ul corect (vedeți mai sus) când încercați să accesați siteul.</string>
+  <string name="hotspot_help_site_3">Dacă aveți o aplicație firewall verificați că nu blocheze accesul.</string>
+  <string name="hotspot_help_site_4">Dacă puteți vizita siteul dar nu puteți descărca aplicația Briar, încercați cu un alt browser.</string>
+  <string name="hotspot_help_fallback_title">Nimic nu funcționează?</string>
+  <string name="hotspot_help_fallback_intro">Puteți încerca să salvați aplicația ca un fișier .APK pentru a-l partaja în alt mod. Odată fișierul transferat pe celălalt dispozitiv, poate fi folosit să se instaleze Briar.
+		\n\nPont: Pentru a partaja prin Bluetooth s-ar putea sa fie necesar sa redenumiți fișierul ca să aivă terminația .ZIP.</string>
+  <string name="hotspot_help_fallback_button">Salvează aplicația</string>
+  <!--error handling-->
+  <string name="hotspot_error_intro">A apărut o problemă când s-a încercat partajarea aplicației prin Wi-Fi.</string>
+  <string name="hotspot_error_no_wifi_direct">Dispozitivul nu suportă Wi-Fi Direct</string>
+  <string name="hotspot_error_start_callback_failed">Hotspotul nu a putut porni: eroare %s</string>
+  <string name="hotspot_error_start_callback_failed_unknown">Hotspotul nu a putut porni dintr-un motiv necunoscut, motiv %d</string>
+  <string name="hotspot_error_start_callback_no_group_info">Hotspotul nu a putut porni: nu există informații de grup</string>
+  <string name="hotspot_error_web_server_start">Eroare la pornirea serverului web</string>
+  <string name="hotspot_error_web_server_serve">Eroare la prezentarea siteului.\n\nVă rugăm să trimiteți feedback (cu date anonime) prin intermediul aplicației Briar dacă problema persistă.</string>
+  <string name="hotspot_flag_test">Atenție: Această aplicație a fost instalată din Android Studio și NU poate fi instalată pe un alt dispozitiv.</string>
+  <string name="hotspot_error_framework_busy">Nu s-a putut porni hotspotul.\n\nDacă aveți alt hotspot pornit sau dacă partajați conexiunea la Internet prin Wi-Fi, încercați să opriți asta și să reîncercați apoi.</string>
+  <!--Transfer Data via Removable Drives-->
+  <string name="removable_drive_title_send">Trimiteți date</string>
+  <string name="removable_drive_title_receive">Primiți date</string>
+  <string name="removable_drive_send_intro">Atingeți butonul de mai jos pentru a crea un nou fișier care conține mesajele criptate. Puteți alege unde va fi salvat fișierul.\n\nDacă doriți să salvați fișierul pe o unitate detașabilă, introduceți unitatea acum.</string>
+  <string name="removable_drive_send_no_data">În prezent, nu există niciun mesaj care să aștepte să fie trimis către acest contact.</string>
+  <string name="removable_drive_send_not_supported">Acest contact utilizează o versiune veche a Briar sau un dispozitiv vechi care nu acceptă această funcție.</string>
+  <string name="removable_drive_send_button">Alegeți fișierul pentru export</string>
+  <string name="removable_drive_ongoing">Vă rugăm să așteptați finalizarea sarcinii în curs</string>
+  <string name="removable_drive_receive_intro">Atingeți butonul de mai jos pentru a alege fișierul pe care v-a trimis persoana de contact.\n\nDacă fișierul se află pe o unitate detașabilă, introduceți unitatea acum.</string>
+  <string name="removable_drive_receive_button">Alegeți fișierul pentru import</string>
+  <string name="removable_drive_success_send_title">Export reușit</string>
+  <string name="removable_drive_success_send_text">Datele au fost exportate cu succes. Aveți acum la dispoziție 28 de zile pentru a transporta fișierul către persoana de contact.\n\nDacă fișierul se află pe o unitate detașabilă, utilizați notificarea din bara de stare pentru a ejecta unitatea înainte de a o deconecta.</string>
+  <string name="removable_drive_success_receive_title">Importat cu succes</string>
+  <string name="removable_drive_success_receive_text">Toate mesajele criptate conținute în acest fișier au fost primite.</string>
+  <string name="removable_drive_error_send_title">Eroare la exportul de date</string>
+  <string name="removable_drive_error_send_text">A avut loc o eroare de scriere a datelor în fișier.\n\nDacă utilizați o unitate detașabilă, asigurați-vă că aceasta este introdusă corect și încercați din nou.\n\n\nDacă eroarea persistă, vă rugăm să trimiteți feedback pentru a informa echipa Briar despre problemă.</string>
+  <string name="removable_drive_error_receive_title">Eroare la importul de date</string>
+  <string name="removable_drive_error_receive_text">Fișierul selectat nu conține nimic care să poată fi recunoscut de Briar.\n\nVă rugăm să verificați dacă ați ales fișierul corect.\n\nDacă persoana de contact a creat fișierul cu mai mult de 28 de zile în urmă, Briar nu îl va putea recunoaște.</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-ru/strings.xml
+++ b/briar-android/src/main/res/values-ru/strings.xml
@@ -40,15 +40,12 @@
  <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">Ваша учетная запись была создана в старой версии Briar, поэтому открыть ее в этой версии приложения не удастся. Вам необходимо либо установить старую версию, либо создать новый аккаунт, выбрав \'я забыл свой пароль\' на этапе авторизации в приложении.</string>
-  <string name="startup_failed_data_too_new_error">Эта версия приложения слишком старая. Обновите до последней версии и повторите попытку.</string>
-  <string name="startup_failed_service_error">Briar не смог запустить требуемый плагин. Переустановка Briar обычно решает эту проблему. Однако учтите, что вы потеряете свою учетную запись и все связанные с 
-ней данные, поскольку 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>
  <plurals name="expiry_warning">
    <item quantity="one">Это бета-версия Briar. Срок действия вашего аккаунта закончится через %d день и не может быть возобновлен.</item>
    <item quantity="few">Это бета-версия Briar. Срок действия вашего аккаунта закончится через %d дня и не может быть возобновлен.</item>
@@ -151,6 +148,7 @@
  <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>
@@ -160,6 +158,7 @@
  <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>
@@ -176,15 +175,6 @@
  <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."-->
  <string name="auto_delete_msg_you_enabled">Ваши сообщения исчезнут спустя %1$s. %2$s</string>
  <!--The placeholder at the end will add "Tap to learn more."-->
@@ -242,6 +232,7 @@
  <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>
@@ -340,6 +331,12 @@
  <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_no_location_permission">Невозможно продолжить без доступа к местоположению</string>
+  <string name="connect_via_bluetooth_start">Подключение через Bluetooth...</string>
+  <string name="connect_via_bluetooth_success">Успешное подключение через Bluetooth</string>
  <!--Private Groups-->
  <string name="groups_list_empty">Нет групп для отображения</string>
  <string name="groups_list_empty_action">Для создания группы нажмите значок + или попросите ваши контакты поделиться с вами группами</string>
@@ -606,7 +603,8 @@
 		Ваш контакт также может изменить эту настройку для вас обоих.</string>
  <string name="learn_more">Узнать больше</string>
  <string name="disappearing_messages_summary">Сделайте так, чтобы будущие сообщения в этом разговоре автоматически исчезали спустя 7\u00A0дней.</string>
-  <!--Settings Feedback-->
+  <!--Settings Actions-->
+  <string name="pref_category_actions">Действия</string>
  <string name="send_feedback">Отправить отзыв</string>
  <!--Link Warning-->
  <string name="link_warning_title">Предупреждение о ссылке</string>
@@ -673,6 +671,88 @@
  <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, 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">Ваш телефон работает в режиме точки доступа Wi-Fi. Пользователи, которые хотят загрузить Briar, могут подключиться к ней, добавив ее в настройках Wi-Fi своего устройства, используя данные ниже или %s. После подключения к точке доступа нажмите \"Далее\".</string>
+  <string name="hotspot_manual_wifi_ssid">Имя сети</string>
+  <string name="hotspot_qr_wifi">Ваш телефон работает в режиме точки доступа Wi-Fi. Пользователи, которые хотят загрузить Briar, могут подключиться к ней, просканировав этот QR-код. Когда они подключатся к точке доступа, нажмите \'Далее\'.</string>
+  <string name="hotspot_no_peers_connected">Нет подключенных устройств</string>
+  <plurals name="hotspot_peers_connected">
+    <item quantity="one">Подключено %s устройство</item>
+    <item quantity="few">Подключено %s устройства</item>
+    <item quantity="many">Подключено %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">Ваш телефон работает в режиме точки доступа Wi-Fi. Пользователи, подключенные к ней, могут загрузить Briar, набрав следующую ссылку в веб-браузере или %s.</string>
+  <string name="hotspot_manual_site_address">Адрес (URL)</string>
+  <string name="hotspot_qr_site">Ваш телефон работает в режиме точки доступа Wi-Fi. Пользователи, подключенные к ней, могут загрузить 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="website_troubleshooting_2_old">Чтобы установить загруженное приложение, вам может понадобиться разрешить установку приложений из \"Неизвестных источников\" в настройках системы. После этого может потребоваться повторная загрузка приложения. Мы рекомендуем отключить настройку \"Неизвестные источники\" после установки приложения.</string>
+  <string name="website_troubleshooting_2_new">Чтобы установить загруженное приложение, вам может потребоваться разрешить браузеру устанавливать неизвестные приложения. После установки приложения рекомендуется удалить разрешение браузера на установку неизвестных приложений.</string>
+  <string name="hotspot_help_wifi_title">Проблемы с подключением к Wi-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 Direct</string>
+  <string name="hotspot_error_start_callback_failed">Не удалось запустить точку доступа: ошибка %s</string>
+  <string name="hotspot_error_start_callback_failed_unknown">Не удалось запустить точку доступа из-за неизвестной ошибки, причина %d</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_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-sq/strings.xml
+++ b/briar-android/src/main/res/values-sq/strings.xml
@@ -41,13 +41,13 @@ këmbyes aplikacionesh)\n\n2. Shtypni dhe mbajeni të shtypur figurën e Briar-i
  <string name="forgotten_password">Kam harruar fjalëkalimin tim</string>
  <string name="dialog_title_lost_password">U humb Fjalëkalimi</string>
  <string name="dialog_message_lost_password">Llogaria juaj Briar depozitohet e fshehtëzuar në pajisjen tuaj, jo në re, ndaj s\’mund ta ricaktojmë fjalëkalimin tuaj. Do të donit ta fshini llogarinë tuaj dhe t\’ia filloni nga e para?\n\nKujdes: Identitetet, kontaktet dhe mesazhet tuaja do të humbin përgjithnjë.</string>
-  <string name="startup_failed_notification_title">Briar-i s\’u nis dot</string>
-  <string name="startup_failed_notification_text">Prekeni për më tepër të dhëna.</string>
  <string name="startup_failed_activity_title">Dështim Nisjeje i Briar-it</string>
-  <string name="startup_failed_db_error">Për ndonjë arsye, baza e të dhënave të Briar-it është e dëmtuar sa nuk ndreqet dot. Llogaria juaj, të dhënat tuaja dhe krejt kontaktet tuaja humbën. Mjerisht, duhet të riinstaloni Briar-in dhe të rregulloni një llogari të re, duke zgjedhur \'Kam harruar fjalëkalimin tim\' te hapi për fjalëkalimin.</string>
-  <string name="startup_failed_data_too_old_error">Llogaria juaj qe krijuar me një version të vjetër të këtij aplikacioni dhe s\’mund të hapet me këtë version. Ose duhet të riinstaloni versionin e vjetër, ose të fshini llogarinë tuaj të vjetër duke zgjedhur \'Kam harruar fjalëkalimin tim\' te hapi për fjalëkalimin.</string>
-  <string name="startup_failed_data_too_new_error">Ky version i aplikacionit është shumë i vjetër. Ju lutemi, përmirësojeni me versionin më të ri dhe riprovoni.</string>
-  <string name="startup_failed_service_error">Briar-i s\’arriti të nisë një shtojcë të domosdoshme. Zakonisht këtë problem e zgjidh riinstalimi i Briar-it. Por, ju lutemi, kini parasysh se me të do të humbni llogarinë tuaj dhe krejt të dhënat e lidhura me të, ngaqë Briar nuk përdor shërbyes qendrorë për të depozituar në ta të dhënat tuaja.</string>
+  <string name="startup_failed_clock_error">Briar-i s’qe në gjendje të nisej, ngaqë sahati i pajisjes tuaj është gabim.\n\nJu lutemi, vëreni sahatin e pajisjes tuaj në kohën e saktë dhe riprovoni.</string>
+  <string name="startup_failed_db_error">Briar-i s’qe në gjendje të hapte bazën e të dhënave që përmban llogarinë tuaj, kontaktet tuaja dhe mesazhet tuaja.\n\nJu lutemi, përmirësojeni me versionin më të ri të aplikacionit dhe riprovoni, ose ujdisni një llogari të re duke zgjedhur “Kam harruar fjalëkalimin tim”, kur ju kërkohet fjalëkalimi.</string>
+  <string name="startup_failed_data_too_old_error">Llogaria juaj qe krijuar me një version të vjetër të këtij aplikacioni dhe s’mund të hapet me këtë version.\n\nDuhet ose të riinstaloni versionin e vjetër, ose të ujdisni llogari të re duke zgjedhur “Kam harruar fjalëkalimin tim”, kur ju kërkohet fjalëkalimi.</string>
+  <string name="startup_failed_data_too_new_error">Llogaria juaj qe krijuar me një version më të ri të këtij aplikacioni 
+dhe s’mund të hapet me këtë version.\n\nJu lutemi, përmirësojeni me versionin më të ri dhe riprovoni.</string>
+  <string name="startup_failed_service_error">Briar-i nuk arriti të nisë një përbërës të domosdoshëm.\n\nJu lutemi, përmirësojeni me versionin më të ri të aplikacionit dhe riprovoni. </string>
  <plurals name="expiry_warning">
    <item quantity="one">Ky është një version beta i Briar-it. Llogaria juaj do të skadojë për %d ditë dhe s\’mund të rinovohet.</item>
    <item quantity="other">Ky është një version beta i Briar-it. Llogaria juaj do të skadojë për %d ditë dhe s\’mund të rinovohet.</item>
@@ -140,6 +140,7 @@ këmbyes aplikacionesh)\n\n2. Shtypni dhe mbajeni të shtypur figurën e Briar-i
  <string name="open">Hape</string>
  <string name="change">Ndryshoje</string>
  <string name="start">Nise</string>
+  <string name="finish">Përfundoje</string>
  <string name="no_data">S\’ka të dhëna</string>
  <string name="ellipsis">…</string>
  <string name="text_too_long">Teksti i dhënë është shumë i gjatë</string>
@@ -149,6 +150,7 @@ këmbyes aplikacionesh)\n\n2. Shtypni dhe mbajeni të shtypur figurën e Briar-i
  <string name="sorry">Na ndjeni</string>
  <string name="error_start_activity">Jo i passhëm në sistemin tuaj</string>
  <string name="status_heading">Gjëndja</string>
+  <string name="error">Gabim</string>
  <!--Contacts and Private Conversations-->
  <string name="no_contacts">S’ka kontakte për shfaqje</string>
  <string name="no_contacts_action">Prekni ikonën + që të shtoni një kontakt</string>
@@ -165,15 +167,6 @@ këmbyes aplikacionesh)\n\n2. Shtypni dhe mbajeni të shtypur figurën e Briar-i
  <string name="set_contact_alias">Ndryshoni emër kontakti</string>
  <string name="set_contact_alias_hint">Emër kontakti</string>
  <string name="menu_item_disappearing_messages">Mesazhe që treten</string>
-  <string name="menu_item_connect_via_bluetooth">Lidhu përmes Bluetooth-i</string>
-  <string name="dialog_title_connect_via_bluetooth">Lidhu përmes Bluetooth-i</string>
-  <string name="dialog_message_connect_via_bluetooth">Është e nevojshme që kontakti juaj të jetë atypari, që kjo të funksionojë.\n\nJu dhe kontakti juaj duhet që të shtypin “Fillo” në të njëjtën kohë.</string>
-  <string name="toast_connect_via_bluetooth_already_discovering">Po provohet tashmë të lidhet përmes Bluetooth-i</string>
-  <string name="toast_connect_via_bluetooth_not_discoverable">S’mund të vazhdohet pa Bluetooth</string>
-  <string name="toast_connect_via_bluetooth_no_location_permission">S’mund të vazhdohet pa leje vendore</string>
-  <string name="toast_connect_via_bluetooth_start">Po lidhet me Bluetooth…</string>
-  <string name="toast_connect_via_bluetooth_success">U lidh me sukses përmes Bluetooth-i</string>
-  <string name="toast_connect_via_bluetooth_error">S’u lidh dot përmes Bluetooth-i</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">Mesazhet tuaja do të treten pas %1$s. %2$s</string>
  <!--The placeholder at the end will add "Tap to learn more."-->
@@ -225,6 +218,7 @@ këmbyes aplikacionesh)\n\n2. Shtypni dhe mbajeni të shtypur figurën e Briar-i
  <string name="dialog_title_image_support">Tani mund t\’i dërgoni figura këtij kontakti</string>
  <string name="dialog_message_image_support">Prekeni këtë ikonë që të bashkëngjitni figura.</string>
  <string name="messaging_too_many_attachments_toast">Do të dërgohen vetëm %d figurat e para</string>
+  <string name="menu_contact">Kontakt</string>
  <!--Adding Contacts-->
  <string name="add_contact_title">Shtoni Kontakt Atypari  </string>
  <string name="face_to_face">Duhet të takoheni me personin që doni ta shtoni si kontakt.\n\nKjo do të pengojë cilindo të hiqet si ju ose të lexojë në të ardhmen mesazhet tuaj.</string>
@@ -321,6 +315,16 @@ këmbyes aplikacionesh)\n\n2. Shtypni dhe mbajeni të shtypur figurën e Briar-i
  <string name="introduction_response_accepted_received">%1$s pranoi prezantimin te %2$s.</string>
  <string name="introduction_response_declined_received">%1$s hodhi poshtë prezantimin te %2$s.</string>
  <string name="introduction_response_declined_received_by_introducee">%1$s thotë se %2$s hodhi poshtë prezantimin.</string>
+  <!--Connect via Bluetooth-->
+  <string name="menu_item_connect_via_bluetooth">Lidhu përmes Bluetooth-i</string>
+  <string name="connect_via_bluetooth_title">Lidhu përmes Bluetooth-i</string>
+  <string name="connect_via_bluetooth_intro">Në rast se lidhjet me Bluetooth s’funksionojnë automatikisht, mund të përdorni këtë skenë që të bëni lidhjen dorazi.\n\nQë kjo të funksionojë, kontakti juaj duhet të jetë atypari.\n\nJu dhe kontakti juaj duhet të shtypni që të dy “Fillo” në të njëjtën kohë.</string>
+  <string name="connect_via_bluetooth_already_discovering">Po provohet tashmë të bëhet lidhje përmes Bluetooth-i. Ju lutemi, riprovoni pas pak.</string>
+  <string name="connect_via_bluetooth_no_location_permission">S’mund të vazhdohet pa leje vendore</string>
+  <string name="connect_via_bluetooth_start">Po lidhet me Bluetooth…</string>
+  <string name="connect_via_bluetooth_success">U lidh me sukses përmes Bluetooth-i</string>
+  <string name="connect_via_bluetooth_error">S’u bë dot lidhja me Bluetooth.</string>
+  <string name="connect_via_bluetooth_error_not_supported">Bluetooth-i nuk mbulohet nga pajisja.</string>
  <!--Private Groups-->
  <string name="groups_list_empty">S’ka grupe për shfaqje</string>
  <string name="groups_list_empty_action">Prekni ikonën + që të krijoni një grup, ose kërkojuni kontakteve tuaj të ndajnë grupe me ju</string>
@@ -579,7 +583,8 @@ menjëherë dhe mbi mesazhet e kontaktit sapo të marrë mesazhin tuaj të radh
 Këtë rregullim mund ta ndryshojë edhe kontakti juaj, për të dy ju.</string>
  <string name="learn_more">Mësoni më tepër</string>
  <string name="disappearing_messages_summary">Bëji mesazhet e ardhshëm në këtë bisedë të treten automatikisht pas 7\u00A0ditësh.</string>
-  <!--Settings Feedback-->
+  <!--Settings Actions-->
+  <string name="pref_category_actions">Veprime</string>
  <string name="send_feedback">Dërgoji përshtypjet</string>
  <!--Link Warning-->
  <string name="link_warning_title">Sinjalizim Lidhjeje</string>
@@ -588,7 +593,7 @@ Këtë rregullim mund ta ndryshojë edhe kontakti juaj, për të dy ju.</string>
  <string name="link_warning_open_link">Hape Lidhjen</string>
  <!--Crash Reporter-->
  <string name="crash_report_title">Njoftim Vithisjesh Briar-i</string>
-  <string name="briar_crashed">Na ndjeni, Briar-i u vithis.</string>
+  <string name="briar_crashed">Na ndjeni, Briar-i u vithis</string>
  <string name="not_your_fault">S\’është faji juaj.</string>
  <string name="please_send_report">Ju lutemi, na ndihmoni të ndërtojmë një Briar më të mirë, duke na dërguar një njoftim vithisjeje.</string>
  <string name="report_is_encrypted">Premtojmë që njoftimi fshehtëzohet dhe dërgohet në mënyrë të sigurt.</string>
@@ -648,6 +653,86 @@ Këtë rregullim mund ta ndryshojë edhe kontakti juaj, për të dy ju.</string>
 Për privatësi, krejt lidhjet Internet kalojnë përmes rrjetit Tor.\n\n
 Nëse me një kontakt mund të bëhet lidhja përmes metodash të shumta,\n\n
 Briar-i i përdor ato paralelisht.</string>
+  <!--Share app offline-->
+  <string name="hotspot_title">Ndaje me të tjerë “offline” këtë aplikacion</string>
+  <string name="hotspot_intro">Jepeni këtë aplikacion për dikë atypari pa lidhje Internet, duke përdorur Wi-Fi-n e telefonit tuaj.
+		\n\nTelefoni juaj do të nisë një Wi-Fi hotspot. Persona atypari mund të lidhen me hotspot-in dhe të shkarkojnë aplikacionin Briar që nga telefoni juaj.</string>
+  <string name="hotspot_button_start_sharing">Nise hotspot-in</string>
+  <string name="hotspot_button_stop_sharing">Ndale hotspot-in</string>
+  <string name="hotspot_progress_text_start">Po ujdiset hotspot…</string>
+  <string name="hotspot_notification_channel_title">Hotspot Wi-Fi</string>
+  <string name="hotspot_notification_title">Dhënie Briar-i “offline”</string>
+  <string name="hotspot_button_connected">Pasuesi</string>
+  <string name="permission_hotspot_location_request_body">Që të krijohet një hotspot Wi-Fi, Briar-i lyp leje për të njohur vendndodhjen tuaj.\n\nBriar-i nuk e depoziton apo ia jep dikujt vendndodhjen tuaj.</string>
+  <string name="permission_hotspot_location_denied_body">Keni mohuar njohjen e vendndodhjes tuaj, ndërkohë që Briar-it i duhet kjo leje për të krijuar një hotspot Wi-Fi.\n\nJu lutemi, shihni mundësinë e akordimit të kësaj lejeje.</string>
+  <string name="wifi_settings_title">Rregullim Wi-Fi-i</string>
+  <string name="wifi_settings_request_enable_body">Që të krijohet një hotspot Wi-Fi, Briar-it i duhet të përdorë Wi-Fi-n. Ju lutemi, aktivizojeni.</string>
+  <string name="hotspot_tab_manual">Dorazi</string>
+  <!--The placeholder to be inserted into the string 'hotspot_manual_wifi': People can connect by %s-->
+  <string name="hotspot_scanning_a_qr_code">duke skanuar një kod 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">Telefoni juaj po ofron një hotspot Wi-Fi. Personat që duan të shkarkojnë Briar-in, mund të lidhen me hotspot-in duke shtuar te te rregullimet e pajisjeve të tyre për Wi-Fi-n hollësitë më poshtë ose duke %s. Kur të jenë lidhur me hotspot-in, shtypni “Pasuesi”.</string>
+  <string name="hotspot_manual_wifi_ssid">Emër rrjet</string>
+  <string name="hotspot_qr_wifi">Telefoni juaj po ofron një hotspot Wi-Fi. Persona që duan të shkarkojnë Briar-in mund të lidhen me hotspot-in duke skanuar këtë kod QR. Kur të jenë lidhur me hotspot-in, shtypni “Pasuesi”.</string>
+  <string name="hotspot_no_peers_connected">S’ka pajisje të lidhur</string>
+  <plurals name="hotspot_peers_connected">
+    <item quantity="one">%s pajisje e lidhur</item>
+    <item quantity="other">%s pajisje të lidhura</item>
+  </plurals>
+  <!--Download link-->
+  <!--The %s placeholder will be replaced with the translation of 'hotspot_scanning_a_qr_code'-->
+  <string name="hotspot_manual_site">Telefoni juaj po ofron një hotspot Wi-Fi. Persona që duan të shkarkojnë Briar-in mund të lidhen me hotspot-in duke shtypur lidhjen vijuese në një shfletues ose %s.</string>
+  <string name="hotspot_manual_site_address">Adresë (URL)</string>
+  <string name="hotspot_qr_site">Telefoni juaj po ofron një hotspot Wi-Fi. Persona që janë të lidhur me hotspot-in mund të shkarkojnë Briar-in duke skanuar këtë kod QR.</string>
+  <!--e.g. Download Briar 1.2.20-->
+  <string name="website_download_title">Shkarkoni %s</string>
+  <string name="website_download_intro">Dikush atypari ndau %s me ju.</string>
+  <string name="website_download_outro">Pasi të jetë plotësuar shkarkimi, hapni kartelën e shkarkuar dhe instalojeni.</string>
+  <string name="website_troubleshooting_title">Diagnostikim</string>
+  <string name="website_troubleshooting_1">Nëse s’mund të shkarkoni aplikacionin, provoni me një aplikacion tjetër shfletuesi.</string>
+  <string name="website_troubleshooting_2_old">Që të instaloni aplikacionin e shkarkuar, mund t’ju duhet të lejoni instalim aplikacionesh nga “Burime të panjohura”, që nga rregullimet e sistemit. Më pas, mund t’ju duhet të shkarkoni sërish aplikacionin. Rekomandojmë çaktivizimin e rregullimit “Burime të panjohura”, pas instalimit të aplikacionit.</string>
+  <string name="website_troubleshooting_2_new">Që të instaloni aplikacionin e shkarkuar, mund t’ju duhet të lejoni shfletuesin të instalojë aplikacione të panjohura. Pas instalimit të aplikacionit, rekomandojmë çaktivizimin e lejes për instalim aplikacionesh të panjohur nga shfletuesi.</string>
+  <string name="hotspot_help_wifi_title">Probleme me lidhjen me Wi-Fi:</string>
+  <string name="hotspot_help_wifi_1">Provoni çaktivizimin dhe riaktivizimin e Wi-Fi-it në të dy telefonat dhe riprovoni.</string>
+  <string name="hotspot_help_wifi_2">Nëse telefoni juaj ankohet se Wi-Fi s’ka internet, i thoni se dëshironi të jeni i lidhur sido qoftë.</string>
+  <string name="hotspot_help_site_title">Probleme në vizita të sajtit vendor:</string>
+  <string name="hotspot_help_site_1">Rikontrolloni se e keni dhënë adresën saktësisht siç shfaqet. Një gabim i vockël mund të bëjë të dështojë.</string>
+  <string name="hotspot_help_site_2">Sigurohuni se telefoni juaj është ende i lidhur me Wi-Fi e duhur (shihni më sipër), kur provoni të hyni te sajti.</string>
+  <string name="hotspot_help_site_3">Nëse keni një aplikacion firewall-i, shihni se mos po e bllokon hyrjen.</string>
+  <string name="hotspot_help_site_4">Nëse mund ta vizitoni sajtin, por jo të shkarkoni aplikacionin Briar, provoni me një tjetër aplikacion shfletuesi.</string>
+  <string name="hotspot_help_fallback_title">Asgjë s’bën punë?</string>
+  <string name="hotspot_help_fallback_intro">Mund të provoni ta ruani aplikacionin si një kartelë .apk, për ta dhënë me ndonjë rrugë tjetër. Pasi kartela të jetë shpërngulur te pajisja tjetër, mund të përdoret për të instaluar Briar-in.
+		\n\nNdihmëz: Për ta dhënë përmes Bluetooth-i, mund t’ju duhet së pari ta riemërtoni kartelën, në mënyrë që të përfundojë me .zip.</string>
+  <string name="hotspot_help_fallback_button">Ruaje aplikacionin</string>
+  <!--error handling-->
+  <string name="hotspot_error_intro">Diç shkoi ters teksa provohej të jepej aplikacioni përmes Wi-Fi:</string>
+  <string name="hotspot_error_no_wifi_direct">Pajisja nuk mbulon Wi-Fi Direct</string>
+  <string name="hotspot_error_start_callback_failed">S’u arrit të nisej hotspot-i: gabim %s</string>
+  <string name="hotspot_error_start_callback_failed_unknown">Nga një gabim i panjohur, hotspot-i s’u arrit të nisej, arsye %d</string>
+  <string name="hotspot_error_start_callback_no_group_info">S’u arrit të nisej hotspot-i: pa hollësi grupi</string>
+  <string name="hotspot_error_web_server_start">Gabim në nisjen e shërbyesit</string>
+  <string name="hotspot_error_web_server_serve">Gabim në paraqitjen e sajtit.\n\nJu lutemi, nëse problemi vazhdon, dërgoni njoftim (me të dhëna anonime) përmes aplikacionit Briar.</string>
+  <string name="hotspot_flag_test">Kujdes: Ky aplikacion qe instaluar me Android Studio dhe NUK mund të instalohet në një pajisje tjetër.</string>
+  <string name="hotspot_error_framework_busy">S’arrihet të niset hotspot-i.\n\nNëse keni një tjetër hotspot në punë, ose e jepni lidhjen tuaj Internet përmes Wi-Fi, provoni ta ndalni dhe të riprovoni pas kësaj.</string>
+  <!--Transfer Data via Removable Drives-->
+  <string name="removable_drive_title_send">Dërgoni të dhëna</string>
+  <string name="removable_drive_title_receive">Merrni të dhëna</string>
+  <string name="removable_drive_send_intro">Prekni butonin më poshtë që të krijoni një kartelë të re që përmban mesazhe të fshehtëzuar. Mund të zgjidhni ku të ruhen kartelat.\n\nNëse doni të ruhet kartela në një disk të heqshëm, futeni diskun tani.</string>
+  <string name="removable_drive_send_no_data">Aktualisht s’ka mesazhe në pritje për t’u dërguar te ky kontakt.</string>
+  <string name="removable_drive_send_not_supported">Ky kontakt po përdor një version të dikurshëm të Briar-it, ose një pajisje të vjetër, që nuk mbulon këtë veçori.</string>
+  <string name="removable_drive_send_button">Zgjidhni kartelë për eksport</string>
+  <string name="removable_drive_ongoing">Ju lutemi, pritni të plotësohet puna që është duke u kryer</string>
+  <string name="removable_drive_receive_intro">Prekni butonin më poshtë që të zgjidhni kartelën që ju ka dërguar kontakti juaj.\n\nNëse kartela gjendet në një disk të heqshëm, futeni diskun tani.</string>
+  <string name="removable_drive_receive_button">Zgjidhni kartelë për import</string>
+  <string name="removable_drive_success_send_title">Eksportim i suksesshëm</string>
+  <string name="removable_drive_success_send_text">Të dhënat u eksportuan me sukses. Tani keni 28 ditë për të shpërngulur kartelën te kontakti juaj.\n\nNëse kartela gjendet në një disk të heqshëm, përdorni njoftimin te shtylla e gjendjes për të bërë shkëputjen e diskut, përpara se ta hiqni.</string>
+  <string name="removable_drive_success_receive_title">Importim i suksesshëm</string>
+  <string name="removable_drive_success_receive_text">Janë marrë krejt mesazhet e fshehtëzuar që përmbante kjo kartelë.</string>
+  <string name="removable_drive_error_send_title">Gabim në eksportim të dhënash</string>
+  <string name="removable_drive_error_send_text">Pati një gabim gjatë shkrimit të të dhënave te kartela.\n\nNëse po përdorni një disk të heqshëm, sigurohuni se është futur si duhet dhe riprovoni.\n\nNëse gabimi vazhdon, ju lutemi, dërgoni një njoftim për t’ia bërë problemin të ditur ekipit të Briar-it.</string>
+  <string name="removable_drive_error_receive_title">Gabim në importim të dhënash</string>
+  <string name="removable_drive_error_receive_text">Kartela e përzgjedhur nuk përmbante ndonjë gjë të kuptueshme nga Briar-i.\n\nJu lutemi, kontrolloni se keni zgjedhur kartelën e duhur.\n\nNëse kontakti e krijoi kartelën më herët se 28 ditë më parë, Briar-i s’do të jetë në gjendje ta hapë.</string>
  <!--Screenshots-->
  <!--This is a name to be used in screenshots. Feel free to change it to a local name.-->
  <string name="screenshot_alice">Mira</string>
--- a/briar-android/src/main/res/values-sv/strings.xml
+++ b/briar-android/src/main/res/values-sv/strings.xml
@@ -33,13 +33,7 @@
  <string name="forgotten_password">Jag har glömt mitt lösenord </string>
  <string name="dialog_title_lost_password">Glömt lösenord?</string>
  <string name="dialog_message_lost_password">Eftersom ditt Briar-konto lagras krypterat på din mobil eller läsplatta och inte hos en molntjänst kan vi inte återställa ditt lösenord. Vill du radera ditt konto och skapa ett nytt?\n\nCaution: Du kommer att förlora din profil, dina kontakter och dina meddelanden.</string>
-  <string name="startup_failed_notification_title">Briar kunde inte startas </string>
-  <string name="startup_failed_notification_text">Tryck för mer information.</string>
  <string name="startup_failed_activity_title">Briar kunde inte starta</string>
-  <string name="startup_failed_db_error">Av någon anledning så har Briars databas skadads och går ej att reparera. Ditt konto, din data och alla dina kontakter har gått förlorade. Tyvärr måste du installera om Briar, eller skapa ett nytt konto genom att välja \'Jag har glömt mitt lösenord\' när lösenord efterfrågas.</string>
-  <string name="startup_failed_data_too_old_error">Ditt konto skapades med en gammal version av den här appen och kan ej öppnas med den här versionen. Du måste antingen installera den gamla versionen, eller skapa ett nytt konto genom att välja \'Jag har glömt mitt lösenord\' när lösenord efterfrågas.</string>
-  <string name="startup_failed_data_too_new_error">Du har en för gammal version av appen. Vänligen uppgradera till nyaste versionen och försök igen.</string>
-  <string name="startup_failed_service_error">Briar kunde inte starta ett nödvändigt insticksprogram. Att återinstallera Briar brukar lösa problemet, men eftersom dina data inte lagras på en central server innebär detta att du kommer att förlora ditt konto och alla dess tillhörande data.</string>
  <plurals name="expiry_warning">
    <item quantity="one">Det här är en test-version av Briar. Ditt konto kommer att upphöra om %d dagar och kan ej förnyas.</item>
    <item quantity="other">Det här är en test-version av Briar. Ditt konto kommer att upphöra om %d dag och kan ej förnyas.</item>
@@ -132,6 +126,7 @@
  <string name="open">Öppen</string>
  <string name="change">Ändra</string>
  <string name="start">Kör</string>
+  <string name="finish">Slutför</string>
  <string name="no_data">Ingen data</string>
  <string name="ellipsis">…</string>
  <string name="text_too_long">Texten innehåller för många tecken</string>
@@ -141,6 +136,7 @@
  <string name="sorry">Tyvärr</string>
  <string name="error_start_activity">Otillgänglig på ditt system</string>
  <string name="status_heading">Status</string>
+  <string name="error">Fel</string>
  <!--Contacts and Private Conversations-->
  <string name="no_contacts">Inga kontakter</string>
  <string name="no_contacts_action">Tryck på plus-ikonen (+) för att lägga till en kontakt</string>
@@ -154,8 +150,6 @@
  <string name="image_attach_error_invalid_mime_type">Bildformatet stöds ej: %s</string>
  <string name="set_contact_alias">Ändra namn på kontakt</string>
  <string name="set_contact_alias_hint">Kontaktnamn</string>
-  <string name="menu_item_connect_via_bluetooth">Anslut via Bluetooth</string>
-  <string name="dialog_title_connect_via_bluetooth">Anslut 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."-->
@@ -186,6 +180,7 @@
  <string name="dialog_title_image_support">Du kan nu skicka bilder till den här kontakten</string>
  <string name="dialog_message_image_support">Tryck på denna ikon för att bifoga bilder.</string>
  <string name="messaging_too_many_attachments_toast">Endast de första %d bilder kommer att skickas</string>
+  <string name="menu_contact">Kontakt</string>
  <!--Adding Contacts-->
  <string name="add_contact_title">Lägg till en närvarande kontakt</string>
  <string name="face_to_face">Du måste personligen träffa den som du vill lägga till som kontakt.\n\nDetta för att undvika att någon senare låtsas vara du eller läser dina meddelanden.</string>
@@ -281,6 +276,9 @@
  <string name="introduction_response_accepted_received">%1$s godkände att bli presenterad för %2$s.</string>
  <string name="introduction_response_declined_received">%1$s avvisade presentation för %2$s.</string>
  <string name="introduction_response_declined_received_by_introducee">%1$s säger att %2$s avvisade presentation.</string>
+  <!--Connect via Bluetooth-->
+  <string name="menu_item_connect_via_bluetooth">Anslut via Bluetooth</string>
+  <string name="connect_via_bluetooth_title">Anslut via Bluetooth</string>
  <!--Private Groups-->
  <string name="groups_list_empty">Inga grupper</string>
  <string name="groups_list_empty_action">Tryck på plus-ikonen (+) för att skapa en grupp. Du kan också fråga en kontakt om att bli inbjuden till en grupp.</string>
@@ -524,7 +522,8 @@
  <string name="cannot_load_ringtone">Kan ej ladda ringsignal</string>
  <!--Conversation Settings-->
  <string name="learn_more">Läs mer</string>
-  <!--Settings Feedback-->
+  <!--Settings Actions-->
+  <string name="pref_category_actions">Åtgärder</string>
  <string name="send_feedback">Lämna synpunkter</string>
  <!--Link Warning-->
  <string name="link_warning_title">Länkvarning</string>
@@ -533,7 +532,6 @@
  <string name="link_warning_open_link">Öppna länk</string>
  <!--Crash Reporter-->
  <string name="crash_report_title">Briar-felrapport</string>
-  <string name="briar_crashed">Tyvärr, Briar kraschade.</string>
  <string name="not_your_fault">Detta är inte ditt fel.</string>
  <string name="please_send_report">Hjälp oss att förbättra Briar genom att skicka en felrapport.</string>
  <string name="report_is_encrypted">Vi lovar att felrapporten är krypterad och skickas säkert.</string>
@@ -587,6 +585,17 @@
  <string name="lock_tap_to_unlock">Tryck för att låsa upp</string>
  <!--Connections Screen-->
  <string name="transports_help_text">Briar kan ansluta till dina kontakter via internet, Wi-Fi eller Bluetooth.\n\nAlla internetanslutningar går via Tor-nätverket av integritetsskäl.\n\nOm en kontakt kan nås via flera metoder kommer Briar att använda dem parallellt.</string>
+  <!--Share app offline-->
+  <string name="hotspot_button_connected">Nästa</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">Felsökning</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">Alice</string>
--- a/briar-android/src/main/res/values-sw/strings.xml
+++ b/briar-android/src/main/res/values-sw/strings.xml
@@ -1,5 +1,5 @@
 <?xml version='1.0' encoding='UTF-8'?>
-<resources xmlns:tools="http://schemas.android.com/tools">
+<resources>
  <!--Setup-->
  <string name="setup_title">Karibu kwenye Briar</string>
  <string name="setup_name_explanation">lakabu lako litaonekana kwenye kila chapisho lako . Na hutaweza badilisha baada ya kuteneneza akaunti yako .</string>
@@ -146,7 +146,7 @@ Umepoteza nenosiri.</string>
  <string name="set_contact_alias">Badilisha jina lako la mawasiliano </string>
  <string name="set_contact_alias_hint">Jina la mawasiliano </string>
  <string name="menu_item_connect_via_bluetooth">Unganisha kwa Bluetooth</string>
-  <string name="dialog_title_connect_via_bluetooth">Unganisha kwa Bluetooth</string>
+  <string name="connect_via_bluetooth_title">Unganisha kwa 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-tr/strings.xml
+++ b/briar-android/src/main/res/values-tr/strings.xml
@@ -40,13 +40,12 @@
  <string name="forgotten_password">Parolamı unuttum</string>
  <string name="dialog_title_lost_password">Kayıp Parola</string>
  <string name="dialog_message_lost_password">Briar hesabınız, bulutta değil şifreli olarak cihazınızda saklanır, bu nedenle şifrenizi sıfırlayamıyoruz. Hesabınızı silmek ve tekrar başlamak ister misiniz? \n\nUyarı: Kimlikleriniz, kişileriniz ve iletileriniz kaybolur.</string>
-  <string name="startup_failed_notification_title">Briar başlayamadı</string>
-  <string name="startup_failed_notification_text">Daha fazla bilgi için dokunun.</string>
  <string name="startup_failed_activity_title">Briar Başlangıç Hatası</string>
-  <string name="startup_failed_db_error">Bir nedenden dolayı Briar veritabanı onarılamayacak kadar bozulmuş. Hesabınız, verileriniz ve bütün kişileriniz kayboldu. Maalesef Briar\'ı tekrar kurmanız ve parola sorulduğunda \"Parolamı unuttum\" seçeneğini kullanarak yeni bir hesap oluşturmanız gerekiyor.</string>
-  <string name="startup_failed_data_too_old_error">Hesabınız bu uygulamanın eski bir sürümüyle oluşturulmuş ve bu sürümle açılamaz. Eski sürümü yeniden kurmanız veya parola sorulduğunda \"Parolamı unuttum\" seçeneğini seçerek yeni bir hesap oluşturmanız gerekiyor.</string>
-  <string name="startup_failed_data_too_new_error">Uygulamanın bu sürümü çok eski. Lütfen son sürüme yükseltin ve yeniden deneyin.</string>
-  <string name="startup_failed_service_error">Briar gerekli bir eklentiyi başlatamadı. Briar\'ı yeniden yüklemek genellikle bu sorunu çözer. Bununla birlikte, lütfen Briar\'ın verilerinizi depolamak için merkezi sunucuları kullanmadığından hesabınızı ve onunla ilişkili tüm verileri kaybedeceğinizi unutmayın.</string>
+  <string name="startup_failed_clock_error">Aygıtınızın saati yanlış olduğu Briar başlatılamadı.\n\nLütfen aygıtınızın saatini doğru zamana ayarlayın ve tekrar deneyin.</string>
+  <string name="startup_failed_db_error">Briar, hesabınızı, bağlantılarınızı ve iletilerinizi içeren veritabanını açamadı.\n\nLütfen uygulamanın son sürümüne yükseltin ve tekrar deneyin veya parola ekranında \"Parolamı Unuttum\" seçeneğiyle yeni bir hesap ayarlayın.</string>
+  <string name="startup_failed_data_too_old_error">Hesabınız bu uygulamanın eski bir sürümüyle oluşturulmuş ve bu sürümle açılamaz.\n\nEski sürümü yeniden kurmanız veya parola sorulduğunda \"Parolamı unuttum\" seçeneğini seçerek yeni bir hesap oluşturmanız gerekiyor.</string>
+  <string name="startup_failed_data_too_new_error">Hesabınız bu uygulamanın daha yeni bir sürümüyle oluşturulmuş ve bu sürümde açılamaz.\n\nLütfen son sürüme yükseltin ve tekrar deneyin.</string>
+  <string name="startup_failed_service_error">Briar ihtiyaç duyduğu bir bileşeni başlatamadı.\n\nLütfen uygulamayı son sürüme yükseltin ve tekrar deneyin.</string>
  <plurals name="expiry_warning">
    <item quantity="one">Bu Briar\'ın deneme sürümüdür. Hesabınız %d gün içinde sona erecek ve yenilenemez.</item>
    <item quantity="other">Bu Briar\'ın deneme sürümüdür. Hesabınız %d gün içinde geçersiz olacak ve yenilenmeyecektir.</item>
@@ -72,7 +71,7 @@
  <string name="transports_onboarding_text">Briar\'ın kişilerinizle nasıl bağlanacağını kontrol etmek için buraya tıklayın</string>
  <!--Transports: Tor-->
  <string name="transport_tor">İnternet</string>
-  <string name="tor_device_status_online_wifi">Telefonunuzun Wi-Fi aracılığıyla İnternet erişimi var</string>
+  <string name="tor_device_status_online_wifi">Telefonunuzun kablosuz aracılığıyla İnternet erişimi var</string>
  <string name="tor_device_status_online_mobile">Telefonunuzun mobil veri aracılığıyla İnternet erişimi var</string>
  <string name="tor_device_status_offline">Telefonunuzun İnternet erişimi yok</string>
  <string name="tor_plugin_status_enabling">Briar İnternet\'e bağlanıyor</string>
@@ -83,14 +82,14 @@
  <string name="tor_plugin_status_disabled_battery">Briar pille çalışırken İnternet kullanmamak üzere yapılandırılmış</string>
  <string name="tor_plugin_status_disabled_country_blocked">Briar bu ülkede İnternet kullanmamak üzere yapılandırılmış</string>
  <!--Transports: Wi-Fi-->
-  <string name="transport_lan">Wi-Fi</string>
-  <string name="transport_lan_long">Aynı Wi-Fi Ağı</string>
-  <string name="lan_device_status_on">Telefonunuz Wi-Fi\'ye bağlı</string>
-  <string name="lan_device_status_off">Telefonunuz Wi-Fi\'ye bağlı değil</string>
-  <string name="lan_plugin_status_enabling">Briar Wi-Fi ağına bağlanıyor</string>
-  <string name="lan_plugin_status_active">Briar Wi-Fi ağına bağlandı</string>
-  <string name="lan_plugin_status_inactive">Briar Wi-Fi ağına bağlanamıyor</string>
-  <string name="lan_plugin_status_disabled">Briar Wi-Fi ağını kullanmamak üzere yapılandırılmış</string>
+  <string name="transport_lan">Kablosuz</string>
+  <string name="transport_lan_long">Aynı Kablosuz Ağı</string>
+  <string name="lan_device_status_on">Telefonunuz Kablosuz ağa bağlı</string>
+  <string name="lan_device_status_off">Telefonunuz Kablosuz ağa bağlı değil</string>
+  <string name="lan_plugin_status_enabling">Briar kablosuz ağa bağlanıyor</string>
+  <string name="lan_plugin_status_active">Briar kablosuz ağa bağlandı</string>
+  <string name="lan_plugin_status_inactive">Briar kablosuz ağa bağlanamıyor</string>
+  <string name="lan_plugin_status_disabled">Briar kablosuz ağı kullanmamak üzere yapılandırılmış</string>
  <!--Transports: Bluetooth-->
  <string name="transport_bt">Bluetooth</string>
  <string name="bt_device_status_on">Telefonunuzun Bluetooth\'u açık</string>
@@ -139,6 +138,7 @@
  <string name="open">Aç</string>
  <string name="change">Değişiklik</string>
  <string name="start">Başlat</string>
+  <string name="finish">Bitir</string>
  <string name="no_data">Bilgi yok</string>
  <string name="ellipsis">…</string>
  <string name="text_too_long">Girilen metin çok uzun</string>
@@ -148,6 +148,7 @@
  <string name="sorry">Üzgünüm</string>
  <string name="error_start_activity">Sisteminizde mevcut değil</string>
  <string name="status_heading">Durum</string>
+  <string name="error">Hata</string>
  <!--Contacts and Private Conversations-->
  <string name="no_contacts">Gösterilecek kişi yok</string>
  <string name="no_contacts_action">kişi eklemek için + simgesine dokunun</string>
@@ -164,15 +165,6 @@
  <string name="set_contact_alias">Kişi adını değiştir</string>
  <string name="set_contact_alias_hint">Ad</string>
  <string name="menu_item_disappearing_messages">Kaybolan iletiler</string>
-  <string name="menu_item_connect_via_bluetooth">Bluetooth ile Bağlan</string>
-  <string name="dialog_title_connect_via_bluetooth">Bluetooth ile Bağlan</string>
-  <string name="dialog_message_connect_via_bluetooth">Bunun çalışması için kişinin yakınlarda olması gerekiyor.\n\nSizin ve kişinin \"Başlat\" düğmesine aynı anda basması gerekiyor.</string>
-  <string name="toast_connect_via_bluetooth_already_discovering">Zaten Bluetooth\'a bağlanmaya çalışıyor</string>
-  <string name="toast_connect_via_bluetooth_not_discoverable">Bluetooth olmadan devam edilemez</string>
-  <string name="toast_connect_via_bluetooth_no_location_permission">Konum izni olmadan devam edilemez</string>
-  <string name="toast_connect_via_bluetooth_start">Bluetooth ile bağlanılıyor…</string>
-  <string name="toast_connect_via_bluetooth_success">Bluetooth ile başarılı bir şekilde bağlandı</string>
-  <string name="toast_connect_via_bluetooth_error">Bluetooth ile bağlanamıyor</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">İletileriniz %1$s sonra kaybolacak. %2$s</string>
  <!--The placeholder at the end will add "Tap to learn more."-->
@@ -224,6 +216,7 @@
  <string name="dialog_title_image_support">Artık bu kişiye resim gönderebilirsiniz</string>
  <string name="dialog_message_image_support">Resim eklemek için bu simgeye dokunun.</string>
  <string name="messaging_too_many_attachments_toast">Yalnızca ilk %d resim gönderilecek</string>
+  <string name="menu_contact">İletişim</string>
  <!--Adding Contacts-->
  <string name="add_contact_title">Yakındaki Kişiyi Ekle</string>
  <string name="face_to_face">Kişi olarak eklemek istediğiniz kişiyle buluşmanız gerekir.\n\nBu, gelecekte başkalarının sizin kimliğinize bürünmesini veya iletilerinizi okumasını engelleyecektir.</string>
@@ -320,6 +313,12 @@
  <string name="introduction_response_accepted_received">%1$s, %2$s ile tanışmayı kabul etti.</string>
  <string name="introduction_response_declined_received">%1$s, %2$s ile tanışmayı reddetti.</string>
  <string name="introduction_response_declined_received_by_introducee">%1$s, %2$s kişisinin tanışmayı reddettiğini söyledi.</string>
+  <!--Connect via Bluetooth-->
+  <string name="menu_item_connect_via_bluetooth">Bluetooth ile Bağlan</string>
+  <string name="connect_via_bluetooth_title">Bluetooth ile Bağlan</string>
+  <string name="connect_via_bluetooth_no_location_permission">Konum izni olmadan devam edilemez</string>
+  <string name="connect_via_bluetooth_start">Bluetooth ile bağlanılıyor…</string>
+  <string name="connect_via_bluetooth_success">Bluetooth ile başarılı bir şekilde bağlandı</string>
  <!--Private Groups-->
  <string name="groups_list_empty">Gösterilecek grup yok</string>
  <string name="groups_list_empty_action">Bir grup oluşturmak için + simgesine dokunun veya kişilerinizden grupları sizinle paylaşmasını isteyin</string>
@@ -578,7 +577,8 @@
 		Kişiniz bu ayarı her ikiniz için değiştirebilir.</string>
  <string name="learn_more">Ayrıntılı bilgi alın</string>
  <string name="disappearing_messages_summary">Bu konuşmadaki gelecekteki iletileri 7\u00A0gün içinde otomatik olarak kaybolacak şekilde ayarla.</string>
-  <!--Settings Feedback-->
+  <!--Settings Actions-->
+  <string name="pref_category_actions">Eylemler</string>
  <string name="send_feedback">Geri bildirim gönder</string>
  <!--Link Warning-->
  <string name="link_warning_title">Uyarı Bağlantısı</string>
@@ -587,7 +587,7 @@
  <string name="link_warning_open_link">Bağlantıyı Aç</string>
  <!--Crash Reporter-->
  <string name="crash_report_title">Briar Çökme Raporu</string>
-  <string name="briar_crashed">Üzgünüz, Briar çöktü.</string>
+  <string name="briar_crashed">Üzgünüz, Briar çöktü</string>
  <string name="not_your_fault">Bu senin hatan değil.</string>
  <string name="please_send_report">Bize bir çökme raporu göndererek Briar\'ı daha iyi bir hale getirmemize yardımcı olun.</string>
  <string name="report_is_encrypted">Raporun şifrelendiğine ve güvenli bir şekilde gönderildiğine söz veriyoruz.</string>
@@ -626,7 +626,7 @@
  <string name="permission_camera_title">Kamera izinleri</string>
  <string name="permission_camera_request_body">QR kodunu taramak için Briar\'ın kameraya erişmesi gerekiyor.</string>
  <string name="permission_location_title">Konum izinleri</string>
-  <string name="permission_location_request_body">Bluetooth aygıtlarını keşfetmek için, Briar\'ın konumunuza erişme iznine ihtiyaç duyar.\n\nBriar konum bilginizi kaydetmez ve kimseyle paylaşmaz.</string>
+  <string name="permission_location_request_body">Bluetooth aygıtlarını keşfetmek için, Briar\'ın konumunuza erişmesi gerekiyor.\n\nBriar konum bilginizi kaydetmez ve kimseyle paylaşmaz.</string>
  <string name="permission_camera_location_title">Kamera ve konum</string>
  <string name="permission_camera_location_request_body">QR kodunu taramak için, Briar\'ın kameranıza erişmesi gerekiyor.\n\nBluetooth aygıtlarını keşfetmek için Briar\'ın konumunuza erişmesi gerekiyor.\n\nBriar konumunuzu saklamaz ve hiç kimseyle paylaşmaz.</string>
  <string name="permission_camera_denied_body">Kameraya erişimi engellediniz, ancak kişi eklemek için kamerayı kullanmanız gerekiyor.\n\nLütfen erişim izni vermeyi düşünün.</string>
@@ -644,7 +644,87 @@
  <string name="lock_is_locked">Briar kilitli</string>
  <string name="lock_tap_to_unlock">Kilidi açmak için dokunun</string>
  <!--Connections Screen-->
-  <string name="transports_help_text">Briar kişilerinizle İnternet, Wi-Fi veya Bluetooth ile bağlanabilir.\n\nBütün İnternet bağlantıları gizliliğiniz için Tor Ağı üzerinden yapılıyor.\n\nEğer bir kişiniz birçok yöntemle erişilebiliyorsa, Briar bu yöntemleri paralel olarak kullanır.</string>
+  <string name="transports_help_text">Briar kişilerinizle İnternet, Kablosuz ağ veya Bluetooth ile bağlanabilir.\n\nBütün İnternet bağlantıları gizliliğiniz için Tor Ağı üzerinden yapılıyor.\n\nEğer birisi birçok yöntemle erişilebiliyorsa, Briar bu yöntemleri paralel olarak kullanır.</string>
+  <!--Share app offline-->
+  <string name="hotspot_title">Bu uygulamayı çevrimdışı paylaş</string>
+  <string name="hotspot_intro">Bu uygulamayı, İnternet olmadan, telefonunuzun kablosuz ağını kullanarak yakınınızda olan biriyle paylaşın.
+		\n\nTelefonunuz bir kablosuz erişim noktası başlatacaktır. Yakın civarda olan kişiler bu erişim noktasına bağlanarak, Briar uygulamasını kendi telefonlarına indirebilecektir.</string>
+  <string name="hotspot_button_start_sharing">Erişim noktası başlat</string>
+  <string name="hotspot_button_stop_sharing">Erişim noktasını durdur</string>
+  <string name="hotspot_progress_text_start">Erişim noktası ayarlanıyor…</string>
+  <string name="hotspot_notification_channel_title">Kablosuz erişim noktası</string>
+  <string name="hotspot_notification_title">Briar çevrimdışı paylaşılıyor</string>
+  <string name="hotspot_button_connected">İleri</string>
+  <string name="permission_hotspot_location_request_body">Bir kablosuz erişim noktası oluşturmak için, Briar konumunuza erişme iznine ihtiyaç duyar.\n\nBriar konum bilginizi kaydetmez ve kimseyle paylaşmaz.</string>
+  <string name="permission_hotspot_location_denied_body">Konuma erişimi engellediniz, ancak Briar\'ın Wi-Fi erişim noktası oluşturmak için bu izne ihtiyacı var.\n\nLütfen erişim izni vermeyi düşünün.</string>
+  <string name="wifi_settings_title">Kablosuz ağ ayarları</string>
+  <string name="wifi_settings_request_enable_body">Bir kablosuz erişim noktası oluşturmak için Briar\'ın kablosuz ağı kullanması gerekiyor. Lütfen kablosuz ağı etkinleştirin.</string>
+  <string name="hotspot_tab_manual">El ile</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 kodu tarayarak</string>
+  <!--Wi-Fi setup-->
+  <!--The %s placeholder will be replaced with the translation of 'hotspot_scanning_a_qr_code'-->
+  <string name="hotspot_manual_wifi">Telefonunuz bir kablosuz erişim noktası sunuyor. Briar\'ı indirmek isteyen kişiler bu erişim noktasına aşağıdaki bilgiyi kullanarak kendi Kablosuz ayarlarına girerek veya %s ile bağlanabilirler. Erişim noktasına bağlandıklarında \'Sonraki\'ye basın.</string>
+  <string name="hotspot_manual_wifi_ssid">Ağ adı</string>
+  <string name="hotspot_qr_wifi">Telefonunuz bir kablosuz erişim noktası sunuyor. Briar\'ı indirmek isteyen kişiler bu erişim noktasına QR kodunu tarayarak bağlanabilir. Erişim noktasına bağlandıklarında \'Sonraki\'ye basın.</string>
+  <string name="hotspot_no_peers_connected">Bağlı aygıt yok</string>
+  <plurals name="hotspot_peers_connected">
+    <item quantity="one">%s aygıt bağlı</item>
+    <item quantity="other">%s aygıt bağlı</item>
+  </plurals>
+  <!--Download link-->
+  <!--The %s placeholder will be replaced with the translation of 'hotspot_scanning_a_qr_code'-->
+  <string name="hotspot_manual_site">Telefonunuz bir kablosuz erişim noktası sunuyor. Erişim noktasına bağlı kişiler Briar\'ı gösterilen bağlantıyı bir tarayıcıya yazarak veya %s ile indirebilirler. </string>
+  <string name="hotspot_manual_site_address">Adres (URL)</string>
+  <string name="hotspot_qr_site">Telefonunuz bir kablosuz erişim noktası sunuyor. Erişim noktasına bağlı kişiler Briar\'ı QR kodunu tarayarak indirebilirler. </string>
+  <!--e.g. Download Briar 1.2.20-->
+  <string name="website_download_title">%s İndir</string>
+  <string name="website_download_intro">Yakınınızda olan biri sizinle %s paylaştı</string>
+  <string name="website_download_outro">İndirme tamamlandıktan sonra, indirdiğiniz dosyayı açın ve kurun.</string>
+  <string name="website_troubleshooting_title">Sorun çözme</string>
+  <string name="website_troubleshooting_1">Uygulamayı indiremiyorsanız, başka bir tarayıcı uygulamasıyla deneyin.</string>
+  <string name="website_troubleshooting_2_old">İndirilen uygulamayı kurabilmek için, sistem ayarlarında \"Bilinmeyen kaynaklar\"dan uygulama kurma izni vermeniz gerekebilir. Daha sonra uygulamayı tekrar indirmeniz gerekebilir. Uygulamayı kurduktan sonra \"Bilinmeyen kaynaklar\" seçeneğini devre dışı bırakmanızı öneririz.</string>
+  <string name="website_troubleshooting_2_new">İndirilen uygulamayı kurmak için, tarayıcının bilinmeyen uygulamaları kurmasına izin vermeniz gerekebilir. Uygulamayı kurduktan sonra, tarayıcının bilinmeye uygulamaları kurma iznini kaldırmanızı öneririz.</string>
+  <string name="hotspot_help_wifi_title">Kablosuz ağa bağlanma sorunları:</string>
+  <string name="hotspot_help_wifi_1">Her iki telefonda da kablosuz ağı devre dışı bırakıp tekrar etkinleştirin ve yeniden deneyin.</string>
+  <string name="hotspot_help_wifi_2">Eğer telefonunuz kablosuz ağda İnternet olmadığını söylüyorsa yine de bağlı kalmasını söyleyin.</string>
+  <string name="hotspot_help_site_title">Yerel web sitesini ziyaret etme sorunları:</string>
+  <string name="hotspot_help_site_1">Adresi tam gösterildiği şekilde girdiğinizden emin olun. Çok küçük bir hata sorun olabilir.</string>
+  <string name="hotspot_help_site_2">Siteye erişmeye çalışırken telefonunuzun doğru kablosuz ağa bağlı olduğundan emin olun (Bkz. önceki kısım).</string>
+  <string name="hotspot_help_site_3">Bir güvenlik duvarı uygulamanız varsa, erişimi engellemediğinden emin olun.</string>
+  <string name="hotspot_help_site_4">Siteyi ziyaret edebiliyor ama Briar uygulamasını indiremiyorsanız, başka bir web tarayıcısıyla deneyin.</string>
+  <string name="hotspot_help_fallback_title">Hiç bir şey çalışmıyor mu?</string>
+  <string name="hotspot_help_fallback_intro">Uygulamayı, başka bir şekilde paylaşmak için .apk olarak kaydetmeyi deneyebilirsiniz. Dosya diğer aygıta aktarıldığında, Briar kurmak için kullanılabilir.
+		\n\nİpucu: Bluetooth üzerinden paylaşmak için, aktarmadan önce dosya uzantısını .zip olarak değiştirmeniz gerekebilir.</string>
+  <string name="hotspot_help_fallback_button">Uygulamayı kaydet</string>
+  <!--error handling-->
+  <string name="hotspot_error_intro">Uygulamayı kablosuz aracılığıyla paylaşmaya çalışırken bir şeyler ters gitti:</string>
+  <string name="hotspot_error_no_wifi_direct">Aygıt Wi-Fi Direct desteklemiyor</string>
+  <string name="hotspot_error_start_callback_failed">Erişim noktası başlatılamadı: hata %s</string>
+  <string name="hotspot_error_start_callback_failed_unknown">Erişim noktası bilinmeyen bir nedenle başlatılamadı, gerekçe %d</string>
+  <string name="hotspot_error_start_callback_no_group_info">Erişim noktası başlatılamadı: grup bilgisi yok</string>
+  <string name="hotspot_error_web_server_start">Web sunucusu başlatmada hata</string>
+  <string name="hotspot_error_web_server_serve">Website sunumunda hata.\n\n Sorun devam ederse, Briar uygulaması aracılığıyla lütfen (anonim bir şekilde) geri bildirimde bulunun.</string>
+  <string name="hotspot_flag_test">Uyarı: Bu uygulama Android Studio ile kurulduğu için başka bir aygıta kurulamaz.</string>
+  <string name="hotspot_error_framework_busy">Erişim noktası başlatılamıyor.\n\nEğer başka bir erişim noktası çalışıyorsa veya İnternet bağlantınızı kablosuz üzerinden paylaşıyorsanız, lütfen önce onu durdurun ve sonra yeniden deneyin.</string>
+  <!--Transfer Data via Removable Drives-->
+  <string name="removable_drive_title_send">Veri gönder</string>
+  <string name="removable_drive_title_receive">Veri al</string>
+  <string name="removable_drive_send_intro">Şifreli iletileri içeren yeni bir dosya oluşturmak için aşağıdaki düğmeye dokunun. Dosyanın kaydedileceği yeri seçebilirsiniz.\n\nEğer dosyayı taşınabilir bir sürücüye saklamak istiyorsanız, sürücüyü şimdi takın.</string>
+  <string name="removable_drive_send_no_data">Şu an bu kişiye gönderilmeyi bekleyen bir ileti yok.</string>
+  <string name="removable_drive_send_not_supported">Bu kişi, bu özelliği desteklemeyen eski bir Briar sürümü veya eski bir aygıt kullanıyor.</string>
+  <string name="removable_drive_send_button">Dışa aktarmak için dosya seçin</string>
+  <string name="removable_drive_ongoing">Lütfen devam eden işlemin bitmesini bekleyin</string>
+  <string name="removable_drive_receive_intro">Kişinin size gönderdiği dosyayı seçmek için aşağıdaki düğmeye dokunun.\n\nEğer dosya taşınabilir bir sürücüde ise, sürüyü şimdi takın.</string>
+  <string name="removable_drive_receive_button">İçe aktarmak için dosya seçin</string>
+  <string name="removable_drive_success_send_title">Dışa aktarma başarılı</string>
+  <string name="removable_drive_success_send_text">Veri başarılı bir şekilde dışa aktarıldı. Bu dosyayı kişinize aktarmak için 28 gününüz var.\n\nEğer dosya taşınabilir bir sürücüde ise, almadan önce çıkarmak için durum çubuğundaki bildirimi kullanın.</string>
+  <string name="removable_drive_success_receive_title">İçe aktarma başarılı</string>
+  <string name="removable_drive_success_receive_text">Bu dosyada mevcut olan tüm şifreli iletiler alındı.</string>
+  <string name="removable_drive_error_send_title">Dışa aktarmada hata</string>
+  <string name="removable_drive_error_send_text">Dosyaya veri yazarken bir hata oluştu.\n\nTaşınabilir bir sürücü kullanıyorsanız, uygun bir şekilde takıldığından emin olun ve tekrar deneyin.\n\nEğer hata devam ederse, lütfen Briar ekibinin bu konu hakkında bilgileri olması için geri bildirimde bulunun.</string>
+  <string name="removable_drive_error_receive_title">İçe aktarmada hata</string>
+  <string name="removable_drive_error_receive_text">Seçilmiş olan dosyada Briar\'ın tanımlayabildiği bir şey bulunamadı.\n\nLütfen doğru dosyayı seçtiğinizden emin olun.\n\nEğer kişiniz dosyayı 28 günden önce oluşturduysa, Briar onu tanıyamayabilir.</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-uk/strings.xml
+++ b/briar-android/src/main/res/values-uk/strings.xml
@@ -1,5 +1,5 @@
 <?xml version='1.0' encoding='UTF-8'?>
-<resources xmlns:tools="http://schemas.android.com/tools">
+<resources>
  <!--Setup-->
  <string name="setup_title">Вітаємо у Briar</string>
  <string name="setup_name_explanation">Ваше ім\'я користувача буде відображено біля будь-якого матеріалу, який ви опублікуєте. Ви не зможете змінити його після створення облікового запису.</string>
@@ -135,7 +135,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="dialog_title_connect_via_bluetooth">З\'єднатися через Bluetooth</string>
+  <string name="connect_via_bluetooth_title">З\'єднатися через 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-zh-rCN/strings.xml
+++ b/briar-android/src/main/res/values-zh-rCN/strings.xml
@@ -40,13 +40,12 @@
  <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 或者在提示输入密码时选择“我忘记了密码”来重新创建一个 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>
+  <string name="startup_failed_clock_error">无法启动 Briar，因为你设备的时间错误。\n\n请设置您的设备时钟到正确的时间，然后再试一次。</string>
+  <string name="startup_failed_db_error">Bria r无法打开包含您的帐户、联系人和信息的数据库。\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>
  <plurals name="expiry_warning">
    <item quantity="other">这是 Briar 的一个测试版本。您的帐户将在 %d 天后到期，且无法延期。</item>
  </plurals>
@@ -134,6 +133,7 @@
  <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>
@@ -143,6 +143,7 @@
  <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,15 +160,6 @@
  <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."-->
@@ -216,6 +208,7 @@
  <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>
@@ -311,6 +304,16 @@
  <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_intro">如果蓝牙无法自动连接，您可以使用此界面进行手动连接。\n\n你的联系人需要在附近，这样才能工作。\n\n你和你的联系人应该同时按“开始。</string>
+  <string name="connect_via_bluetooth_already_discovering">已经在尝试通过蓝牙连接。请稍后再试</string>
+  <string name="connect_via_bluetooth_no_location_permission">没有位置权限不能继续 </string>
+  <string name="connect_via_bluetooth_start">正通过蓝牙连接 …</string>
+  <string name="connect_via_bluetooth_success">通过蓝牙连接成功</string>
+  <string name="connect_via_bluetooth_error">无法通过蓝牙连接。</string>
+  <string name="connect_via_bluetooth_error_not_supported">设备不支持蓝牙</string>
  <!--Private Groups-->
  <string name="groups_list_empty">尚无群聊可供展示</string>
  <string name="groups_list_empty_action">轻按 + 号创建群聊，或让您的联系人分享群聊给您</string>
@@ -565,7 +568,8 @@
 		你的联系人也可以为双方更改此设置。</string>
  <string name="learn_more">了解更多</string>
  <string name="disappearing_messages_summary">在7\u00A0天之后，使此对话中的后续消息自动消失。</string>
-  <!--Settings Feedback-->
+  <!--Settings Actions-->
+  <string name="pref_category_actions">操作</string>
  <string name="send_feedback">提交反馈</string>
  <!--Link Warning-->
  <string name="link_warning_title">链接警告</string>
@@ -574,7 +578,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>
@@ -632,6 +636,87 @@
  <string name="lock_tap_to_unlock">轻按以解锁</string>
  <!--Connections Screen-->
  <string name="transports_help_text">Briar 可以通过互联网、Wi-Fi 或蓝牙来连接到您的联系人。\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\n Briar 不会储存你的位置也不会和任何人分享它。</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 热点，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">扫描一个二维码</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。当他们连接到热点，按 “下一步”。</string>
+  <string name="hotspot_manual_wifi_ssid">网络名称</string>
+  <string name="hotspot_qr_wifi">你的手机提供了 Wi-Fi 热点。想下载 Briar 的人可以通过扫描这个二维码连接到热点。当他们连接到热点，按“下一步”。</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热点。连接到该热点的用户可以下载 Briar，方法是在浏览器中输入以下链接或 %s</string>
+  <string name="hotspot_manual_site_address">地址 (URL)</string>
+  <string name="hotspot_qr_site">你的手机正提供 Wi-Fi 热点。连接到这个热点的人可以通过扫描这个二维码下载 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">连接 Wi-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提示：要通过蓝牙共享，您可能需要先重命名文件以 .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 Direct</string>
+  <string name="hotspot_error_start_callback_failed">热点启动失败：错误 %s</string>
+  <string name="hotspot_error_start_callback_failed_unknown">热点启动失败，出现未知错误，原因 %d</string>
+  <string name="hotspot_error_start_callback_no_group_info">热点启动失败：没有组信息</string>
+  <string name="hotspot_error_web_server_start">启动 web 服务器出错</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_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/strings.xml
+++ b/briar-android/src/main/res/values/strings.xml
@@ -178,15 +178,6 @@
 	<string name="set_contact_alias">Change contact name</string>
 	<string name="set_contact_alias_hint">Contact name</string>
 	<string name="menu_item_disappearing_messages">Disappearing messages</string>
-	<string name="menu_item_connect_via_bluetooth">Connect via Bluetooth</string>
-	<string name="dialog_title_connect_via_bluetooth">Connect via Bluetooth</string>
-	<string name="dialog_message_connect_via_bluetooth">Your contact needs to be nearby for this to work.\n\nYou and your contact should both press \"Start\" at the same time.</string>
-	<string name="toast_connect_via_bluetooth_already_discovering">Already trying to connect via Bluetooth</string>
-	<string name="toast_connect_via_bluetooth_not_discoverable">Cannot continue without Bluetooth</string>
-	<string name="toast_connect_via_bluetooth_no_location_permission">Cannot continue without location permission</string>
-	<string name="toast_connect_via_bluetooth_start">Connecting via Bluetooth…</string>
-	<string name="toast_connect_via_bluetooth_success">Successfully connected via Bluetooth</string>
-	<string name="toast_connect_via_bluetooth_error">Could not 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." -->
 	<string name="auto_delete_msg_you_enabled">Your messages will disappear after %1$s. %2$s</string>
 	<!-- The placeholder at the end will add "Tap to learn more." -->
@@ -342,6 +333,18 @@
 	<string name="introduction_response_declined_received">%1$s declined the introduction to %2$s.</string>
 	<string name="introduction_response_declined_received_by_introducee">%1$s says that %2$s declined the introduction.</string>

+	<!-- Connect via Bluetooth -->
+
+	<string name="menu_item_connect_via_bluetooth">Connect via Bluetooth</string>
+	<string name="connect_via_bluetooth_title">Connect via Bluetooth</string>
+	<string name="connect_via_bluetooth_intro">In case Bluetooth connections do not work automatically, you can use this screen to connect manually.\n\nYour contact needs to be nearby for this to work.\n\nYou and your contact should both press \"Start\" at the same time.</string>
+	<string name="connect_via_bluetooth_already_discovering">Already trying to connect via Bluetooth. Please try again shortly.</string>
+	<string name="connect_via_bluetooth_no_location_permission">Cannot continue without location permission</string>
+	<string name="connect_via_bluetooth_start">Connecting via Bluetooth…</string>
+	<string name="connect_via_bluetooth_success">Successfully connected via Bluetooth</string>
+	<string name="connect_via_bluetooth_error">Could not connect via Bluetooth.</string>
+	<string name="connect_via_bluetooth_error_not_supported">Bluetooth is not supported by device.</string>
+
 	<!-- Private Groups -->
 	<string name="groups_list_empty">No groups to show</string>
 	<string name="groups_list_empty_action">Tap the + icon to create a group, or ask your contacts to share groups with you</string>
@@ -707,7 +710,6 @@
 	<string name="permission_hotspot_location_denied_body">You have denied access to your location, but Briar needs this permission to create a Wi-Fi hotspot.\n\nPlease consider granting access.</string>
 	<string name="wifi_settings_title">Wi-Fi setting</string>
 	<string name="wifi_settings_request_enable_body">To create a Wi-Fi hotspot, Briar needs to use Wi-Fi. Please enable it.</string>
-	<string name="wifi_settings_request_denied_body">You have denied permission to enable Wi-Fi, but Briar needs to use Wi-Fi.\n\nPlease consider enabling it.</string>

 	<string name="hotspot_tab_manual">Manual</string>
 	<!-- The placeholder to be inserted into the string 'hotspot_manual_wifi': People can connect by %s -->
@@ -766,8 +768,9 @@

 	<!-- Transfer Data via Removable Drives -->

-	<string name="removable_drive_menu_title">Transfer data</string>
-	<string name="removable_drive_intro">You can send encrypted messages to your contact using removable storage such as USB flash drives or SD cards.\n\nIf your contact has sent you a removable drive containing encrypted messages, you can import the messages into Briar by using the receive button below.</string>
+	<string name="removable_drive_menu_title">Connect via Removable Drive</string>
+	<string name="removable_drive_intro">If you can\'t connect to your contact via the Internet, Wi-Fi or Bluetooth, Briar can also transfer messages on a removable drive such as a USB stick or an SD card.</string>
+	<string name="removable_drive_explanation">If you can\'t connect to your contact via the Internet, Wi-Fi or Bluetooth, Briar can also transfer messages on a removable drive such as a USB stick or an SD card.\n\nWhen you use the \"Send Data\" button, any data that\'s waiting to be sent to the contact will be written to the removable drive. This includes private messages, attachments, blogs, forums and private groups.\n\nEverything will be encrypted before it is written to the removable drive.\n\nWhen your contact receives the removable drive, they can use the \"Receive Data\" button to import the messages into Briar.</string>
 	<string name="removable_drive_title_send">Send data</string>
 	<string name="removable_drive_title_receive">Receive data</string>
 	<string name="removable_drive_send_intro">Tap the button below to create a new file containing the encrypted messages. You can choose where the file will be saved.\n\nIf you want to save the file on a removable drive, insert the drive now.</string>
--- a/briar-headless/build.gradle
+++ b/briar-headless/build.gradle
@@ -65,6 +65,7 @@ void jarFactory(Jar jarTask, jarArchitecture) {
 						exclude "tor_" + arch + ".zip"
 					}
 				}
+				exclude 'META-INF/*.SF', 'META-INF/*.DSA', 'META-INF/*.RSA'
 			}
 	jarTask.with jar
 	jarTask.doLast {
--- a/briar-headless/src/main/java/org/briarproject/briar/headless/BriarService.kt
+++ b/briar-headless/src/main/java/org/briarproject/briar/headless/BriarService.kt
@@ -37,7 +37,7 @@ constructor(
                ?: throw UsageError("Could not get password. Is STDIN connected?")
            try {
                accountManager.signIn(password)
-            } catch (e : DecryptionException) {
+            } catch (e: DecryptionException) {
                echo("Error: Password invalid")
                exitProcess(1)
            }
--- a/briar-headless/src/main/java/org/briarproject/briar/headless/HeadlessModule.kt
+++ b/briar-headless/src/main/java/org/briarproject/briar/headless/HeadlessModule.kt
@@ -95,7 +95,6 @@ internal class HeadlessModule(private val appDir: File) {
        override fun shouldEnableImageAttachments() = false
        override fun shouldEnableProfilePictures() = false
        override fun shouldEnableDisappearingMessages() = false
-        override fun shouldEnableConnectViaBluetooth() = false
        override fun shouldEnableTransferData() = false
        override fun shouldEnableShareAppViaOfflineHotspot() = false
    }
--- a/briar-headless/src/main/java/org/briarproject/briar/headless/Router.kt
+++ b/briar-headless/src/main/java/org/briarproject/briar/headless/Router.kt
@@ -3,7 +3,11 @@ package org.briarproject.briar.headless
 import com.fasterxml.jackson.core.JsonParseException
 import com.fasterxml.jackson.databind.ObjectMapper
 import io.javalin.Javalin
-import io.javalin.apibuilder.ApiBuilder.*
+import io.javalin.apibuilder.ApiBuilder.delete
+import io.javalin.apibuilder.ApiBuilder.get
+import io.javalin.apibuilder.ApiBuilder.path
+import io.javalin.apibuilder.ApiBuilder.post
+import io.javalin.apibuilder.ApiBuilder.put
 import io.javalin.core.security.AccessManager
 import io.javalin.core.util.Header.AUTHORIZATION
 import io.javalin.http.BadRequestResponse
--- a/briar-headless/src/main/java/org/briarproject/briar/headless/blogs/OutputBlogPost.kt
+++ b/briar-headless/src/main/java/org/briarproject/briar/headless/blogs/OutputBlogPost.kt
@@ -6,16 +6,16 @@ import org.briarproject.briar.api.blog.MessageType
 import org.briarproject.briar.headless.json.JsonDict

 internal fun BlogPostHeader.output(text: String) = JsonDict(
-        "text" to text,
-        "author" to author.output(),
-        "authorStatus" to authorInfo.status.output(),
-        "type" to type.output(),
-        "id" to id.bytes,
-        "parentId" to parentId?.bytes,
-        "read" to isRead,
-        "rssFeed" to isRssFeed,
-        "timestamp" to timestamp,
-        "timestampReceived" to timeReceived
-    )
+    "text" to text,
+    "author" to author.output(),
+    "authorStatus" to authorInfo.status.output(),
+    "type" to type.output(),
+    "id" to id.bytes,
+    "parentId" to parentId?.bytes,
+    "read" to isRead,
+    "rssFeed" to isRssFeed,
+    "timestamp" to timestamp,
+    "timestampReceived" to timeReceived
+)

 internal fun MessageType.output() = name.toLowerCase()
--- a/briar-headless/src/main/java/org/briarproject/briar/headless/contact/OutputPendingContact.kt
+++ b/briar-headless/src/main/java/org/briarproject/briar/headless/contact/OutputPendingContact.kt
@@ -2,7 +2,11 @@ package org.briarproject.briar.headless.contact

 import org.briarproject.bramble.api.contact.PendingContact
 import org.briarproject.bramble.api.contact.PendingContactState
-import org.briarproject.bramble.api.contact.PendingContactState.*
+import org.briarproject.bramble.api.contact.PendingContactState.ADDING_CONTACT
+import org.briarproject.bramble.api.contact.PendingContactState.CONNECTING
+import org.briarproject.bramble.api.contact.PendingContactState.FAILED
+import org.briarproject.bramble.api.contact.PendingContactState.OFFLINE
+import org.briarproject.bramble.api.contact.PendingContactState.WAITING_FOR_CONNECTION
 import org.briarproject.bramble.api.contact.event.PendingContactAddedEvent
 import org.briarproject.bramble.api.contact.event.PendingContactRemovedEvent
 import org.briarproject.bramble.api.contact.event.PendingContactStateChangedEvent
@@ -14,7 +18,7 @@ internal fun PendingContact.output() = JsonDict(
    "timestamp" to timestamp
 )

-internal fun PendingContactState.output() = when(this) {
+internal fun PendingContactState.output() = when (this) {
    WAITING_FOR_CONNECTION -> "waiting_for_connection"
    OFFLINE -> "offline"
    CONNECTING -> "connecting"
--- a/briar-headless/src/test/java/org/briarproject/briar/headless/ControllerTest.kt
+++ b/briar-headless/src/test/java/org/briarproject/briar/headless/ControllerTest.kt
@@ -14,7 +14,12 @@ import org.briarproject.bramble.api.identity.LocalAuthor
 import org.briarproject.bramble.api.sync.Group
 import org.briarproject.bramble.api.sync.Message
 import org.briarproject.bramble.api.system.Clock
-import org.briarproject.bramble.test.TestUtils.*
+import org.briarproject.bramble.test.TestUtils.getAuthor
+import org.briarproject.bramble.test.TestUtils.getClientId
+import org.briarproject.bramble.test.TestUtils.getContact
+import org.briarproject.bramble.test.TestUtils.getGroup
+import org.briarproject.bramble.test.TestUtils.getLocalAuthor
+import org.briarproject.bramble.test.TestUtils.getMessage
 import org.briarproject.bramble.util.StringUtils.getRandomString
 import org.briarproject.briar.api.conversation.ConversationManager
 import org.briarproject.briar.headless.event.WebSocketController
--- a/briar-headless/src/test/java/org/briarproject/briar/headless/IntegrationTest.kt
+++ b/briar-headless/src/test/java/org/briarproject/briar/headless/IntegrationTest.kt
@@ -48,31 +48,31 @@ abstract class IntegrationTest {
        dataDir.deleteRecursively()
    }

-    protected fun get(url: String) : Response {
+    protected fun get(url: String): Response {
        return khttp.get(url, getAuthTokenHeader(token))
    }

-    protected fun getWithWrongToken(url: String) : Response {
+    protected fun getWithWrongToken(url: String): Response {
        return khttp.get(url, getAuthTokenHeader("wrongToken"))
    }

-    protected fun post(url: String, data: String) : Response {
+    protected fun post(url: String, data: String): Response {
        return khttp.post(url, getAuthTokenHeader(token), data = data)
    }

-    protected fun postWithWrongToken(url: String) : Response {
+    protected fun postWithWrongToken(url: String): Response {
        return khttp.post(url, getAuthTokenHeader("wrongToken"), data = "")
    }

-    protected fun delete(url: String) : Response {
+    protected fun delete(url: String): Response {
        return khttp.delete(url, getAuthTokenHeader(token))
    }

-    protected fun delete(url: String, data: String) : Response {
+    protected fun delete(url: String, data: String): Response {
        return khttp.delete(url, getAuthTokenHeader(token), data = data)
    }

-    protected fun deleteWithWrongToken(url: String) : Response {
+    protected fun deleteWithWrongToken(url: String): Response {
        return khttp.delete(url, getAuthTokenHeader("wrongToken"))
    }

--- a/briar-headless/src/test/java/org/briarproject/briar/headless/contact/ContactControllerIntegrationTest.kt
+++ b/briar-headless/src/test/java/org/briarproject/briar/headless/contact/ContactControllerIntegrationTest.kt
@@ -8,7 +8,7 @@ import org.junit.jupiter.api.Assertions.assertEquals
 import org.junit.jupiter.api.Assertions.assertTrue
 import org.junit.jupiter.api.Test

-class ContactControllerIntegrationTest: IntegrationTest() {
+class ContactControllerIntegrationTest : IntegrationTest() {

    @Test
    fun `returning list of contacts needs authentication token`() {
@@ -24,7 +24,7 @@ class ContactControllerIntegrationTest: IntegrationTest() {
        assertEquals(0, response.jsonArray.length())

        // add one test contact
-        val testContactName= "testContactName"
+        val testContactName = "testContactName"
        testDataCreator.addContact(testContactName, true, false)

        // retrieve list with one test contact
--- a/briar-headless/src/test/java/org/briarproject/briar/headless/contact/ContactControllerTest.kt
+++ b/briar-headless/src/test/java/org/briarproject/briar/headless/contact/ContactControllerTest.kt
@@ -1,8 +1,6 @@
 package org.briarproject.briar.headless.contact

 import io.javalin.http.BadRequestResponse
-import io.javalin.http.ForbiddenResponse
-import io.javalin.http.HttpResponseException
 import io.javalin.http.NotFoundResponse
 import io.javalin.plugin.json.JavalinJson.toJson
 import io.mockk.Runs
@@ -35,7 +33,6 @@ import org.briarproject.bramble.util.StringUtils.getRandomString
 import org.briarproject.briar.headless.ControllerTest
 import org.briarproject.briar.headless.getFromJson
 import org.briarproject.briar.headless.json.JsonDict
-import org.junit.jupiter.api.Assertions.assertEquals
 import org.junit.jupiter.api.Assertions.assertNotNull
 import org.junit.jupiter.api.Assertions.assertThrows
 import org.junit.jupiter.api.Test
@@ -316,7 +313,9 @@ internal class ContactControllerTest : ControllerTest() {
    fun testSetContactAliasInvalid() {
        mockkStatic("org.briarproject.briar.headless.RouterKt")
        every { ctx.pathParam("contactId") } returns "1"
-        every { ctx.getFromJson(objectMapper, "alias") } returns getRandomString(MAX_AUTHOR_NAME_LENGTH + 1)
+        every {
+            ctx.getFromJson(objectMapper, "alias")
+        } returns getRandomString(MAX_AUTHOR_NAME_LENGTH + 1)
        assertThrows(BadRequestResponse::class.java) {
            controller.setContactAlias(ctx)
        }
Author	SHA1	Message	Date
akwizgran	807677532c	Bump version numbers for 1.3.8 release.	2021-08-31 15:38:11 +01:00
Torsten Grote	7e9d64b6ad	Merge branch 'fix-headless-build' into 'master' Remove jar signatures to avoid SecurityException when repacking headless jar See merge request briar/briar!1532	2021-08-31 14:37:13 +00:00
akwizgran	f963c4cfdd	Remove jar signatures to avoid SecurityException when repacking headless jar.	2021-08-31 15:02:43 +01:00
akwizgran	7388da410f	Bump version numbers for 1.3.7 release.	2021-08-31 14:16:43 +01:00
akwizgran	3635c35923	Update translations.	2021-08-31 14:15:47 +01:00
akwizgran	7c1399c326	Merge branch 'simpler-hotspot-name-pass' into 'master' Limit hotspot name and password to only lowercase letters (on 29+) See merge request briar/briar!1520	2021-08-31 13:10:02 +00:00
akwizgran	c002cc2e73	Merge branch 'enable-connect-via-bluetooth' into 'master' Enable connect via Bluetooth feature in release builds See merge request briar/briar!1531	2021-08-31 13:07:59 +00:00
Torsten Grote	f3273260bb	Fix Kotlin coding style	2021-08-31 14:32:36 +02:00
Torsten Grote	abf99f0219	Merge branch '2148-shrink-hotspot-qr-codes' into 'master' Shrink QR code to avoid scrolling Closes #2148 See merge request briar/briar!1528	2021-08-31 12:21:16 +00:00
Torsten Grote	7405ed7196	Merge branch '2076-revise-transfer-data-explanation' into 'master' Revise removable drive ui after usability testing Closes #2076 See merge request briar/briar!1530	2021-08-31 12:11:11 +00:00
Daniel Lublin	b53203581c	Enable scrollbar for hotspot scrollviews	2021-08-31 12:10:40 +02:00
Daniel Lublin	d522942bdd	Enable scrollbar for scrollview	2021-08-31 12:02:39 +02:00
Daniel Lublin	802015d995	Shrink QR code to avoid scrolling	2021-08-31 09:09:10 +02:00
Daniel Lublin	c36352f2b8	Rename feature for user	2021-08-31 09:08:42 +02:00
Daniel Lublin	21a2f91521	Revise transfer data wording, adding explanation in fullscreen dialog	2021-08-31 09:08:40 +02:00
akwizgran	d8267ce559	Update code style settings.	2021-08-30 15:22:34 +01:00
akwizgran	8f887c609f	Enable connect via Bluetooth feature in release builds.	2021-08-30 15:17:53 +01:00
akwizgran	b077e5f94f	Update translations.	2021-08-30 15:03:57 +01:00
akwizgran	2b61b01b4e	Merge branch '2151-bluetooth-connect-ui' into 'master' Add simple UI for Connect via Bluetooth feature Closes #2151 and #1821 See merge request briar/briar!1524	2021-08-30 13:58:26 +00:00
Torsten Grote	822a58c8a6	Replace final Bluetooth connection fragments with toasts	2021-08-30 15:34:37 +02:00
Daniel Lublin	09b065f46e	Limit hotspot name and password to only lowercase letters (on 29+)	2021-08-23 10:44:42 +02:00
Torsten Grote	1be8ac6e14	Add simple UI for Connect via Bluetooth feature	2021-08-20 09:11:35 +02:00