bump version

* New translations AppResources.resx (French)

* New translations AppResources.resx (Catalan)

* New translations AppResources.resx (Danish)

* New translations AppResources.resx (German)

* New translations AppResources.resx (Greek)

* New translations AppResources.resx (Hungarian)

* New translations AppResources.resx (Dutch)

* New translations AppResources.resx (Portuguese)

* New translations AppResources.resx (Swedish)

* New translations AppResources.resx (Turkish)

* New translations AppResources.resx (Chinese Simplified)

* New translations AppResources.resx (Portuguese, Brazilian)

* New translations AppResources.resx (Estonian)

* New translations AppResources.resx (Hindi)

.github/workflows/build.yml

@@ -0,0 +1,51 @@
+name: Build
+
+on: push
+
+jobs:
+
+  android:
+
+    runs-on: windows-latest
+
+    steps:
+      - name: Set up NuGet
+        uses: nuget/setup-nuget@v1
+        with:
+          nuget-version: 'latest'
+
+      - name: Set up MSBuild
+        uses: microsoft/setup-msbuild@v1.0.0
+
+      - name: Print environment
+        run: |
+          nuget help
+          msbuild -version
+
+      - name: Checkout repo
+        uses: actions/checkout@v2
+
+      - name: Restore packages
+        run: nuget restore
+
+      - name: Build app
+        run: msbuild ./src/Android/Android.csproj /p:Configuration=Debug
+
+  ios:
+
+    runs-on: macos-latest
+
+    steps:
+      - name: Print environment
+        run: |
+          nuget help
+          msbuild -version
+
+      - name: Checkout repo
+        uses: actions/checkout@v2
+
+      - name: Restore packages
+        run: nuget restore
+
+      - name: Build app
+        run: msbuild ./src/iOS/iOS.csproj /verbosity:normal /p:Platform=iPhone /p:Configuration=Debug

bitwarden-mobile.sln

@@ -24,6 +24,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution
 		.editorconfig = .editorconfig
 		.gitignore = .gitignore
 		appveyor.yml = appveyor.yml
+		.github\workflows\build.yml = .github\workflows\build.yml
 		CONTRIBUTING.md = CONTRIBUTING.md
 		crowdin.yml = crowdin.yml
 		README.md = README.md
@@ -238,22 +239,22 @@ Global
 		{256F9E44-0AF5-4D97-A2F9-DA26080C0A5D}.Release|iPhoneSimulator.Build.0 = Release|Any CPU
 		{E71F3053-056C-4381-9638-048ED73BDFF6}.Ad-Hoc|Any CPU.ActiveCfg = Ad-Hoc|Any CPU
 		{E71F3053-056C-4381-9638-048ED73BDFF6}.Ad-Hoc|Any CPU.Build.0 = Ad-Hoc|Any CPU
-		{E71F3053-056C-4381-9638-048ED73BDFF6}.Ad-Hoc|iPhone.ActiveCfg = Ad-Hoc|Any CPU
-		{E71F3053-056C-4381-9638-048ED73BDFF6}.Ad-Hoc|iPhone.Build.0 = Ad-Hoc|Any CPU
-		{E71F3053-056C-4381-9638-048ED73BDFF6}.Ad-Hoc|iPhoneSimulator.ActiveCfg = Ad-Hoc|Any CPU
-		{E71F3053-056C-4381-9638-048ED73BDFF6}.Ad-Hoc|iPhoneSimulator.Build.0 = Ad-Hoc|Any CPU
+		{E71F3053-056C-4381-9638-048ED73BDFF6}.Ad-Hoc|iPhone.ActiveCfg = Ad-Hoc|iPhone
+		{E71F3053-056C-4381-9638-048ED73BDFF6}.Ad-Hoc|iPhone.Build.0 = Ad-Hoc|iPhone
+		{E71F3053-056C-4381-9638-048ED73BDFF6}.Ad-Hoc|iPhoneSimulator.ActiveCfg = Ad-Hoc|iPhoneSimulator
+		{E71F3053-056C-4381-9638-048ED73BDFF6}.Ad-Hoc|iPhoneSimulator.Build.0 = Ad-Hoc|iPhoneSimulator
 		{E71F3053-056C-4381-9638-048ED73BDFF6}.AppStore|Any CPU.ActiveCfg = AppStore|Any CPU
 		{E71F3053-056C-4381-9638-048ED73BDFF6}.AppStore|Any CPU.Build.0 = AppStore|Any CPU
-		{E71F3053-056C-4381-9638-048ED73BDFF6}.AppStore|iPhone.ActiveCfg = AppStore|Any CPU
-		{E71F3053-056C-4381-9638-048ED73BDFF6}.AppStore|iPhone.Build.0 = AppStore|Any CPU
-		{E71F3053-056C-4381-9638-048ED73BDFF6}.AppStore|iPhoneSimulator.ActiveCfg = AppStore|Any CPU
-		{E71F3053-056C-4381-9638-048ED73BDFF6}.AppStore|iPhoneSimulator.Build.0 = AppStore|Any CPU
+		{E71F3053-056C-4381-9638-048ED73BDFF6}.AppStore|iPhone.ActiveCfg = AppStore|iPhone
+		{E71F3053-056C-4381-9638-048ED73BDFF6}.AppStore|iPhone.Build.0 = AppStore|iPhone
+		{E71F3053-056C-4381-9638-048ED73BDFF6}.AppStore|iPhoneSimulator.ActiveCfg = AppStore|iPhoneSimulator
+		{E71F3053-056C-4381-9638-048ED73BDFF6}.AppStore|iPhoneSimulator.Build.0 = AppStore|iPhoneSimulator
 		{E71F3053-056C-4381-9638-048ED73BDFF6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{E71F3053-056C-4381-9638-048ED73BDFF6}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{E71F3053-056C-4381-9638-048ED73BDFF6}.Debug|iPhone.ActiveCfg = Debug|Any CPU
-		{E71F3053-056C-4381-9638-048ED73BDFF6}.Debug|iPhone.Build.0 = Debug|Any CPU
-		{E71F3053-056C-4381-9638-048ED73BDFF6}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU
-		{E71F3053-056C-4381-9638-048ED73BDFF6}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU
+		{E71F3053-056C-4381-9638-048ED73BDFF6}.Debug|iPhone.ActiveCfg = Debug|iPhone
+		{E71F3053-056C-4381-9638-048ED73BDFF6}.Debug|iPhone.Build.0 = Debug|iPhone
+		{E71F3053-056C-4381-9638-048ED73BDFF6}.Debug|iPhoneSimulator.ActiveCfg = Debug|iPhoneSimulator
+		{E71F3053-056C-4381-9638-048ED73BDFF6}.Debug|iPhoneSimulator.Build.0 = Debug|iPhoneSimulator
 		{E71F3053-056C-4381-9638-048ED73BDFF6}.FDroid|Any CPU.ActiveCfg = FDroid|Any CPU
 		{E71F3053-056C-4381-9638-048ED73BDFF6}.FDroid|Any CPU.Build.0 = FDroid|Any CPU
 		{E71F3053-056C-4381-9638-048ED73BDFF6}.FDroid|iPhone.ActiveCfg = FDroid|Any CPU

src/Android/Accessibility/AccessibilityHelpers.cs

@@ -70,6 +70,7 @@ namespace Bit.Droid.Accessibility
             new Browser("org.adblockplus.browser", "url_bar,url_bar_title"), // 2nd = Legacy (before v2)
             new Browser("org.adblockplus.browser.beta", "url_bar,url_bar_title"), // 2nd = Legacy (before v2)
             new Browser("org.bromite.bromite", "url_bar"),
+            new Browser("org.bromite.chromium", "url_bar"),
             new Browser("org.chromium.chrome", "url_bar"),
             new Browser("org.codeaurora.swe.browser", "url_bar"),
             new Browser("org.gnu.icecat", "url_bar_title,mozac_browser_toolbar_url_view"), // 2nd = Anticipation

src/Android/Android.csproj

@@ -150,6 +150,7 @@
     <None Include="ci-build-apks.ps1" />
     <GoogleServicesJson Include="google-services.json" />
     <GoogleServicesJson Include="google-services.json.enc" />
+    <None Include="fdroid-keystore.jks.enc" />
     <None Include="Properties\AndroidManifest.xml" />
     <None Include="upload-keystore.jks.enc" />
   </ItemGroup>

src/Android/Autofill/AutofillHelpers.cs

@@ -75,6 +75,7 @@ namespace Bit.Droid.Autofill
             "org.adblockplus.browser",
             "org.adblockplus.browser.beta",
             "org.bromite.bromite",
+            "org.bromite.chromium",
             "org.chromium.chrome",
             "org.codeaurora.swe.browser",
             "org.gnu.icecat",

src/Android/Properties/AndroidManifest.xml

@@ -3,7 +3,7 @@
   xmlns:android="http://schemas.android.com/apk/res/android"
   xmlns:tools="http://schemas.android.com/tools"
   android:versionCode="1"
-  android:versionName="2.4.0"
+  android:versionName="2.4.3"
   package="com.x8bit.bitwarden">
 
   <uses-sdk android:minSdkVersion="21" android:targetSdkVersion="29" />

src/Android/Resources/xml/autofillservice.xml

@@ -121,6 +121,9 @@
   <compatibility-package
     android:name="org.bromite.bromite"
     android:maxLongVersionCode="10000000000"/>
+  <compatibility-package
+    android:name="org.bromite.chromium"
+    android:maxLongVersionCode="10000000000"/>
   <compatibility-package
     android:name="org.chromium.chrome"
     android:maxLongVersionCode="10000000000"/>

src/Android/ci-build-apks.ps1

@@ -22,10 +22,12 @@ echo "##### Decrypt Keystore"
 echo "########################################"
 
 $encKeystorePath = $($rootPath + "\src\Android\8bit.keystore.enc");
+$encFdroidKeystorePath = $($rootPath + "\src\Android\fdroid-keystore.jks.enc");
 $encUploadKeystorePath = $($rootPath + "\src\Android\upload-keystore.jks.enc");
 $secureFilePath = $($rootPath + "\secure-file\tools\secure-file.exe");
 
 Invoke-Expression "& `"$secureFilePath`" -decrypt $($encKeystorePath) -secret $($env:keystore_dec_secret)"
+Invoke-Expression "& `"$secureFilePath`" -decrypt $($encFdroidKeystorePath) -secret $($env:fdroid_apk_keystore_dec_secret)"
 Invoke-Expression "& `"$secureFilePath`" -decrypt $($encUploadKeystorePath) -secret $($env:upload_keystore_dec_secret)"
 
 echo "########################################"
@@ -146,9 +148,10 @@ echo "########################################"
 msbuild "$($androidPath)" "/logger:C:\Program Files\AppVeyor\BuildAgent\Appveyor.MSBuildLogger.dll" `
     "/p:Configuration=FDroid"
 msbuild "$($androidPath)" "/t:SignAndroidPackage" "/p:Configuration=FDroid" "/p:AndroidKeyStore=true" `
-    "/p:AndroidSigningKeyAlias=bitwarden" "/p:AndroidSigningKeyPass=$($env:keystore_password)" `
-    "/p:AndroidSigningKeyStore=8bit.keystore" "/p:AndroidSigningStorePass=$($env:keystore_password)" "/v:quiet"
-	
+    "/p:AndroidSigningKeyAlias=bitwarden" "/p:AndroidSigningKeyPass=$($env:fdroid_apk_keystore_password)" `
+    "/p:AndroidSigningKeyStore=fdroid-keystore.jks" "/p:AndroidSigningStorePass=$($env:fdroid_apk_keystore_password)" `
+    "/v:quiet"
+
 echo "########################################"
 echo "##### Copy FDroid apk to project root"
 echo "########################################"

src/App/Pages/Settings/SettingsPage/SettingsPageViewModel.cs

@@ -112,7 +112,7 @@ namespace Bit.App.Pages
             {
                 fingerprint = await _cryptoService.GetFingerprintAsync(await _userService.GetUserIdAsync());
             }
-            catch (Exception e) when(e.Message == "No public key available.")
+            catch (Exception e) when (e.Message == "No public key available.")
             {
                 return;
             }
@@ -193,8 +193,10 @@ namespace Bit.App.Pages
 
         public async Task VaultTimeoutAsync()
         {
-            var options = _vaultTimeouts.Select(o => o.Key == _vaultTimeoutDisplayValue ? $"✓ {o.Key}" : o.Key).ToArray();
-            var selection = await Page.DisplayActionSheet(AppResources.VaultTimeout, AppResources.Cancel, null, options);
+            var options = _vaultTimeouts.Select(
+                o => o.Key == _vaultTimeoutDisplayValue ? $"✓ {o.Key}" : o.Key).ToArray();
+            var selection = await Page.DisplayActionSheet(AppResources.VaultTimeout,
+                AppResources.Cancel, null, options);
             if (selection == null || selection == AppResources.Cancel)
             {
                 return;
@@ -206,11 +208,13 @@ namespace Bit.App.Pages
                 GetVaultTimeoutActionFromKey(_vaultTimeoutActionDisplayValue));
             BuildList();
         }
-        
+
         public async Task VaultTimeoutActionAsync()
         {
-            var options = _vaultTimeoutActions.Select(o => o.Key == _vaultTimeoutActionDisplayValue ? $"✓ {o.Key}" : o.Key).ToArray();
-            var selection = await Page.DisplayActionSheet(AppResources.VaultTimeoutAction, AppResources.Cancel, null, options);
+            var options = _vaultTimeoutActions.Select(o =>
+                o.Key == _vaultTimeoutActionDisplayValue ? $"✓ {o.Key}" : o.Key).ToArray();
+            var selection = await Page.DisplayActionSheet(AppResources.VaultTimeoutAction,
+                AppResources.Cancel, null, options);
             if (selection == null || selection == AppResources.Cancel)
             {
                 return;
@@ -227,9 +231,14 @@ namespace Bit.App.Pages
                 }
             }
             var selectionOption = _vaultTimeoutActions.FirstOrDefault(o => o.Key == cleanSelection);
+            var changed = _vaultTimeoutActionDisplayValue != selectionOption.Key;
             _vaultTimeoutActionDisplayValue = selectionOption.Key;
             await _vaultTimeoutService.SetVaultTimeoutOptionsAsync(GetVaultTimeoutFromKey(_vaultTimeoutDisplayValue),
                 selectionOption.Value);
+            if (changed)
+            {
+                _messagingService.Send("vaultTimeoutActionChanged");
+            }
             BuildList();
         }
 
@@ -349,7 +358,11 @@ namespace Bit.App.Pages
             var securityItems = new List<SettingsPageListItem>
             {
                 new SettingsPageListItem { Name = AppResources.VaultTimeout, SubLabel = _vaultTimeoutDisplayValue },
-                new SettingsPageListItem { Name = AppResources.VaultTimeoutAction, SubLabel = _vaultTimeoutActionDisplayValue },
+                new SettingsPageListItem 
+                {
+                    Name = AppResources.VaultTimeoutAction,
+                    SubLabel = _vaultTimeoutActionDisplayValue
+                },
                 new SettingsPageListItem
                 {
                     Name = AppResources.UnlockWithPIN,

src/App/Resources/AppResources.af.resx

@@ -518,23 +518,29 @@
   <data name="Lock" xml:space="preserve">
     <value>Lock</value>
   </data>
-  <data name="LockOption15Minutes" xml:space="preserve">
+  <data name="FifteenMinutes" xml:space="preserve">
     <value>15 minutes</value>
   </data>
-  <data name="LockOption1Hour" xml:space="preserve">
+  <data name="OneHour" xml:space="preserve">
     <value>1 hour</value>
   </data>
-  <data name="LockOption1Minute" xml:space="preserve">
+  <data name="OneMinute" xml:space="preserve">
     <value>1 minute</value>
   </data>
-  <data name="LockOption4Hours" xml:space="preserve">
+  <data name="FourHours" xml:space="preserve">
     <value>4 hours</value>
   </data>
-  <data name="LockOptionImmediately" xml:space="preserve">
+  <data name="Immediately" xml:space="preserve">
     <value>Immediately</value>
   </data>
-  <data name="LockOptions" xml:space="preserve">
-    <value>Lock Options</value>
+  <data name="VaultTimeout" xml:space="preserve">
+    <value>Vault Timeout</value>
+  </data>
+  <data name="VaultTimeoutAction" xml:space="preserve">
+    <value>Vault Timeout Action</value>
+  </data>
+  <data name="VaultTimeoutLogOutConfirmation" xml:space="preserve">
+    <value>Logging out will remove all access to your vault and requires online authentication after the timeout period. Are you sure you want to use this setting?</value>
   </data>
   <data name="LoggingIn" xml:space="preserve">
     <value>Logging in...</value>
@@ -1433,12 +1439,9 @@
   <data name="Unlock" xml:space="preserve">
     <value>Unlock</value>
   </data>
-  <data name="LockOption30Minutes" xml:space="preserve">
+  <data name="ThirtyMinutes" xml:space="preserve">
     <value>30 minutes</value>
   </data>
-  <data name="LockOption5Minutes" xml:space="preserve">
-    <value>5 minutes</value>
-  </data>
   <data name="SetPINDescription" xml:space="preserve">
     <value>Set your PIN code for unlocking Bitwarden. Your PIN settings will be reset if you ever fully log out of the application.</value>
   </data>
@@ -1463,9 +1466,6 @@
   <data name="FiveMinutes" xml:space="preserve">
     <value>5 minutes</value>
   </data>
-  <data name="OneMinute" xml:space="preserve">
-    <value>1 minute</value>
-  </data>
   <data name="TenSeconds" xml:space="preserve">
     <value>10 seconds</value>
   </data>
@@ -1517,7 +1517,7 @@
     <value>Are you sure you want to exit Bitwarden?</value>
   </data>
   <data name="PINRequireMasterPasswordRestart" xml:space="preserve">
-    <value>Do you want to require unlocking with your master password when the application is restarted?</value>
+    <value>You you want to require unlocking with your master password when the application is restarted?</value>
   </data>
   <data name="Black" xml:space="preserve">
     <value>Black</value>
@@ -1535,7 +1535,7 @@
   <data name="DisableSavePromptDescription" xml:space="preserve">
     <value>The "Save Prompt" automatically prompts you to save new items to your vault whenever you enter them for the first time.</value>
   </data>
-  <data name="LockOptionOnRestart" xml:space="preserve">
+  <data name="OnRestart" xml:space="preserve">
     <value>On App Restart</value>
   </data>
   <data name="AutofillServiceNotEnabled" xml:space="preserve">

src/App/Resources/AppResources.be.resx

@@ -518,23 +518,29 @@
   <data name="Lock" xml:space="preserve">
     <value>Заблакіраваць</value>
   </data>
-  <data name="LockOption15Minutes" xml:space="preserve">
-    <value>15 хвілін</value>
+  <data name="FifteenMinutes" xml:space="preserve">
+    <value>15 minutes</value>
   </data>
-  <data name="LockOption1Hour" xml:space="preserve">
-    <value>1 гадзіна</value>
+  <data name="OneHour" xml:space="preserve">
+    <value>1 hour</value>
   </data>
-  <data name="LockOption1Minute" xml:space="preserve">
+  <data name="OneMinute" xml:space="preserve">
     <value>1 хвіліна</value>
   </data>
-  <data name="LockOption4Hours" xml:space="preserve">
-    <value>4 гадзіны</value>
+  <data name="FourHours" xml:space="preserve">
+    <value>4 hours</value>
   </data>
-  <data name="LockOptionImmediately" xml:space="preserve">
-    <value>Адразу</value>
+  <data name="Immediately" xml:space="preserve">
+    <value>Immediately</value>
   </data>
-  <data name="LockOptions" xml:space="preserve">
-    <value>Параметры блакіроўкі</value>
+  <data name="VaultTimeout" xml:space="preserve">
+    <value>Vault Timeout</value>
+  </data>
+  <data name="VaultTimeoutAction" xml:space="preserve">
+    <value>Vault Timeout Action</value>
+  </data>
+  <data name="VaultTimeoutLogOutConfirmation" xml:space="preserve">
+    <value>Logging out will remove all access to your vault and requires online authentication after the timeout period. Are you sure you want to use this setting?</value>
   </data>
   <data name="LoggingIn" xml:space="preserve">
     <value>Уваход...</value>
@@ -1433,11 +1439,8 @@
   <data name="Unlock" xml:space="preserve">
     <value>Разблакіраваць</value>
   </data>
-  <data name="LockOption30Minutes" xml:space="preserve">
-    <value>30 хвілін</value>
-  </data>
-  <data name="LockOption5Minutes" xml:space="preserve">
-    <value>5 хвілін</value>
+  <data name="ThirtyMinutes" xml:space="preserve">
+    <value>30 minutes</value>
   </data>
   <data name="SetPINDescription" xml:space="preserve">
     <value>Задайце PIN-код для разблакіроўкі Bitwarden. Налады PIN-кода будуць скінуты, калі вы калі-небудзь цалкам выйдзеце з праграмы.</value>
@@ -1463,9 +1466,6 @@
   <data name="FiveMinutes" xml:space="preserve">
     <value>5 хвілін</value>
   </data>
-  <data name="OneMinute" xml:space="preserve">
-    <value>1 хвіліна</value>
-  </data>
   <data name="TenSeconds" xml:space="preserve">
     <value>10 секунд</value>
   </data>
@@ -1535,8 +1535,8 @@
   <data name="DisableSavePromptDescription" xml:space="preserve">
     <value>Апавяшчэнне аб захаванні аўтаматычна прапануе вам захаваць новыя элементы ў сховішчы пасля іх дадання.</value>
   </data>
-  <data name="LockOptionOnRestart" xml:space="preserve">
-    <value>Пры перазапуску</value>
+  <data name="OnRestart" xml:space="preserve">
+    <value>On App Restart</value>
   </data>
   <data name="AutofillServiceNotEnabled" xml:space="preserve">
     <value>Аўтазапаўненне спрашчае бяспечны доступ да вашага сховішча Bitwarden з другіх вэб-сайтаў і праграм. Здаецца, вы не уключылі службу аўтазапаўнення Bitwarden. Гэта можна зрабіць у наладах.</value>

src/App/Resources/AppResources.bg.resx

@@ -518,23 +518,29 @@
   <data name="Lock" xml:space="preserve">
     <value>Заключване</value>
   </data>
-  <data name="LockOption15Minutes" xml:space="preserve">
-    <value>15 минути</value>
+  <data name="FifteenMinutes" xml:space="preserve">
+    <value>15 minutes</value>
   </data>
-  <data name="LockOption1Hour" xml:space="preserve">
-    <value>1 час</value>
+  <data name="OneHour" xml:space="preserve">
+    <value>1 hour</value>
   </data>
-  <data name="LockOption1Minute" xml:space="preserve">
+  <data name="OneMinute" xml:space="preserve">
     <value>1 минута</value>
   </data>
-  <data name="LockOption4Hours" xml:space="preserve">
-    <value>4 часа</value>
+  <data name="FourHours" xml:space="preserve">
+    <value>4 hours</value>
   </data>
-  <data name="LockOptionImmediately" xml:space="preserve">
-    <value>Незабавно</value>
+  <data name="Immediately" xml:space="preserve">
+    <value>Immediately</value>
   </data>
-  <data name="LockOptions" xml:space="preserve">
-    <value>Настройки на заключването</value>
+  <data name="VaultTimeout" xml:space="preserve">
+    <value>Vault Timeout</value>
+  </data>
+  <data name="VaultTimeoutAction" xml:space="preserve">
+    <value>Vault Timeout Action</value>
+  </data>
+  <data name="VaultTimeoutLogOutConfirmation" xml:space="preserve">
+    <value>Logging out will remove all access to your vault and requires online authentication after the timeout period. Are you sure you want to use this setting?</value>
   </data>
   <data name="LoggingIn" xml:space="preserve">
     <value>Вписване…</value>
@@ -1433,11 +1439,8 @@
   <data name="Unlock" xml:space="preserve">
     <value>Отключване</value>
   </data>
-  <data name="LockOption30Minutes" xml:space="preserve">
-    <value>30 минути</value>
-  </data>
-  <data name="LockOption5Minutes" xml:space="preserve">
-    <value>5 минути</value>
+  <data name="ThirtyMinutes" xml:space="preserve">
+    <value>30 minutes</value>
   </data>
   <data name="SetPINDescription" xml:space="preserve">
     <value>Задайте ПИН за отключване на Битуорден. Настройките за ПИН се изчистват при всяко пълно излизане от програмата.</value>
@@ -1463,9 +1466,6 @@
   <data name="FiveMinutes" xml:space="preserve">
     <value>5 минути</value>
   </data>
-  <data name="OneMinute" xml:space="preserve">
-    <value>1 минута</value>
-  </data>
   <data name="TenSeconds" xml:space="preserve">
     <value>10 секунди</value>
   </data>
@@ -1535,8 +1535,8 @@
   <data name="DisableSavePromptDescription" xml:space="preserve">
     <value>Дали да бъдете автоматично подканени да запазите в трезора данни за вписване, които въвеждате за първи път.</value>
   </data>
-  <data name="LockOptionOnRestart" xml:space="preserve">
-    <value>При повторно пускане</value>
+  <data name="OnRestart" xml:space="preserve">
+    <value>On App Restart</value>
   </data>
   <data name="AutofillServiceNotEnabled" xml:space="preserve">
     <value>Автоматичното дописване позволява сигурен достъп до трезора от сайтове и приложения. Изглежда не сте включили тази възможност в Битуорден, можете да го направите от екрана за настройките.</value>

src/App/Resources/AppResources.ca.resx

@@ -518,23 +518,29 @@
   <data name="Lock" xml:space="preserve">
     <value>Bloqueja</value>
   </data>
-  <data name="LockOption15Minutes" xml:space="preserve">
+  <data name="FifteenMinutes" xml:space="preserve">
     <value>15 minuts</value>
   </data>
-  <data name="LockOption1Hour" xml:space="preserve">
+  <data name="OneHour" xml:space="preserve">
     <value>1 hora</value>
   </data>
-  <data name="LockOption1Minute" xml:space="preserve">
+  <data name="OneMinute" xml:space="preserve">
     <value>1 minut</value>
   </data>
-  <data name="LockOption4Hours" xml:space="preserve">
+  <data name="FourHours" xml:space="preserve">
     <value>4 hores</value>
   </data>
-  <data name="LockOptionImmediately" xml:space="preserve">
+  <data name="Immediately" xml:space="preserve">
     <value>Immediatament</value>
   </data>
-  <data name="LockOptions" xml:space="preserve">
-    <value>Opcions de bloqueig</value>
+  <data name="VaultTimeout" xml:space="preserve">
+    <value>Temps d'espera de la caixa forta</value>
+  </data>
+  <data name="VaultTimeoutAction" xml:space="preserve">
+    <value>Acció del temps d'espera de la caixa forta</value>
+  </data>
+  <data name="VaultTimeoutLogOutConfirmation" xml:space="preserve">
+    <value>En tancar la sessió s'eliminarà tot l'accés a la vostra caixa forta i es requerirà una autenticació en línia després del període de temps d'espera. Esteu segur que voleu utilitzar aquesta configuració?</value>
   </data>
   <data name="LoggingIn" xml:space="preserve">
     <value>S'està iniciant sessió...</value>
@@ -1433,12 +1439,9 @@
   <data name="Unlock" xml:space="preserve">
     <value>Desbloqueja</value>
   </data>
-  <data name="LockOption30Minutes" xml:space="preserve">
+  <data name="ThirtyMinutes" xml:space="preserve">
     <value>30 minuts</value>
   </data>
-  <data name="LockOption5Minutes" xml:space="preserve">
-    <value>5 minuts</value>
-  </data>
   <data name="SetPINDescription" xml:space="preserve">
     <value>Estableix el teu codi PIN per desbloquejar Bitwarden. La configuració PIN es restablirà si tanqueu sessió de manera completa de l'aplicació.</value>
   </data>
@@ -1463,9 +1466,6 @@
   <data name="FiveMinutes" xml:space="preserve">
     <value>5 minuts</value>
   </data>
-  <data name="OneMinute" xml:space="preserve">
-    <value>1 minut</value>
-  </data>
   <data name="TenSeconds" xml:space="preserve">
     <value>10 segons</value>
   </data>
@@ -1535,8 +1535,8 @@
   <data name="DisableSavePromptDescription" xml:space="preserve">
     <value>"Guarda elements nous" demanarà automàticament que guardeu elements nous al magatzem cada volta que els introduïu per primera vegada.</value>
   </data>
-  <data name="LockOptionOnRestart" xml:space="preserve">
-    <value>En reiniciar aplicació</value>
+  <data name="OnRestart" xml:space="preserve">
+    <value>En reiniciar l'aplicació</value>
   </data>
   <data name="AutofillServiceNotEnabled" xml:space="preserve">
     <value>L'emplenament automàtic facilita l'accés de forma segura a la vostra caixa forta de Bitwarden des d'altres llocs web i aplicacions. Sembla que no heu habilitat un servei d’emplenament automàtic per a Bitwarden. Habiliteu-lo a la pantalla "Configuració".</value>

src/App/Resources/AppResources.cs.resx

@@ -518,23 +518,29 @@
   <data name="Lock" xml:space="preserve">
     <value>Zamknout</value>
   </data>
-  <data name="LockOption15Minutes" xml:space="preserve">
-    <value>Po 15 minutách</value>
+  <data name="FifteenMinutes" xml:space="preserve">
+    <value>15 minutes</value>
   </data>
-  <data name="LockOption1Hour" xml:space="preserve">
-    <value>Po 1 hodině</value>
+  <data name="OneHour" xml:space="preserve">
+    <value>1 hour</value>
   </data>
-  <data name="LockOption1Minute" xml:space="preserve">
-    <value>Po 1 minutě</value>
+  <data name="OneMinute" xml:space="preserve">
+    <value>1 minuta</value>
   </data>
-  <data name="LockOption4Hours" xml:space="preserve">
-    <value>Po 4 hodinách</value>
+  <data name="FourHours" xml:space="preserve">
+    <value>4 hours</value>
   </data>
-  <data name="LockOptionImmediately" xml:space="preserve">
-    <value>Okamžitě</value>
+  <data name="Immediately" xml:space="preserve">
+    <value>Immediately</value>
   </data>
-  <data name="LockOptions" xml:space="preserve">
-    <value>Možnosti zamknutí</value>
+  <data name="VaultTimeout" xml:space="preserve">
+    <value>Vault Timeout</value>
+  </data>
+  <data name="VaultTimeoutAction" xml:space="preserve">
+    <value>Vault Timeout Action</value>
+  </data>
+  <data name="VaultTimeoutLogOutConfirmation" xml:space="preserve">
+    <value>Logging out will remove all access to your vault and requires online authentication after the timeout period. Are you sure you want to use this setting?</value>
   </data>
   <data name="LoggingIn" xml:space="preserve">
     <value>Přihlašování…</value>
@@ -1132,7 +1138,7 @@
     <value>V této složce nejsou žádné položky.</value>
   </data>
   <data name="NoItemsTrash" xml:space="preserve">
-    <value>There are no items in the trash.</value>
+    <value>V koši nejsou žádné položky.</value>
   </data>
   <data name="AutofillAccessibilityService" xml:space="preserve">
     <value>Služba přístupnosti</value>
@@ -1433,11 +1439,8 @@
   <data name="Unlock" xml:space="preserve">
     <value>Odemknout</value>
   </data>
-  <data name="LockOption30Minutes" xml:space="preserve">
-    <value>Po 30 minutách</value>
-  </data>
-  <data name="LockOption5Minutes" xml:space="preserve">
-    <value>Po 5 minutách</value>
+  <data name="ThirtyMinutes" xml:space="preserve">
+    <value>30 minutes</value>
   </data>
   <data name="SetPINDescription" xml:space="preserve">
     <value>Nastavte svůj PIN kód pro odemknutí trezoru. Pokud se zcela odhlásíte z aplikace bude váš současný PIN bude resetován.</value>
@@ -1463,9 +1466,6 @@
   <data name="FiveMinutes" xml:space="preserve">
     <value>5 minut</value>
   </data>
-  <data name="OneMinute" xml:space="preserve">
-    <value>1 minuta</value>
-  </data>
   <data name="TenSeconds" xml:space="preserve">
     <value>10 sekund</value>
   </data>
@@ -1535,8 +1535,8 @@
   <data name="DisableSavePromptDescription" xml:space="preserve">
     <value>„Výzva k uložení“ vás automaticky vyzve k uložení nových položek do trezoru, kdykoli je poprvé zadáte.</value>
   </data>
-  <data name="LockOptionOnRestart" xml:space="preserve">
-    <value>Při restartu aplikace</value>
+  <data name="OnRestart" xml:space="preserve">
+    <value>On App Restart</value>
   </data>
   <data name="AutofillServiceNotEnabled" xml:space="preserve">
     <value>Automatické vyplňování usnadňuje bezpečný přístup k trezoru Bitwarden z jiných webových stránek a aplikací. Vypadá to, že jste službu Bitwarden nepovolili. Povolte automatické vyplnění pro Bitwarden z obrazovky „Nastavení“.</value>
@@ -1629,49 +1629,49 @@
     <value>Příloha byla úspěšně uložena</value>
   </data>
   <data name="AutofillTileAccessibilityRequired" xml:space="preserve">
-    <value>Please enable "Auto-fill Accessibility Service" from Bitwarden Settings to use the Auto-fill tile.</value>
+    <value>Povolte službu automatického vyplnění v nastavení Bitwarden pro použití dlaždice automatického vyplnění.</value>
   </data>
   <data name="AutofillTileUriNotFound" xml:space="preserve">
     <value>Nenalezena žádná pole pro hesla</value>
   </data>
   <data name="SoftDeleting" xml:space="preserve">
-    <value>Sending to trash...</value>
+    <value>Přesouvání do koše…</value>
     <comment>Message shown when interacting with the server</comment>
   </data>
   <data name="ItemSoftDeleted" xml:space="preserve">
-    <value>Item has been sent to trash.</value>
+    <value>Položka byla přesunuta do koše.</value>
     <comment>Confirmation message after successfully soft-deleting a login</comment>
   </data>
   <data name="Restore" xml:space="preserve">
-    <value>Restore</value>
+    <value>Obnovit</value>
     <comment>Restores an entity (verb).</comment>
   </data>
   <data name="Restoring" xml:space="preserve">
-    <value>Restoring...</value>
+    <value>Obnovování…</value>
     <comment>Message shown when interacting with the server</comment>
   </data>
   <data name="ItemRestored" xml:space="preserve">
-    <value>Item has been restored.</value>
+    <value>Položka byla obnovena.</value>
     <comment>Confirmation message after successfully restoring a soft-deleted item</comment>
   </data>
   <data name="Trash" xml:space="preserve">
-    <value>Trash</value>
+    <value>Koš</value>
     <comment>(noun) Location of deleted items which have not yet been permanently deleted</comment>
   </data>
   <data name="SearchTrash" xml:space="preserve">
-    <value>Search trash</value>
+    <value>Hledat v koši</value>
     <comment>(action prompt) Label for the search text field when viewing the trash folder</comment>
   </data>
   <data name="DoYouReallyWantToPermanentlyDeleteCipher" xml:space="preserve">
-    <value>Do you really want to permanently delete? This cannot be undone.</value>
+    <value>Opravdu chcete trvale smazat tuto položku? Akce je nevratná.</value>
     <comment>Confirmation alert message when permanently deleteing a cipher.</comment>
   </data>
   <data name="DoYouReallyWantToRestoreCipher" xml:space="preserve">
-    <value>Do you really want to restore this item?</value>
+    <value>Opravdu chcete tuto položku obnovit?</value>
     <comment>Confirmation alert message when restoring a soft-deleted cipher.</comment>
   </data>
   <data name="DoYouReallyWantToSoftDeleteCipher" xml:space="preserve">
-    <value>Do you really want to send to the trash?</value>
+    <value>Opravdu chcete položku přesunout do koše?</value>
     <comment>Confirmation alert message when soft-deleting a cipher.</comment>
   </data>
 </root>

src/App/Resources/AppResources.da.resx

@@ -518,23 +518,29 @@
   <data name="Lock" xml:space="preserve">
     <value>Lås</value>
   </data>
-  <data name="LockOption15Minutes" xml:space="preserve">
+  <data name="FifteenMinutes" xml:space="preserve">
     <value>15 minutter</value>
   </data>
-  <data name="LockOption1Hour" xml:space="preserve">
+  <data name="OneHour" xml:space="preserve">
     <value>1 time</value>
   </data>
-  <data name="LockOption1Minute" xml:space="preserve">
+  <data name="OneMinute" xml:space="preserve">
     <value>1 minut</value>
   </data>
-  <data name="LockOption4Hours" xml:space="preserve">
+  <data name="FourHours" xml:space="preserve">
     <value>4 timer</value>
   </data>
-  <data name="LockOptionImmediately" xml:space="preserve">
+  <data name="Immediately" xml:space="preserve">
     <value>Straks</value>
   </data>
-  <data name="LockOptions" xml:space="preserve">
-    <value>Låseindstillinger</value>
+  <data name="VaultTimeout" xml:space="preserve">
+    <value>Boks-timeout</value>
+  </data>
+  <data name="VaultTimeoutAction" xml:space="preserve">
+    <value>Boks-timeout handling</value>
+  </data>
+  <data name="VaultTimeoutLogOutConfirmation" xml:space="preserve">
+    <value>Udlogning vil fjerne al adgang til din boks og vil kræve online-godkendelse efter timeout-perioden. Sikker på, at du vil benytte denne indstilling?</value>
   </data>
   <data name="LoggingIn" xml:space="preserve">
     <value>Logger ind...</value>
@@ -1433,12 +1439,9 @@
   <data name="Unlock" xml:space="preserve">
     <value>Lås op</value>
   </data>
-  <data name="LockOption30Minutes" xml:space="preserve">
+  <data name="ThirtyMinutes" xml:space="preserve">
     <value>30 minutter</value>
   </data>
-  <data name="LockOption5Minutes" xml:space="preserve">
-    <value>5 minutter</value>
-  </data>
   <data name="SetPINDescription" xml:space="preserve">
     <value>Indstil din pinkode til at låse Bitwarden op. Dine pin-indstillinger nulstilles, hvis du nogensinde logger helt ud af app'en.</value>
   </data>
@@ -1463,9 +1466,6 @@
   <data name="FiveMinutes" xml:space="preserve">
     <value>5 minutter</value>
   </data>
-  <data name="OneMinute" xml:space="preserve">
-    <value>1 minut</value>
-  </data>
   <data name="TenSeconds" xml:space="preserve">
     <value>10 sekunder</value>
   </data>
@@ -1535,7 +1535,7 @@
   <data name="DisableSavePromptDescription" xml:space="preserve">
     <value>"Gem"-forespørgslen beder dig automatisk gemme nye emner i din boks, når du angiver dem for første gang.</value>
   </data>
-  <data name="LockOptionOnRestart" xml:space="preserve">
+  <data name="OnRestart" xml:space="preserve">
     <value>Ved app-genstart</value>
   </data>
   <data name="AutofillServiceNotEnabled" xml:space="preserve">

src/App/Resources/AppResources.de.resx

@@ -518,23 +518,29 @@
   <data name="Lock" xml:space="preserve">
     <value>Sperren</value>
   </data>
-  <data name="LockOption15Minutes" xml:space="preserve">
+  <data name="FifteenMinutes" xml:space="preserve">
     <value>15 Minuten</value>
   </data>
-  <data name="LockOption1Hour" xml:space="preserve">
+  <data name="OneHour" xml:space="preserve">
     <value>1 Stunde</value>
   </data>
-  <data name="LockOption1Minute" xml:space="preserve">
+  <data name="OneMinute" xml:space="preserve">
     <value>1 Minute</value>
   </data>
-  <data name="LockOption4Hours" xml:space="preserve">
+  <data name="FourHours" xml:space="preserve">
     <value>4 Stunden</value>
   </data>
-  <data name="LockOptionImmediately" xml:space="preserve">
+  <data name="Immediately" xml:space="preserve">
     <value>Sofort</value>
   </data>
-  <data name="LockOptions" xml:space="preserve">
-    <value>Sperroptionen</value>
+  <data name="VaultTimeout" xml:space="preserve">
+    <value>Tresor-Timeout</value>
+  </data>
+  <data name="VaultTimeoutAction" xml:space="preserve">
+    <value>Aktion bei Tresor-Timeout</value>
+  </data>
+  <data name="VaultTimeoutLogOutConfirmation" xml:space="preserve">
+    <value>Nach dem Ausloggen verlieren Sie jeglichen Zugriff auf Ihren Tresor und es ist nach Ablauf der Timeout-Zeit eine Online-Authentifizierung erforderlich. Sind Sie sicher, dass Sie diese Einstellung nutzen möchten?</value>
   </data>
   <data name="LoggingIn" xml:space="preserve">
     <value>Anmeldung läuft...</value>
@@ -1433,12 +1439,9 @@
   <data name="Unlock" xml:space="preserve">
     <value>Entsperren</value>
   </data>
-  <data name="LockOption30Minutes" xml:space="preserve">
+  <data name="ThirtyMinutes" xml:space="preserve">
     <value>30 Minuten</value>
   </data>
-  <data name="LockOption5Minutes" xml:space="preserve">
-    <value>5 Minuten</value>
-  </data>
   <data name="SetPINDescription" xml:space="preserve">
     <value>Legen Sie Ihre PIN für das Entsperren von Bitwarden fest. Ihre PIN-Einstellungen werden zurückgesetzt, wenn Sie sich jemals vollständig aus der Anwendung abmelden.</value>
   </data>
@@ -1463,9 +1466,6 @@
   <data name="FiveMinutes" xml:space="preserve">
     <value>5 Minuten</value>
   </data>
-  <data name="OneMinute" xml:space="preserve">
-    <value>1 Minute</value>
-  </data>
   <data name="TenSeconds" xml:space="preserve">
     <value>10 Sekunden</value>
   </data>
@@ -1517,7 +1517,7 @@
     <value>Sind Sie sicher, dass Sie Bitwarden verlassen möchten?</value>
   </data>
   <data name="PINRequireMasterPasswordRestart" xml:space="preserve">
-    <value>Do you want to require unlocking with your master password when the application is restarted?</value>
+    <value>Möchten Sie mit Ihrem Master-Passwort entsperren, wenn die Anwendung neu gestartet wird?</value>
   </data>
   <data name="Black" xml:space="preserve">
     <value>Schwarz</value>
@@ -1527,7 +1527,7 @@
     <value>Gesperrte URIs</value>
   </data>
   <data name="BlacklistedUrisDescription" xml:space="preserve">
-    <value>URIs that are blacklisted will not offer auto-fill. The list of apps should be comma separated. Ex: "https://twitter.com, androidapp://com.twitter.android".</value>
+    <value>URIs auf der Sperrliste, werden nicht automatisch ausgefüllt. Die Listeneinträge sollten durch Komma getrennt sein. Z.B.: "https://twitter.com, androidapp://com.twitter.android".</value>
   </data>
   <data name="DisableSavePrompt" xml:space="preserve">
     <value>Speichern-Prompt deaktivieren</value>
@@ -1535,8 +1535,8 @@
   <data name="DisableSavePromptDescription" xml:space="preserve">
     <value>Der "Speichern-Prompt" fordert Sie automatisch dazu auf, neue Einträge in den Tresor zu speichern, wenn Sie sie zum ersten Mal eingeben.</value>
   </data>
-  <data name="LockOptionOnRestart" xml:space="preserve">
-    <value>Bei App Neustart</value>
+  <data name="OnRestart" xml:space="preserve">
+    <value>Beim Neustart der App</value>
   </data>
   <data name="AutofillServiceNotEnabled" xml:space="preserve">
     <value>Durch automatisches Füllen ist es leicht, auf Ihren Bitwarden Tresor von anderen Webseiten und Apps sicher zuzugreifen. Es sieht aus, als ob Sie den Automatisches Fülldienst für Bitwarden nicht aktiviert haben. Aktivieren Sie automatisches Füllen im "Einstellungen"-Bildschirm.</value>
@@ -1567,10 +1567,10 @@
     <value>Biometrische Daten zur Verifizierung nutzen.</value>
   </data>
   <data name="Biometrics" xml:space="preserve">
-    <value>Biometrisch</value>
+    <value>Biometrie</value>
   </data>
   <data name="UseBiometricsToUnlock" xml:space="preserve">
-    <value>Biometrische Daten zum entsperren verwenden</value>
+    <value>Biometrie zum Entsperren verwenden</value>
   </data>
   <data name="AccessibilityOverlayPermissionAlert" xml:space="preserve">
     <value>Bitwarden braucht Aufmerksamkeit - Siehe "Auto-Fill-Bedienungshilfe" in den Bitwarden-Einstellungen</value>

src/App/Resources/AppResources.el.resx

@@ -519,23 +519,29 @@
   <data name="Lock" xml:space="preserve">
     <value>Κλείδωμα</value>
   </data>
-  <data name="LockOption15Minutes" xml:space="preserve">
+  <data name="FifteenMinutes" xml:space="preserve">
     <value>15 λεπτά</value>
   </data>
-  <data name="LockOption1Hour" xml:space="preserve">
+  <data name="OneHour" xml:space="preserve">
     <value>1 ώρα</value>
   </data>
-  <data name="LockOption1Minute" xml:space="preserve">
+  <data name="OneMinute" xml:space="preserve">
     <value>1 λεπτό</value>
   </data>
-  <data name="LockOption4Hours" xml:space="preserve">
+  <data name="FourHours" xml:space="preserve">
     <value>4 ώρες</value>
   </data>
-  <data name="LockOptionImmediately" xml:space="preserve">
+  <data name="Immediately" xml:space="preserve">
     <value>Άμεσα</value>
   </data>
-  <data name="LockOptions" xml:space="preserve">
-    <value>Επιλογές Κλειδώματος</value>
+  <data name="VaultTimeout" xml:space="preserve">
+    <value>Χρόνος Λήξης Vault</value>
+  </data>
+  <data name="VaultTimeoutAction" xml:space="preserve">
+    <value>Ενέργεια Χρόνου Λήξης Vault</value>
+  </data>
+  <data name="VaultTimeoutLogOutConfirmation" xml:space="preserve">
+    <value>Η αποσύνδεση θα καταργήσει όλη την πρόσβαση στο vault σας και απαιτεί online έλεγχο ταυτότητας μετά το χρονικό όριο λήξης. Είστε βέβαιοι ότι θέλετε να χρησιμοποιήσετε αυτήν τη ρύθμιση;</value>
   </data>
   <data name="LoggingIn" xml:space="preserve">
     <value>Σύνδεση...</value>
@@ -1133,7 +1139,7 @@
     <value>Δεν υπάρχουν στοιχεία σε αυτόν τον φάκελο.</value>
   </data>
   <data name="NoItemsTrash" xml:space="preserve">
-    <value>There are no items in the trash.</value>
+    <value>Δεν υπάρχουν αντικείμενα στον κάδο απορριμμάτων.</value>
   </data>
   <data name="AutofillAccessibilityService" xml:space="preserve">
     <value>Υπηρεσία προσβασιμότητας αυτόματης συμπλήρωσης</value>
@@ -1434,12 +1440,9 @@
   <data name="Unlock" xml:space="preserve">
     <value>Ξεκλείδωμα</value>
   </data>
-  <data name="LockOption30Minutes" xml:space="preserve">
+  <data name="ThirtyMinutes" xml:space="preserve">
     <value>30 λεπτά</value>
   </data>
-  <data name="LockOption5Minutes" xml:space="preserve">
-    <value>5 λεπτά</value>
-  </data>
   <data name="SetPINDescription" xml:space="preserve">
     <value>Ορίστε τον κωδικό PIN για να ξεκλειδώσετε το Bitwarden. Οι ρυθμίσεις PIN θα επαναρυθμιστούν αν αποσυνδεθείτε πλήρως από την εφαρμογή.</value>
   </data>
@@ -1464,9 +1467,6 @@
   <data name="FiveMinutes" xml:space="preserve">
     <value>5 λεπτά</value>
   </data>
-  <data name="OneMinute" xml:space="preserve">
-    <value>1 λεπτό</value>
-  </data>
   <data name="TenSeconds" xml:space="preserve">
     <value>10 δευτερόλεπτα</value>
   </data>
@@ -1536,7 +1536,7 @@
   <data name="DisableSavePromptDescription" xml:space="preserve">
     <value>Η "προτροπή αποθήκευσης" σας ζητάει αυτόματα να αποθηκεύετε νέα στοιχεία στο vault σας, κάθε φορά που τα εισάγετε για πρώτη φορά.</value>
   </data>
-  <data name="LockOptionOnRestart" xml:space="preserve">
+  <data name="OnRestart" xml:space="preserve">
     <value>Κατά την Επανεκκίνηση Εφαρμογής</value>
   </data>
   <data name="AutofillServiceNotEnabled" xml:space="preserve">
@@ -1636,43 +1636,43 @@
     <value>Δεν εντοπίστηκαν πεδία κωδικού πρόσβασης</value>
   </data>
   <data name="SoftDeleting" xml:space="preserve">
-    <value>Sending to trash...</value>
+    <value>Αποστολή στον κάδο απορριμμάτων ...</value>
     <comment>Message shown when interacting with the server</comment>
   </data>
   <data name="ItemSoftDeleted" xml:space="preserve">
-    <value>Item has been sent to trash.</value>
+    <value>Το στοιχείο έχει σταλεί στον κάδο απορριμμάτων.</value>
     <comment>Confirmation message after successfully soft-deleting a login</comment>
   </data>
   <data name="Restore" xml:space="preserve">
-    <value>Restore</value>
+    <value>Ανάκτηση</value>
     <comment>Restores an entity (verb).</comment>
   </data>
   <data name="Restoring" xml:space="preserve">
-    <value>Restoring...</value>
+    <value>Γίνεται επαναφορά...</value>
     <comment>Message shown when interacting with the server</comment>
   </data>
   <data name="ItemRestored" xml:space="preserve">
-    <value>Item has been restored.</value>
+    <value>Το στοιχείο έχει ανακτηθεί.</value>
     <comment>Confirmation message after successfully restoring a soft-deleted item</comment>
   </data>
   <data name="Trash" xml:space="preserve">
-    <value>Trash</value>
+    <value>Κάδος</value>
     <comment>(noun) Location of deleted items which have not yet been permanently deleted</comment>
   </data>
   <data name="SearchTrash" xml:space="preserve">
-    <value>Search trash</value>
+    <value>Αναζήτηση Κάδου</value>
     <comment>(action prompt) Label for the search text field when viewing the trash folder</comment>
   </data>
   <data name="DoYouReallyWantToPermanentlyDeleteCipher" xml:space="preserve">
-    <value>Do you really want to permanently delete? This cannot be undone.</value>
+    <value>Θέλετε πραγματικά να διαγράψετε οριστικά; Αυτό δεν μπορεί να αναιρεθεί.</value>
     <comment>Confirmation alert message when permanently deleteing a cipher.</comment>
   </data>
   <data name="DoYouReallyWantToRestoreCipher" xml:space="preserve">
-    <value>Do you really want to restore this item?</value>
+    <value>Θέλετε πραγματικά να επαναφέρετε αυτό το στοιχείο;</value>
     <comment>Confirmation alert message when restoring a soft-deleted cipher.</comment>
   </data>
   <data name="DoYouReallyWantToSoftDeleteCipher" xml:space="preserve">
-    <value>Do you really want to send to the trash?</value>
+    <value>Θέλετε πραγματικά να στείλετε στον κάδο απορριμμάτων;</value>
     <comment>Confirmation alert message when soft-deleting a cipher.</comment>
   </data>
 </root>

src/App/Resources/AppResources.en-GB.resx

@@ -518,23 +518,29 @@
   <data name="Lock" xml:space="preserve">
     <value>Lock</value>
   </data>
-  <data name="LockOption15Minutes" xml:space="preserve">
+  <data name="FifteenMinutes" xml:space="preserve">
     <value>15 minutes</value>
   </data>
-  <data name="LockOption1Hour" xml:space="preserve">
+  <data name="OneHour" xml:space="preserve">
     <value>1 hour</value>
   </data>
-  <data name="LockOption1Minute" xml:space="preserve">
+  <data name="OneMinute" xml:space="preserve">
     <value>1 minute</value>
   </data>
-  <data name="LockOption4Hours" xml:space="preserve">
+  <data name="FourHours" xml:space="preserve">
     <value>4 hours</value>
   </data>
-  <data name="LockOptionImmediately" xml:space="preserve">
+  <data name="Immediately" xml:space="preserve">
     <value>Immediately</value>
   </data>
-  <data name="LockOptions" xml:space="preserve">
-    <value>Lock options</value>
+  <data name="VaultTimeout" xml:space="preserve">
+    <value>Vault Timeout</value>
+  </data>
+  <data name="VaultTimeoutAction" xml:space="preserve">
+    <value>Vault Timeout Action</value>
+  </data>
+  <data name="VaultTimeoutLogOutConfirmation" xml:space="preserve">
+    <value>Logging out will remove all access to your vault and requires online authentication after the timeout period. Are you sure you want to use this setting?</value>
   </data>
   <data name="LoggingIn" xml:space="preserve">
     <value>Logging in...</value>
@@ -1433,12 +1439,9 @@
   <data name="Unlock" xml:space="preserve">
     <value>Unlock</value>
   </data>
-  <data name="LockOption30Minutes" xml:space="preserve">
+  <data name="ThirtyMinutes" xml:space="preserve">
     <value>30 minutes</value>
   </data>
-  <data name="LockOption5Minutes" xml:space="preserve">
-    <value>5 minutes</value>
-  </data>
   <data name="SetPINDescription" xml:space="preserve">
     <value>Set your PIN code for unlocking Bitwarden. Your PIN settings will be reset if you ever fully log out of the application.</value>
   </data>
@@ -1463,9 +1466,6 @@
   <data name="FiveMinutes" xml:space="preserve">
     <value>5 minutes</value>
   </data>
-  <data name="OneMinute" xml:space="preserve">
-    <value>1 minute</value>
-  </data>
   <data name="TenSeconds" xml:space="preserve">
     <value>10 seconds</value>
   </data>
@@ -1535,8 +1535,8 @@
   <data name="DisableSavePromptDescription" xml:space="preserve">
     <value>The "save prompt" automatically prompts you to save new items to your vault whenever you enter them for the first time.</value>
   </data>
-  <data name="LockOptionOnRestart" xml:space="preserve">
-    <value>On app restart</value>
+  <data name="OnRestart" xml:space="preserve">
+    <value>On App Restart</value>
   </data>
   <data name="AutofillServiceNotEnabled" xml:space="preserve">
     <value>Auto-fill makes it easy to securely access your Bitwarden vault from other websites and apps. It looks like you have not enabled an auto-fill service for Bitwarden. Enable auto-fill for Bitwarden from the "Settings" screen.</value>

src/App/Resources/AppResources.es.resx

@@ -518,23 +518,29 @@
   <data name="Lock" xml:space="preserve">
     <value>Bloquear</value>
   </data>
-  <data name="LockOption15Minutes" xml:space="preserve">
-    <value>15 minutos</value>
+  <data name="FifteenMinutes" xml:space="preserve">
+    <value>15 minutes</value>
   </data>
-  <data name="LockOption1Hour" xml:space="preserve">
-    <value>1 hora</value>
+  <data name="OneHour" xml:space="preserve">
+    <value>1 hour</value>
   </data>
-  <data name="LockOption1Minute" xml:space="preserve">
+  <data name="OneMinute" xml:space="preserve">
     <value>1 minuto</value>
   </data>
-  <data name="LockOption4Hours" xml:space="preserve">
-    <value>4 horas</value>
+  <data name="FourHours" xml:space="preserve">
+    <value>4 hours</value>
   </data>
-  <data name="LockOptionImmediately" xml:space="preserve">
-    <value>Inmediatamente</value>
+  <data name="Immediately" xml:space="preserve">
+    <value>Immediately</value>
   </data>
-  <data name="LockOptions" xml:space="preserve">
-    <value>Opciones de bloqueo</value>
+  <data name="VaultTimeout" xml:space="preserve">
+    <value>Vault Timeout</value>
+  </data>
+  <data name="VaultTimeoutAction" xml:space="preserve">
+    <value>Vault Timeout Action</value>
+  </data>
+  <data name="VaultTimeoutLogOutConfirmation" xml:space="preserve">
+    <value>Logging out will remove all access to your vault and requires online authentication after the timeout period. Are you sure you want to use this setting?</value>
   </data>
   <data name="LoggingIn" xml:space="preserve">
     <value>Iniciando sesión...</value>
@@ -1132,7 +1138,7 @@
     <value>No hay elementos en esta carpeta.</value>
   </data>
   <data name="NoItemsTrash" xml:space="preserve">
-    <value>There are no items in the trash.</value>
+    <value>No hay elementos en la papelera.</value>
   </data>
   <data name="AutofillAccessibilityService" xml:space="preserve">
     <value>Servicio de accesibilidad de autorellenado</value>
@@ -1433,11 +1439,8 @@
   <data name="Unlock" xml:space="preserve">
     <value>Desbloquear</value>
   </data>
-  <data name="LockOption30Minutes" xml:space="preserve">
-    <value>30 minutos</value>
-  </data>
-  <data name="LockOption5Minutes" xml:space="preserve">
-    <value>5 minutos</value>
+  <data name="ThirtyMinutes" xml:space="preserve">
+    <value>30 minutes</value>
   </data>
   <data name="SetPINDescription" xml:space="preserve">
     <value>Establece tu código PIN para desbloquear Bitwarden. Tus ajustes de PIN se reiniciarán si alguna vez cierras tu sesión completamente de la aplicación.</value>
@@ -1463,9 +1466,6 @@
   <data name="FiveMinutes" xml:space="preserve">
     <value>5 minutos</value>
   </data>
-  <data name="OneMinute" xml:space="preserve">
-    <value>1 minuto</value>
-  </data>
   <data name="TenSeconds" xml:space="preserve">
     <value>10 segundos</value>
   </data>
@@ -1517,7 +1517,7 @@
     <value>¿Estás seguro de que deseas salir de Bitwarden?</value>
   </data>
   <data name="PINRequireMasterPasswordRestart" xml:space="preserve">
-    <value>Do you want to require unlocking with your master password when the application is restarted?</value>
+    <value>You you want to require unlocking with your master password when the application is restarted?</value>
   </data>
   <data name="Black" xml:space="preserve">
     <value>Negro</value>
@@ -1535,8 +1535,8 @@
   <data name="DisableSavePromptDescription" xml:space="preserve">
     <value>La "Notificación para añadir entradas" pregunta automáticamente si quieres salvar nuevas entradas en tu caja fuerte cuando te identificas en un sitio web por primera vez.</value>
   </data>
-  <data name="LockOptionOnRestart" xml:space="preserve">
-    <value>Al reiniciar la App</value>
+  <data name="OnRestart" xml:space="preserve">
+    <value>On App Restart</value>
   </data>
   <data name="AutofillServiceNotEnabled" xml:space="preserve">
     <value>El autocompletado facilita el acceso seguro a la caja fuerte de Bitwarden desde otros sitios web y aplicaciones. Parece que no has habilitado un servicio de autocompletado para Bitwarden. Habilita el autocompletado para Bitwarden desde la pantalla "Ajustes".</value>
@@ -1635,43 +1635,43 @@
     <value>No se han detectado campos de contraseña</value>
   </data>
   <data name="SoftDeleting" xml:space="preserve">
-    <value>Sending to trash...</value>
+    <value>Enviando a la papelera...</value>
     <comment>Message shown when interacting with the server</comment>
   </data>
   <data name="ItemSoftDeleted" xml:space="preserve">
-    <value>Item has been sent to trash.</value>
+    <value>El elemento ha sido enviado a la papelera.</value>
     <comment>Confirmation message after successfully soft-deleting a login</comment>
   </data>
   <data name="Restore" xml:space="preserve">
-    <value>Restore</value>
+    <value>Restaurar</value>
     <comment>Restores an entity (verb).</comment>
   </data>
   <data name="Restoring" xml:space="preserve">
-    <value>Restoring...</value>
+    <value>Restaurando...</value>
     <comment>Message shown when interacting with the server</comment>
   </data>
   <data name="ItemRestored" xml:space="preserve">
-    <value>Item has been restored.</value>
+    <value>El elemento ha sido restaurado.</value>
     <comment>Confirmation message after successfully restoring a soft-deleted item</comment>
   </data>
   <data name="Trash" xml:space="preserve">
-    <value>Trash</value>
+    <value>Papelera</value>
     <comment>(noun) Location of deleted items which have not yet been permanently deleted</comment>
   </data>
   <data name="SearchTrash" xml:space="preserve">
-    <value>Search trash</value>
+    <value>Buscar en la papelera</value>
     <comment>(action prompt) Label for the search text field when viewing the trash folder</comment>
   </data>
   <data name="DoYouReallyWantToPermanentlyDeleteCipher" xml:space="preserve">
-    <value>Do you really want to permanently delete? This cannot be undone.</value>
+    <value>¿Seguro que quieres eliminarlo permanentemente? Esto no se puede deshacer.</value>
     <comment>Confirmation alert message when permanently deleteing a cipher.</comment>
   </data>
   <data name="DoYouReallyWantToRestoreCipher" xml:space="preserve">
-    <value>Do you really want to restore this item?</value>
+    <value>¿Seguro que quieres restaurar este elemento?</value>
     <comment>Confirmation alert message when restoring a soft-deleted cipher.</comment>
   </data>
   <data name="DoYouReallyWantToSoftDeleteCipher" xml:space="preserve">
-    <value>Do you really want to send to the trash?</value>
+    <value>¿Seguro que quieres enviarlo a la papelera?</value>
     <comment>Confirmation alert message when soft-deleting a cipher.</comment>
   </data>
 </root>

src/App/Resources/AppResources.et.resx

@@ -518,23 +518,29 @@
   <data name="Lock" xml:space="preserve">
     <value>Lukusta</value>
   </data>
-  <data name="LockOption15Minutes" xml:space="preserve">
+  <data name="FifteenMinutes" xml:space="preserve">
     <value>15 minuti pärast</value>
   </data>
-  <data name="LockOption1Hour" xml:space="preserve">
+  <data name="OneHour" xml:space="preserve">
     <value>1 tunni pärast</value>
   </data>
-  <data name="LockOption1Minute" xml:space="preserve">
+  <data name="OneMinute" xml:space="preserve">
     <value>1 minuti pärast</value>
   </data>
-  <data name="LockOption4Hours" xml:space="preserve">
+  <data name="FourHours" xml:space="preserve">
     <value>4 tunni pärast</value>
   </data>
-  <data name="LockOptionImmediately" xml:space="preserve">
+  <data name="Immediately" xml:space="preserve">
     <value>Koheselt</value>
   </data>
-  <data name="LockOptions" xml:space="preserve">
-    <value>Lukustamine</value>
+  <data name="VaultTimeout" xml:space="preserve">
+    <value>Hoidla ajalõpp</value>
+  </data>
+  <data name="VaultTimeoutAction" xml:space="preserve">
+    <value>Hoidla ajalõpu tegevus</value>
+  </data>
+  <data name="VaultTimeoutLogOutConfirmation" xml:space="preserve">
+    <value>Väljalogimine eemaldab hoidlale ligipääsu ning nõuab pärast ajalõpu perioodi uuesti autentimist. Oled kindel, et soovid seda valikut kasutada?</value>
   </data>
   <data name="LoggingIn" xml:space="preserve">
     <value>Sisselogimine...</value>
@@ -1433,12 +1439,9 @@
   <data name="Unlock" xml:space="preserve">
     <value>Lukusta lahti</value>
   </data>
-  <data name="LockOption30Minutes" xml:space="preserve">
+  <data name="ThirtyMinutes" xml:space="preserve">
     <value>30 minuti pärast</value>
   </data>
-  <data name="LockOption5Minutes" xml:space="preserve">
-    <value>5 minuti pärast</value>
-  </data>
   <data name="SetPINDescription" xml:space="preserve">
     <value>Määra Bitwardeni lahtilukustamiseks PIN kood. Rakendusest täielikult välja logides nullitakse ka PIN koodi seaded.</value>
   </data>
@@ -1463,9 +1466,6 @@
   <data name="FiveMinutes" xml:space="preserve">
     <value>5 minuti pärast</value>
   </data>
-  <data name="OneMinute" xml:space="preserve">
-    <value>1 minuti pärast</value>
-  </data>
   <data name="TenSeconds" xml:space="preserve">
     <value>10 sekundi pärast</value>
   </data>
@@ -1517,7 +1517,7 @@
     <value>Kas soovid tõesti Bitwardeni sulgeda?</value>
   </data>
   <data name="PINRequireMasterPasswordRestart" xml:space="preserve">
-    <value>Do you want to require unlocking with your master password when the application is restarted?</value>
+    <value>You you want to require unlocking with your master password when the application is restarted?</value>
   </data>
   <data name="Black" xml:space="preserve">
     <value>Must</value>
@@ -1535,7 +1535,7 @@
   <data name="DisableSavePromptDescription" xml:space="preserve">
     <value>"Lisa konto andmed" märguanne ilmub pärast esimest sisselogimist ning võimaldab kontoandmeid salvestada.</value>
   </data>
-  <data name="LockOptionOnRestart" xml:space="preserve">
+  <data name="OnRestart" xml:space="preserve">
     <value>Äpi taaskäivitamisel</value>
   </data>
   <data name="AutofillServiceNotEnabled" xml:space="preserve">

src/App/Resources/AppResources.fa.resx

@@ -518,23 +518,29 @@
   <data name="Lock" xml:space="preserve">
     <value>قفل</value>
   </data>
-  <data name="LockOption15Minutes" xml:space="preserve">
+  <data name="FifteenMinutes" xml:space="preserve">
     <value>۱۵ دقیقه</value>
   </data>
-  <data name="LockOption1Hour" xml:space="preserve">
+  <data name="OneHour" xml:space="preserve">
     <value>۱ ساعت</value>
   </data>
-  <data name="LockOption1Minute" xml:space="preserve">
+  <data name="OneMinute" xml:space="preserve">
     <value>۱ دقیقه</value>
   </data>
-  <data name="LockOption4Hours" xml:space="preserve">
+  <data name="FourHours" xml:space="preserve">
     <value>۴ ساعت</value>
   </data>
-  <data name="LockOptionImmediately" xml:space="preserve">
+  <data name="Immediately" xml:space="preserve">
     <value>بلافاصله</value>
   </data>
-  <data name="LockOptions" xml:space="preserve">
-    <value>گزینه‌های قفل</value>
+  <data name="VaultTimeout" xml:space="preserve">
+    <value>متوقف شدن گاو‌صندوق</value>
+  </data>
+  <data name="VaultTimeoutAction" xml:space="preserve">
+    <value>عمل متوقف شدن گاو‌صندوق</value>
+  </data>
+  <data name="VaultTimeoutLogOutConfirmation" xml:space="preserve">
+    <value>خروج از سیستم تمام دسترسی ها به گاو‌صندوق شما را از بین می برد و نیاز به احراز هویت آنلاین پس از مدت زمان توقف دارد. آیا مطمئن هستید که می خواهید از این تنظیمات استفاده کنید؟</value>
   </data>
   <data name="LoggingIn" xml:space="preserve">
     <value>در حال ورود...</value>
@@ -1433,12 +1439,9 @@
   <data name="Unlock" xml:space="preserve">
     <value>باز کردن قفل</value>
   </data>
-  <data name="LockOption30Minutes" xml:space="preserve">
+  <data name="ThirtyMinutes" xml:space="preserve">
     <value>۳۰ دقیقه</value>
   </data>
-  <data name="LockOption5Minutes" xml:space="preserve">
-    <value>۵ دقیقه</value>
-  </data>
   <data name="SetPINDescription" xml:space="preserve">
     <value>پین کد خود را برای باز کردن بیت واردن خود استفاده کنید. اگر به صورت کامل از حساب خود خارج شوید تنظیمات پین شما ریست می شود.</value>
   </data>
@@ -1463,9 +1466,6 @@
   <data name="FiveMinutes" xml:space="preserve">
     <value>۵ دقیقه</value>
   </data>
-  <data name="OneMinute" xml:space="preserve">
-    <value>۱ دقیقه</value>
-  </data>
   <data name="TenSeconds" xml:space="preserve">
     <value>۱۰ ثانیه</value>
   </data>
@@ -1517,7 +1517,7 @@
     <value>آیا مطمئنید که می‌خواهید از Bitwarden خارج شوید؟</value>
   </data>
   <data name="PINRequireMasterPasswordRestart" xml:space="preserve">
-    <value>Do you want to require unlocking with your master password when the application is restarted?</value>
+    <value>You you want to require unlocking with your master password when the application is restarted?</value>
   </data>
   <data name="Black" xml:space="preserve">
     <value>سیاه</value>
@@ -1535,7 +1535,7 @@
   <data name="DisableSavePromptDescription" xml:space="preserve">
     <value>"ذخیره سریع" به صورت خودکار باعث افزایش سرعت شما برای ذخیره موارد جدید در گاوصندوقتان می شود زمانی که شما آنها را برای اولین بار وارد میکند.</value>
   </data>
-  <data name="LockOptionOnRestart" xml:space="preserve">
+  <data name="OnRestart" xml:space="preserve">
     <value>راه اندازی مجدد در برنامه</value>
   </data>
   <data name="AutofillServiceNotEnabled" xml:space="preserve">

src/App/Resources/AppResources.fi.resx

@@ -518,23 +518,29 @@
   <data name="Lock" xml:space="preserve">
     <value>Lukitse</value>
   </data>
-  <data name="LockOption15Minutes" xml:space="preserve">
-    <value>15 minuuttia</value>
+  <data name="FifteenMinutes" xml:space="preserve">
+    <value>15 minutes</value>
   </data>
-  <data name="LockOption1Hour" xml:space="preserve">
-    <value>1 tunti</value>
+  <data name="OneHour" xml:space="preserve">
+    <value>1 hour</value>
   </data>
-  <data name="LockOption1Minute" xml:space="preserve">
+  <data name="OneMinute" xml:space="preserve">
     <value>1 minuutti</value>
   </data>
-  <data name="LockOption4Hours" xml:space="preserve">
-    <value>4 tuntia</value>
+  <data name="FourHours" xml:space="preserve">
+    <value>4 hours</value>
   </data>
-  <data name="LockOptionImmediately" xml:space="preserve">
-    <value>Välittömästi</value>
+  <data name="Immediately" xml:space="preserve">
+    <value>Immediately</value>
   </data>
-  <data name="LockOptions" xml:space="preserve">
-    <value>Lukitseminen</value>
+  <data name="VaultTimeout" xml:space="preserve">
+    <value>Vault Timeout</value>
+  </data>
+  <data name="VaultTimeoutAction" xml:space="preserve">
+    <value>Vault Timeout Action</value>
+  </data>
+  <data name="VaultTimeoutLogOutConfirmation" xml:space="preserve">
+    <value>Logging out will remove all access to your vault and requires online authentication after the timeout period. Are you sure you want to use this setting?</value>
   </data>
   <data name="LoggingIn" xml:space="preserve">
     <value>Kirjaudutaan sisään…</value>
@@ -1433,11 +1439,8 @@
   <data name="Unlock" xml:space="preserve">
     <value>Avaa</value>
   </data>
-  <data name="LockOption30Minutes" xml:space="preserve">
-    <value>30 minuuttia</value>
-  </data>
-  <data name="LockOption5Minutes" xml:space="preserve">
-    <value>5 minuuttia</value>
+  <data name="ThirtyMinutes" xml:space="preserve">
+    <value>30 minutes</value>
   </data>
   <data name="SetPINDescription" xml:space="preserve">
     <value>Aseta PIN-koodi Bitwardenin avaamista varten. PIN-asetukset nollautuvat, jos kirjaudut täysin ulos sovelluksesta.</value>
@@ -1463,9 +1466,6 @@
   <data name="FiveMinutes" xml:space="preserve">
     <value>5 minuuttia</value>
   </data>
-  <data name="OneMinute" xml:space="preserve">
-    <value>1 minuutti</value>
-  </data>
   <data name="TenSeconds" xml:space="preserve">
     <value>10 sekuntia</value>
   </data>
@@ -1535,8 +1535,8 @@
   <data name="DisableSavePromptDescription" xml:space="preserve">
     <value>Tallennuskehote kysyy, haluatko tallentaa kirjautumistiedot holviisi, kun kirjaudut sivustoille ensimmäistä kertaa.</value>
   </data>
-  <data name="LockOptionOnRestart" xml:space="preserve">
-    <value>Sovellusta uudelleenkäynnistettäessä</value>
+  <data name="OnRestart" xml:space="preserve">
+    <value>On App Restart</value>
   </data>
   <data name="AutofillServiceNotEnabled" xml:space="preserve">
     <value>Automaattinen täyttö tekee Bitwarden-holviiisi pääsystä muista ohjelmista ja sivustoista helppoa. Et näytä kytkeneen automaattista täyttöä päälle. Voit tehdä sen Asetukset-näytöstä.</value>

src/App/Resources/AppResources.fr.resx

@@ -518,23 +518,29 @@
   <data name="Lock" xml:space="preserve">
     <value>Verrouiller</value>
   </data>
-  <data name="LockOption15Minutes" xml:space="preserve">
+  <data name="FifteenMinutes" xml:space="preserve">
     <value>15 minutes</value>
   </data>
-  <data name="LockOption1Hour" xml:space="preserve">
+  <data name="OneHour" xml:space="preserve">
     <value>1 heure</value>
   </data>
-  <data name="LockOption1Minute" xml:space="preserve">
+  <data name="OneMinute" xml:space="preserve">
     <value>1 minute</value>
   </data>
-  <data name="LockOption4Hours" xml:space="preserve">
+  <data name="FourHours" xml:space="preserve">
     <value>4 heures</value>
   </data>
-  <data name="LockOptionImmediately" xml:space="preserve">
+  <data name="Immediately" xml:space="preserve">
     <value>Immédiatement</value>
   </data>
-  <data name="LockOptions" xml:space="preserve">
-    <value>Options de verrouillage</value>
+  <data name="VaultTimeout" xml:space="preserve">
+    <value>Délai d'expiration du coffre</value>
+  </data>
+  <data name="VaultTimeoutAction" xml:space="preserve">
+    <value>Action lors de l'expiration du délai du coffre</value>
+  </data>
+  <data name="VaultTimeoutLogOutConfirmation" xml:space="preserve">
+    <value>La déconnexion supprimera tous les accès à votre coffre et nécessite une authentification en ligne après la période d'expiration. Êtes-vous sûr de vouloir utiliser ce paramètre ?</value>
   </data>
   <data name="LoggingIn" xml:space="preserve">
     <value>Identification...</value>
@@ -1433,12 +1439,9 @@
   <data name="Unlock" xml:space="preserve">
     <value>Déverrouiller</value>
   </data>
-  <data name="LockOption30Minutes" xml:space="preserve">
+  <data name="ThirtyMinutes" xml:space="preserve">
     <value>30 minutes</value>
   </data>
-  <data name="LockOption5Minutes" xml:space="preserve">
-    <value>5 minutes</value>
-  </data>
   <data name="SetPINDescription" xml:space="preserve">
     <value>Définissez votre code PIN pour déverrouiller Bitwarden. Les paramètres relatifs à votre code PIN seront réinitialisés si vous vous déconnectez complètement de l'application.</value>
   </data>
@@ -1463,9 +1466,6 @@
   <data name="FiveMinutes" xml:space="preserve">
     <value>5 minutes</value>
   </data>
-  <data name="OneMinute" xml:space="preserve">
-    <value>1 minute</value>
-  </data>
   <data name="TenSeconds" xml:space="preserve">
     <value>10 secondes</value>
   </data>
@@ -1535,7 +1535,7 @@
   <data name="DisableSavePromptDescription" xml:space="preserve">
     <value>La "Demande d'enregistrement" vous invite automatiquement à enregistrer de nouveaux éléments dans votre coffre à chaque fois que vous les entrez pour la première fois.</value>
   </data>
-  <data name="LockOptionOnRestart" xml:space="preserve">
+  <data name="OnRestart" xml:space="preserve">
     <value>Au redémarrage de l'application</value>
   </data>
   <data name="AutofillServiceNotEnabled" xml:space="preserve">

src/App/Resources/AppResources.he.resx

@@ -518,23 +518,29 @@
   <data name="Lock" xml:space="preserve">
     <value>נעל</value>
   </data>
-  <data name="LockOption15Minutes" xml:space="preserve">
-    <value>15 דקות</value>
+  <data name="FifteenMinutes" xml:space="preserve">
+    <value>15 minutes</value>
   </data>
-  <data name="LockOption1Hour" xml:space="preserve">
-    <value>שעה</value>
+  <data name="OneHour" xml:space="preserve">
+    <value>1 hour</value>
   </data>
-  <data name="LockOption1Minute" xml:space="preserve">
-    <value>דקה</value>
+  <data name="OneMinute" xml:space="preserve">
+    <value>דקה אחת</value>
   </data>
-  <data name="LockOption4Hours" xml:space="preserve">
-    <value>4 שעות</value>
+  <data name="FourHours" xml:space="preserve">
+    <value>4 hours</value>
   </data>
-  <data name="LockOptionImmediately" xml:space="preserve">
-    <value>באופן מיידי</value>
+  <data name="Immediately" xml:space="preserve">
+    <value>Immediately</value>
   </data>
-  <data name="LockOptions" xml:space="preserve">
-    <value>אפשרויות נעילה</value>
+  <data name="VaultTimeout" xml:space="preserve">
+    <value>Vault Timeout</value>
+  </data>
+  <data name="VaultTimeoutAction" xml:space="preserve">
+    <value>Vault Timeout Action</value>
+  </data>
+  <data name="VaultTimeoutLogOutConfirmation" xml:space="preserve">
+    <value>Logging out will remove all access to your vault and requires online authentication after the timeout period. Are you sure you want to use this setting?</value>
   </data>
   <data name="LoggingIn" xml:space="preserve">
     <value>מתחבר...</value>
@@ -1434,11 +1440,8 @@ Bitwarden בעזרת פתיחת חלון "הגדרות".</value>
   <data name="Unlock" xml:space="preserve">
     <value>בטל נעילה</value>
   </data>
-  <data name="LockOption30Minutes" xml:space="preserve">
-    <value>30 דקות</value>
-  </data>
-  <data name="LockOption5Minutes" xml:space="preserve">
-    <value>5 דקות</value>
+  <data name="ThirtyMinutes" xml:space="preserve">
+    <value>30 minutes</value>
   </data>
   <data name="SetPINDescription" xml:space="preserve">
     <value>קבע קוד PIN לביטול נעילת Bitwarden. הגדרות הPIN יאופסו אם תבצע יציאה מהתוכנה.</value>
@@ -1464,9 +1467,6 @@ Bitwarden בעזרת פתיחת חלון "הגדרות".</value>
   <data name="FiveMinutes" xml:space="preserve">
     <value>5 דקות</value>
   </data>
-  <data name="OneMinute" xml:space="preserve">
-    <value>דקה אחת</value>
-  </data>
   <data name="TenSeconds" xml:space="preserve">
     <value>10 שניות</value>
   </data>
@@ -1536,8 +1536,8 @@ Bitwarden בעזרת פתיחת חלון "הגדרות".</value>
   <data name="DisableSavePromptDescription" xml:space="preserve">
     <value>החלון "שמור" מופיע כשאתה מזין פרטי כניסה בפעם הראשונה.</value>
   </data>
-  <data name="LockOptionOnRestart" xml:space="preserve">
-    <value>באתחול האפליקציה</value>
+  <data name="OnRestart" xml:space="preserve">
+    <value>On App Restart</value>
   </data>
   <data name="AutofillServiceNotEnabled" xml:space="preserve">
     <value>השלמה אוטומטית הופכת את תהליך הכניסה לאתרים לקל ומאובטח בעת גישה לאתרים ואפליקציות. נראה שלא הפעלת את שירות ההשלמה האוטומטית עבור Bitwarden. אנא הפעל את השירות דרך חלון "הגדרות".</value>

src/App/Resources/AppResources.hi.resx

@@ -172,14 +172,14 @@
     <comment>Message shown when interacting with the server</comment>
   </data>
   <data name="DoYouReallyWantToDelete" xml:space="preserve">
-    <value>Do you really want to delete? This cannot be undone.</value>
+    <value>क्या आप वास्तव में हटाना चाहते हैं? इसे नष्ट नहीं किया जा सकता है</value>
     <comment>Confirmation alert message when deleteing something.</comment>
   </data>
   <data name="Edit" xml:space="preserve">
     <value>संशोधन करें</value>
   </data>
   <data name="EditFolder" xml:space="preserve">
-    <value>Edit Folder</value>
+    <value>फ़ोल्डर संपादित करें</value>
   </data>
   <data name="Email" xml:space="preserve">
     <value>ईमेल</value>
@@ -193,7 +193,7 @@
     <value>हमें ईमेल करें</value>
   </data>
   <data name="EmailUsDescription" xml:space="preserve">
-    <value>Email us directly to get help or leave feedback.</value>
+    <value>सहायता प्राप्त करने या प्रतिक्रिया छोड़ने के लिए हमें ईमेल करें।</value>
   </data>
   <data name="EnterPIN" xml:space="preserve">
     <value>अपना पिन डालें</value>
@@ -203,10 +203,10 @@
     <comment>Title for your favorite items in the vault.</comment>
   </data>
   <data name="FileBugReport" xml:space="preserve">
-    <value>File a Bug Report</value>
+    <value>बग रिपोर्ट दर्ज करें</value>
   </data>
   <data name="FileBugReportDescription" xml:space="preserve">
-    <value>Open an issue at our GitHub repository.</value>
+    <value>हमारे GitHub भंडार में एक मुद्दे को बताएं।</value>
   </data>
   <data name="FingerprintDirection" xml:space="preserve">
     <value>फिंगरप्रिंट से सत्यापन करें</value>
@@ -243,37 +243,37 @@
     <comment>Hide a secret value that is currently shown (password).</comment>
   </data>
   <data name="InternetConnectionRequiredMessage" xml:space="preserve">
-    <value>Please connect to the internet before continuing.</value>
+    <value>जारी रखने से पहले कृपया इंटरनेट से जुड़े।</value>
     <comment>Description message for the alert when internet connection is required to continue.</comment>
   </data>
   <data name="InternetConnectionRequiredTitle" xml:space="preserve">
-    <value>Internet Connection Required</value>
+    <value>इंटरनेट से जुड़िए।</value>
     <comment>Title for the alert when internet connection is required to continue.</comment>
   </data>
   <data name="InvalidMasterPassword" xml:space="preserve">
-    <value>Invalid Master Password. Try again.</value>
+    <value>मास्टर पासवर्ड गलत है। फिर कोशिश करें।</value>
   </data>
   <data name="InvalidPIN" xml:space="preserve">
-    <value>Invalid PIN. Try again.</value>
+    <value>पिन गलत है। फिर कोशिश करें।</value>
   </data>
   <data name="Launch" xml:space="preserve">
-    <value>Launch</value>
+    <value>खोलें</value>
     <comment>The button text that allows user to launch the website to their web browser.</comment>
   </data>
   <data name="LogIn" xml:space="preserve">
-    <value>Log In</value>
+    <value>लॉग इन करें</value>
     <comment>The login button text (verb).</comment>
   </data>
   <data name="LogInNoun" xml:space="preserve">
-    <value>Login</value>
+    <value>लॉग इन</value>
     <comment>Title for login page. (noun)</comment>
   </data>
   <data name="LogOut" xml:space="preserve">
-    <value>Log Out</value>
+    <value>लॉग आउट</value>
     <comment>The log out button text (verb).</comment>
   </data>
   <data name="LogoutConfirmation" xml:space="preserve">
-    <value>Are you sure you want to log out?</value>
+    <value>क्या आप वाकई लॉग आउट करना चाहते हैं?</value>
   </data>
   <data name="MasterPassword" xml:space="preserve">
     <value>मास्टर / मुख्य पासवर्ड</value>
@@ -284,22 +284,22 @@
     <comment>Text to define that there are more options things to see.</comment>
   </data>
   <data name="MyVault" xml:space="preserve">
-    <value>My Vault</value>
+    <value>मेरी तिजोरी</value>
     <comment>The title for the vault page.</comment>
   </data>
   <data name="Name" xml:space="preserve">
-    <value>Name</value>
+    <value>नाम</value>
     <comment>Label for an entity name.</comment>
   </data>
   <data name="No" xml:space="preserve">
-    <value>No</value>
+    <value>नहीं</value>
   </data>
   <data name="Notes" xml:space="preserve">
     <value>टिप्पणियाँ</value>
     <comment>Label for notes.</comment>
   </data>
   <data name="Ok" xml:space="preserve">
-    <value>Ok</value>
+    <value>ठीक</value>
     <comment>Acknowledgement.</comment>
   </data>
   <data name="Password" xml:space="preserve">
@@ -323,14 +323,14 @@
     <comment>Reveal a hidden value (password).</comment>
   </data>
   <data name="ItemDeleted" xml:space="preserve">
-    <value>Item has been deleted.</value>
+    <value>आइटम हटा दिया गया है।</value>
     <comment>Confirmation message after successfully deleting a login.</comment>
   </data>
   <data name="Submit" xml:space="preserve">
-    <value>Submit</value>
+    <value>जमा करें</value>
   </data>
   <data name="Sync" xml:space="preserve">
-    <value>Sync</value>
+    <value>संकालन</value>
     <comment>The title for the sync page.</comment>
   </data>
   <data name="ThankYou" xml:space="preserve">
@@ -345,28 +345,28 @@
     <comment>Label for a uri/url.</comment>
   </data>
   <data name="UseFingerprintToUnlock" xml:space="preserve">
-    <value>Use Fingerprint to Unlock</value>
+    <value>अंगुलिछाप से खोलें</value>
   </data>
   <data name="Username" xml:space="preserve">
     <value>उपयोगकर्ता नाम:</value>
     <comment>Label for a username.</comment>
   </data>
   <data name="ValidationFieldRequired" xml:space="preserve">
-    <value>The {0} field is required.</value>
+    <value>{0} की आश्यकता है।</value>
     <comment>Validation message for when a form field is left blank and is required to be entered.</comment>
   </data>
   <data name="ValueHasBeenCopied" xml:space="preserve">
-    <value>{0} has been copied.</value>
+    <value>{0} कॉपी कर लिया गया है।</value>
     <comment>Confirmation message after suceessfully copying a value to the clipboard.</comment>
   </data>
   <data name="VerifyFingerprint" xml:space="preserve">
-    <value>Verify Fingerprint</value>
+    <value>अंगुलिछाप दें</value>
   </data>
   <data name="VerifyMasterPassword" xml:space="preserve">
-    <value>Verify Master Password</value>
+    <value>मास्टर पासवर्ड बताएं।</value>
   </data>
   <data name="VerifyPIN" xml:space="preserve">
-    <value>Verify PIN</value>
+    <value>पिन बताएं।</value>
   </data>
   <data name="Version" xml:space="preserve">
     <value>संस्करण</value>
@@ -397,13 +397,13 @@
     <value>आइटम जोड़ें</value>
   </data>
   <data name="AppExtension" xml:space="preserve">
-    <value>App Extension</value>
+    <value>ऐप का विस्तारण</value>
   </data>
   <data name="AutofillAccessibilityDescription" xml:space="preserve">
     <value>Use the bitwarden accessibility service to auto-fill your logins across apps and the web.</value>
   </data>
   <data name="AutofillService" xml:space="preserve">
-    <value>Auto-fill Service</value>
+    <value>भरण सेवा</value>
   </data>
   <data name="AvoidAmbiguousCharacters" xml:space="preserve">
     <value>अस्पष्ट अक्षर से बचें</value>
@@ -412,7 +412,7 @@
     <value>bitwarden App Extension</value>
   </data>
   <data name="BitwardenAppExtensionAlert2" xml:space="preserve">
-    <value>The easiest way to add new logins to your vault is from the Bitwarden App Extension. Learn more about using the Bitwarden App Extension by navigating to the "Settings" screen.</value>
+    <value>अपने तिजोरी में नए आइटम डालने का सबसे सरल तरीका है Bitwarden ऐप विस्तारण। Bitwarden ऐप विस्तरण के उपयोग संबंधी जानकारी पाने के लिए "सेटिंग्स" में जाएं।</value>
   </data>
   <data name="BitwardenAppExtensionDescription" xml:space="preserve">
     <value>Use bitwarden in Safari and other apps to auto-fill your logins.</value>
@@ -433,13 +433,13 @@
     <value>मास्टर पासवर्ड बदलें</value>
   </data>
   <data name="ChangePasswordConfirmation" xml:space="preserve">
-    <value>You can change your master password on the bitwarden.com web vault. Do you want to visit the website now?</value>
+    <value>मास्टर पासवर्ड Bitwarden के वेब-तिजोरी पर जाकर बदला जा सकता है। क्या आप वहां जाना चाहते हैं?</value>
   </data>
   <data name="Close" xml:space="preserve">
-    <value>Close</value>
+    <value>बंद करें</value>
   </data>
   <data name="Continue" xml:space="preserve">
-    <value>Continue</value>
+    <value>जारी रखें</value>
   </data>
   <data name="CreateAccount" xml:space="preserve">
     <value>खाता बनाएँ</value>
@@ -452,26 +452,26 @@
     <value>आइटम संपादित करें</value>
   </data>
   <data name="EnableAutomaticSyncing" xml:space="preserve">
-    <value>Enable Automatic Syncing</value>
+    <value>स्वतः सिंक चालू करें।</value>
   </data>
   <data name="EnterEmailForHint" xml:space="preserve">
-    <value>Enter your account email address to receive your master password hint.</value>
+    <value>अपने मास्टर पासवर्ड संकेत प्राप्त करने के लिए अपने खाते का ईमेल पता दर्ज करें।</value>
   </data>
   <data name="ExntesionReenable" xml:space="preserve">
-    <value>Re-enable App Extension</value>
+    <value>ऐप विस्तारण को फिर चालू करें</value>
   </data>
   <data name="ExtensionAlmostDone" xml:space="preserve">
     <value>लगभग सम्पूर्ण!</value>
   </data>
   <data name="ExtensionEnable" xml:space="preserve">
-    <value>Enable App Extension</value>
+    <value>ऐप विस्तारण को चालू करें</value>
   </data>
   <data name="ExtensionInSafari" xml:space="preserve">
     <value>In Safari, find bitwarden using the share icon (hint: scroll to the right on the bottom row of the menu).</value>
     <comment>Safari is the name of apple's web browser</comment>
   </data>
   <data name="ExtensionInstantAccess" xml:space="preserve">
-    <value>Get instant access to your passwords!</value>
+    <value>अपने पासवर्ड को तुरंत प्राप्त करें</value>
   </data>
   <data name="ExtensionReady" xml:space="preserve">
     <value>आप लॉग इन करने के लिए तैयार हैं!</value>
@@ -504,69 +504,76 @@
     <value>आइटम्स आयात करें</value>
   </data>
   <data name="ImportItemsConfirmation" xml:space="preserve">
-    <value>You can bulk import items from the bitwarden.com web vault. Do you want to visit the website now?</value>
+    <value>Bitwarden के वेब-तिजोरी से एक साथ कई आइटम आयातित किए जा सकते हैं। क्या आप वहां जाना चाहते हैं?</value>
   </data>
   <data name="ImportItemsDescription" xml:space="preserve">
-    <value>Quickly bulk import your items from other password management apps.</value>
+    <value>दूसरे पासवर्ड प्रबंधन ऐप से एक साथ कई आइटम जल्दी आयातित करें।</value>
   </data>
   <data name="LastSync" xml:space="preserve">
-    <value>Last Sync:</value>
+    <value>आखिरी बार सिंक हुआ:</value>
   </data>
   <data name="Length" xml:space="preserve">
-    <value>Length</value>
+    <value>लंबाई</value>
   </data>
   <data name="Lock" xml:space="preserve">
     <value>लॉक</value>
   </data>
-  <data name="LockOption15Minutes" xml:space="preserve">
+  <data name="FifteenMinutes" xml:space="preserve">
     <value>15 मिनिट</value>
   </data>
-  <data name="LockOption1Hour" xml:space="preserve">
+  <data name="OneHour" xml:space="preserve">
     <value>1 घंटा</value>
   </data>
-  <data name="LockOption1Minute" xml:space="preserve">
+  <data name="OneMinute" xml:space="preserve">
     <value>1 मिनट</value>
   </data>
-  <data name="LockOption4Hours" xml:space="preserve">
+  <data name="FourHours" xml:space="preserve">
     <value>4 घंटे</value>
   </data>
-  <data name="LockOptionImmediately" xml:space="preserve">
-    <value>तत्‍काल</value>
+  <data name="Immediately" xml:space="preserve">
+    <value>तत्‍काल
+</value>
   </data>
-  <data name="LockOptions" xml:space="preserve">
-    <value>अवरोध विकल्प</value>
+  <data name="VaultTimeout" xml:space="preserve">
+    <value>तिजोरी का समय समाप्त</value>
+  </data>
+  <data name="VaultTimeoutAction" xml:space="preserve">
+    <value>Vault Timeout Action</value>
+  </data>
+  <data name="VaultTimeoutLogOutConfirmation" xml:space="preserve">
+    <value>लॉग आउट करने से तिजोरी में प्रवेश संभव नहीं होगा और समय समाप्त होने के बाद ऑनलाइन प्रमाणीकरण की आश्यकता होगी। आप इस सेटिंग्स को प्रयोग करने के लिए विश्वस्त हैं?</value>
   </data>
   <data name="LoggingIn" xml:space="preserve">
     <value>लॉगिन कर रहा है...</value>
     <comment>Message shown when interacting with the server</comment>
   </data>
   <data name="LoginOrCreateNewAccount" xml:space="preserve">
-    <value>Log in or create a new account to access your secure vault.</value>
+    <value>सुरक्षित तिजोरी में प्रवेश करने के लिए नया खाता बनाएं या लॉग इन करें।</value>
   </data>
   <data name="Manage" xml:space="preserve">
     <value>प्रबंधन</value>
   </data>
   <data name="MasterPasswordConfirmationValMessage" xml:space="preserve">
-    <value>Password confirmation is not correct.</value>
+    <value>पासवर्ड गलत है।</value>
   </data>
   <data name="MasterPasswordDescription" xml:space="preserve">
-    <value>The master password is the password you use to access your vault. It is very important that you do not forget your master password. There is no way to recover the password in the event that you forget it.</value>
+    <value>मास्टर पासवर्ड वह पासवर्ड है जो तिजोरी में प्रवेश के लिए प्रयोग होता है। आप मास्टर पासवर्ड ना भूले यह अतिआवश्यक है। भूलने की अवस्था में पासवर्ड को दोबारा पाना संभव नहीं होगा।</value>
   </data>
   <data name="MasterPasswordHint" xml:space="preserve">
-    <value>Master Password Hint (optional)</value>
+    <value>मास्टर पासवर्ड संकेत (वैकल्पिक)</value>
   </data>
   <data name="MasterPasswordHintDescription" xml:space="preserve">
-    <value>A master password hint can help you remember your password if you forget it.</value>
+    <value>मास्टर पासवर्ड संकेत आपको भूल जाने की अवस्था में पासवर्ड को याद करने में सहायता करता है।</value>
   </data>
   <data name="MasterPasswordLengthValMessage" xml:space="preserve">
-    <value>Master password must be at least 8 characters long.</value>
+    <value>मास्टर पासवर्ड में कम से कम 8 अक्षर होने चाहिएं।</value>
   </data>
   <data name="MinNumbers" xml:space="preserve">
-    <value>Minimum Numbers</value>
+    <value>कम से कम अंक</value>
     <comment>Minimum numeric characters for password generator settings</comment>
   </data>
   <data name="MinSpecial" xml:space="preserve">
-    <value>Minimum Special</value>
+    <value>कम से कम विशेष अक्षर</value>
     <comment>Minimum special characters for password generator settings</comment>
   </data>
   <data name="MoreSettings" xml:space="preserve">
@@ -579,19 +586,19 @@
     <value>कभी नहीं</value>
   </data>
   <data name="NewItemCreated" xml:space="preserve">
-    <value>New item created.</value>
+    <value>नया आइटम बनाया गया</value>
   </data>
   <data name="NoFavorites" xml:space="preserve">
-    <value>There are no favorites in your vault.</value>
+    <value>तिजोरी में कोई अभिमत आइटम नहीं है।</value>
   </data>
   <data name="NoItems" xml:space="preserve">
-    <value>There are no items in your vault.</value>
+    <value>तिजोरी में कोई आइटम नहीं है।</value>
   </data>
   <data name="NoItemsTap" xml:space="preserve">
     <value>There are no items in your vault for this website. Tap to add one.</value>
   </data>
   <data name="NoUsernamePasswordConfigured" xml:space="preserve">
-    <value>This login does not have a username or password configured.</value>
+    <value>इस आइटम में कोई यूजरनेम या पासवर्ड नहीं पड़ा है।</value>
   </data>
   <data name="OkGotIt" xml:space="preserve">
     <value>ठीक है, समझ गए!</value>
@@ -616,10 +623,10 @@
     <value>पासवर्ड संकेत</value>
   </data>
   <data name="PasswordHintAlert" xml:space="preserve">
-    <value>We've sent you an email with your master password hint.</value>
+    <value>हमने आपको मास्टर पासवर्ड संकेत के साथ एक ईमेल भेजा है।</value>
   </data>
   <data name="PasswordOverrideAlert" xml:space="preserve">
-    <value>Are you sure you want to overwrite the current password?</value>
+    <value>आप पुराने पासवर्ड के ऊपर दूसरा पासवर्ड लिखने के लिए आश्वस्त हैं?</value>
   </data>
   <data name="PushNotificationAlert" xml:space="preserve">
     <value>bitwarden keeps your vault automatically synced by using push notifications. For the best possible experience, please select "Ok" on the following prompt when asked to enable push notifications.</value>
@@ -629,13 +636,13 @@
     <value>इस एप्प का मूल्यांकन करें</value>
   </data>
   <data name="RateTheAppDescription" xml:space="preserve">
-    <value>Please consider helping us out with a good review!</value>
+    <value>कृपया हमें एक अच्छी समीक्षा के साथ बाहर की मदद करने पर विचार करें!</value>
   </data>
   <data name="RegeneratePassword" xml:space="preserve">
-    <value>Regenerate Password</value>
+    <value>पासवर्ड पुन: जनरेट करें</value>
   </data>
   <data name="RetypeMasterPassword" xml:space="preserve">
-    <value>Re-type Master Password</value>
+    <value>मास्टर पासवर्ड पुनः टाइप करें</value>
   </data>
   <data name="SearchVault" xml:space="preserve">
     <value>Search vault</value>
@@ -656,24 +663,24 @@
     <value>आइटम सूचना</value>
   </data>
   <data name="ItemUpdated" xml:space="preserve">
-    <value>Item updated.</value>
+    <value>आइटम अपडेट किया गया।</value>
   </data>
   <data name="Submitting" xml:space="preserve">
-    <value>Submitting...</value>
+    <value>सबमिट हो रहा हैं...</value>
     <comment>Message shown when interacting with the server</comment>
   </data>
   <data name="Syncing" xml:space="preserve">
-    <value>Syncing...</value>
+    <value>सिंक हो रहा है…</value>
     <comment>Message shown when interacting with the server</comment>
   </data>
   <data name="SyncingComplete" xml:space="preserve">
-    <value>Syncing complete.</value>
+    <value>सिंकिंग पूर्ण</value>
   </data>
   <data name="SyncingFailed" xml:space="preserve">
-    <value>Syncing failed.</value>
+    <value>सिंकिंग असफल।</value>
   </data>
   <data name="SyncVaultNow" xml:space="preserve">
-    <value>Sync Vault Now</value>
+    <value>तिजोरी अभी सिंक करें।</value>
   </data>
   <data name="TouchID" xml:space="preserve">
     <value>Touch ID</value>
@@ -899,28 +906,28 @@
     <value>Attachment added</value>
   </data>
   <data name="AttachmentDeleted" xml:space="preserve">
-    <value>Attachment deleted</value>
+    <value>संग्लित वस्तु डिलीट करी गई</value>
   </data>
   <data name="ChooseFile" xml:space="preserve">
-    <value>Choose File</value>
+    <value>फ़ाइल चुनें</value>
   </data>
   <data name="File" xml:space="preserve">
     <value>फ़ाइल</value>
   </data>
   <data name="NoFileChosen" xml:space="preserve">
-    <value>No file chosen</value>
+    <value>कोई फाइल नहीं चुनी गई।</value>
   </data>
   <data name="NoAttachments" xml:space="preserve">
-    <value>There are no attachments.</value>
+    <value>कोई संग्लित वस्तु नहीं है।</value>
   </data>
   <data name="FileSource" xml:space="preserve">
-    <value>File Source</value>
+    <value>फ़ाइल स्रोत</value>
   </data>
   <data name="FeatureUnavailable" xml:space="preserve">
-    <value>Feature Unavailable</value>
+    <value>फीचर उपलब्ध नहीं है</value>
   </data>
   <data name="MaxFileSize" xml:space="preserve">
-    <value>Maximum file size is 100 MB.</value>
+    <value>अधिकतम फाइल आकार 100 MB है</value>
   </data>
   <data name="UpdateKey" xml:space="preserve">
     <value>You cannot use this feature until you update your encryption key.</value>
@@ -1433,12 +1440,9 @@
   <data name="Unlock" xml:space="preserve">
     <value>Unlock</value>
   </data>
-  <data name="LockOption30Minutes" xml:space="preserve">
+  <data name="ThirtyMinutes" xml:space="preserve">
     <value>30 minutes</value>
   </data>
-  <data name="LockOption5Minutes" xml:space="preserve">
-    <value>5 minutes</value>
-  </data>
   <data name="SetPINDescription" xml:space="preserve">
     <value>Set your PIN code for unlocking Bitwarden. Your PIN settings will be reset if you ever fully log out of the application.</value>
   </data>
@@ -1463,9 +1467,6 @@
   <data name="FiveMinutes" xml:space="preserve">
     <value>5 minutes</value>
   </data>
-  <data name="OneMinute" xml:space="preserve">
-    <value>1 minute</value>
-  </data>
   <data name="TenSeconds" xml:space="preserve">
     <value>10 seconds</value>
   </data>
@@ -1535,7 +1536,7 @@
   <data name="DisableSavePromptDescription" xml:space="preserve">
     <value>The "Save Prompt" automatically prompts you to save new items to your vault whenever you enter them for the first time.</value>
   </data>
-  <data name="LockOptionOnRestart" xml:space="preserve">
+  <data name="OnRestart" xml:space="preserve">
     <value>On App Restart</value>
   </data>
   <data name="AutofillServiceNotEnabled" xml:space="preserve">

src/App/Resources/AppResources.hr.resx

@@ -518,23 +518,29 @@
   <data name="Lock" xml:space="preserve">
     <value>Zaključaj</value>
   </data>
-  <data name="LockOption15Minutes" xml:space="preserve">
-    <value>15 minuta</value>
+  <data name="FifteenMinutes" xml:space="preserve">
+    <value>15 minutes</value>
   </data>
-  <data name="LockOption1Hour" xml:space="preserve">
-    <value>1 sat</value>
+  <data name="OneHour" xml:space="preserve">
+    <value>1 hour</value>
   </data>
-  <data name="LockOption1Minute" xml:space="preserve">
+  <data name="OneMinute" xml:space="preserve">
     <value>1 minuta</value>
   </data>
-  <data name="LockOption4Hours" xml:space="preserve">
-    <value>4 sata</value>
+  <data name="FourHours" xml:space="preserve">
+    <value>4 hours</value>
   </data>
-  <data name="LockOptionImmediately" xml:space="preserve">
-    <value>Odmah</value>
+  <data name="Immediately" xml:space="preserve">
+    <value>Immediately</value>
   </data>
-  <data name="LockOptions" xml:space="preserve">
-    <value>Opcije zaključavanja</value>
+  <data name="VaultTimeout" xml:space="preserve">
+    <value>Vault Timeout</value>
+  </data>
+  <data name="VaultTimeoutAction" xml:space="preserve">
+    <value>Vault Timeout Action</value>
+  </data>
+  <data name="VaultTimeoutLogOutConfirmation" xml:space="preserve">
+    <value>Logging out will remove all access to your vault and requires online authentication after the timeout period. Are you sure you want to use this setting?</value>
   </data>
   <data name="LoggingIn" xml:space="preserve">
     <value>Prijavljivanje...</value>
@@ -1433,11 +1439,8 @@
   <data name="Unlock" xml:space="preserve">
     <value>Otključaj</value>
   </data>
-  <data name="LockOption30Minutes" xml:space="preserve">
-    <value>30 minuta</value>
-  </data>
-  <data name="LockOption5Minutes" xml:space="preserve">
-    <value>5 minuta</value>
+  <data name="ThirtyMinutes" xml:space="preserve">
+    <value>30 minutes</value>
   </data>
   <data name="SetPINDescription" xml:space="preserve">
     <value>Postavite Vaš PIN kod za otključavanje Bitwardena. Vaše postavke PIN-a će biti resetirane ako se ikada potpuno odjavite iz aplikacije.</value>
@@ -1463,9 +1466,6 @@
   <data name="FiveMinutes" xml:space="preserve">
     <value>5 minuta</value>
   </data>
-  <data name="OneMinute" xml:space="preserve">
-    <value>1 minuta</value>
-  </data>
   <data name="TenSeconds" xml:space="preserve">
     <value>10 sekundi</value>
   </data>
@@ -1535,8 +1535,8 @@
   <data name="DisableSavePromptDescription" xml:space="preserve">
     <value>"Upit za spremanje" automatski traži da spremite nove unose u trezor prvi put kad u njih uđete.</value>
   </data>
-  <data name="LockOptionOnRestart" xml:space="preserve">
-    <value>Kada se aplikacija ponovno pokrene</value>
+  <data name="OnRestart" xml:space="preserve">
+    <value>On App Restart</value>
   </data>
   <data name="AutofillServiceNotEnabled" xml:space="preserve">
     <value>Automatsko punjenje olakšava siguran pristup Vašem Bitwarden trezoru s drugih web stranica i aplikacija. Izgleda da niste omogućili uslugu automatskog popunjavanja Bitwardena. Omogućite automatsko popunjavanje Bitwardena na zaslonu "Postavke".</value>

src/App/Resources/AppResources.hu.resx

@@ -518,23 +518,29 @@
   <data name="Lock" xml:space="preserve">
     <value>Lezárás</value>
   </data>
-  <data name="LockOption15Minutes" xml:space="preserve">
+  <data name="FifteenMinutes" xml:space="preserve">
     <value>15 perc</value>
   </data>
-  <data name="LockOption1Hour" xml:space="preserve">
+  <data name="OneHour" xml:space="preserve">
     <value>1 óra</value>
   </data>
-  <data name="LockOption1Minute" xml:space="preserve">
+  <data name="OneMinute" xml:space="preserve">
     <value>1 perc</value>
   </data>
-  <data name="LockOption4Hours" xml:space="preserve">
+  <data name="FourHours" xml:space="preserve">
     <value>4 óra</value>
   </data>
-  <data name="LockOptionImmediately" xml:space="preserve">
+  <data name="Immediately" xml:space="preserve">
     <value>Azonnal</value>
   </data>
-  <data name="LockOptions" xml:space="preserve">
-    <value>Zárolási beállítások</value>
+  <data name="VaultTimeout" xml:space="preserve">
+    <value>Széf időkifutás</value>
+  </data>
+  <data name="VaultTimeoutAction" xml:space="preserve">
+    <value>Széf időkifutás művelet</value>
+  </data>
+  <data name="VaultTimeoutLogOutConfirmation" xml:space="preserve">
+    <value>Kijelentkezve az összes széf elérés eltávolításra kerül és webes hitelesítésre van szükség az időkifutás után. Biztosan szeretnénk használni ezt a beállítást?</value>
   </data>
   <data name="LoggingIn" xml:space="preserve">
     <value>Bejelentkezés...</value>
@@ -1433,12 +1439,9 @@
   <data name="Unlock" xml:space="preserve">
     <value>Feloldás</value>
   </data>
-  <data name="LockOption30Minutes" xml:space="preserve">
+  <data name="ThirtyMinutes" xml:space="preserve">
     <value>30 perc</value>
   </data>
-  <data name="LockOption5Minutes" xml:space="preserve">
-    <value>5 perc</value>
-  </data>
   <data name="SetPINDescription" xml:space="preserve">
     <value>A pinkód beállítása a Bitwarden feloldásához. A pinkód beállítás alaphelyzetbe kerül, ha teljesen kijelentkezünk az alkalmazásból.</value>
   </data>
@@ -1463,9 +1466,6 @@
   <data name="FiveMinutes" xml:space="preserve">
     <value>5 perc</value>
   </data>
-  <data name="OneMinute" xml:space="preserve">
-    <value>1 perc</value>
-  </data>
   <data name="TenSeconds" xml:space="preserve">
     <value>10 másodperc</value>
   </data>
@@ -1517,7 +1517,7 @@
     <value>Biztos vagy benne, hogy kilépsz?</value>
   </data>
   <data name="PINRequireMasterPasswordRestart" xml:space="preserve">
-    <value>Do you want to require unlocking with your master password when the application is restarted?</value>
+    <value>You you want to require unlocking with your master password when the application is restarted?</value>
   </data>
   <data name="Black" xml:space="preserve">
     <value>Fekete</value>
@@ -1535,7 +1535,7 @@
   <data name="DisableSavePromptDescription" xml:space="preserve">
     <value>A "Bejelentkezés felkérés hozzáadása" automatikusan felajánlja a bejelentkezés széfbe mentését az első bejelentkezéskor.</value>
   </data>
-  <data name="LockOptionOnRestart" xml:space="preserve">
+  <data name="OnRestart" xml:space="preserve">
     <value>Újraindításkor</value>
   </data>
   <data name="AutofillServiceNotEnabled" xml:space="preserve">

src/App/Resources/AppResources.id.resx

@@ -518,23 +518,29 @@
   <data name="Lock" xml:space="preserve">
     <value>Kunci</value>
   </data>
-  <data name="LockOption15Minutes" xml:space="preserve">
-    <value>15 menit</value>
+  <data name="FifteenMinutes" xml:space="preserve">
+    <value>15 minutes</value>
   </data>
-  <data name="LockOption1Hour" xml:space="preserve">
-    <value>1 jam</value>
+  <data name="OneHour" xml:space="preserve">
+    <value>1 hour</value>
   </data>
-  <data name="LockOption1Minute" xml:space="preserve">
+  <data name="OneMinute" xml:space="preserve">
     <value>1 menit</value>
   </data>
-  <data name="LockOption4Hours" xml:space="preserve">
-    <value>4 jam</value>
+  <data name="FourHours" xml:space="preserve">
+    <value>4 hours</value>
   </data>
-  <data name="LockOptionImmediately" xml:space="preserve">
-    <value>Segera</value>
+  <data name="Immediately" xml:space="preserve">
+    <value>Immediately</value>
   </data>
-  <data name="LockOptions" xml:space="preserve">
-    <value>Pilihan Penguncian</value>
+  <data name="VaultTimeout" xml:space="preserve">
+    <value>Vault Timeout</value>
+  </data>
+  <data name="VaultTimeoutAction" xml:space="preserve">
+    <value>Vault Timeout Action</value>
+  </data>
+  <data name="VaultTimeoutLogOutConfirmation" xml:space="preserve">
+    <value>Logging out will remove all access to your vault and requires online authentication after the timeout period. Are you sure you want to use this setting?</value>
   </data>
   <data name="LoggingIn" xml:space="preserve">
     <value>Sedang masuk...</value>
@@ -1433,11 +1439,8 @@
   <data name="Unlock" xml:space="preserve">
     <value>Unlock</value>
   </data>
-  <data name="LockOption30Minutes" xml:space="preserve">
-    <value>30 menit</value>
-  </data>
-  <data name="LockOption5Minutes" xml:space="preserve">
-    <value>5 menit</value>
+  <data name="ThirtyMinutes" xml:space="preserve">
+    <value>30 minutes</value>
   </data>
   <data name="SetPINDescription" xml:space="preserve">
     <value>Set your PIN code for unlocking Bitwarden. Your PIN settings will be reset if you ever fully log out of the application.</value>
@@ -1463,9 +1466,6 @@
   <data name="FiveMinutes" xml:space="preserve">
     <value>5 menit</value>
   </data>
-  <data name="OneMinute" xml:space="preserve">
-    <value>1 menit</value>
-  </data>
   <data name="TenSeconds" xml:space="preserve">
     <value>10 detik</value>
   </data>
@@ -1517,7 +1517,7 @@
     <value>Apakah anda yakin ingin keluar dari Bitwarden?</value>
   </data>
   <data name="PINRequireMasterPasswordRestart" xml:space="preserve">
-    <value>Do you want to require unlocking with your master password when the application is restarted?</value>
+    <value>You you want to require unlocking with your master password when the application is restarted?</value>
   </data>
   <data name="Black" xml:space="preserve">
     <value>Hitam</value>
@@ -1535,8 +1535,8 @@
   <data name="DisableSavePromptDescription" xml:space="preserve">
     <value>"Saran Simpan" secara otomatis meminta anda untuk menyimpan item baru ke brankas anda setiap kali anda memasukkannya untuk pertama kali.</value>
   </data>
-  <data name="LockOptionOnRestart" xml:space="preserve">
-    <value>Saat Aplikasi Memulai Ulang</value>
+  <data name="OnRestart" xml:space="preserve">
+    <value>On App Restart</value>
   </data>
   <data name="AutofillServiceNotEnabled" xml:space="preserve">
     <value>Isi-otomatis memudahkan untuk mengakses brankas Bitwarden anda dengan aman dari situs web dan aplikasi lain. Sepertinya anda belum mengaktifkan layanan pengisian-otomatis untuk Bitwarden. Aktifkan pengisian-otomatis untuk Bitwarden dari layar "Pengaturan".</value>

src/App/Resources/AppResources.it.resx

@@ -518,23 +518,29 @@
   <data name="Lock" xml:space="preserve">
     <value>Blocca</value>
   </data>
-  <data name="LockOption15Minutes" xml:space="preserve">
+  <data name="FifteenMinutes" xml:space="preserve">
     <value>15 minuti</value>
   </data>
-  <data name="LockOption1Hour" xml:space="preserve">
+  <data name="OneHour" xml:space="preserve">
     <value>1 ora</value>
   </data>
-  <data name="LockOption1Minute" xml:space="preserve">
+  <data name="OneMinute" xml:space="preserve">
     <value>1 minuto</value>
   </data>
-  <data name="LockOption4Hours" xml:space="preserve">
+  <data name="FourHours" xml:space="preserve">
     <value>4 ore</value>
   </data>
-  <data name="LockOptionImmediately" xml:space="preserve">
+  <data name="Immediately" xml:space="preserve">
     <value>Immediatamente</value>
   </data>
-  <data name="LockOptions" xml:space="preserve">
-    <value>Opzioni di blocco</value>
+  <data name="VaultTimeout" xml:space="preserve">
+    <value>Scadenza Cassaforte</value>
+  </data>
+  <data name="VaultTimeoutAction" xml:space="preserve">
+    <value>Azione Scadenza Cassaforte</value>
+  </data>
+  <data name="VaultTimeoutLogOutConfirmation" xml:space="preserve">
+    <value>La disconnessione rimuove tutti gli accessi alla tua cassaforte e richiede l'autenticazione online dopo il periodo di scadenza. Sei sicuro di voler utilizzare questa impostazione?</value>
   </data>
   <data name="LoggingIn" xml:space="preserve">
     <value>Connessione in corso...</value>
@@ -1433,12 +1439,9 @@
   <data name="Unlock" xml:space="preserve">
     <value>Sblocca</value>
   </data>
-  <data name="LockOption30Minutes" xml:space="preserve">
+  <data name="ThirtyMinutes" xml:space="preserve">
     <value>30 minuti</value>
   </data>
-  <data name="LockOption5Minutes" xml:space="preserve">
-    <value>5 minuti</value>
-  </data>
   <data name="SetPINDescription" xml:space="preserve">
     <value>Imposta il tuo codice PIN per sbloccare Bitwarden. Le impostazioni PIN verranno reimpostate se si effettuerà il logout completo dall'applicazione.</value>
   </data>
@@ -1463,9 +1466,6 @@
   <data name="FiveMinutes" xml:space="preserve">
     <value>5 minuti</value>
   </data>
-  <data name="OneMinute" xml:space="preserve">
-    <value>1 minuto</value>
-  </data>
   <data name="TenSeconds" xml:space="preserve">
     <value>10 secondi</value>
   </data>
@@ -1517,7 +1517,7 @@
     <value>Sei sicuro di voler uscire da Bitwarden?</value>
   </data>
   <data name="PINRequireMasterPasswordRestart" xml:space="preserve">
-    <value>Do you want to require unlocking with your master password when the application is restarted?</value>
+    <value>You you want to require unlocking with your master password when the application is restarted?</value>
   </data>
   <data name="Black" xml:space="preserve">
     <value>Nero</value>
@@ -1535,8 +1535,8 @@
   <data name="DisableSavePromptDescription" xml:space="preserve">
     <value>La "Richiesta di salvataggio" ti richiede automaticamente di salvare nuovi elementi nella tua cassaforte quando le utilizzi per la prima volta.</value>
   </data>
-  <data name="LockOptionOnRestart" xml:space="preserve">
-    <value>Al riavvio dell'applicazione</value>
+  <data name="OnRestart" xml:space="preserve">
+    <value>Al Riavvio dell'App</value>
   </data>
   <data name="AutofillServiceNotEnabled" xml:space="preserve">
     <value>Auto-riempimento rende facile accedere in modo sicuro alla tua cassaforte Bitwarden da altri siti web e applicazioni. Sembra che tu non abbia abilitato un servizio di auto-riempimento per Bitwarden. Abilita l'auto-riempimento per Bitwarden dalla schermata "Impostazioni".</value>

src/App/Resources/AppResources.ja.resx

@@ -518,23 +518,29 @@
   <data name="Lock" xml:space="preserve">
     <value>ロック</value>
   </data>
-  <data name="LockOption15Minutes" xml:space="preserve">
+  <data name="FifteenMinutes" xml:space="preserve">
     <value>15分</value>
   </data>
-  <data name="LockOption1Hour" xml:space="preserve">
+  <data name="OneHour" xml:space="preserve">
     <value>1時間</value>
   </data>
-  <data name="LockOption1Minute" xml:space="preserve">
-    <value>1分</value>
+  <data name="OneMinute" xml:space="preserve">
+    <value>1 分</value>
   </data>
-  <data name="LockOption4Hours" xml:space="preserve">
+  <data name="FourHours" xml:space="preserve">
     <value>4時間</value>
   </data>
-  <data name="LockOptionImmediately" xml:space="preserve">
-    <value>すぐに</value>
+  <data name="Immediately" xml:space="preserve">
+    <value>即時</value>
   </data>
-  <data name="LockOptions" xml:space="preserve">
-    <value>ロックオプション</value>
+  <data name="VaultTimeout" xml:space="preserve">
+    <value>保管庫のタイムアウト</value>
+  </data>
+  <data name="VaultTimeoutAction" xml:space="preserve">
+    <value>保管庫タイムアウト時のアクション</value>
+  </data>
+  <data name="VaultTimeoutLogOutConfirmation" xml:space="preserve">
+    <value>ログアウトすると保管庫へのすべてのアクセスが制限され、タイムアウト期間後にオンライン認証が必要になります。 この設定を使用してもよろしいですか？</value>
   </data>
   <data name="LoggingIn" xml:space="preserve">
     <value>ログイン中...</value>
@@ -1433,11 +1439,8 @@
   <data name="Unlock" xml:space="preserve">
     <value>ロック解除</value>
   </data>
-  <data name="LockOption30Minutes" xml:space="preserve">
-    <value>30 分</value>
-  </data>
-  <data name="LockOption5Minutes" xml:space="preserve">
-    <value>5 分</value>
+  <data name="ThirtyMinutes" xml:space="preserve">
+    <value>30分</value>
   </data>
   <data name="SetPINDescription" xml:space="preserve">
     <value>Bitwarden のロックを解除するための PIN コードを設定します。アプリから完全にログアウトすると、PIN 設定はリセットされます。</value>
@@ -1463,9 +1466,6 @@
   <data name="FiveMinutes" xml:space="preserve">
     <value>5 分</value>
   </data>
-  <data name="OneMinute" xml:space="preserve">
-    <value>1 分</value>
-  </data>
   <data name="TenSeconds" xml:space="preserve">
     <value>10 秒</value>
   </data>
@@ -1535,7 +1535,7 @@
   <data name="DisableSavePromptDescription" xml:space="preserve">
     <value>新しいアイテムを入力したとき、保管庫に保存するかどうか尋ねるためのプロンプトを自動的に表示します。</value>
   </data>
-  <data name="LockOptionOnRestart" xml:space="preserve">
+  <data name="OnRestart" xml:space="preserve">
     <value>アプリ再起動時</value>
   </data>
   <data name="AutofillServiceNotEnabled" xml:space="preserve">

src/App/Resources/AppResources.ko.resx

@@ -518,23 +518,29 @@
   <data name="Lock" xml:space="preserve">
     <value>잠금</value>
   </data>
-  <data name="LockOption15Minutes" xml:space="preserve">
-    <value>15분</value>
+  <data name="FifteenMinutes" xml:space="preserve">
+    <value>15 minutes</value>
   </data>
-  <data name="LockOption1Hour" xml:space="preserve">
-    <value>1시간</value>
+  <data name="OneHour" xml:space="preserve">
+    <value>1 hour</value>
   </data>
-  <data name="LockOption1Minute" xml:space="preserve">
+  <data name="OneMinute" xml:space="preserve">
     <value>1분</value>
   </data>
-  <data name="LockOption4Hours" xml:space="preserve">
-    <value>4시간</value>
+  <data name="FourHours" xml:space="preserve">
+    <value>4 hours</value>
   </data>
-  <data name="LockOptionImmediately" xml:space="preserve">
-    <value>즉시</value>
+  <data name="Immediately" xml:space="preserve">
+    <value>Immediately</value>
   </data>
-  <data name="LockOptions" xml:space="preserve">
-    <value>잠금 옵션</value>
+  <data name="VaultTimeout" xml:space="preserve">
+    <value>Vault Timeout</value>
+  </data>
+  <data name="VaultTimeoutAction" xml:space="preserve">
+    <value>Vault Timeout Action</value>
+  </data>
+  <data name="VaultTimeoutLogOutConfirmation" xml:space="preserve">
+    <value>Logging out will remove all access to your vault and requires online authentication after the timeout period. Are you sure you want to use this setting?</value>
   </data>
   <data name="LoggingIn" xml:space="preserve">
     <value>로그인 중...</value>
@@ -1433,11 +1439,8 @@
   <data name="Unlock" xml:space="preserve">
     <value>잠금 해제</value>
   </data>
-  <data name="LockOption30Minutes" xml:space="preserve">
-    <value>30분</value>
-  </data>
-  <data name="LockOption5Minutes" xml:space="preserve">
-    <value>5분</value>
+  <data name="ThirtyMinutes" xml:space="preserve">
+    <value>30 minutes</value>
   </data>
   <data name="SetPINDescription" xml:space="preserve">
     <value>Bitwarden 잠금해제에 사용될 PIN 코드를 설정합니다. 이 애플리케이션에서 완전히 로그아웃할 경우 PIN 설정이 초기화됩니다.</value>
@@ -1463,9 +1466,6 @@
   <data name="FiveMinutes" xml:space="preserve">
     <value>5분</value>
   </data>
-  <data name="OneMinute" xml:space="preserve">
-    <value>1분</value>
-  </data>
   <data name="TenSeconds" xml:space="preserve">
     <value>10초</value>
   </data>
@@ -1517,7 +1517,7 @@
     <value>정말로 Bitwarden에서 나가시려는 건가요?</value>
   </data>
   <data name="PINRequireMasterPasswordRestart" xml:space="preserve">
-    <value>Do you want to require unlocking with your master password when the application is restarted?</value>
+    <value>You you want to require unlocking with your master password when the application is restarted?</value>
   </data>
   <data name="Black" xml:space="preserve">
     <value>검은 테마</value>
@@ -1535,8 +1535,8 @@
   <data name="DisableSavePromptDescription" xml:space="preserve">
     <value>"저장 프롬포트"를 사용하면 처음 입력할 때마다 보관함에 그 항목을 추가할 것인지 물어봅니다.</value>
   </data>
-  <data name="LockOptionOnRestart" xml:space="preserve">
-    <value>앱 재시작 시</value>
+  <data name="OnRestart" xml:space="preserve">
+    <value>On App Restart</value>
   </data>
   <data name="AutofillServiceNotEnabled" xml:space="preserve">
     <value>자동 입력은 다른 웹사이트나 앱에서 Bitwarden 보관함에 안전하게 액세스하기 쉽게 만들어줍니다. Bitwarden의 자동 입력 서비스를 활성화하지 않은 것으로 보입니다. "설정" 화면에서 Bitwarden의 자동 입력을 활성화해주세요.</value>

src/App/Resources/AppResources.nb.resx

@@ -518,23 +518,29 @@
   <data name="Lock" xml:space="preserve">
     <value>Lås</value>
   </data>
-  <data name="LockOption15Minutes" xml:space="preserve">
-    <value>15 minutter</value>
+  <data name="FifteenMinutes" xml:space="preserve">
+    <value>15 minutes</value>
   </data>
-  <data name="LockOption1Hour" xml:space="preserve">
-    <value>1 time</value>
+  <data name="OneHour" xml:space="preserve">
+    <value>1 hour</value>
   </data>
-  <data name="LockOption1Minute" xml:space="preserve">
+  <data name="OneMinute" xml:space="preserve">
     <value>1 minutt</value>
   </data>
-  <data name="LockOption4Hours" xml:space="preserve">
-    <value>4 timer</value>
+  <data name="FourHours" xml:space="preserve">
+    <value>4 hours</value>
   </data>
-  <data name="LockOptionImmediately" xml:space="preserve">
-    <value>Umiddelbart</value>
+  <data name="Immediately" xml:space="preserve">
+    <value>Immediately</value>
   </data>
-  <data name="LockOptions" xml:space="preserve">
-    <value>Låsingsinnstillinger</value>
+  <data name="VaultTimeout" xml:space="preserve">
+    <value>Vault Timeout</value>
+  </data>
+  <data name="VaultTimeoutAction" xml:space="preserve">
+    <value>Vault Timeout Action</value>
+  </data>
+  <data name="VaultTimeoutLogOutConfirmation" xml:space="preserve">
+    <value>Logging out will remove all access to your vault and requires online authentication after the timeout period. Are you sure you want to use this setting?</value>
   </data>
   <data name="LoggingIn" xml:space="preserve">
     <value>Logger på...</value>
@@ -1433,11 +1439,8 @@
   <data name="Unlock" xml:space="preserve">
     <value>Lås opp</value>
   </data>
-  <data name="LockOption30Minutes" xml:space="preserve">
-    <value>30 minutter</value>
-  </data>
-  <data name="LockOption5Minutes" xml:space="preserve">
-    <value>5 minutter</value>
+  <data name="ThirtyMinutes" xml:space="preserve">
+    <value>30 minutes</value>
   </data>
   <data name="SetPINDescription" xml:space="preserve">
     <value>Angi PIN-koden din for å låse opp Bitwarden. PIN-innstillingene tilbakestilles hvis du logger deg helt ut av programmet.</value>
@@ -1463,9 +1466,6 @@
   <data name="FiveMinutes" xml:space="preserve">
     <value>5 minutter</value>
   </data>
-  <data name="OneMinute" xml:space="preserve">
-    <value>1 minutt</value>
-  </data>
   <data name="TenSeconds" xml:space="preserve">
     <value>10 sekunder</value>
   </data>
@@ -1517,7 +1517,7 @@
     <value>Er du sikker på at du vil lukke Bitwarden?</value>
   </data>
   <data name="PINRequireMasterPasswordRestart" xml:space="preserve">
-    <value>Do you want to require unlocking with your master password when the application is restarted?</value>
+    <value>You you want to require unlocking with your master password when the application is restarted?</value>
   </data>
   <data name="Black" xml:space="preserve">
     <value>Svart</value>
@@ -1535,8 +1535,8 @@
   <data name="DisableSavePromptDescription" xml:space="preserve">
     <value>"Lagreforespørselen" spør deg automatisk om du vil lagre nye elementer i hvelvet ditt når du skriver dem inn for første gang.</value>
   </data>
-  <data name="LockOptionOnRestart" xml:space="preserve">
-    <value>Ved app-omstart</value>
+  <data name="OnRestart" xml:space="preserve">
+    <value>On App Restart</value>
   </data>
   <data name="AutofillServiceNotEnabled" xml:space="preserve">
     <value>Auto-utfylling gjør det lett å få sikker tilgang til Bitwarden-hvelvet ditt fra andre nettsteder og apper. Det ser ut til at du ikke har skrudd på noen auto-utfyllingstjenester for Bitwarden. Du kan skru på auto-utfylling for Bitwarden i «Innstillinger»-menyen.</value>

src/App/Resources/AppResources.nl.resx

@@ -518,23 +518,29 @@
   <data name="Lock" xml:space="preserve">
     <value>Vergrendelen</value>
   </data>
-  <data name="LockOption15Minutes" xml:space="preserve">
+  <data name="FifteenMinutes" xml:space="preserve">
     <value>15 minuten</value>
   </data>
-  <data name="LockOption1Hour" xml:space="preserve">
+  <data name="OneHour" xml:space="preserve">
     <value>1 uur</value>
   </data>
-  <data name="LockOption1Minute" xml:space="preserve">
+  <data name="OneMinute" xml:space="preserve">
     <value>1 minuut</value>
   </data>
-  <data name="LockOption4Hours" xml:space="preserve">
+  <data name="FourHours" xml:space="preserve">
     <value>4 uur</value>
   </data>
-  <data name="LockOptionImmediately" xml:space="preserve">
+  <data name="Immediately" xml:space="preserve">
     <value>Onmiddellijk</value>
   </data>
-  <data name="LockOptions" xml:space="preserve">
-    <value>Vergrendeling</value>
+  <data name="VaultTimeout" xml:space="preserve">
+    <value>Time-out van de kluis</value>
+  </data>
+  <data name="VaultTimeoutAction" xml:space="preserve">
+    <value>Actie bij time-out</value>
+  </data>
+  <data name="VaultTimeoutLogOutConfirmation" xml:space="preserve">
+    <value>Uitloggen ontneemt je de toegang tot je kluis en vereist online authenticatie na een periode van time-out. Weet je zeker dat je deze instelling wilt gebruiken?</value>
   </data>
   <data name="LoggingIn" xml:space="preserve">
     <value>Inloggen...</value>
@@ -1433,12 +1439,9 @@
   <data name="Unlock" xml:space="preserve">
     <value>Ontgrendelen</value>
   </data>
-  <data name="LockOption30Minutes" xml:space="preserve">
+  <data name="ThirtyMinutes" xml:space="preserve">
     <value>30 minuten</value>
   </data>
-  <data name="LockOption5Minutes" xml:space="preserve">
-    <value>5 minuten</value>
-  </data>
   <data name="SetPINDescription" xml:space="preserve">
     <value>Stel je PIN-code in voor het ontgrendelen van Bitwarden. Je PIN-code wordt opnieuw ingesteld als je je ooit volledig afmeldt bij de applicatie.</value>
   </data>
@@ -1463,9 +1466,6 @@
   <data name="FiveMinutes" xml:space="preserve">
     <value>5 minuten</value>
   </data>
-  <data name="OneMinute" xml:space="preserve">
-    <value>1 minuut</value>
-  </data>
   <data name="TenSeconds" xml:space="preserve">
     <value>10 seconden</value>
   </data>
@@ -1535,8 +1535,8 @@
   <data name="DisableSavePromptDescription" xml:space="preserve">
     <value>De "Notificatie bij nieuwe site" vraagt automatisch om nieuwe sites op te slaan in je kluis wanneer je voor de eerste keer inlogt.</value>
   </data>
-  <data name="LockOptionOnRestart" xml:space="preserve">
-    <value>Na opnieuw starten van de app</value>
+  <data name="OnRestart" xml:space="preserve">
+    <value>Na opnieuw starten</value>
   </data>
   <data name="AutofillServiceNotEnabled" xml:space="preserve">
     <value>Automatisch aanvullen vereenvoudigt veilige toegang tot je Bitwarden-kluis vanuit andere websites en apps. Het lijkt erop dat Automatisch aanvullen niet is ingeschakeld. Schakel Automatisch aanvullen voor Bitwarden in via "Instellingen".</value>

src/App/Resources/AppResources.pl.resx

@@ -518,23 +518,29 @@
   <data name="Lock" xml:space="preserve">
     <value>Zablokuj</value>
   </data>
-  <data name="LockOption15Minutes" xml:space="preserve">
+  <data name="FifteenMinutes" xml:space="preserve">
     <value>15 minut</value>
   </data>
-  <data name="LockOption1Hour" xml:space="preserve">
+  <data name="OneHour" xml:space="preserve">
     <value>1 godzina</value>
   </data>
-  <data name="LockOption1Minute" xml:space="preserve">
+  <data name="OneMinute" xml:space="preserve">
     <value>1 minuta</value>
   </data>
-  <data name="LockOption4Hours" xml:space="preserve">
+  <data name="FourHours" xml:space="preserve">
     <value>4 godziny</value>
   </data>
-  <data name="LockOptionImmediately" xml:space="preserve">
+  <data name="Immediately" xml:space="preserve">
     <value>Natychmiast</value>
   </data>
-  <data name="LockOptions" xml:space="preserve">
-    <value>Czas automatycznego blokowania</value>
+  <data name="VaultTimeout" xml:space="preserve">
+    <value>Blokowanie sejfu</value>
+  </data>
+  <data name="VaultTimeoutAction" xml:space="preserve">
+    <value>Sposób blokowania sejfu</value>
+  </data>
+  <data name="VaultTimeoutLogOutConfirmation" xml:space="preserve">
+    <value>Po wylogowaniu się z sejfu musisz ponownie zalogować się, aby uzyskać do niego dostęp. Czy na pewno chcesz użyć tego ustawienia?</value>
   </data>
   <data name="LoggingIn" xml:space="preserve">
     <value>Logowanie...</value>
@@ -1433,12 +1439,9 @@
   <data name="Unlock" xml:space="preserve">
     <value>Odblokuj</value>
   </data>
-  <data name="LockOption30Minutes" xml:space="preserve">
+  <data name="ThirtyMinutes" xml:space="preserve">
     <value>30 minut</value>
   </data>
-  <data name="LockOption5Minutes" xml:space="preserve">
-    <value>5 minut</value>
-  </data>
   <data name="SetPINDescription" xml:space="preserve">
     <value>Ustaw kod PIN do odblokowywania aplikacji Bitwarden. Ustawienia odblokowywania kodem PIN zostaną zresetowane po wylogowaniu.</value>
   </data>
@@ -1463,9 +1466,6 @@
   <data name="FiveMinutes" xml:space="preserve">
     <value>5 minut</value>
   </data>
-  <data name="OneMinute" xml:space="preserve">
-    <value>1 minuta</value>
-  </data>
   <data name="TenSeconds" xml:space="preserve">
     <value>10 sekund</value>
   </data>
@@ -1535,7 +1535,7 @@
   <data name="DisableSavePromptDescription" xml:space="preserve">
     <value>"Monit o zapisywanie" automatycznie zapyta Cię o zapisanie nowych elementów do sejfu za każdym razem, gdy wpiszesz je po raz pierwszy.</value>
   </data>
-  <data name="LockOptionOnRestart" xml:space="preserve">
+  <data name="OnRestart" xml:space="preserve">
     <value>Po restarcie aplikacji</value>
   </data>
   <data name="AutofillServiceNotEnabled" xml:space="preserve">

src/App/Resources/AppResources.pt-BR.resx

@@ -518,23 +518,29 @@
   <data name="Lock" xml:space="preserve">
     <value>Bloquear</value>
   </data>
-  <data name="LockOption15Minutes" xml:space="preserve">
+  <data name="FifteenMinutes" xml:space="preserve">
     <value>15 minutos</value>
   </data>
-  <data name="LockOption1Hour" xml:space="preserve">
+  <data name="OneHour" xml:space="preserve">
     <value>1 hora</value>
   </data>
-  <data name="LockOption1Minute" xml:space="preserve">
+  <data name="OneMinute" xml:space="preserve">
     <value>1 minuto</value>
   </data>
-  <data name="LockOption4Hours" xml:space="preserve">
+  <data name="FourHours" xml:space="preserve">
     <value>4 horas</value>
   </data>
-  <data name="LockOptionImmediately" xml:space="preserve">
+  <data name="Immediately" xml:space="preserve">
     <value>Imediatamente</value>
   </data>
-  <data name="LockOptions" xml:space="preserve">
-    <value>Opções de Bloqueio</value>
+  <data name="VaultTimeout" xml:space="preserve">
+    <value>Tempo Limite do Cofre</value>
+  </data>
+  <data name="VaultTimeoutAction" xml:space="preserve">
+    <value>Ação de Tempo Limite do Cofre</value>
+  </data>
+  <data name="VaultTimeoutLogOutConfirmation" xml:space="preserve">
+    <value>Sair irá remover todo o acesso ao seu cofre e requer autenticação online após o período de tempo limite. Tem certeza de que deseja usar esta configuração?</value>
   </data>
   <data name="LoggingIn" xml:space="preserve">
     <value>Iniciando Sessão...</value>
@@ -1433,12 +1439,9 @@
   <data name="Unlock" xml:space="preserve">
     <value>Desbloquear</value>
   </data>
-  <data name="LockOption30Minutes" xml:space="preserve">
+  <data name="ThirtyMinutes" xml:space="preserve">
     <value>30 minutos</value>
   </data>
-  <data name="LockOption5Minutes" xml:space="preserve">
-    <value>5 minutos</value>
-  </data>
   <data name="SetPINDescription" xml:space="preserve">
     <value>Defina o seu código PIN para desbloquear o Bitwarden. As suas configurações de PIN serão redefinidas se você encerrar a sessão por completo do aplicativo.</value>
   </data>
@@ -1463,9 +1466,6 @@
   <data name="FiveMinutes" xml:space="preserve">
     <value>5 minutos</value>
   </data>
-  <data name="OneMinute" xml:space="preserve">
-    <value>1 minuto</value>
-  </data>
   <data name="TenSeconds" xml:space="preserve">
     <value>10 segundos</value>
   </data>
@@ -1535,7 +1535,7 @@
   <data name="DisableSavePromptDescription" xml:space="preserve">
     <value>A "Solicitação de Salvamento" solicita automaticamente que você salve novos itens no seu cofre sempre que você inseri-los pela primeira vez.</value>
   </data>
-  <data name="LockOptionOnRestart" xml:space="preserve">
+  <data name="OnRestart" xml:space="preserve">
     <value>Ao Reiniciar o App</value>
   </data>
   <data name="AutofillServiceNotEnabled" xml:space="preserve">
@@ -1629,7 +1629,7 @@
     <value>Anexo salvo com sucesso</value>
   </data>
   <data name="AutofillTileAccessibilityRequired" xml:space="preserve">
-    <value>Por favor, habilite "Serviço de Autopreenchimento de Acessibilidade" nas configurações do Bitwarden para usar o bloco de Autopreenchimento.</value>
+    <value>Por favor, habilite "Serviço de Acessibilidade de Autopreenchimento" nas configurações do Bitwarden para usar o bloco de Autopreenchimento.</value>
   </data>
   <data name="AutofillTileUriNotFound" xml:space="preserve">
     <value>Nenhum campo de senha detectado</value>

src/App/Resources/AppResources.pt-PT.resx

@@ -518,23 +518,29 @@
   <data name="Lock" xml:space="preserve">
     <value>Bloquear</value>
   </data>
-  <data name="LockOption15Minutes" xml:space="preserve">
+  <data name="FifteenMinutes" xml:space="preserve">
     <value>15 minutos</value>
   </data>
-  <data name="LockOption1Hour" xml:space="preserve">
+  <data name="OneHour" xml:space="preserve">
     <value>1 hora</value>
   </data>
-  <data name="LockOption1Minute" xml:space="preserve">
+  <data name="OneMinute" xml:space="preserve">
     <value>1 minuto</value>
   </data>
-  <data name="LockOption4Hours" xml:space="preserve">
+  <data name="FourHours" xml:space="preserve">
     <value>4 horas</value>
   </data>
-  <data name="LockOptionImmediately" xml:space="preserve">
+  <data name="Immediately" xml:space="preserve">
     <value>Imediatamente</value>
   </data>
-  <data name="LockOptions" xml:space="preserve">
-    <value>Opções de bloqueio</value>
+  <data name="VaultTimeout" xml:space="preserve">
+    <value>Vault Timeout</value>
+  </data>
+  <data name="VaultTimeoutAction" xml:space="preserve">
+    <value>Vault Timeout Action</value>
+  </data>
+  <data name="VaultTimeoutLogOutConfirmation" xml:space="preserve">
+    <value>Logging out will remove all access to your vault and requires online authentication after the timeout period. Are you sure you want to use this setting?</value>
   </data>
   <data name="LoggingIn" xml:space="preserve">
     <value>A iniciar sessão...</value>
@@ -1433,12 +1439,9 @@
   <data name="Unlock" xml:space="preserve">
     <value>Desbloquear</value>
   </data>
-  <data name="LockOption30Minutes" xml:space="preserve">
+  <data name="ThirtyMinutes" xml:space="preserve">
     <value>30 minutos</value>
   </data>
-  <data name="LockOption5Minutes" xml:space="preserve">
-    <value>5 minutos</value>
-  </data>
   <data name="SetPINDescription" xml:space="preserve">
     <value>Defina o seu código PIN para desbloquear o Bitwarden. As suas definições PIN serão redefinidas se terminar sessão completamente da aplicação.</value>
   </data>
@@ -1463,9 +1466,6 @@
   <data name="FiveMinutes" xml:space="preserve">
     <value>5 minutos</value>
   </data>
-  <data name="OneMinute" xml:space="preserve">
-    <value>1 minuto</value>
-  </data>
   <data name="TenSeconds" xml:space="preserve">
     <value>10 segundos</value>
   </data>
@@ -1535,7 +1535,7 @@
   <data name="DisableSavePromptDescription" xml:space="preserve">
     <value>A "solicitação de guardar" solicita-lhe automaticamente a guardar novos itens para o seu cofre quando os introduz pela primeira vez.</value>
   </data>
-  <data name="LockOptionOnRestart" xml:space="preserve">
+  <data name="OnRestart" xml:space="preserve">
     <value>Quando reiniciar a aplicação</value>
   </data>
   <data name="AutofillServiceNotEnabled" xml:space="preserve">

src/App/Resources/AppResources.ro.resx

@@ -518,23 +518,29 @@
   <data name="Lock" xml:space="preserve">
     <value>Blocare</value>
   </data>
-  <data name="LockOption15Minutes" xml:space="preserve">
-    <value>15 minute</value>
+  <data name="FifteenMinutes" xml:space="preserve">
+    <value>15 minutes</value>
   </data>
-  <data name="LockOption1Hour" xml:space="preserve">
-    <value>1 oră</value>
+  <data name="OneHour" xml:space="preserve">
+    <value>1 hour</value>
   </data>
-  <data name="LockOption1Minute" xml:space="preserve">
+  <data name="OneMinute" xml:space="preserve">
     <value>1 minut</value>
   </data>
-  <data name="LockOption4Hours" xml:space="preserve">
-    <value>4 ore</value>
+  <data name="FourHours" xml:space="preserve">
+    <value>4 hours</value>
   </data>
-  <data name="LockOptionImmediately" xml:space="preserve">
-    <value>Imediat</value>
+  <data name="Immediately" xml:space="preserve">
+    <value>Immediately</value>
   </data>
-  <data name="LockOptions" xml:space="preserve">
-    <value>Blocare</value>
+  <data name="VaultTimeout" xml:space="preserve">
+    <value>Vault Timeout</value>
+  </data>
+  <data name="VaultTimeoutAction" xml:space="preserve">
+    <value>Vault Timeout Action</value>
+  </data>
+  <data name="VaultTimeoutLogOutConfirmation" xml:space="preserve">
+    <value>Logging out will remove all access to your vault and requires online authentication after the timeout period. Are you sure you want to use this setting?</value>
   </data>
   <data name="LoggingIn" xml:space="preserve">
     <value>Autentificare...</value>
@@ -1433,11 +1439,8 @@
   <data name="Unlock" xml:space="preserve">
     <value>Deblocare</value>
   </data>
-  <data name="LockOption30Minutes" xml:space="preserve">
-    <value>30 de minute</value>
-  </data>
-  <data name="LockOption5Minutes" xml:space="preserve">
-    <value>5 minute</value>
+  <data name="ThirtyMinutes" xml:space="preserve">
+    <value>30 minutes</value>
   </data>
   <data name="SetPINDescription" xml:space="preserve">
     <value>Setaţi codul PIN de deblocare Bitwarden. Setările codului PIN vor fi resetate dacă vă deconectaţi vreodată din aplicație.</value>
@@ -1463,9 +1466,6 @@
   <data name="FiveMinutes" xml:space="preserve">
     <value>5 minute</value>
   </data>
-  <data name="OneMinute" xml:space="preserve">
-    <value>1 minut</value>
-  </data>
   <data name="TenSeconds" xml:space="preserve">
     <value>10 secunde</value>
   </data>
@@ -1517,7 +1517,7 @@
     <value>Sunteți sigur că doriți să ieșiți?</value>
   </data>
   <data name="PINRequireMasterPasswordRestart" xml:space="preserve">
-    <value>Do you want to require unlocking with your master password when the application is restarted?</value>
+    <value>You you want to require unlocking with your master password when the application is restarted?</value>
   </data>
   <data name="Black" xml:space="preserve">
     <value>Neagră</value>
@@ -1535,8 +1535,8 @@
   <data name="DisableSavePromptDescription" xml:space="preserve">
     <value>"Notificarea de salvare" solicită automat salvarea de noi elemente în seiful dvs. de fiecare dată când le introduceți pentru prima dată.</value>
   </data>
-  <data name="LockOptionOnRestart" xml:space="preserve">
-    <value>La repornirea aplicației</value>
+  <data name="OnRestart" xml:space="preserve">
+    <value>On App Restart</value>
   </data>
   <data name="AutofillServiceNotEnabled" xml:space="preserve">
     <value>Completarea automată simplifică accesarea securizată a seifului Bitwarden de pe alte site-uri web și aplicații. Se pare că nu ați activat un serviciu de completare automată pentru Bitwarden. Activați completarea automată pentru Bitwarden din ecranul „Setări”.</value>

src/App/Resources/AppResources.ru.resx

@@ -518,23 +518,29 @@
   <data name="Lock" xml:space="preserve">
     <value>Заблокировать</value>
   </data>
-  <data name="LockOption15Minutes" xml:space="preserve">
+  <data name="FifteenMinutes" xml:space="preserve">
     <value>15 минут</value>
   </data>
-  <data name="LockOption1Hour" xml:space="preserve">
+  <data name="OneHour" xml:space="preserve">
     <value>1 час</value>
   </data>
-  <data name="LockOption1Minute" xml:space="preserve">
+  <data name="OneMinute" xml:space="preserve">
     <value>1 минута</value>
   </data>
-  <data name="LockOption4Hours" xml:space="preserve">
+  <data name="FourHours" xml:space="preserve">
     <value>4 часа</value>
   </data>
-  <data name="LockOptionImmediately" xml:space="preserve">
+  <data name="Immediately" xml:space="preserve">
     <value>Немедленно</value>
   </data>
-  <data name="LockOptions" xml:space="preserve">
-    <value>Параметры блокировки</value>
+  <data name="VaultTimeout" xml:space="preserve">
+    <value>Таймаут хранилища</value>
+  </data>
+  <data name="VaultTimeoutAction" xml:space="preserve">
+    <value>Действие по таймауту хранилища</value>
+  </data>
+  <data name="VaultTimeoutLogOutConfirmation" xml:space="preserve">
+    <value>По истечении таймаута будет выполнен выход, что приведет к отмене всех прав доступа к вашему хранилищу и потребует онлайн-аутентификации. Вы уверены, что хотите использовать этот параметр?</value>
   </data>
   <data name="LoggingIn" xml:space="preserve">
     <value>Вход...</value>
@@ -1132,7 +1138,7 @@
     <value>В этой папке нет элементов.</value>
   </data>
   <data name="NoItemsTrash" xml:space="preserve">
-    <value>Нет элементов в корзине.</value>
+    <value>В корзине нет элементов.</value>
   </data>
   <data name="AutofillAccessibilityService" xml:space="preserve">
     <value>Служба специальных возможностей автозаполнения</value>
@@ -1433,12 +1439,9 @@
   <data name="Unlock" xml:space="preserve">
     <value>Разблокировать</value>
   </data>
-  <data name="LockOption30Minutes" xml:space="preserve">
+  <data name="ThirtyMinutes" xml:space="preserve">
     <value>30 минут</value>
   </data>
-  <data name="LockOption5Minutes" xml:space="preserve">
-    <value>5 минут</value>
-  </data>
   <data name="SetPINDescription" xml:space="preserve">
     <value>Установите PIN-код для разблокировки Bitwarden. Настройки PIN-кода будут сброшены, если вы когда-либо полностью выйдете из приложения.</value>
   </data>
@@ -1463,9 +1466,6 @@
   <data name="FiveMinutes" xml:space="preserve">
     <value>5 минут</value>
   </data>
-  <data name="OneMinute" xml:space="preserve">
-    <value>1 минута</value>
-  </data>
   <data name="TenSeconds" xml:space="preserve">
     <value>10 секунд</value>
   </data>
@@ -1535,7 +1535,7 @@
   <data name="DisableSavePromptDescription" xml:space="preserve">
     <value>Уведомление о сохранении автоматически предложит вам сохранить новые элементы в ваше хранилище.</value>
   </data>
-  <data name="LockOptionOnRestart" xml:space="preserve">
+  <data name="OnRestart" xml:space="preserve">
     <value>При перезапуске приложения</value>
   </data>
   <data name="AutofillServiceNotEnabled" xml:space="preserve">
@@ -1629,10 +1629,10 @@
     <value>Вложение успешно сохранено</value>
   </data>
   <data name="AutofillTileAccessibilityRequired" xml:space="preserve">
-    <value>Включите службу автозаполнения в настройках Bitwarden для использования плитки автозаполнения.</value>
+    <value>Пожалуйста, включите службу специальных возможностей автозаполнения Bitwarden для использования панели автозаполнения.</value>
   </data>
   <data name="AutofillTileUriNotFound" xml:space="preserve">
-    <value>Поля пароля не обнаружены</value>
+    <value>Полей ввода пароля не обнаружено</value>
   </data>
   <data name="SoftDeleting" xml:space="preserve">
     <value>Отправка в корзину...</value>
@@ -1663,7 +1663,7 @@
     <comment>(action prompt) Label for the search text field when viewing the trash folder</comment>
   </data>
   <data name="DoYouReallyWantToPermanentlyDeleteCipher" xml:space="preserve">
-    <value>Вы настаиваете на окончательном удалении? Это действие необратимо.</value>
+    <value>Вы действительно хотите удалить окончательно? Это нельзя отменить.</value>
     <comment>Confirmation alert message when permanently deleteing a cipher.</comment>
   </data>
   <data name="DoYouReallyWantToRestoreCipher" xml:space="preserve">
@@ -1671,7 +1671,7 @@
     <comment>Confirmation alert message when restoring a soft-deleted cipher.</comment>
   </data>
   <data name="DoYouReallyWantToSoftDeleteCipher" xml:space="preserve">
-    <value>Вы настаиваете на отправке в корзину?</value>
+    <value>Вы действительно хотите отправить в корзину?</value>
     <comment>Confirmation alert message when soft-deleting a cipher.</comment>
   </data>
 </root>

src/App/Resources/AppResources.sk.resx

@@ -518,23 +518,29 @@
   <data name="Lock" xml:space="preserve">
     <value>Zámok</value>
   </data>
-  <data name="LockOption15Minutes" xml:space="preserve">
-    <value>15 minút</value>
+  <data name="FifteenMinutes" xml:space="preserve">
+    <value>15 minutes</value>
   </data>
-  <data name="LockOption1Hour" xml:space="preserve">
-    <value>1 hodina</value>
+  <data name="OneHour" xml:space="preserve">
+    <value>1 hour</value>
   </data>
-  <data name="LockOption1Minute" xml:space="preserve">
+  <data name="OneMinute" xml:space="preserve">
     <value>1 minúta</value>
   </data>
-  <data name="LockOption4Hours" xml:space="preserve">
-    <value>4 hodiny</value>
+  <data name="FourHours" xml:space="preserve">
+    <value>4 hours</value>
   </data>
-  <data name="LockOptionImmediately" xml:space="preserve">
-    <value>Okamžite</value>
+  <data name="Immediately" xml:space="preserve">
+    <value>Immediately</value>
   </data>
-  <data name="LockOptions" xml:space="preserve">
-    <value>Možnosti zámku</value>
+  <data name="VaultTimeout" xml:space="preserve">
+    <value>Vault Timeout</value>
+  </data>
+  <data name="VaultTimeoutAction" xml:space="preserve">
+    <value>Vault Timeout Action</value>
+  </data>
+  <data name="VaultTimeoutLogOutConfirmation" xml:space="preserve">
+    <value>Logging out will remove all access to your vault and requires online authentication after the timeout period. Are you sure you want to use this setting?</value>
   </data>
   <data name="LoggingIn" xml:space="preserve">
     <value>Prihlasovanie...</value>
@@ -1433,11 +1439,8 @@
   <data name="Unlock" xml:space="preserve">
     <value>Odomknúť</value>
   </data>
-  <data name="LockOption30Minutes" xml:space="preserve">
-    <value>30 minút</value>
-  </data>
-  <data name="LockOption5Minutes" xml:space="preserve">
-    <value>5 minút</value>
+  <data name="ThirtyMinutes" xml:space="preserve">
+    <value>30 minutes</value>
   </data>
   <data name="SetPINDescription" xml:space="preserve">
     <value>Nastaviť kód PIN na odomknutie Bitwarden. Nastavenie PIN sa vynuluje, ak úplne odhlásite z aplikácie.</value>
@@ -1463,9 +1466,6 @@
   <data name="FiveMinutes" xml:space="preserve">
     <value>5 minút</value>
   </data>
-  <data name="OneMinute" xml:space="preserve">
-    <value>1 minúta</value>
-  </data>
   <data name="TenSeconds" xml:space="preserve">
     <value>10 sekúnd</value>
   </data>
@@ -1517,7 +1517,7 @@
     <value>Naozaj chcete ukončiť Bitwarden?</value>
   </data>
   <data name="PINRequireMasterPasswordRestart" xml:space="preserve">
-    <value>Do you want to require unlocking with your master password when the application is restarted?</value>
+    <value>You you want to require unlocking with your master password when the application is restarted?</value>
   </data>
   <data name="Black" xml:space="preserve">
     <value>Čierna</value>
@@ -1535,8 +1535,8 @@
   <data name="DisableSavePromptDescription" xml:space="preserve">
     <value>"Notifikácia Pridať prihlasovacie údaje" vás automaticky upozorní na uloženie nových údajov do vášho trezoru vždy, keď sa s nimi prihlasujete po prvý krát.</value>
   </data>
-  <data name="LockOptionOnRestart" xml:space="preserve">
-    <value>Po reštarte aplikácie</value>
+  <data name="OnRestart" xml:space="preserve">
+    <value>On App Restart</value>
   </data>
   <data name="AutofillServiceNotEnabled" xml:space="preserve">
     <value>Automatické dopĺňanie umožňuje jednoducho pristupovať k vašemu trezoru z iných stránok a plaikácii. Vyzerá že ste službu automatického dopĺňania pomocou Bitwarden nezapli. Zapnúť ju môžete na obrazove "Nastavenia".</value>

src/App/Resources/AppResources.sv.resx

@@ -518,23 +518,29 @@
   <data name="Lock" xml:space="preserve">
     <value>Lås</value>
   </data>
-  <data name="LockOption15Minutes" xml:space="preserve">
+  <data name="FifteenMinutes" xml:space="preserve">
     <value>15 minuter</value>
   </data>
-  <data name="LockOption1Hour" xml:space="preserve">
+  <data name="OneHour" xml:space="preserve">
     <value>1 timme</value>
   </data>
-  <data name="LockOption1Minute" xml:space="preserve">
+  <data name="OneMinute" xml:space="preserve">
     <value>1 minut</value>
   </data>
-  <data name="LockOption4Hours" xml:space="preserve">
+  <data name="FourHours" xml:space="preserve">
     <value>4 timmar</value>
   </data>
-  <data name="LockOptionImmediately" xml:space="preserve">
+  <data name="Immediately" xml:space="preserve">
     <value>Omedelbart</value>
   </data>
-  <data name="LockOptions" xml:space="preserve">
-    <value>Låsalternativ</value>
+  <data name="VaultTimeout" xml:space="preserve">
+    <value>Valvets tidsgräns</value>
+  </data>
+  <data name="VaultTimeoutAction" xml:space="preserve">
+    <value>Åtgärd när valvets tidsgräns överskrids</value>
+  </data>
+  <data name="VaultTimeoutLogOutConfirmation" xml:space="preserve">
+    <value>Genom att logga ut upphör all åtkomst till valvet och onlineautentisering krävs efter att tidsgränsen överskridits. Är du säker på att du vill använda denna inställning?</value>
   </data>
   <data name="LoggingIn" xml:space="preserve">
     <value>Loggar in...</value>
@@ -1433,12 +1439,9 @@
   <data name="Unlock" xml:space="preserve">
     <value>Lås upp</value>
   </data>
-  <data name="LockOption30Minutes" xml:space="preserve">
+  <data name="ThirtyMinutes" xml:space="preserve">
     <value>30 minuter</value>
   </data>
-  <data name="LockOption5Minutes" xml:space="preserve">
-    <value>5 minuter</value>
-  </data>
   <data name="SetPINDescription" xml:space="preserve">
     <value>Ange en PIN-kod att låsa upp Bitwarden med. Dina PIN-kodsinställningar återställs om du någonsin loggar ut helt från appen.</value>
   </data>
@@ -1463,9 +1466,6 @@
   <data name="FiveMinutes" xml:space="preserve">
     <value>5 minuter</value>
   </data>
-  <data name="OneMinute" xml:space="preserve">
-    <value>1 minut</value>
-  </data>
   <data name="TenSeconds" xml:space="preserve">
     <value>10 sekunder</value>
   </data>
@@ -1535,7 +1535,7 @@
   <data name="DisableSavePromptDescription" xml:space="preserve">
     <value>"Sparförfrågan" frågar dig om du vill lägga till nya objekt i ditt valv automatiskt när du använder dem för första gången.</value>
   </data>
-  <data name="LockOptionOnRestart" xml:space="preserve">
+  <data name="OnRestart" xml:space="preserve">
     <value>Vid omstart av appen</value>
   </data>
   <data name="AutofillServiceNotEnabled" xml:space="preserve">

src/App/Resources/AppResources.th.resx

@@ -518,23 +518,29 @@
   <data name="Lock" xml:space="preserve">
     <value>ล็อค</value>
   </data>
-  <data name="LockOption15Minutes" xml:space="preserve">
-    <value>15 นาที</value>
+  <data name="FifteenMinutes" xml:space="preserve">
+    <value>15 minutes</value>
   </data>
-  <data name="LockOption1Hour" xml:space="preserve">
-    <value>1 ชั่วโมง</value>
+  <data name="OneHour" xml:space="preserve">
+    <value>1 hour</value>
   </data>
-  <data name="LockOption1Minute" xml:space="preserve">
-    <value>1 นาที</value>
+  <data name="OneMinute" xml:space="preserve">
+    <value>1 minute</value>
   </data>
-  <data name="LockOption4Hours" xml:space="preserve">
-    <value>4 ชั่วโมง</value>
+  <data name="FourHours" xml:space="preserve">
+    <value>4 hours</value>
   </data>
-  <data name="LockOptionImmediately" xml:space="preserve">
-    <value>ทันที</value>
+  <data name="Immediately" xml:space="preserve">
+    <value>Immediately</value>
   </data>
-  <data name="LockOptions" xml:space="preserve">
-    <value>ตัวเลือกการล็อก</value>
+  <data name="VaultTimeout" xml:space="preserve">
+    <value>Vault Timeout</value>
+  </data>
+  <data name="VaultTimeoutAction" xml:space="preserve">
+    <value>Vault Timeout Action</value>
+  </data>
+  <data name="VaultTimeoutLogOutConfirmation" xml:space="preserve">
+    <value>Logging out will remove all access to your vault and requires online authentication after the timeout period. Are you sure you want to use this setting?</value>
   </data>
   <data name="LoggingIn" xml:space="preserve">
     <value>กำลังเข้าสู่ระบบ...</value>
@@ -1433,12 +1439,9 @@
   <data name="Unlock" xml:space="preserve">
     <value>Unlock</value>
   </data>
-  <data name="LockOption30Minutes" xml:space="preserve">
+  <data name="ThirtyMinutes" xml:space="preserve">
     <value>30 minutes</value>
   </data>
-  <data name="LockOption5Minutes" xml:space="preserve">
-    <value>5 minutes</value>
-  </data>
   <data name="SetPINDescription" xml:space="preserve">
     <value>Set your PIN code for unlocking Bitwarden. Your PIN settings will be reset if you ever fully log out of the application.</value>
   </data>
@@ -1463,9 +1466,6 @@
   <data name="FiveMinutes" xml:space="preserve">
     <value>5 minutes</value>
   </data>
-  <data name="OneMinute" xml:space="preserve">
-    <value>1 minute</value>
-  </data>
   <data name="TenSeconds" xml:space="preserve">
     <value>10 seconds</value>
   </data>
@@ -1517,7 +1517,7 @@
     <value>Are you sure you want to exit Bitwarden?</value>
   </data>
   <data name="PINRequireMasterPasswordRestart" xml:space="preserve">
-    <value>Do you want to require unlocking with your master password when the application is restarted?</value>
+    <value>You you want to require unlocking with your master password when the application is restarted?</value>
   </data>
   <data name="Black" xml:space="preserve">
     <value>Black</value>
@@ -1535,7 +1535,7 @@
   <data name="DisableSavePromptDescription" xml:space="preserve">
     <value>The "Save Prompt" automatically prompts you to save new items to your vault whenever you enter them for the first time.</value>
   </data>
-  <data name="LockOptionOnRestart" xml:space="preserve">
+  <data name="OnRestart" xml:space="preserve">
     <value>On App Restart</value>
   </data>
   <data name="AutofillServiceNotEnabled" xml:space="preserve">

src/App/Resources/AppResources.tr.resx

@@ -518,23 +518,29 @@
   <data name="Lock" xml:space="preserve">
     <value>Kilitle</value>
   </data>
-  <data name="LockOption15Minutes" xml:space="preserve">
+  <data name="FifteenMinutes" xml:space="preserve">
     <value>15 dakika</value>
   </data>
-  <data name="LockOption1Hour" xml:space="preserve">
+  <data name="OneHour" xml:space="preserve">
     <value>1 saat</value>
   </data>
-  <data name="LockOption1Minute" xml:space="preserve">
+  <data name="OneMinute" xml:space="preserve">
     <value>1 dakika</value>
   </data>
-  <data name="LockOption4Hours" xml:space="preserve">
+  <data name="FourHours" xml:space="preserve">
     <value>4 saat</value>
   </data>
-  <data name="LockOptionImmediately" xml:space="preserve">
+  <data name="Immediately" xml:space="preserve">
     <value>Hemen</value>
   </data>
-  <data name="LockOptions" xml:space="preserve">
-    <value>Kilit Seçenekleri</value>
+  <data name="VaultTimeout" xml:space="preserve">
+    <value>Kasa Zaman Aşımı</value>
+  </data>
+  <data name="VaultTimeoutAction" xml:space="preserve">
+    <value>Kasa Zaman Aşımı Eylemi</value>
+  </data>
+  <data name="VaultTimeoutLogOutConfirmation" xml:space="preserve">
+    <value>Oturumu kapatmak kasanıza olan tüm erişiminizi kaldırır ve zaman aşımından sonra çevrimiçi kimlik doğrulaması gerektirir. Bu ayarı kullanmak istediğinizden emin misiniz?</value>
   </data>
   <data name="LoggingIn" xml:space="preserve">
     <value>Oturum açılıyor...</value>
@@ -1132,7 +1138,7 @@
     <value>Bu klasörde öğe yok.</value>
   </data>
   <data name="NoItemsTrash" xml:space="preserve">
-    <value>There are no items in the trash.</value>
+    <value>Çöp kutusunda hiç öge yok.</value>
   </data>
   <data name="AutofillAccessibilityService" xml:space="preserve">
     <value>Otomatik Doldur Erişilebilirlik Hizmeti</value>
@@ -1433,12 +1439,9 @@
   <data name="Unlock" xml:space="preserve">
     <value>Kilidi Aç</value>
   </data>
-  <data name="LockOption30Minutes" xml:space="preserve">
+  <data name="ThirtyMinutes" xml:space="preserve">
     <value>30 dakika</value>
   </data>
-  <data name="LockOption5Minutes" xml:space="preserve">
-    <value>5 dakika</value>
-  </data>
   <data name="SetPINDescription" xml:space="preserve">
     <value>Bitwarden'ı açmak için bir PIN kodu belirleyin. Uygulamadan tamamen çıkış yaparsanız PIN ayarlarınız sıfırlanacaktır.</value>
   </data>
@@ -1463,9 +1466,6 @@
   <data name="FiveMinutes" xml:space="preserve">
     <value>5 dakika</value>
   </data>
-  <data name="OneMinute" xml:space="preserve">
-    <value>1 dakika</value>
-  </data>
   <data name="TenSeconds" xml:space="preserve">
     <value>10 saniye</value>
   </data>
@@ -1535,7 +1535,7 @@
   <data name="DisableSavePromptDescription" xml:space="preserve">
     <value>"Kaydet Uyarısı", ilk kez girdiğinizde yeni ögeleri kasanıza kaydetmeniz için otomatik olarak size sorar.</value>
   </data>
-  <data name="LockOptionOnRestart" xml:space="preserve">
+  <data name="OnRestart" xml:space="preserve">
     <value>Uygulama Yeniden Başlatılırken</value>
   </data>
   <data name="AutofillServiceNotEnabled" xml:space="preserve">
@@ -1635,43 +1635,43 @@
     <value>Şifre alanı tespit edilmedi</value>
   </data>
   <data name="SoftDeleting" xml:space="preserve">
-    <value>Sending to trash...</value>
+    <value>Çöp kutusuna gönderiliyor...</value>
     <comment>Message shown when interacting with the server</comment>
   </data>
   <data name="ItemSoftDeleted" xml:space="preserve">
-    <value>Item has been sent to trash.</value>
+    <value>Öge çöp kutusuna gönderildi.</value>
     <comment>Confirmation message after successfully soft-deleting a login</comment>
   </data>
   <data name="Restore" xml:space="preserve">
-    <value>Restore</value>
+    <value>Geri Yükle</value>
     <comment>Restores an entity (verb).</comment>
   </data>
   <data name="Restoring" xml:space="preserve">
-    <value>Restoring...</value>
+    <value>Geri yükleniyor...</value>
     <comment>Message shown when interacting with the server</comment>
   </data>
   <data name="ItemRestored" xml:space="preserve">
-    <value>Item has been restored.</value>
+    <value>Öge geri yüklendi.</value>
     <comment>Confirmation message after successfully restoring a soft-deleted item</comment>
   </data>
   <data name="Trash" xml:space="preserve">
-    <value>Trash</value>
+    <value>Çöp Kutusu</value>
     <comment>(noun) Location of deleted items which have not yet been permanently deleted</comment>
   </data>
   <data name="SearchTrash" xml:space="preserve">
-    <value>Search trash</value>
+    <value>Çöplerde ara</value>
     <comment>(action prompt) Label for the search text field when viewing the trash folder</comment>
   </data>
   <data name="DoYouReallyWantToPermanentlyDeleteCipher" xml:space="preserve">
-    <value>Do you really want to permanently delete? This cannot be undone.</value>
+    <value>Gerçekten kalıcı olarak silmek istiyor musunuz? Bu işlem geri alınamaz.</value>
     <comment>Confirmation alert message when permanently deleteing a cipher.</comment>
   </data>
   <data name="DoYouReallyWantToRestoreCipher" xml:space="preserve">
-    <value>Do you really want to restore this item?</value>
+    <value>Bu ögeyi geri yüklemeyi gerçekten istiyor musunuz?</value>
     <comment>Confirmation alert message when restoring a soft-deleted cipher.</comment>
   </data>
   <data name="DoYouReallyWantToSoftDeleteCipher" xml:space="preserve">
-    <value>Do you really want to send to the trash?</value>
+    <value>Bu ögeyi çöp kutusuna göndermeyi gerçekten istiyor musunuz?</value>
     <comment>Confirmation alert message when soft-deleting a cipher.</comment>
   </data>
 </root>

src/App/Resources/AppResources.uk.resx

@@ -518,23 +518,29 @@
   <data name="Lock" xml:space="preserve">
     <value>Заблокувати</value>
   </data>
-  <data name="LockOption15Minutes" xml:space="preserve">
+  <data name="FifteenMinutes" xml:space="preserve">
     <value>15 хвилин</value>
   </data>
-  <data name="LockOption1Hour" xml:space="preserve">
+  <data name="OneHour" xml:space="preserve">
     <value>1 година</value>
   </data>
-  <data name="LockOption1Minute" xml:space="preserve">
+  <data name="OneMinute" xml:space="preserve">
     <value>1 хвилина</value>
   </data>
-  <data name="LockOption4Hours" xml:space="preserve">
+  <data name="FourHours" xml:space="preserve">
     <value>4 години</value>
   </data>
-  <data name="LockOptionImmediately" xml:space="preserve">
+  <data name="Immediately" xml:space="preserve">
     <value>Негайно</value>
   </data>
-  <data name="LockOptions" xml:space="preserve">
-    <value>Час блокування</value>
+  <data name="VaultTimeout" xml:space="preserve">
+    <value>Час очікування сховища</value>
+  </data>
+  <data name="VaultTimeoutAction" xml:space="preserve">
+    <value>Дія після часу очікування сховища</value>
+  </data>
+  <data name="VaultTimeoutLogOutConfirmation" xml:space="preserve">
+    <value>Вихід скасує всі права доступу до вашого сховища і вимагатиме авторизації після завершення часу очікування. Ви дійсно хочете використати цей параметр?</value>
   </data>
   <data name="LoggingIn" xml:space="preserve">
     <value>Вхід...</value>
@@ -1433,12 +1439,9 @@
   <data name="Unlock" xml:space="preserve">
     <value>Розблокувати</value>
   </data>
-  <data name="LockOption30Minutes" xml:space="preserve">
+  <data name="ThirtyMinutes" xml:space="preserve">
     <value>30 хвилин</value>
   </data>
-  <data name="LockOption5Minutes" xml:space="preserve">
-    <value>5 хвилин</value>
-  </data>
   <data name="SetPINDescription" xml:space="preserve">
     <value>Встановіть PIN-код для розблокування Bitwarden. Налаштування PIN-коду будуть скинуті, якщо ви коли-небудь повністю вийдете з програми.</value>
   </data>
@@ -1463,9 +1466,6 @@
   <data name="FiveMinutes" xml:space="preserve">
     <value>5 хвилин</value>
   </data>
-  <data name="OneMinute" xml:space="preserve">
-    <value>1 хвилина</value>
-  </data>
   <data name="TenSeconds" xml:space="preserve">
     <value>10 секунд</value>
   </data>
@@ -1535,7 +1535,7 @@
   <data name="DisableSavePromptDescription" xml:space="preserve">
     <value>Запит про збереження автоматично пропонує вам зберегти нові записи до вашого сховища, щоразу, коли ви вперше заповнюєте облікові дані.</value>
   </data>
-  <data name="LockOptionOnRestart" xml:space="preserve">
+  <data name="OnRestart" xml:space="preserve">
     <value>При перезапуску програми</value>
   </data>
   <data name="AutofillServiceNotEnabled" xml:space="preserve">

src/App/Resources/AppResources.vi.resx

@@ -518,23 +518,29 @@
   <data name="Lock" xml:space="preserve">
     <value>Khóa</value>
   </data>
-  <data name="LockOption15Minutes" xml:space="preserve">
-    <value>15 phút</value>
+  <data name="FifteenMinutes" xml:space="preserve">
+    <value>15 minutes</value>
   </data>
-  <data name="LockOption1Hour" xml:space="preserve">
-    <value>1 giờ</value>
+  <data name="OneHour" xml:space="preserve">
+    <value>1 hour</value>
   </data>
-  <data name="LockOption1Minute" xml:space="preserve">
-    <value>1 phút</value>
+  <data name="OneMinute" xml:space="preserve">
+    <value>1 minute</value>
   </data>
-  <data name="LockOption4Hours" xml:space="preserve">
-    <value>4 giờ</value>
+  <data name="FourHours" xml:space="preserve">
+    <value>4 hours</value>
   </data>
-  <data name="LockOptionImmediately" xml:space="preserve">
-    <value>Tức thì</value>
+  <data name="Immediately" xml:space="preserve">
+    <value>Immediately</value>
   </data>
-  <data name="LockOptions" xml:space="preserve">
-    <value>Khóa lại sau</value>
+  <data name="VaultTimeout" xml:space="preserve">
+    <value>Vault Timeout</value>
+  </data>
+  <data name="VaultTimeoutAction" xml:space="preserve">
+    <value>Vault Timeout Action</value>
+  </data>
+  <data name="VaultTimeoutLogOutConfirmation" xml:space="preserve">
+    <value>Logging out will remove all access to your vault and requires online authentication after the timeout period. Are you sure you want to use this setting?</value>
   </data>
   <data name="LoggingIn" xml:space="preserve">
     <value>Đang đăng nhập...</value>
@@ -1433,12 +1439,9 @@
   <data name="Unlock" xml:space="preserve">
     <value>Unlock</value>
   </data>
-  <data name="LockOption30Minutes" xml:space="preserve">
+  <data name="ThirtyMinutes" xml:space="preserve">
     <value>30 minutes</value>
   </data>
-  <data name="LockOption5Minutes" xml:space="preserve">
-    <value>5 minutes</value>
-  </data>
   <data name="SetPINDescription" xml:space="preserve">
     <value>Set your PIN code for unlocking Bitwarden. Your PIN settings will be reset if you ever fully log out of the application.</value>
   </data>
@@ -1463,9 +1466,6 @@
   <data name="FiveMinutes" xml:space="preserve">
     <value>5 minutes</value>
   </data>
-  <data name="OneMinute" xml:space="preserve">
-    <value>1 minute</value>
-  </data>
   <data name="TenSeconds" xml:space="preserve">
     <value>10 seconds</value>
   </data>
@@ -1517,7 +1517,7 @@
     <value>Are you sure you want to exit Bitwarden?</value>
   </data>
   <data name="PINRequireMasterPasswordRestart" xml:space="preserve">
-    <value>Do you want to require unlocking with your master password when the application is restarted?</value>
+    <value>You you want to require unlocking with your master password when the application is restarted?</value>
   </data>
   <data name="Black" xml:space="preserve">
     <value>Black</value>
@@ -1535,7 +1535,7 @@
   <data name="DisableSavePromptDescription" xml:space="preserve">
     <value>The "Save Prompt" automatically prompts you to save new items to your vault whenever you enter them for the first time.</value>
   </data>
-  <data name="LockOptionOnRestart" xml:space="preserve">
+  <data name="OnRestart" xml:space="preserve">
     <value>On App Restart</value>
   </data>
   <data name="AutofillServiceNotEnabled" xml:space="preserve">

src/App/Resources/AppResources.zh-Hans.resx

@@ -518,23 +518,29 @@
   <data name="Lock" xml:space="preserve">
     <value>锁定</value>
   </data>
-  <data name="LockOption15Minutes" xml:space="preserve">
+  <data name="FifteenMinutes" xml:space="preserve">
     <value>15 分钟</value>
   </data>
-  <data name="LockOption1Hour" xml:space="preserve">
+  <data name="OneHour" xml:space="preserve">
     <value>1 小时</value>
   </data>
-  <data name="LockOption1Minute" xml:space="preserve">
+  <data name="OneMinute" xml:space="preserve">
     <value>1 分钟</value>
   </data>
-  <data name="LockOption4Hours" xml:space="preserve">
+  <data name="FourHours" xml:space="preserve">
     <value>4 小时</value>
   </data>
-  <data name="LockOptionImmediately" xml:space="preserve">
+  <data name="Immediately" xml:space="preserve">
     <value>立即</value>
   </data>
-  <data name="LockOptions" xml:space="preserve">
-    <value>锁定选项</value>
+  <data name="VaultTimeout" xml:space="preserve">
+    <value>密码库超时</value>
+  </data>
+  <data name="VaultTimeoutAction" xml:space="preserve">
+    <value>密码库超时动作</value>
+  </data>
+  <data name="VaultTimeoutLogOutConfirmation" xml:space="preserve">
+    <value>超时后登出将解除对密码库的所有访问权限，并需要进行在线认证。确定使用此设置吗？</value>
   </data>
   <data name="LoggingIn" xml:space="preserve">
     <value>正在登录...</value>
@@ -1433,12 +1439,9 @@
   <data name="Unlock" xml:space="preserve">
     <value>解锁​​​​</value>
   </data>
-  <data name="LockOption30Minutes" xml:space="preserve">
+  <data name="ThirtyMinutes" xml:space="preserve">
     <value>30 分钟</value>
   </data>
-  <data name="LockOption5Minutes" xml:space="preserve">
-    <value>5 分钟</value>
-  </data>
   <data name="SetPINDescription" xml:space="preserve">
     <value>设定您用来解锁 Bitwarden 的 PIN 码。您的 PIN 设置将在您完全退出本应用程序时被重置。</value>
   </data>
@@ -1463,9 +1466,6 @@
   <data name="FiveMinutes" xml:space="preserve">
     <value>5 分钟</value>
   </data>
-  <data name="OneMinute" xml:space="preserve">
-    <value>1 分钟</value>
-  </data>
   <data name="TenSeconds" xml:space="preserve">
     <value>10 秒</value>
   </data>
@@ -1535,8 +1535,8 @@
   <data name="DisableSavePromptDescription" xml:space="preserve">
     <value>当您第一次输入新的项目时，“保存提示” 会自动提醒您在密码库里保存此新项目。</value>
   </data>
-  <data name="LockOptionOnRestart" xml:space="preserve">
-    <value>重启时</value>
+  <data name="OnRestart" xml:space="preserve">
+    <value>应用重启时</value>
   </data>
   <data name="AutofillServiceNotEnabled" xml:space="preserve">
     <value>自动填充可以简单安全地从其他网站和应用程序中访问您的 Bitwarden 密码库。看起来您还没有启用 Bitwarden 自动填充服务。从“设置”屏幕启用 Bitwarden 自动填充。</value>

src/App/Resources/AppResources.zh-Hant.resx

@@ -518,23 +518,29 @@
   <data name="Lock" xml:space="preserve">
     <value>鎖定</value>
   </data>
-  <data name="LockOption15Minutes" xml:space="preserve">
-    <value>15 分鐘</value>
+  <data name="FifteenMinutes" xml:space="preserve">
+    <value>15 minutes</value>
   </data>
-  <data name="LockOption1Hour" xml:space="preserve">
-    <value>1 小時</value>
+  <data name="OneHour" xml:space="preserve">
+    <value>1 hour</value>
   </data>
-  <data name="LockOption1Minute" xml:space="preserve">
+  <data name="OneMinute" xml:space="preserve">
     <value>1 分鐘</value>
   </data>
-  <data name="LockOption4Hours" xml:space="preserve">
-    <value>4 小時</value>
+  <data name="FourHours" xml:space="preserve">
+    <value>4 hours</value>
   </data>
-  <data name="LockOptionImmediately" xml:space="preserve">
-    <value>立即</value>
+  <data name="Immediately" xml:space="preserve">
+    <value>Immediately</value>
   </data>
-  <data name="LockOptions" xml:space="preserve">
-    <value>自動鎖定時間</value>
+  <data name="VaultTimeout" xml:space="preserve">
+    <value>Vault Timeout</value>
+  </data>
+  <data name="VaultTimeoutAction" xml:space="preserve">
+    <value>Vault Timeout Action</value>
+  </data>
+  <data name="VaultTimeoutLogOutConfirmation" xml:space="preserve">
+    <value>Logging out will remove all access to your vault and requires online authentication after the timeout period. Are you sure you want to use this setting?</value>
   </data>
   <data name="LoggingIn" xml:space="preserve">
     <value>正在登入...</value>
@@ -1433,11 +1439,8 @@
   <data name="Unlock" xml:space="preserve">
     <value>解鎖</value>
   </data>
-  <data name="LockOption30Minutes" xml:space="preserve">
-    <value>30 分鐘</value>
-  </data>
-  <data name="LockOption5Minutes" xml:space="preserve">
-    <value>5 分鐘</value>
+  <data name="ThirtyMinutes" xml:space="preserve">
+    <value>30 minutes</value>
   </data>
   <data name="SetPINDescription" xml:space="preserve">
     <value>設定您用來解鎖 Bitwarden 的 PIN 碼。您的 PIN 設定將在您完全結束本應用程式時被重設。</value>
@@ -1463,9 +1466,6 @@
   <data name="FiveMinutes" xml:space="preserve">
     <value>5 分鐘</value>
   </data>
-  <data name="OneMinute" xml:space="preserve">
-    <value>1 分鐘</value>
-  </data>
   <data name="TenSeconds" xml:space="preserve">
     <value>10 秒鐘</value>
   </data>
@@ -1535,8 +1535,8 @@
   <data name="DisableSavePromptDescription" xml:space="preserve">
     <value>當您首次輸入時，「儲存提示」會自動提示您將新項目儲存進密碼庫。</value>
   </data>
-  <data name="LockOptionOnRestart" xml:space="preserve">
-    <value>於程式重新啟動時</value>
+  <data name="OnRestart" xml:space="preserve">
+    <value>On App Restart</value>
   </data>
   <data name="AutofillServiceNotEnabled" xml:space="preserve">
     <value>「自動填入」使其他網站及 App 能更簡單地安全存取您的 Bitwarden 密碼庫。看起來您尚未啟用 Bitwarden 的自動填入服務。請在「設定」畫面啟用 Bitwarden 的自動填入。</value>

src/Core/Core.csproj

@@ -24,7 +24,7 @@
 
   <ItemGroup>
     <PackageReference Include="CsvHelper" Version="15.0.5" />
-    <PackageReference Include="LiteDB" Version="5.0.4" />
+    <PackageReference Include="LiteDB" Version="5.0.8" />
     <PackageReference Include="Newtonsoft.Json" Version="12.0.3" />
     <PackageReference Include="PCLCrypto" Version="2.0.147" />
   </ItemGroup>

src/Core/Services/LiteDbStorageService.cs

@@ -2,14 +2,16 @@
 using LiteDB;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Serialization;
-using System;
 using System.Linq;
 using System.Threading.Tasks;
 
 namespace Bit.Core.Services
 {
-    public class LiteDbStorageService : IStorageService, IDisposable
+    public class LiteDbStorageService : IStorageService
     {
+        private static LiteDatabase _db;
+        private static readonly object _lock = new object();
+
         private readonly JsonSerializerSettings _jsonSettings = new JsonSerializerSettings
         {
             ContractResolver = new CamelCasePropertyNamesContractResolver()
@@ -17,7 +19,6 @@ namespace Bit.Core.Services
         private readonly string _dbPath;
         private ILiteCollection<JsonItem> _collection;
         private Task _initTask;
-        private LiteDatabase _db;
 
         public LiteDbStorageService(string dbPath)
         {
@@ -38,7 +39,13 @@ namespace Bit.Core.Services
             {
                 try
                 {
-                    _db = new LiteDatabase($"Filename={_dbPath};Upgrade=true;");
+                    lock (_lock)
+                    {
+                        if (_db == null)
+                        {
+                            _db = new LiteDatabase($"Filename={_dbPath};Upgrade=true;");
+                        }
+                    }
                     _collection = _db.GetCollection<JsonItem>("json_items");
                 }
                 finally
@@ -73,11 +80,6 @@ namespace Bit.Core.Services
             _collection.DeleteMany(i => i.Id == key);
         }
 
-        public void Dispose()
-        {
-            _db?.Dispose();
-        }
-
         private class JsonItem
         {
             public JsonItem() { }

src/Core/Utilities/CoreHelpers.cs

@@ -36,13 +36,14 @@ namespace Bit.Core.Utilities
 
         public static string GetHostname(string uriString)
         {
-            return GetUri(uriString)?.Host;
+            var uri = GetUri(uriString);
+            return string.IsNullOrEmpty(uri?.Host) ? null : uri.Host;
         }
 
         public static string GetHost(string uriString)
         {
             var uri = GetUri(uriString);
-            if (uri != null)
+            if (!string.IsNullOrEmpty(uri?.Host))
             {
                 if (uri.IsDefaultPort)
                 {

src/iOS.Autofill/CredentialProviderViewController.cs

@@ -41,7 +41,7 @@ namespace Bit.iOS.Autofill
             };
         }
 
-        public override void PrepareCredentialList(ASCredentialServiceIdentifier[] serviceIdentifiers)
+        public override async void PrepareCredentialList(ASCredentialServiceIdentifier[] serviceIdentifiers)
         {
             InitAppIfNeeded();
             _context.ServiceIdentifiers = serviceIdentifiers;
@@ -54,11 +54,11 @@ namespace Bit.iOS.Autofill
                 }
                 _context.UrlString = uri;
             }
-            if (!IsAuthed())
+            if (!await IsAuthed())
             {
                 LaunchLoginFlow();
             }
-            else if (IsLocked())
+            else if (await IsLocked())
             {
                 PerformSegue("lockPasswordSegue", this);
             }
@@ -75,10 +75,10 @@ namespace Bit.iOS.Autofill
             }
         }
 
-        public override void ProvideCredentialWithoutUserInteraction(ASPasswordCredentialIdentity credentialIdentity)
+        public override async void ProvideCredentialWithoutUserInteraction(ASPasswordCredentialIdentity credentialIdentity)
         {
             InitAppIfNeeded();
-            if (!IsAuthed() || IsLocked())
+            if (!await IsAuthed() || await IsLocked())
             {
                 var err = new NSError(new NSString("ASExtensionErrorDomain"),
                     Convert.ToInt32(ASExtensionErrorCode.UserInteractionRequired), null);
@@ -86,13 +86,13 @@ namespace Bit.iOS.Autofill
                 return;
             }
             _context.CredentialIdentity = credentialIdentity;
-            ProvideCredentialAsync().GetAwaiter().GetResult();
+            await ProvideCredentialAsync();
         }
 
-        public override void PrepareInterfaceToProvideCredential(ASPasswordCredentialIdentity credentialIdentity)
+        public override async void PrepareInterfaceToProvideCredential(ASPasswordCredentialIdentity credentialIdentity)
         {
             InitAppIfNeeded();
-            if (!IsAuthed())
+            if (!await IsAuthed())
             {
                 LaunchLoginFlow();
                 return;
@@ -101,11 +101,11 @@ namespace Bit.iOS.Autofill
             CheckLock(async () => await ProvideCredentialAsync());
         }
 
-        public override void PrepareInterfaceForExtensionConfiguration()
+        public override async void PrepareInterfaceForExtensionConfiguration()
         {
             InitAppIfNeeded();
             _context.Configuring = true;
-            if (!IsAuthed())
+            if (!await IsAuthed())
             {
                 LaunchLoginFlow();
                 return;
@@ -203,12 +203,18 @@ namespace Bit.iOS.Autofill
         private async Task ProvideCredentialAsync()
         {
             var cipherService = ServiceContainer.Resolve<ICipherService>("cipherService", true);
-            var cipher = await cipherService?.GetAsync(_context.CredentialIdentity.RecordIdentifier);
-            if (cipher == null || cipher.Type != Bit.Core.Enums.CipherType.Login)
+            Bit.Core.Models.Domain.Cipher cipher = null;
+            var cancel = cipherService == null || _context.CredentialIdentity?.RecordIdentifier == null;
+            if (!cancel)
+            {
+                cipher = await cipherService.GetAsync(_context.CredentialIdentity.RecordIdentifier);
+                cancel = cipher == null || cipher.Type != Bit.Core.Enums.CipherType.Login || cipher.Login == null;
+            }
+            if (cancel)
             {
                 var err = new NSError(new NSString("ASExtensionErrorDomain"),
                     Convert.ToInt32(ASExtensionErrorCode.CredentialIdentityNotFound), null);
-                ExtensionContext.CancelRequest(err);
+                ExtensionContext?.CancelRequest(err);
                 return;
             }
 
@@ -231,9 +237,9 @@ namespace Bit.iOS.Autofill
             CompleteRequest(decCipher.Id, decCipher.Login.Username, decCipher.Login.Password, totpCode);
         }
 
-        private void CheckLock(Action notLockedAction)
+        private async void CheckLock(Action notLockedAction)
         {
-            if (IsLocked())
+            if (await IsLocked())
             {
                 PerformSegue("lockPasswordSegue", this);
             }
@@ -243,16 +249,16 @@ namespace Bit.iOS.Autofill
             }
         }
 
-        private bool IsLocked()
+        private Task<bool> IsLocked()
         {
             var vaultTimeoutService = ServiceContainer.Resolve<IVaultTimeoutService>("vaultTimeoutService");
-            return vaultTimeoutService.IsLockedAsync().GetAwaiter().GetResult();
+            return vaultTimeoutService.IsLockedAsync();
         }
 
-        private bool IsAuthed()
+        private Task<bool> IsAuthed()
         {
             var userService = ServiceContainer.Resolve<IUserService>("userService");
-            return userService.IsAuthenticatedAsync().GetAwaiter().GetResult();
+            return userService.IsAuthenticatedAsync();
         }
 
         private void InitApp()

src/iOS.Autofill/Info.plist

@@ -11,9 +11,9 @@
 	<key>CFBundleIdentifier</key>
 	<string>com.8bit.bitwarden.autofill</string>
 	<key>CFBundleShortVersionString</key>
-	<string>2.4.0</string>
+	<string>2.4.3</string>
 	<key>CFBundleVersion</key>
-	<string>65</string>
+	<string>69</string>
 	<key>CFBundleLocalizations</key>
 	<array>
 		<string>en</string>
@@ -44,6 +44,13 @@
 		<string>pl</string>
 		<string>ko</string>
 		<string>fa</string>
+		<string>ru</string>
+		<string>be</string>
+		<string>bg</string>
+		<string>ca</string>
+		<string>cs</string>
+		<string>el</string>
+		<string>th</string>
 	</array>
 	<key>CFBundleDevelopmentRegion</key>
 	<string>en</string>

src/iOS.Autofill/SetupViewController.cs

@@ -25,6 +25,7 @@ namespace Bit.iOS.Autofill
 
             ActivatedLabel.Text = AppResources.AutofillActivated;
             ActivatedLabel.Font = UIFont.FromDescriptor(descriptor, descriptor.PointSize * 1.3f);
+            ActivatedLabel.TextColor = ThemeHelpers.SuccessColor;
 
             BackButton.Title = AppResources.Back;
             base.ViewDidLoad();

src/iOS.Autofill/iOS.Autofill.csproj

@@ -41,7 +41,7 @@
     <ConsolePause>false</ConsolePause>
     <CodesignEntitlements>Entitlements.plist</CodesignEntitlements>
     <MtouchHttpClientHandler>NSUrlSessionHandler</MtouchHttpClientHandler>
-    <MtouchExtraArgs>--http-message-handler=NSUrlSessionHandler --linkskip=BitwardeniOS --linkskip=BitwardeniOSCore --linkskip=BitwardeniOSAutofill --linkskip=BitwardenApp --linkskip=BitwardenCore</MtouchExtraArgs>
+    <MtouchExtraArgs>--http-message-handler=NSUrlSessionHandler --linkskip=BitwardeniOS --linkskip=BitwardeniOSCore --linkskip=BitwardeniOSAutofill --linkskip=BitwardenApp --linkskip=BitwardenCore --linkskip=LiteDB</MtouchExtraArgs>
     <OptimizePNGs>true</OptimizePNGs>
     <CodesignKey>iPhone Distribution</CodesignKey>
     <CodesignProvision>Dist: Autofill</CodesignProvision>
@@ -79,7 +79,7 @@
     <MtouchLink>Full</MtouchLink>
     <MtouchHttpClientHandler>NSUrlSessionHandler</MtouchHttpClientHandler>
     <OptimizePNGs>true</OptimizePNGs>
-    <MtouchExtraArgs>--http-message-handler=NSUrlSessionHandler --linkskip=BitwardeniOS --linkskip=BitwardeniOSCore --linkskip=BitwardeniOSAutofill --linkskip=BitwardenApp --linkskip=BitwardenCore</MtouchExtraArgs>
+    <MtouchExtraArgs>--http-message-handler=NSUrlSessionHandler --linkskip=BitwardeniOS --linkskip=BitwardeniOSCore --linkskip=BitwardeniOSAutofill --linkskip=BitwardenApp --linkskip=BitwardenCore --linkskip=LiteDB</MtouchExtraArgs>
     <CodesignProvision>Dist: Autofill</CodesignProvision>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(RunConfiguration)' == 'Default' ">
@@ -93,7 +93,7 @@
     <UseVSHostingProcess>false</UseVSHostingProcess>
     <ErrorReport>prompt</ErrorReport>
     <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
-    <MtouchExtraArgs>--http-message-handler=NSUrlSessionHandler --linkskip=BitwardeniOS --linkskip=BitwardeniOSCore --linkskip=BitwardeniOSAutofill --linkskip=BitwardenApp --linkskip=BitwardenCore</MtouchExtraArgs>
+    <MtouchExtraArgs>--http-message-handler=NSUrlSessionHandler --linkskip=BitwardeniOS --linkskip=BitwardeniOSCore --linkskip=BitwardeniOSAutofill --linkskip=BitwardenApp --linkskip=BitwardenCore --linkskip=LiteDB</MtouchExtraArgs>
     <OptimizePNGs>true</OptimizePNGs>
     <MtouchHttpClientHandler>NSUrlSessionHandler</MtouchHttpClientHandler>
     <MtouchLink>Full</MtouchLink>
@@ -111,7 +111,7 @@
     <ErrorReport>prompt</ErrorReport>
     <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
     <MtouchLink>Full</MtouchLink>
-    <MtouchExtraArgs>--http-message-handler=NSUrlSessionHandler --linkskip=BitwardeniOS --linkskip=BitwardeniOSCore --linkskip=BitwardeniOSAutofill --linkskip=BitwardenApp --linkskip=BitwardenCore</MtouchExtraArgs>
+    <MtouchExtraArgs>--http-message-handler=NSUrlSessionHandler --linkskip=BitwardeniOS --linkskip=BitwardeniOSCore --linkskip=BitwardeniOSAutofill --linkskip=BitwardenApp --linkskip=BitwardenCore --linkskip=LiteDB</MtouchExtraArgs>
     <OptimizePNGs>true</OptimizePNGs>
     <MtouchArch>ARM64</MtouchArch>
     <MtouchSdkVersion>10.2</MtouchSdkVersion>
@@ -127,7 +127,7 @@
     <UseVSHostingProcess>false</UseVSHostingProcess>
     <ErrorReport>prompt</ErrorReport>
     <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
-    <MtouchExtraArgs>--http-message-handler=NSUrlSessionHandler --linkskip=BitwardeniOS --linkskip=BitwardeniOSCore --linkskip=BitwardeniOSAutofill --linkskip=BitwardenApp --linkskip=BitwardenCore</MtouchExtraArgs>
+    <MtouchExtraArgs>--http-message-handler=NSUrlSessionHandler --linkskip=BitwardeniOS --linkskip=BitwardeniOSCore --linkskip=BitwardeniOSAutofill --linkskip=BitwardenApp --linkskip=BitwardenCore --linkskip=LiteDB</MtouchExtraArgs>
     <OptimizePNGs>true</OptimizePNGs>
     <MtouchLink>Full</MtouchLink>
     <MtouchHttpClientHandler>NSUrlSessionHandler</MtouchHttpClientHandler>
@@ -147,7 +147,7 @@
     <MtouchArch>ARM64</MtouchArch>
     <MtouchHttpClientHandler>NSUrlSessionHandler</MtouchHttpClientHandler>
     <MtouchLink>Full</MtouchLink>
-    <MtouchExtraArgs>--http-message-handler=NSUrlSessionHandler --linkskip=BitwardeniOS --linkskip=BitwardeniOSCore --linkskip=BitwardeniOSAutofill --linkskip=BitwardenApp --linkskip=BitwardenCore</MtouchExtraArgs>
+    <MtouchExtraArgs>--http-message-handler=NSUrlSessionHandler --linkskip=BitwardeniOS --linkskip=BitwardeniOSCore --linkskip=BitwardeniOSAutofill --linkskip=BitwardenApp --linkskip=BitwardenCore --linkskip=LiteDB</MtouchExtraArgs>
     <OptimizePNGs>true</OptimizePNGs>
     <CodesignKey>iPhone Distribution</CodesignKey>
     <CodesignEntitlements>Entitlements.plist</CodesignEntitlements>

src/iOS.Core/Utilities/ASHelpers.cs

@@ -15,6 +15,11 @@ namespace Bit.iOS.Core.Utilities
             if (await AutofillEnabled())
             {
                 var storageService = ServiceContainer.Resolve<IStorageService>("storageService");
+                var timeoutAction = await storageService.GetAsync<string>(Bit.Core.Constants.VaultTimeoutActionKey);
+                if (timeoutAction == "logOut")
+                {
+                    return;
+                }
                 var vaultTimeoutService = ServiceContainer.Resolve<IVaultTimeoutService>("vaultTimeoutService");
                 if (await vaultTimeoutService.IsLockedAsync())
                 {
@@ -42,6 +47,12 @@ namespace Bit.iOS.Core.Utilities
 
         public static async Task<bool> IdentitiesCanIncremental()
         {
+            var storageService = ServiceContainer.Resolve<IStorageService>("storageService");
+            var timeoutAction = await storageService.GetAsync<string>(Bit.Core.Constants.VaultTimeoutActionKey);
+            if (timeoutAction == "logOut")
+            {
+                return false;
+            }
             var state = await ASCredentialIdentityStore.SharedStore?.GetCredentialIdentityStoreStateAsync();
             return state != null && state.Enabled && state.SupportsIncrementalUpdates;
         }

src/iOS.Core/iOS.Core.csproj

@@ -25,6 +25,26 @@
     <WarningLevel>4</WarningLevel>
     <ConsolePause>false</ConsolePause>
   </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|iPhone' ">
+    <DebugSymbols>true</DebugSymbols>
+    <DebugType>full</DebugType>
+    <Optimize>false</Optimize>
+    <OutputPath>bin\iPhone\Debug</OutputPath>
+    <DefineConstants>DEBUG;</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+    <ConsolePause>false</ConsolePause>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|iPhoneSimulator' ">
+    <DebugSymbols>true</DebugSymbols>
+    <DebugType>full</DebugType>
+    <Optimize>false</Optimize>
+    <OutputPath>bin\iPhoneSimulator\Debug</OutputPath>
+    <DefineConstants>DEBUG;</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+    <ConsolePause>false</ConsolePause>
+  </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
     <DebugType>full</DebugType>
     <Optimize>true</Optimize>
@@ -54,6 +74,28 @@
     <ErrorReport>prompt</ErrorReport>
     <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
   </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'AppStore|iPhone' ">
+    <OutputPath>bin\iPhone\AppStore\</OutputPath>
+    <DefineConstants>__IOS__;__MOBILE__;__UNIFIED__;</DefineConstants>
+    <Optimize>true</Optimize>
+    <NoWarn>;VSX1000</NoWarn>
+    <DebugType>full</DebugType>
+    <PlatformTarget>AnyCPU</PlatformTarget>
+    <UseVSHostingProcess>false</UseVSHostingProcess>
+    <ErrorReport>prompt</ErrorReport>
+    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'AppStore|iPhoneSimulator' ">
+    <OutputPath>bin\iPhoneSimulator\AppStore\</OutputPath>
+    <DefineConstants>__IOS__;__MOBILE__;__UNIFIED__;</DefineConstants>
+    <Optimize>true</Optimize>
+    <NoWarn>;VSX1000</NoWarn>
+    <DebugType>full</DebugType>
+    <PlatformTarget>AnyCPU</PlatformTarget>
+    <UseVSHostingProcess>false</UseVSHostingProcess>
+    <ErrorReport>prompt</ErrorReport>
+    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
+  </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Ad-Hoc|AnyCPU'">
     <OutputPath>bin\Ad-Hoc\</OutputPath>
     <DefineConstants>__IOS__;__MOBILE__;__UNIFIED__;</DefineConstants>
@@ -65,6 +107,28 @@
     <ErrorReport>prompt</ErrorReport>
     <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
   </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Ad-Hoc|iPhone' ">
+    <OutputPath>bin\iPhone\Ad-Hoc\</OutputPath>
+    <DefineConstants>__IOS__;__MOBILE__;__UNIFIED__;</DefineConstants>
+    <Optimize>true</Optimize>
+    <NoWarn>;VSX1000</NoWarn>
+    <DebugType>full</DebugType>
+    <PlatformTarget>AnyCPU</PlatformTarget>
+    <UseVSHostingProcess>false</UseVSHostingProcess>
+    <ErrorReport>prompt</ErrorReport>
+    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Ad-Hoc|iPhoneSimulator' ">
+    <OutputPath>bin\iPhoneSimulator\Ad-Hoc\</OutputPath>
+    <DefineConstants>__IOS__;__MOBILE__;__UNIFIED__;</DefineConstants>
+    <Optimize>true</Optimize>
+    <NoWarn>;VSX1000</NoWarn>
+    <DebugType>full</DebugType>
+    <PlatformTarget>AnyCPU</PlatformTarget>
+    <UseVSHostingProcess>false</UseVSHostingProcess>
+    <ErrorReport>prompt</ErrorReport>
+    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
+  </PropertyGroup>
   <ItemGroup>
     <Reference Include="System" />
     <Reference Include="System.Xml" />

src/iOS.Extension/Info.plist

@@ -11,7 +11,7 @@
 	<key>CFBundleIdentifier</key>
 	<string>com.8bit.bitwarden.find-login-action-extension</string>
 	<key>CFBundleShortVersionString</key>
-	<string>2.4.0</string>
+	<string>2.4.3</string>
 	<key>CFBundleLocalizations</key>
 	<array>
 		<string>en</string>
@@ -42,6 +42,13 @@
 		<string>pl</string>
 		<string>ko</string>
 		<string>fa</string>
+		<string>ru</string>
+		<string>be</string>
+		<string>bg</string>
+		<string>ca</string>
+		<string>cs</string>
+		<string>el</string>
+		<string>th</string>
 	</array>
 	<key>CFBundleDevelopmentRegion</key>
 	<string>en</string>
@@ -104,6 +111,6 @@
 		<string>com.apple.ui-services</string>
 	</dict>
 	<key>CFBundleVersion</key>
-	<string>65</string>
+	<string>69</string>
 </dict>
 </plist>

src/iOS.Extension/LoadingViewController.cs

@@ -6,9 +6,9 @@ using Bit.iOS.Core;
 using Bit.iOS.Extension.Models;
 using MobileCoreServices;
 using Bit.iOS.Core.Utilities;
-using Bit.App.Resources;
 using Bit.iOS.Core.Controllers;
 using System.Collections.Generic;
+using System.Threading.Tasks;
 using Bit.iOS.Core.Models;
 using Bit.Core.Utilities;
 using Bit.Core.Abstractions;
@@ -63,7 +63,7 @@ namespace Bit.iOS.Extension
             }
         }
 
-        public override void ViewDidAppear(bool animated)
+        public override async void ViewDidAppear(bool animated)
         {
             base.ViewDidAppear(animated);
             if (_context.ProviderType == Constants.UTTypeAppExtensionSetup)
@@ -71,12 +71,12 @@ namespace Bit.iOS.Extension
                 PerformSegue("setupSegue", this);
                 return;
             }
-            if (!IsAuthed())
+            if (!await IsAuthed())
             {
                 LaunchLoginFlow();
                 return;
             }
-            else if (IsLocked())
+            else if (await IsLocked())
             {
                 PerformSegue("lockPasswordSegue", this);
             }
@@ -408,16 +408,16 @@ namespace Bit.iOS.Extension
             iOSCoreHelpers.SubscribeBroadcastReceiver(this, _nfcSession, _nfcDelegate);
         }
 
-        private bool IsLocked()
+        private Task<bool> IsLocked()
         {
             var vaultTimeoutService = ServiceContainer.Resolve<IVaultTimeoutService>("vaultTimeoutService");
-            return vaultTimeoutService.IsLockedAsync().GetAwaiter().GetResult();
+            return vaultTimeoutService.IsLockedAsync();
         }
 
-        private bool IsAuthed()
+        private Task<bool> IsAuthed()
         {
             var userService = ServiceContainer.Resolve<IUserService>("userService");
-            return userService.IsAuthenticatedAsync().GetAwaiter().GetResult();
+            return userService.IsAuthenticatedAsync();
         }
 
         private void LaunchLoginFlow()

src/iOS.Extension/iOS.Extension.csproj

@@ -39,7 +39,7 @@
     <ConsolePause>false</ConsolePause>
     <CodesignEntitlements>Entitlements.plist</CodesignEntitlements>
     <MtouchHttpClientHandler>NSUrlSessionHandler</MtouchHttpClientHandler>
-    <MtouchExtraArgs>--http-message-handler=NSUrlSessionHandler --linkskip=BitwardeniOS --linkskip=BitwardeniOSCore --linkskip=BitwardeniOSExtension --linkskip=BitwardenApp --linkskip=BitwardenCore</MtouchExtraArgs>
+    <MtouchExtraArgs>--http-message-handler=NSUrlSessionHandler --linkskip=BitwardeniOS --linkskip=BitwardeniOSCore --linkskip=BitwardeniOSExtension --linkskip=BitwardenApp --linkskip=BitwardenCore --linkskip=LiteDB</MtouchExtraArgs>
     <OptimizePNGs>true</OptimizePNGs>
     <MtouchSdkVersion>9.3</MtouchSdkVersion>
     <CodesignKey>iPhone Distribution</CodesignKey>
@@ -74,7 +74,7 @@
     <MtouchArch>ARM64</MtouchArch>
     <ConsolePause>false</ConsolePause>
     <CodesignKey>iPhone Distribution</CodesignKey>
-    <MtouchExtraArgs>--http-message-handler=NSUrlSessionHandler --linkskip=BitwardeniOS --linkskip=BitwardeniOSCore --linkskip=BitwardeniOSExtension --linkskip=BitwardenApp --linkskip=BitwardenCore</MtouchExtraArgs>
+    <MtouchExtraArgs>--http-message-handler=NSUrlSessionHandler --linkskip=BitwardeniOS --linkskip=BitwardeniOSCore --linkskip=BitwardeniOSExtension --linkskip=BitwardenApp --linkskip=BitwardenCore --linkskip=LiteDB</MtouchExtraArgs>
     <OptimizePNGs>true</OptimizePNGs>
     <MtouchHttpClientHandler>NSUrlSessionHandler</MtouchHttpClientHandler>
     <MtouchLink>Full</MtouchLink>
@@ -93,7 +93,7 @@
     <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
     <MtouchLink>Full</MtouchLink>
     <MtouchHttpClientHandler>NSUrlSessionHandler</MtouchHttpClientHandler>
-    <MtouchExtraArgs>--http-message-handler=NSUrlSessionHandler --linkskip=BitwardeniOS --linkskip=BitwardeniOSCore --linkskip=BitwardeniOSExtension --linkskip=BitwardenApp --linkskip=BitwardenCore</MtouchExtraArgs>
+    <MtouchExtraArgs>--http-message-handler=NSUrlSessionHandler --linkskip=BitwardeniOS --linkskip=BitwardeniOSCore --linkskip=BitwardeniOSExtension --linkskip=BitwardenApp --linkskip=BitwardenCore --linkskip=LiteDB</MtouchExtraArgs>
     <OptimizePNGs>true</OptimizePNGs>
     <MtouchSdkVersion>9.3</MtouchSdkVersion>
     <CodesignKey>iPhone Distribution</CodesignKey>
@@ -108,7 +108,7 @@
     <UseVSHostingProcess>false</UseVSHostingProcess>
     <ErrorReport>prompt</ErrorReport>
     <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
-    <MtouchExtraArgs>--http-message-handler=NSUrlSessionHandler --linkskip=BitwardeniOS --linkskip=BitwardeniOSCore --linkskip=BitwardeniOSExtension --linkskip=BitwardenApp --linkskip=BitwardenCore</MtouchExtraArgs>
+    <MtouchExtraArgs>--http-message-handler=NSUrlSessionHandler --linkskip=BitwardeniOS --linkskip=BitwardeniOSCore --linkskip=BitwardeniOSExtension --linkskip=BitwardenApp --linkskip=BitwardenCore --linkskip=LiteDB</MtouchExtraArgs>
     <OptimizePNGs>true</OptimizePNGs>
     <MtouchHttpClientHandler>NSUrlSessionHandler</MtouchHttpClientHandler>
     <MtouchArch>ARM64</MtouchArch>
@@ -126,7 +126,7 @@
     <UseVSHostingProcess>false</UseVSHostingProcess>
     <ErrorReport>prompt</ErrorReport>
     <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
-    <MtouchExtraArgs>--http-message-handler=NSUrlSessionHandler --linkskip=BitwardeniOS --linkskip=BitwardeniOSCore --linkskip=BitwardeniOSExtension --linkskip=BitwardenApp --linkskip=BitwardenCore</MtouchExtraArgs>
+    <MtouchExtraArgs>--http-message-handler=NSUrlSessionHandler --linkskip=BitwardeniOS --linkskip=BitwardeniOSCore --linkskip=BitwardeniOSExtension --linkskip=BitwardenApp --linkskip=BitwardenCore --linkskip=LiteDB</MtouchExtraArgs>
     <OptimizePNGs>true</OptimizePNGs>
     <MtouchHttpClientHandler>NSUrlSessionHandler</MtouchHttpClientHandler>
     <MtouchLink>Full</MtouchLink>
@@ -146,7 +146,7 @@
     <MtouchArch>ARM64</MtouchArch>
     <MtouchLink>Full</MtouchLink>
     <MtouchHttpClientHandler>NSUrlSessionHandler</MtouchHttpClientHandler>
-    <MtouchExtraArgs>--http-message-handler=NSUrlSessionHandler --linkskip=BitwardeniOS --linkskip=BitwardeniOSCore --linkskip=BitwardeniOSExtension --linkskip=BitwardenApp --linkskip=BitwardenCore</MtouchExtraArgs>
+    <MtouchExtraArgs>--http-message-handler=NSUrlSessionHandler --linkskip=BitwardeniOS --linkskip=BitwardeniOSCore --linkskip=BitwardeniOSExtension --linkskip=BitwardenApp --linkskip=BitwardenCore --linkskip=LiteDB</MtouchExtraArgs>
     <OptimizePNGs>true</OptimizePNGs>
     <CodesignKey>iPhone Distribution</CodesignKey>
     <CodesignProvision>Automatic:AdHoc</CodesignProvision>

src/iOS/AppDelegate.cs

@@ -120,7 +120,8 @@ namespace Bit.iOS
                         }
                     }
                 }
-                else if (message.Command == "addedCipher" || message.Command == "editedCipher" || message.Command == "restoredCipher")
+                else if (message.Command == "addedCipher" || message.Command == "editedCipher" ||
+                    message.Command == "restoredCipher")
                 {
                     if (_deviceActionService.SystemMajorVersion() >= 12)
                     {
@@ -173,6 +174,18 @@ namespace Bit.iOS
                 {
                     await ASHelpers.ReplaceAllIdentities();
                 }
+                else if (message.Command == "vaultTimeoutActionChanged")
+                {
+                    var timeoutAction = await _storageService.GetAsync<string>(Constants.VaultTimeoutActionKey);
+                    if (timeoutAction == "logOut")
+                    {
+                        await ASCredentialIdentityStore.SharedStore?.RemoveAllCredentialIdentitiesAsync();
+                    }
+                    else
+                    {
+                        await ASHelpers.ReplaceAllIdentities();
+                    }
+                }
             });
 
             return base.FinishedLaunching(app, options);

src/iOS/Info.plist

@@ -11,9 +11,9 @@
 	<key>CFBundleIdentifier</key>
 	<string>com.8bit.bitwarden</string>
 	<key>CFBundleShortVersionString</key>
-	<string>2.4.0</string>
+	<string>2.4.3</string>
 	<key>CFBundleVersion</key>
-	<string>65</string>
+	<string>69</string>
 	<key>CFBundleIconName</key>
 	<string>AppIcon</string>
 	<key>CFBundleURLTypes</key>
@@ -58,6 +58,13 @@
 		<string>pl</string>
 		<string>ko</string>
 		<string>fa</string>
+		<string>ru</string>
+		<string>be</string>
+		<string>bg</string>
+		<string>ca</string>
+		<string>cs</string>
+		<string>el</string>
+		<string>th</string>
 	</array>
 	<key>CFBundleDevelopmentRegion</key>
 	<string>en</string>

src/iOS/iOS.csproj

@@ -41,7 +41,7 @@
     <MtouchLink>Full</MtouchLink>
     <MtouchArch>x86_64</MtouchArch>
     <ConsolePause>false</ConsolePause>
-    <MtouchExtraArgs>--nodevcodeshare --http-message-handler=NSUrlSessionHandler --linkskip=BitwardeniOS --linkskip=BitwardeniOSCore --linkskip=BitwardeniOSAutofill --linkskip=BitwardeniOSExtension --linkskip=BitwardenApp --linkskip=BitwardenCore</MtouchExtraArgs>
+    <MtouchExtraArgs>--nodevcodeshare --http-message-handler=NSUrlSessionHandler --linkskip=BitwardeniOS --linkskip=BitwardeniOSCore --linkskip=BitwardeniOSAutofill --linkskip=BitwardeniOSExtension --linkskip=BitwardenApp --linkskip=BitwardenCore --linkskip=LiteDB</MtouchExtraArgs>
     <OptimizePNGs>true</OptimizePNGs>
     <CodesignEntitlements>Entitlements.plist</CodesignEntitlements>
   </PropertyGroup>
@@ -74,7 +74,7 @@
     <CodesignKey>iPhone Developer</CodesignKey>
     <CodesignEntitlements>Entitlements.plist</CodesignEntitlements>
     <MtouchLink>Full</MtouchLink>
-    <MtouchExtraArgs>--nodevcodeshare --http-message-handler=NSUrlSessionHandler --linkskip=BitwardeniOS --linkskip=BitwardeniOSCore --linkskip=BitwardeniOSAutofill --linkskip=BitwardeniOSExtension --linkskip=BitwardenApp --linkskip=BitwardenCore</MtouchExtraArgs>
+    <MtouchExtraArgs>--nodevcodeshare --http-message-handler=NSUrlSessionHandler --linkskip=BitwardeniOS --linkskip=BitwardeniOSCore --linkskip=BitwardeniOSAutofill --linkskip=BitwardeniOSExtension --linkskip=BitwardenApp --linkskip=BitwardenCore --linkskip=LiteDB</MtouchExtraArgs>
     <OptimizePNGs>true</OptimizePNGs>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Ad-Hoc|iPhone' ">
@@ -89,7 +89,7 @@
     <CodesignKey>iPhone Distribution</CodesignKey>
     <CodesignEntitlements>Entitlements.plist</CodesignEntitlements>
     <MtouchLink>Full</MtouchLink>
-    <MtouchExtraArgs>--nodevcodeshare --http-message-handler=NSUrlSessionHandler --linkskip=BitwardeniOS --linkskip=BitwardeniOSCore --linkskip=BitwardeniOSExtension --linkskip=BitwardenApp --linkskip=BitwardenCore</MtouchExtraArgs>
+    <MtouchExtraArgs>--nodevcodeshare --http-message-handler=NSUrlSessionHandler --linkskip=BitwardeniOS --linkskip=BitwardeniOSCore --linkskip=BitwardeniOSExtension --linkskip=BitwardenApp --linkskip=BitwardenCore --linkskip=LiteDB</MtouchExtraArgs>
     <OptimizePNGs>true</OptimizePNGs>
     <CodesignProvision>Automatic:AdHoc</CodesignProvision>
   </PropertyGroup>
@@ -104,7 +104,7 @@
     <CodesignProvision>Automatic:AppStore</CodesignProvision>
     <CodesignKey>iPhone Distribution</CodesignKey>
     <CodesignEntitlements>Entitlements.plist</CodesignEntitlements>
-    <MtouchExtraArgs>--nodevcodeshare --http-message-handler=NSUrlSessionHandler --linkskip=BitwardeniOS --linkskip=BitwardeniOSCore --linkskip=BitwardeniOSExtension --linkskip=BitwardenApp --linkskip=BitwardenCore</MtouchExtraArgs>
+    <MtouchExtraArgs>--nodevcodeshare --http-message-handler=NSUrlSessionHandler --linkskip=BitwardeniOS --linkskip=BitwardeniOSCore --linkskip=BitwardeniOSExtension --linkskip=BitwardenApp --linkskip=BitwardenCore --linkskip=LiteDB</MtouchExtraArgs>
     <OptimizePNGs>true</OptimizePNGs>
     <MtouchLink>Full</MtouchLink>
   </PropertyGroup>
@@ -116,7 +116,7 @@
     <UseVSHostingProcess>false</UseVSHostingProcess>
     <ErrorReport>prompt</ErrorReport>
     <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
-    <MtouchExtraArgs>--nodevcodeshare --http-message-handler=NSUrlSessionHandler --linkskip=BitwardeniOS --linkskip=BitwardeniOSCore --linkskip=BitwardeniOSExtension --linkskip=BitwardenApp --linkskip=BitwardenCore</MtouchExtraArgs>
+    <MtouchExtraArgs>--nodevcodeshare --http-message-handler=NSUrlSessionHandler --linkskip=BitwardeniOS --linkskip=BitwardeniOSCore --linkskip=BitwardeniOSExtension --linkskip=BitwardenApp --linkskip=BitwardenCore --linkskip=LiteDB</MtouchExtraArgs>
     <OptimizePNGs>true</OptimizePNGs>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'FDroid|iPhone'">

store/apple/hi/copy.resx

@@ -118,7 +118,7 @@
     <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
   <data name="Name" xml:space="preserve">
-    <value>bitwarden – Free Password Manager</value>
+    <value>Bitwarden पासवर्ड मैनेजर</value>
     <comment>Max 30 characters</comment>
   </data>
   <data name="Description" xml:space="preserve">
@@ -132,22 +132,22 @@ bitwarden stores all of your logins in an encrypted vault that syncs across all
     <comment>Max 4000 characters</comment>
   </data>
   <data name="Keywords" xml:space="preserve">
-    <value>bitwarden,bit warden,8bit,password,login,free password manager,password manager,login manager</value>
+    <value>बिटवर्डन, 8 बिट, पासवर्ड, फ्री पासवर्ड मैनेजर, पासवर्ड मैनेजर, लॉगिन मैनेजर</value>
     <comment>Max 100 characters</comment>
   </data>
   <data name="Screenshot1" xml:space="preserve">
-    <value>Manage all your logins and passwords from a secure vault</value>
+    <value>एक सुरक्षित तिजोरी से अपने सभी लॉगिन और पासवर्ड प्रबंधित करें</value>
   </data>
   <data name="Screenshot2" xml:space="preserve">
-    <value>Automatically generate strong, random, and secure passwords</value>
+    <value>स्वचालित रूप से मजबूत, यादृच्छिक और सुरक्षित पासवर्ड उत्पन्न करते हैं</value>
   </data>
   <data name="Screenshot3" xml:space="preserve">
-    <value>Protect your vault with Touch ID, PIN code, or master password</value>
+    <value>टच आईडी, पिन कोड या मास्टर पासवर्ड से अपनी तिजोरी को सुरक्षित रखें</value>
   </data>
   <data name="Screenshot4" xml:space="preserve">
-    <value>Auto-fill logins from Safari, Chrome, and hundreds of other apps</value>
+    <value>सफारी, क्रोम और अन्य सैकड़ों ऐप्स से ऑटो-फिल लॉगिन करें</value>
   </data>
   <data name="Screenshot5" xml:space="preserve">
-    <value>Sync and access your vault from multiple devices</value>
+    <value>कई उपकरणों से अपने Vault को सिंक और एक्सेस करें</value>
   </data>
 </root>