Merge branch 'master' into feature/PM-115-encryption-update-new-model

2025-12-05 23:53:33 +00:00 · 2023-04-04 19:18:38 +01:00
parent a3b18dced6 e77a971519
commit 74190e0125
35 changed files with 3494 additions and 523 deletions
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -93,8 +93,8 @@ jobs:
                      ./com.x8bit.bitwarden.apk/com.x8bit.bitwarden.apk,
                      ./com.x8bit.bitwarden-fdroid.apk/com.x8bit.bitwarden-fdroid.apk,
                      ./Bitwarden iOS.zip,
-                      ./bw-android-apk-sha256.txt,
-                      ./bw-fdroid-apk-sha256.txt"
+                      ./bw-android-apk-sha256.txt/bw-android-apk-sha256.txt,
+                      ./bw-fdroid-apk-sha256.txt/bw-fdroid-apk-sha256.txt"
          commit: ${{ github.sha }}
          tag: v${{ steps.version.outputs.version }}
          name: Version ${{ steps.version.outputs.version }}
--- a/.github/workflows/version-auto-bump.yml
+++ b/.github/workflows/version-auto-bump.yml
@@ -32,32 +32,14 @@ jobs:
          echo "new-version=$NEW_VER" >> $GITHUB_OUTPUT

  trigger_version_bump:
-    name: "Trigger version bump workflow"
+    name: "Version bump"
    runs-on: ubuntu-22.04
    needs:
      - setup
    steps:
-      - name: Login to Azure
-        uses: Azure/login@ec3c14589bd3e9312b3cc8c41e6860e258df9010
+      - name: Bump version to ${{ needs.setup.outputs.version_number }}
+        uses: ./.github/workflows/version-bump.yml
+        secrets:
+          AZURE_PROD_KV_CREDENTIALS: ${{ secrets.AZURE_PROD_KV_CREDENTIALS }}
        with:
-          creds: ${{ secrets.AZURE_PROD_KV_CREDENTIALS }}
-
-      - name: Retrieve secrets
-        id: retrieve-secrets
-        uses: bitwarden/gh-actions/get-keyvault-secrets@c3b3285993151c5af47cefcb3b9134c28ab479af
-        with:
-          keyvault: "bitwarden-prod-kv"
-          secrets: "github-pat-bitwarden-devops-bot-repo-scope"
-
-      - name: Call GitHub API to trigger workflow bump
-        env:
-          TOKEN: ${{ steps.retrieve-secrets.outputs.github-pat-bitwarden-devops-bot-repo-scope }}
-          VERSION: ${{ needs.setup.outputs.version_number}}
-        run: |
-          JSON_STRING=$(printf '{"ref":"master", "inputs": { "version_number":"%s"}}' "$VERSION")
-          curl \
-            -X POST \
-            -i -u bitwarden-devops-bot:$TOKEN \
-            -H "Accept: application/vnd.github.v3+json" \
-            https://api.github.com/repos/bitwarden/mobile/actions/workflows/version-bump.yml/dispatches \
-            -d $JSON_STRING
+          version_number: ${{ needs.setup.outputs.version_number }}
--- a/.github/workflows/version-bump.yml
+++ b/.github/workflows/version-bump.yml
@@ -7,6 +7,13 @@ on:
      version_number:
        description: "New Version"
        required: true
+  workflow_call:
+    inputs:
+      version_number:
+        required: true
+    secrets:
+      AZURE_PROD_KV_CREDENTIALS:
+        required: true

 jobs:
  bump_version:
--- a/src/Android/Properties/AndroidManifest.xml
+++ b/src/Android/Properties/AndroidManifest.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android" xmlns:tools="http://schemas.android.com/tools" android:versionCode="1" android:versionName="2023.2.1" android:installLocation="internalOnly" package="com.x8bit.bitwarden">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android" xmlns:tools="http://schemas.android.com/tools" android:versionCode="1" android:versionName="2023.3.3" android:installLocation="internalOnly" package="com.x8bit.bitwarden">
 	<uses-sdk android:minSdkVersion="21" android:targetSdkVersion="33" />
 	<uses-permission android:name="android.permission.INTERNET" />
 	<uses-permission android:name="android.permission.NFC" />
--- a/src/App/Controls/CipherViewCell/CipherViewCell.xaml.cs
+++ b/src/App/Controls/CipherViewCell/CipherViewCell.xaml.cs
@@ -1,4 +1,5 @@
 using System;
+using System.Windows.Input;
 using Bit.App.Abstractions;
 using Bit.Core.Models.View;
 using Bit.Core.Utilities;
@@ -18,7 +19,7 @@ namespace Bit.App.Controls
            nameof(WebsiteIconsEnabled), typeof(bool?), typeof(CipherViewCell));

        public static readonly BindableProperty ButtonCommandProperty = BindableProperty.Create(
-            nameof(ButtonCommand), typeof(Command<CipherView>), typeof(CipherViewCell));
+            nameof(ButtonCommand), typeof(ICommand), typeof(CipherViewCell));

        public CipherViewCell()
        {
@@ -42,9 +43,9 @@ namespace Bit.App.Controls
            set => SetValue(CipherProperty, value);
        }

-        public Command<CipherView> ButtonCommand
+        public ICommand ButtonCommand
        {
-            get => GetValue(ButtonCommandProperty) as Command<CipherView>;
+            get => GetValue(ButtonCommandProperty) as ICommand;
            set => SetValue(ButtonCommandProperty, value);
        }

--- a/src/App/Pages/Vault/CipherAddEditPageViewModel.cs
+++ b/src/App/Pages/Vault/CipherAddEditPageViewModel.cs
@@ -121,6 +121,7 @@ namespace Bit.App.Pages
                new KeyValuePair<string, string>("JCB", "JCB"),
                new KeyValuePair<string, string>("Maestro", "Maestro"),
                new KeyValuePair<string, string>("UnionPay", "UnionPay"),
+                new KeyValuePair<string, string>("RuPay", "RuPay"),
                new KeyValuePair<string, string>(AppResources.Other, "Other")
            };
            CardExpMonthOptions = new List<KeyValuePair<string, string>>
--- a/src/App/Pages/Vault/GroupingsPage/GroupingsPageViewModel.cs
+++ b/src/App/Pages/Vault/GroupingsPage/GroupingsPageViewModel.cs
@@ -78,7 +78,9 @@ namespace Bit.App.Pages
                Refreshing = true;
                await LoadAsync();
            });
-            CipherOptionsCommand = new Command<CipherView>(CipherOptionsAsync);
+            CipherOptionsCommand = new AsyncCommand<CipherView>(cipher => AppHelpers.CipherListOptions(Page, cipher, _passwordRepromptService),
+                onException: ex => _logger.Exception(ex),
+                allowsMultipleExecutions: false);
            VaultFilterCommand = new AsyncCommand(VaultFilterOptionsAsync,
                onException: ex => _logger.Exception(ex),
                allowsMultipleExecutions: false);
@@ -168,7 +170,7 @@ namespace Bit.App.Pages
        public AccountSwitchingOverlayViewModel AccountSwitchingOverlayViewModel { get; }
        public ObservableRangeCollection<IGroupingsPageListItem> GroupedItems { get; set; }
        public Command RefreshCommand { get; set; }
-        public Command<CipherView> CipherOptionsCommand { get; set; }
+        public ICommand CipherOptionsCommand { get; }
        public bool LoadedOnce { get; set; }

        public async Task LoadAsync()
@@ -709,13 +711,5 @@ namespace Bit.App.Pages
            var folders = decFolders.Where(f => _allCiphers.Any(c => c.FolderId == f.Id)).ToList();
            return folders.Any() ? folders : null;
        }
-
-        private async void CipherOptionsAsync(CipherView cipher)
-        {
-            if ((Page as BaseContentPage).DoOnce())
-            {
-                await AppHelpers.CipherListOptions(Page, cipher, _passwordRepromptService);
-            }
-        }
    }
 }
--- a/src/App/Resources/AppResources.de.resx
+++ b/src/App/Resources/AppResources.de.resx
@@ -1252,10 +1252,10 @@ Das Scannen erfolgt automatisch.</value>
    <value>Beginnt mit</value>
  </data>
  <data name="URIMatchDetection" xml:space="preserve">
-    <value>URI Match-Erkennung</value>
+    <value>URI-Übereinstimmungserkennung</value>
  </data>
  <data name="MatchDetection" xml:space="preserve">
-    <value>Match-Erkennung</value>
+    <value>Übereinstimmungserkennung</value>
    <comment>URI match detection for auto-fill.</comment>
  </data>
  <data name="YesAndSave" xml:space="preserve">
@@ -1536,7 +1536,7 @@ Das Scannen erfolgt automatisch.</value>
    <comment>Clipboard is the operating system thing where you copy/paste data to on your device.</comment>
  </data>
  <data name="DefaultUriMatchDetection" xml:space="preserve">
-    <value>Standard-URI-Match-Erkennung</value>
+    <value>Standard URI-Übereinstimmungserkennung</value>
    <comment>Default URI match detection for auto-fill.</comment>
  </data>
  <data name="DefaultUriMatchDetectionDescription" xml:space="preserve">
--- a/src/App/Resources/AppResources.el.resx
+++ b/src/App/Resources/AppResources.el.resx
@@ -2541,16 +2541,16 @@
    <value>Ενεργοποιήστε την άδεια της κάμερας για χρήση του σαρωτή</value>
  </data>
  <data name="Language" xml:space="preserve">
-    <value>Language</value>
+    <value>Γλώσσα</value>
  </data>
  <data name="LanguageChangeXDescription" xml:space="preserve">
-    <value>The language has been changed to {0}. Please restart the app to see the change</value>
+    <value>Η γλώσσα έχει αλλάξει σε {0}. Παρακαλούμε επανεκκινήστε την εφαρμογή για να δείτε την αλλαγή</value>
  </data>
  <data name="LanguageChangeRequiresAppRestart" xml:space="preserve">
-    <value>Language change requires app restart</value>
+    <value>Η αλλαγή γλώσσας απαιτεί επανεκκίνηση της εφαρμογής</value>
  </data>
  <data name="DefaultSystem" xml:space="preserve">
-    <value>Default (System)</value>
+    <value>Προεπιλογή (σύστημα)</value>
  </data>
  <data name="Important" xml:space="preserve">
    <value>Σημαντικό</value>
@@ -2592,15 +2592,15 @@
    <value>Απαιτείται αναγνωριστικό οργανισμού SSO.</value>
  </data>
  <data name="AddTheKeyToAnExistingOrNewItem" xml:space="preserve">
-    <value>Add the key to an existing or new item</value>
+    <value>Προσθέστε το κλειδί σε ένα υπάρχον ή νέο στοιχείο</value>
  </data>
  <data name="ThereAreNoItemsInYourVaultThatMatchX" xml:space="preserve">
-    <value>There are no items in your vault that match "{0}"</value>
+    <value>Δεν υπάρχουν αντικείμενα στη κρύπτη σας που ταιριάζουν με "{0}"</value>
  </data>
  <data name="SearchForAnItemOrAddANewItem" xml:space="preserve">
-    <value>Search for an item or add a new item</value>
+    <value>Αναζητήστε ένα στοιχείο ή προσθέστε ένα νέο</value>
  </data>
  <data name="ThereAreNoItemsThatMatchTheSearch" xml:space="preserve">
-    <value>There are no items that match the search</value>
+    <value>Δεν υπάρχουν στοιχεία που να ταιριάζουν με την αναζήτηση</value>
  </data>
 </root>
--- a/src/App/Resources/AppResources.en-GB.resx
+++ b/src/App/Resources/AppResources.en-GB.resx
@@ -2589,7 +2589,7 @@ Do you want to switch to this account?</value>
    <value>Weak password identified and found in a data breach. Use a strong and unique password to protect your account. Are you sure you want to use this password?</value>
  </data>
  <data name="OrganizationSsoIdentifierRequired" xml:space="preserve">
-    <value>Organization SSO identifier required.</value>
+    <value>Organisation SSO identifier required.</value>
  </data>
  <data name="AddTheKeyToAnExistingOrNewItem" xml:space="preserve">
    <value>Add the key to an existing or new item</value>
--- a/src/App/Resources/AppResources.es.resx
+++ b/src/App/Resources/AppResources.es.resx
@@ -2593,15 +2593,15 @@ seleccione Agregar TOTP para almacenar la clave de forma segura</value>
    <value>Se requiere un inicio de sesión único de la organización.</value>
  </data>
  <data name="AddTheKeyToAnExistingOrNewItem" xml:space="preserve">
-    <value>Add the key to an existing or new item</value>
+    <value>Añadir la clave a un elemento existente o nuevo</value>
  </data>
  <data name="ThereAreNoItemsInYourVaultThatMatchX" xml:space="preserve">
-    <value>There are no items in your vault that match "{0}"</value>
+    <value>No hay artículos en su caja fuerte que coincidan con "{0}"</value>
  </data>
  <data name="SearchForAnItemOrAddANewItem" xml:space="preserve">
-    <value>Search for an item or add a new item</value>
+    <value>Buscar un elemento o añadir uno nuevo</value>
  </data>
  <data name="ThereAreNoItemsThatMatchTheSearch" xml:space="preserve">
-    <value>There are no items that match the search</value>
+    <value>No hay elementos que coincidan con la búsqueda</value>
  </data>
 </root>
--- a/src/App/Resources/AppResources.fil.resx
+++ b/src/App/Resources/AppResources.fil.resx
@@ -391,7 +391,7 @@
    <value>Bersyon</value>
  </data>
  <data name="View" xml:space="preserve">
-    <value>Pagtingin</value>
+    <value>Tingnan</value>
  </data>
  <data name="VisitOurWebsite" xml:space="preserve">
    <value>Bisitahin ang website namin</value>
--- a/src/App/Resources/AppResources.hi.resx
+++ b/src/App/Resources/AppResources.hi.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="About" xml:space="preserve">
-    <value>हमारे बारे में</value>
+    <value>बारे में</value>
  </data>
  <data name="Add" xml:space="preserve">
    <value>जोड़ें</value>
--- a/src/App/Resources/AppResources.hr.resx
+++ b/src/App/Resources/AppResources.hr.resx
@@ -584,7 +584,7 @@
    <value>Podsjetnik glavne lozinke ti može pomoći da se prisjetiš svoje lozinke ako ju zaboraviš.</value>
  </data>
  <data name="MasterPasswordLengthValMessageX" xml:space="preserve">
-    <value>Master password must be at least {0} characters long.</value>
+    <value>Glavna lozinka mora imati najmanje {0} znakova.</value>
  </data>
  <data name="MinNumbers" xml:space="preserve">
    <value>Najmanje brojeva</value>
@@ -2459,7 +2459,7 @@
    <value>Nasumično</value>
  </data>
  <data name="ConnectToWatch" xml:space="preserve">
-    <value>Connect to Watch</value>
+    <value>Spoji se na Watch</value>
  </data>
  <data name="AccessibilityServiceDisclosure" xml:space="preserve">
    <value>Odobrenje servisa pristupačnosti</value>
@@ -2482,7 +2482,7 @@
 Želiš li se prebaciti na ovaj račun?</value>
  </data>
  <data name="NewAroundHere" xml:space="preserve">
-    <value>New around here?</value>
+    <value>Novi korisnik?</value>
  </data>
  <data name="GetMasterPasswordwordHint" xml:space="preserve">
    <value>Slanje podsjetnika glavne lozinke</value>
@@ -2521,84 +2521,84 @@
    <value>Ovaj zahtjev više nije valjan</value>
  </data>
  <data name="PendingLogInRequests" xml:space="preserve">
-    <value>Pending login requests</value>
+    <value>Zahtjevi za prijavu na čekanju</value>
  </data>
  <data name="DeclineAllRequests" xml:space="preserve">
-    <value>Decline all requests</value>
+    <value>Odbij sve zahtjeve</value>
  </data>
  <data name="AreYouSureYouWantToDeclineAllPendingLogInRequests" xml:space="preserve">
-    <value>Are you sure you want to decline all pending login requests?</value>
+    <value>Sigurno želiš odbiti sve zahtjeve na čekanju?</value>
  </data>
  <data name="RequestsDeclined" xml:space="preserve">
-    <value>Requests declined</value>
+    <value>Zahtjevi odbijeni</value>
  </data>
  <data name="NoPendingRequests" xml:space="preserve">
-    <value>No pending requests</value>  
+    <value>Nema zahtjeva na čekanju</value>  
  </data>
  <data name="EnableCamerPermissionToUseTheScanner" xml:space="preserve">
-    <value>Enable camera permission to use the scanner</value>
+    <value>Za skeniranje, odobri korištenje kamere</value>
  </data>
  <data name="Language" xml:space="preserve">
-    <value>Language</value>
+    <value>Jezik</value>
  </data>
  <data name="LanguageChangeXDescription" xml:space="preserve">
-    <value>The language has been changed to {0}. Please restart the app to see the change</value>
+    <value>Jezik je promijenjen u {0}. Ponovno pokreni aplikaciju za primjenu.</value>
  </data>
  <data name="LanguageChangeRequiresAppRestart" xml:space="preserve">
-    <value>Language change requires app restart</value>
+    <value>Promjena jezika zahtijeva ponovno pokretanje aplikacije</value>
  </data>
  <data name="DefaultSystem" xml:space="preserve">
-    <value>Default (System)</value>
+    <value>Zadano (sustav)</value>
  </data>
  <data name="Important" xml:space="preserve">
-    <value>Important</value>
+    <value>Važno</value>
  </data>
  <data name="YourMasterPasswordCannotBeRecoveredIfYouForgetItXCharactersMinimum" xml:space="preserve">
-    <value>Your master password cannot be recovered if you forget it! {0} characters minimum.</value>
+    <value>Glavnu lozinku nije moguće vratiti ako ju zaboraviš! Najmanje {0} znakova.</value>
  </data>
  <data name="WeakMasterPassword" xml:space="preserve">
-    <value>Weak Master Password</value>
+    <value>Slaba glavna lozinka</value>
  </data>
  <data name="WeakPasswordIdentifiedUseAStrongPasswordToProtectYourAccount" xml:space="preserve">
-    <value>Weak password identified. Use a strong password to protect your account. Are you sure you want to use a weak password?</value>
+    <value>Prepoznata je slaba lozinka. Za zaštitu računa, preporučuje se da koristiš jake lozinke. Želiš li svejedno koristiti slabu lozinku?</value>
  </data>
  <data name="Weak" xml:space="preserve">
-    <value>Weak</value>
+    <value>Slaba</value>
  </data>
  <data name="Good" xml:space="preserve">
-    <value>Good</value>
+    <value>Dobra</value>
  </data>
  <data name="Strong" xml:space="preserve">
-    <value>Strong</value>
+    <value>Jaka</value>
  </data>
  <data name="CheckKnownDataBreachesForThisPassword" xml:space="preserve">
-    <value>Check known data breaches for this password</value>
+    <value>Provjeri je li lozinka ukradena prilikom krađe podataka</value>
  </data>
  <data name="ExposedMasterPassword" xml:space="preserve">
-    <value>Exposed Master Password</value>
+    <value>Ugrožena glavna lozinka</value>
  </data>
  <data name="PasswordFoundInADataBreachAlertDescription" xml:space="preserve">
-    <value>Password found in a data breach. Use a unique password to protect your account. Are you sure you want to use an exposed password?</value>
+    <value>Lozinka je nađena među ukradenima tijekom krađa podataka. Za zaštitu svog računa koristi jedinstvenu lozinku. Želiš li svejedno korisiti ukradenu lozinku?</value>
  </data>
  <data name="WeakAndExposedMasterPassword" xml:space="preserve">
-    <value>Weak and Exposed Master Password</value>
+    <value>Slaba i ugrožena glavna lozinka</value>
  </data>
  <data name="WeakPasswordIdentifiedAndFoundInADataBreachAlertDescription" xml:space="preserve">
-    <value>Weak password identified and found in a data breach. Use a strong and unique password to protect your account. Are you sure you want to use this password?</value>
+    <value>Slaba lozinka je nađena među ukradenima tijekom krađa podataka. Za zaštitu svog računa koristi jaku i jedinstvenu lozinku. Želiš li svejedno korisiti slabu, ukradenu lozinku?</value>
  </data>
  <data name="OrganizationSsoIdentifierRequired" xml:space="preserve">
-    <value>Organization SSO identifier required.</value>
+    <value>Potreban SSO identifikator organizacije.</value>
  </data>
  <data name="AddTheKeyToAnExistingOrNewItem" xml:space="preserve">
-    <value>Add the key to an existing or new item</value>
+    <value>Dodaj ključ postojećoj ili novoj stavci</value>
  </data>
  <data name="ThereAreNoItemsInYourVaultThatMatchX" xml:space="preserve">
-    <value>There are no items in your vault that match "{0}"</value>
+    <value>U tvom trezoru nema stavki za ”{0}„</value>
  </data>
  <data name="SearchForAnItemOrAddANewItem" xml:space="preserve">
-    <value>Search for an item or add a new item</value>
+    <value>Potraži ili dodaj novu stavku</value>
  </data>
  <data name="ThereAreNoItemsThatMatchTheSearch" xml:space="preserve">
-    <value>There are no items that match the search</value>
+    <value>Nema stavki koje odgovaraju pretrazi</value>
  </data>
 </root>
--- a/src/App/Resources/AppResources.it.resx
+++ b/src/App/Resources/AppResources.it.resx
--- a/src/App/Resources/AppResources.ko.resx
+++ b/src/App/Resources/AppResources.ko.resx
@@ -584,7 +584,7 @@
    <value>마스터 비밀번호 힌트는 마스터 비밀번호를 잊었을 때 도움이 될 수 있습니다.</value>
  </data>
  <data name="MasterPasswordLengthValMessageX" xml:space="preserve">
-    <value>Master password must be at least {0} characters long.</value>
+    <value>마스터 비밀번호는 최소 {0}자 이상이어야 합니다.</value>
  </data>
  <data name="MinNumbers" xml:space="preserve">
    <value>숫자 최소 개수</value>
@@ -1143,7 +1143,7 @@
    <value>웹사이트 아이콘 표시하기</value>
  </data>
  <data name="ShowWebsiteIconsDescription" xml:space="preserve">
-    <value>로그인 후 식별 가능한 이미지 표시</value>
+    <value>로그인 정보 옆에 식별용 이미지를 표시합니다.</value>
  </data>
  <data name="IconsUrl" xml:space="preserve">
    <value>아이콘 서버 URL</value>
@@ -2357,34 +2357,34 @@
    <value>로그인 거부됨</value>
  </data>
  <data name="ApproveLoginRequests" xml:space="preserve">
-    <value>Approve login requests</value>
+    <value>로그인 요청 승인</value>
  </data>
  <data name="UseThisDeviceToApproveLoginRequestsMadeFromOtherDevices" xml:space="preserve">
-    <value>Use this device to approve login requests made from other devices.</value>
+    <value>다른 기기에서 발생하는 로그인 요청을 이 기기에서 승인할 수 있습니다.</value>
  </data>
  <data name="AllowNotifications" xml:space="preserve">
-    <value>Allow notifications</value>
+    <value>알림 허용</value>
  </data>
  <data name="ReceivePushNotificationsForNewLoginRequests" xml:space="preserve">
-    <value>Receive push notifications for new login requests</value>
+    <value>새 로그인 요청 푸시 알림 받기</value>
  </data>
  <data name="NoThanks" xml:space="preserve">
-    <value>No thanks</value>
+    <value>아니요, 괜찮습니다</value>
  </data>
  <data name="ConfimLogInAttempForX" xml:space="preserve">
-    <value>Confirm login attempt for {0}</value>
+    <value>{0}(으)로의 로그인 시도 확인</value>
  </data>
  <data name="AllNotifications" xml:space="preserve">
    <value>All notifications</value>
  </data>
  <data name="PasswordType" xml:space="preserve">
-    <value>Password type</value>
+    <value>비밀번호 유형</value>
  </data>
  <data name="WhatWouldYouLikeToGenerate" xml:space="preserve">
-    <value>What would you like to generate?</value>
+    <value>무엇을 생성하실 건가요?</value>
  </data>
  <data name="UsernameType" xml:space="preserve">
-    <value>Username type</value>
+    <value>사용자 이름 유형</value>
  </data>
  <data name="PlusAddressedEmail" xml:space="preserve">
    <value>Plus addressed email</value>
@@ -2396,19 +2396,19 @@
    <value>Forwarded email alias</value>
  </data>
  <data name="RandomWord" xml:space="preserve">
-    <value>Random word</value>
+    <value>무작위 단어</value>
  </data>
  <data name="EmailRequiredParenthesis" xml:space="preserve">
-    <value>Email (required)</value>
+    <value>이메일 (필수)</value>
  </data>
  <data name="DomainNameRequiredParenthesis" xml:space="preserve">
-    <value>Domain name (required)</value>
+    <value>도메인 이름 (필수)</value>
  </data>
  <data name="APIKeyRequiredParenthesis" xml:space="preserve">
-    <value>API key (required)</value>
+    <value>API 키 (필수)</value>
  </data>
  <data name="Service" xml:space="preserve">
-    <value>Service</value>
+    <value>서비스</value>
  </data>
  <data name="AnonAddy" xml:space="preserve">
    <value>AnonAddy</value>
@@ -2431,22 +2431,22 @@
    <comment>"Fastmail" is the product name and should not be translated.</comment>
  </data>
  <data name="APIAccessToken" xml:space="preserve">
-    <value>API access token</value>
+    <value>API 액세스 토큰</value>
  </data>
  <data name="AreYouSureYouWantToOverwriteTheCurrentUsername" xml:space="preserve">
-    <value>Are you sure you want to overwrite the current username?</value>
+    <value>정말 현재 사용자 이름을 덮어쓰시겠습니까?</value>
  </data>
  <data name="GenerateUsername" xml:space="preserve">
-    <value>Generate username</value>
+    <value>사용자 이름 생성</value>
  </data>
  <data name="EmailType" xml:space="preserve">
-    <value>Email Type</value>
+    <value>이메일 유형</value>
  </data>
  <data name="WebsiteRequired" xml:space="preserve">
    <value>Website (required)</value>
  </data>
  <data name="UnknownXErrorMessage" xml:space="preserve">
-    <value>Unknown {0} error occurred.</value>
+    <value>알 수 없는 {0} 오류가 발생했습니다.</value>
  </data>
  <data name="PlusAddressedEmailDescription" xml:space="preserve">
    <value>Use your email provider's subaddress capabilities</value>
@@ -2458,16 +2458,16 @@
    <value>Generate an email alias with an external forwarding service.</value>
  </data>
  <data name="Random" xml:space="preserve">
-    <value>Random</value>
+    <value>무작위</value>
  </data>
  <data name="ConnectToWatch" xml:space="preserve">
-    <value>Connect to Watch</value>
+    <value>Watch에 연결</value>
  </data>
  <data name="AccessibilityServiceDisclosure" xml:space="preserve">
    <value>Accessibility Service Disclosure</value>
  </data>
  <data name="AccessibilityDisclosureText" xml:space="preserve">
-    <value>Bitwarden uses the Accessibility Service to search for login fields in apps and websites, then establish the appropriate field IDs for entering a username &amp; password when a match for the app or site is found. We do not store any of the information presented to us by the service, nor do we make any attempt to control any on-screen elements beyond text entry of credentials.</value>
+    <value>Bitwarden은 접근성 서비스를 사용하여 앱 및 웹사이트에서 로그인 필드를 찾아내고 일치하는 항목이 발견되면 사용자 이름과 비밀번호를 입력합니다. Bitwarden은 서비스에서 제공하는 어떠한 정보도 저장하지 않으며, 자격 증명 이외의 화면 요소를 제어하려고 시도하지 않습니다.</value>
  </data>
  <data name="Accept" xml:space="preserve">
    <value>Accept</value>
@@ -2476,7 +2476,7 @@
    <value>Decline</value>
  </data>
  <data name="LoginRequestHasAlreadyExpired" xml:space="preserve">
-    <value>Login request has already expired.</value>
+    <value>이미 만료된 로그인 요청입니다.</value>
  </data>
  <data name="LoginAttemptFromXDoYouWantToSwitchToThisAccount" xml:space="preserve">
    <value>Login attempt from:
@@ -2484,94 +2484,94 @@
 Do you want to switch to this account?</value>
  </data>
  <data name="NewAroundHere" xml:space="preserve">
-    <value>New around here?</value>
+    <value>새로 찾아오셨나요?</value>
  </data>
  <data name="GetMasterPasswordwordHint" xml:space="preserve">
-    <value>Get master password hint</value>
+    <value>마스터 비밀번호 힌트 얻기</value>
  </data>
  <data name="LoggingInAsX" xml:space="preserve">
-    <value>Logging in as {0}</value>
+    <value>{0}(으)로 로그인 중</value>
  </data>
  <data name="NotYou" xml:space="preserve">
-    <value>Not you?</value>
+    <value>본인이 아닌가요?</value>
  </data>
  <data name="LogInWithMasterPassword" xml:space="preserve">
-    <value>Log in with master password</value>
+    <value>마스터 비밀번호로 로그인</value>
  </data>
  <data name="LogInWithAnotherDevice" xml:space="preserve">
-    <value>Log in with device</value>
+    <value>기기로 로그인</value>
  </data>
  <data name="LogInInitiated" xml:space="preserve">
    <value>Log in initiated</value>
  </data>
  <data name="ANotificationHasBeenSentToYourDevice" xml:space="preserve">
-    <value>A notification has been sent to your device.</value>
+    <value>기기에 알림이 전송되었습니다.</value>
  </data>
  <data name="PleaseMakeSureYourVaultIsUnlockedAndTheFingerprintPhraseMatchesOnTheOtherDevice" xml:space="preserve">
-    <value>Please make sure your vault is unlocked and the Fingerprint phrase matches on the other device.</value>
+    <value>보관함이 잠금 해제되어있고 지문 구절이 다른 기기와 일치하는지 확인하세요.</value>
  </data>
  <data name="ResendNotification" xml:space="preserve">
-    <value>Resend notification</value>
+    <value>알림 재전송</value>
  </data>
  <data name="NeedAnotherOption" xml:space="preserve">
-    <value>Need another option?</value>
+    <value>다른 방식이 필요하신가요?</value>
  </data>
  <data name="ViewAllLoginOptions" xml:space="preserve">
-    <value>View all log in options</value>
+    <value>모든 로그인 방식 보기</value>
  </data>
  <data name="ThisRequestIsNoLongerValid" xml:space="preserve">
    <value>더 이상 유효하지 않은 요청입니다</value>
  </data>
  <data name="PendingLogInRequests" xml:space="preserve">
-    <value>Pending login requests</value>
+    <value>대기 중인 로그인 요청</value>
  </data>
  <data name="DeclineAllRequests" xml:space="preserve">
-    <value>Decline all requests</value>
+    <value>모든 요청 거부</value>
  </data>
  <data name="AreYouSureYouWantToDeclineAllPendingLogInRequests" xml:space="preserve">
-    <value>Are you sure you want to decline all pending login requests?</value>
+    <value>대기 중인 모든 요청을 거부하시겠습니까?</value>
  </data>
  <data name="RequestsDeclined" xml:space="preserve">
-    <value>Requests declined</value>
+    <value>요청 거절됨</value>
  </data>
  <data name="NoPendingRequests" xml:space="preserve">
-    <value>No pending requests</value>  
+    <value>대기 중인 요청이 없습니다</value>  
  </data>
  <data name="EnableCamerPermissionToUseTheScanner" xml:space="preserve">
    <value>스캐너 기능을 위해 권한을 허용해 주십시오</value>
  </data>
  <data name="Language" xml:space="preserve">
-    <value>Language</value>
+    <value>언어</value>
  </data>
  <data name="LanguageChangeXDescription" xml:space="preserve">
-    <value>The language has been changed to {0}. Please restart the app to see the change</value>
+    <value>언어가 {0}로 변경되었습니다. 적용된 모습을 보려면 앱을 다시 시작하세요.</value>
  </data>
  <data name="LanguageChangeRequiresAppRestart" xml:space="preserve">
-    <value>Language change requires app restart</value>
+    <value>언어 변경은 앱을 다시 시작해야 적용됩니다.</value>
  </data>
  <data name="DefaultSystem" xml:space="preserve">
-    <value>Default (System)</value>
+    <value>기본 (시스템)</value>
  </data>
  <data name="Important" xml:space="preserve">
-    <value>Important</value>
+    <value>중요</value>
  </data>
  <data name="YourMasterPasswordCannotBeRecoveredIfYouForgetItXCharactersMinimum" xml:space="preserve">
-    <value>Your master password cannot be recovered if you forget it! {0} characters minimum.</value>
+    <value>마스터 비밀번호를 잊어버리면 복구할 수 없습니다! 최소 길이는 {0}자입니다.</value>
  </data>
  <data name="WeakMasterPassword" xml:space="preserve">
-    <value>Weak Master Password</value>
+    <value>취약한 마스터 비밀번호</value>
  </data>
  <data name="WeakPasswordIdentifiedUseAStrongPasswordToProtectYourAccount" xml:space="preserve">
-    <value>Weak password identified. Use a strong password to protect your account. Are you sure you want to use a weak password?</value>
+    <value>취약한 비밀번호가 감지되었습니다. 계정을 보호하려면 강력한 비밀번호를 사용하세요. 취약한 비밀번호를 정말로 사용하시겠습니까?</value>
  </data>
  <data name="Weak" xml:space="preserve">
-    <value>Weak</value>
+    <value>약함</value>
  </data>
  <data name="Good" xml:space="preserve">
-    <value>Good</value>
+    <value>좋음</value>
  </data>
  <data name="Strong" xml:space="preserve">
-    <value>Strong</value>
+    <value>강함</value>
  </data>
  <data name="CheckKnownDataBreachesForThisPassword" xml:space="preserve">
    <value>Check known data breaches for this password</value>
@@ -2589,18 +2589,18 @@ Do you want to switch to this account?</value>
    <value>Weak password identified and found in a data breach. Use a strong and unique password to protect your account. Are you sure you want to use this password?</value>
  </data>
  <data name="OrganizationSsoIdentifierRequired" xml:space="preserve">
-    <value>Organization SSO identifier required.</value>
+    <value>조직 통합 인증(SSO) 식별자가 필요합니다.</value>
  </data>
  <data name="AddTheKeyToAnExistingOrNewItem" xml:space="preserve">
    <value>Add the key to an existing or new item</value>
  </data>
  <data name="ThereAreNoItemsInYourVaultThatMatchX" xml:space="preserve">
-    <value>There are no items in your vault that match "{0}"</value>
+    <value>보관함에 '{0}'와(과) 일치하는 항목이 없습니다.</value>
  </data>
  <data name="SearchForAnItemOrAddANewItem" xml:space="preserve">
-    <value>Search for an item or add a new item</value>
+    <value>항목 검색 혹은 새 항목 추가</value>
  </data>
  <data name="ThereAreNoItemsThatMatchTheSearch" xml:space="preserve">
-    <value>There are no items that match the search</value>
+    <value>검색어와 일치하는 항목이 없습니다</value>
  </data>
 </root>
--- a/src/App/Resources/AppResources.my.resx
+++ b/src/App/Resources/AppResources.my.resx
--- a/src/App/Resources/AppResources.ro.resx
+++ b/src/App/Resources/AppResources.ro.resx
@@ -584,7 +584,7 @@
    <value>Un indiciu pentru parola principală vă poate ajuta să v-o reamintiți dacă o uitați.</value>
  </data>
  <data name="MasterPasswordLengthValMessageX" xml:space="preserve">
-    <value>Master password must be at least {0} characters long.</value>
+    <value>Parola principală trebuie să aibă cel puțin {0} caractere.</value>
  </data>
  <data name="MinNumbers" xml:space="preserve">
    <value>Minimum de cifre</value>
@@ -2523,34 +2523,34 @@ Doriți să comutați la acest cont?</value>
    <value>Această cerere nu mai este valabilă</value>
  </data>
  <data name="PendingLogInRequests" xml:space="preserve">
-    <value>Pending login requests</value>
+    <value>Cereri de conectare în așteptare</value>
  </data>
  <data name="DeclineAllRequests" xml:space="preserve">
-    <value>Decline all requests</value>
+    <value>Refuză toate cererile</value>
  </data>
  <data name="AreYouSureYouWantToDeclineAllPendingLogInRequests" xml:space="preserve">
-    <value>Are you sure you want to decline all pending login requests?</value>
+    <value>Sunteţi sigur că doriţi să refuzaţi toate solicitările de conectare în aşteptare?</value>
  </data>
  <data name="RequestsDeclined" xml:space="preserve">
-    <value>Requests declined</value>
+    <value>Cereri respinse</value>
  </data>
  <data name="NoPendingRequests" xml:space="preserve">
-    <value>No pending requests</value>  
+    <value>Nicio cerere în așteptare</value>  
  </data>
  <data name="EnableCamerPermissionToUseTheScanner" xml:space="preserve">
    <value>Permite accesul camerei foto pentru a utiliza scanerul</value>
  </data>
  <data name="Language" xml:space="preserve">
-    <value>Language</value>
+    <value>Limbă</value>
  </data>
  <data name="LanguageChangeXDescription" xml:space="preserve">
-    <value>The language has been changed to {0}. Please restart the app to see the change</value>
+    <value>Limba a fost schimbată în {0}. Vă rugăm să reporniți aplicația pentru a vedea schimbarea</value>
  </data>
  <data name="LanguageChangeRequiresAppRestart" xml:space="preserve">
-    <value>Language change requires app restart</value>
+    <value>Schimbarea limbii necesită repornirea aplicației</value>
  </data>
  <data name="DefaultSystem" xml:space="preserve">
-    <value>Default (System)</value>
+    <value>Implicit (sistem)</value>
  </data>
  <data name="Important" xml:space="preserve">
    <value>Important</value>
@@ -2589,18 +2589,18 @@ Doriți să comutați la acest cont?</value>
    <value>Parolă slabă identificată și găsită într-o baza de date expusa. Folosiți o parolă puternică și unică pentru a vă proteja contul. Sigur doriți să utilizați această parolă?</value>
  </data>
  <data name="OrganizationSsoIdentifierRequired" xml:space="preserve">
-    <value>Organization SSO identifier required.</value>
+    <value>Necesită identificator Organizație SSO.</value>
  </data>
  <data name="AddTheKeyToAnExistingOrNewItem" xml:space="preserve">
-    <value>Add the key to an existing or new item</value>
+    <value>Adăugați cheia la un articol existent sau nou</value>
  </data>
  <data name="ThereAreNoItemsInYourVaultThatMatchX" xml:space="preserve">
-    <value>There are no items in your vault that match "{0}"</value>
+    <value>Nu există elemente în seiful dvs. care se potrivesc "{0}"</value>
  </data>
  <data name="SearchForAnItemOrAddANewItem" xml:space="preserve">
-    <value>Search for an item or add a new item</value>
+    <value>Căutați un articol sau adăugați un articol nou</value>
  </data>
  <data name="ThereAreNoItemsThatMatchTheSearch" xml:space="preserve">
-    <value>There are no items that match the search</value>
+    <value>Nu există lucruri care să corespundă căutării</value>
  </data>
 </root>
--- a/src/App/Resources/AppResources.sl.resx
+++ b/src/App/Resources/AppResources.sl.resx
@@ -1443,7 +1443,7 @@ Scanning will happen automatically.</value>
    <value>Število besed</value>
  </data>
  <data name="Passphrase" xml:space="preserve">
-    <value>Šifrirna fraza</value>
+    <value>Večbesedno geslo</value>
  </data>
  <data name="WordSeparator" xml:space="preserve">
    <value>Ločilo besed</value>
@@ -1460,11 +1460,11 @@ Scanning will happen automatically.</value>
    <value>Ni map za prikazat.</value>
  </data>
  <data name="FingerprintPhrase" xml:space="preserve">
-    <value>Fraza prstnega odtisa</value>
+    <value>Identifikacijsko geslo</value>
    <comment>A 'fingerprint phrase' is a unique word phrase (similar to a passphrase) that a user can use to authenticate their public key with another user, for the purposes of sharing.</comment>
  </data>
  <data name="YourAccountsFingerprint" xml:space="preserve">
-    <value>Fraza prstnega odtisa vašega računa</value>
+    <value>Identifikacijsko geslo vašega računa</value>
    <comment>A 'fingerprint phrase' is a unique word phrase (similar to a passphrase) that a user can use to authenticate their public key with another user, for the purposes of sharing.</comment>
  </data>
  <data name="LearnOrgConfirmation" xml:space="preserve">
--- a/src/App/Resources/AppResources.sv.resx
+++ b/src/App/Resources/AppResources.sv.resx
@@ -1105,7 +1105,7 @@ Skanningen sker automatiskt.</value>
    <value>Fröken</value>
  </data>
  <data name="Mx" xml:space="preserve">
-    <value>Mx</value>
+    <value>Vederbörande</value>
  </data>
  <data name="November" xml:space="preserve">
    <value>November</value>
@@ -2534,7 +2534,7 @@ Vill du byta till detta konto?</value>
    <value>Är du säker på att du vill avvisa alla väntande inloggningsförfrågningar?</value>
  </data>
  <data name="RequestsDeclined" xml:space="preserve">
-    <value>Förfågningar avböjdes</value>
+    <value>Förfrågningar avvisades</value>
  </data>
  <data name="NoPendingRequests" xml:space="preserve">
    <value>Inga väntande förfrågningar</value>  
--- a/src/App/Resources/AppResources.uk.resx
+++ b/src/App/Resources/AppResources.uk.resx
@@ -1065,7 +1065,7 @@
    <value>Лютий</value>
  </data>
  <data name="FirstName" xml:space="preserve">
-    <value>Ім’я</value>
+    <value>Ім'я</value>
  </data>
  <data name="January" xml:space="preserve">
    <value>Січень</value>
@@ -1917,7 +1917,7 @@
    <value>Тип тексту не вибрано. Торкніться, щоб вибрати.</value>
  </data>
  <data name="DeletionDate" xml:space="preserve">
-    <value>Дата видалення</value>
+    <value>Термін дії</value>
  </data>
  <data name="DeletionTime" xml:space="preserve">
    <value>Час видалення</value>
@@ -1950,7 +1950,7 @@
    <comment>'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated.</comment>
  </data>
  <data name="MaximumAccessCountReached" xml:space="preserve">
-    <value>Досягнуто максимальну кількість доступів</value>
+    <value>Досягнуто максимальної кількості доступів</value>
  </data>
  <data name="CurrentAccessCount" xml:space="preserve">
    <value>Поточна кількість доступів</value>
@@ -2044,7 +2044,7 @@
    <value>30 днів</value>
  </data>
  <data name="Custom" xml:space="preserve">
-    <value>Спеціальний</value>
+    <value>Власний</value>
  </data>
  <data name="ShareOnSave" xml:space="preserve">
    <value>Поділитися цим відправленням після збереження</value>
--- a/src/App/Resources/AppResources.zh-Hans.resx
+++ b/src/App/Resources/AppResources.zh-Hans.resx
@@ -199,7 +199,7 @@
    <value>请输入您的 PIN 码。</value>
  </data>
  <data name="Favorites" xml:space="preserve">
-    <value>收藏</value>
+    <value>收藏夹</value>
    <comment>Title for your favorite items in the vault.</comment>
  </data>
  <data name="FileBugReport" xml:space="preserve">
@@ -584,7 +584,7 @@
    <value>主密码提示可以在你忘记密码时帮你回忆起来。</value>
  </data>
  <data name="MasterPasswordLengthValMessageX" xml:space="preserve">
-    <value>主密码至少需要 {0} 个字符。</value>
+    <value>主密码必须至少 $VALUE$ 个字符长度。</value>
  </data>
  <data name="MinNumbers" xml:space="preserve">
    <value>数字最少个数</value>
@@ -708,7 +708,7 @@
    <value>两步登录</value>
  </data>
  <data name="TwoStepLoginConfirmation" xml:space="preserve">
-    <value>两步登录要求您从其他设备（例如安全钥匙、验证器应用、短信、电话或者电子邮件）来验证您的登录，这能使您的账户更加安全。两步登录需要在 bitwarden.com 网页版密码中设置。您现在要访问这个网站吗？</value>
+    <value>两步登录要求您从其他设备（例如安全钥匙、验证器应用、短信、电话或者电子邮件）来验证您的登录，这能使您的账户更加安全。两步登录需要在 bitwarden.com 网页版密码库中设置。现在访问此网站吗？</value>
  </data>
  <data name="UnlockWith" xml:space="preserve">
    <value>使用 {0} 解锁</value>
@@ -1056,10 +1056,10 @@
    <value>博士</value>
  </data>
  <data name="ExpirationMonth" xml:space="preserve">
-    <value>到期月份</value>
+    <value>过期月份</value>
  </data>
  <data name="ExpirationYear" xml:space="preserve">
-    <value>到期年份</value>
+    <value>过期年份</value>
  </data>
  <data name="February" xml:space="preserve">
    <value>二月</value>
@@ -1137,7 +1137,7 @@
    <value>地址</value>
  </data>
  <data name="Expiration" xml:space="preserve">
-    <value>到期</value>
+    <value>过期日</value>
  </data>
  <data name="ShowWebsiteIcons" xml:space="preserve">
    <value>显示网站图标</value>
@@ -1457,7 +1457,7 @@
    <comment>Short for "Password Generator"</comment>
  </data>
  <data name="NoFoldersToList" xml:space="preserve">
-    <value>没有可显示的文件夹。</value>
+    <value>没有可列出的文件夹。</value>
  </data>
  <data name="FingerprintPhrase" xml:space="preserve">
    <value>指纹短语</value>
@@ -1674,7 +1674,7 @@
    <value>此导出将使用您账户的加密密钥来加密您的数据。如果您曾经轮换过账户的加密密钥，您应将其重新导出，否则您将无法解密导出的文件。</value>
  </data>
  <data name="EncExportAccountWarning" xml:space="preserve">
-    <value>账户加密密钥对每个 Bitwarden 用户账户都是唯一的，所以您不能将加密的导出导入到另一个账户。</value>
+    <value>每个 Bitwarden 用户账户的账户加密密钥都是唯一的，因此您无法将加密的导出导入到另一个账户。</value>
  </data>
  <data name="ExportVaultConfirmationTitle" xml:space="preserve">
    <value>确认密码库导出</value>
@@ -1774,13 +1774,13 @@
    <value>组织标识符</value>
  </data>
  <data name="LoginSsoError" xml:space="preserve">
-    <value>当前无法使用 SSO 登陆</value>
+    <value>当前无法使用 SSO 登录</value>
  </data>
  <data name="SetMasterPassword" xml:space="preserve">
    <value>设置主密码</value>
  </data>
  <data name="SetMasterPasswordSummary" xml:space="preserve">
-    <value>为使用单点登录（SSO）功能，请设置一个主密码以访问和保护您的密码库。</value>
+    <value>要完成 SSO 登录配置，请设置一个主密码以访问和保护您的密码库。</value>
  </data>
  <data name="MasterPasswordPolicyInEffect" xml:space="preserve">
    <value>一个或多个组织策略要求您的主密码满足下列要求：</value>
@@ -1801,7 +1801,7 @@
    <value>至少包含一个数字</value>
  </data>
  <data name="PolicyInEffectSpecial" xml:space="preserve">
-    <value>包含至少一个下列的特殊字符： {0}</value>
+    <value>至少包含一个以下特殊字符：{0}</value>
  </data>
  <data name="MasterPasswordPolicyValidationTitle" xml:space="preserve">
    <value>无效的密码</value>
@@ -1930,10 +1930,10 @@
    <value>等待删除</value>
  </data>
  <data name="ExpirationDate" xml:space="preserve">
-    <value>到期日期</value>
+    <value>过期日期</value>
  </data>
  <data name="ExpirationTime" xml:space="preserve">
-    <value>到期时间</value>
+    <value>过期时间</value>
  </data>
  <data name="ExpirationDateInfo" xml:space="preserve">
    <value>设置后，对此 Send 的访问将在指定的日期和时间后过期。</value>
@@ -2080,7 +2080,7 @@
    <value>确认主密码</value>
  </data>
  <data name="PasswordConfirmationDesc" xml:space="preserve">
-    <value>此操作受到保护，要继续，请重新输入您的主密码以验证您的身份。</value>
+    <value>此操作受到保护，要继续，请重新输入主密码以验证您的身份。</value>
  </data>
  <data name="CaptchaRequired" xml:space="preserve">
    <value>请完成 Captcha 验证</value>
@@ -2499,7 +2499,7 @@
    <value>使用主密码登录</value>
  </data>
  <data name="LogInWithAnotherDevice" xml:space="preserve">
-    <value>使用其他设备登录</value>
+    <value>设备登录</value>
  </data>
  <data name="LogInInitiated" xml:space="preserve">
    <value>登录已发起</value>
@@ -2523,7 +2523,7 @@
    <value>请求已失效</value>
  </data>
  <data name="PendingLogInRequests" xml:space="preserve">
-    <value>待定登录请求</value>
+    <value>待处理的登录请求</value>
  </data>
  <data name="DeclineAllRequests" xml:space="preserve">
    <value>拒绝所有请求</value>
@@ -2535,7 +2535,7 @@
    <value>请求被拒绝</value>
  </data>
  <data name="NoPendingRequests" xml:space="preserve">
-    <value>无待处理请求</value>  
+    <value>无待处理的请求</value>  
  </data>
  <data name="EnableCamerPermissionToUseTheScanner" xml:space="preserve">
    <value>启用相机权限以使用扫描器</value>
@@ -2544,7 +2544,7 @@
    <value>语言</value>
  </data>
  <data name="LanguageChangeXDescription" xml:space="preserve">
-    <value>语言已更改为 {0}。请重新启动 app 以查看更改</value>
+    <value>语言已更改为 {0}。请重新启动应用程序以查看更改</value>
  </data>
  <data name="LanguageChangeRequiresAppRestart" xml:space="preserve">
    <value>更改语言需要重新启动 app</value>
@@ -2553,16 +2553,16 @@
    <value>默认（系统）</value>
  </data>
  <data name="Important" xml:space="preserve">
-    <value>重要事项：</value>
+    <value>重要：</value>
  </data>
  <data name="YourMasterPasswordCannotBeRecoveredIfYouForgetItXCharactersMinimum" xml:space="preserve">
-    <value>主密码忘记后，将无法恢复！密码不能少于{0}个字符</value>
+    <value>主密码忘记后，将无法恢复！要求不少于 {0} 个字符。</value>
  </data>
  <data name="WeakMasterPassword" xml:space="preserve">
    <value>脆弱的主密码</value>
  </data>
  <data name="WeakPasswordIdentifiedUseAStrongPasswordToProtectYourAccount" xml:space="preserve">
-    <value>发现弱密码。使用一个强密码来保护你的账户。你确定你要使用弱密码吗？</value>
+    <value>识别到弱密码。请使用一个强密码以保护你的账户。确定要使用弱密码吗？</value>
  </data>
  <data name="Weak" xml:space="preserve">
    <value>弱</value>
@@ -2580,27 +2580,27 @@
    <value>已暴露的主密码</value>
  </data>
  <data name="PasswordFoundInADataBreachAlertDescription" xml:space="preserve">
-    <value>一起数据泄露中存在该密码。使用独特的密码有助保护您的账户。确定要使用曾经暴露的密码吗？</value>
+    <value>密码在数据泄露中被发现。请使用一个唯一的密码以保护您的账户。确定要使用已暴露的密码吗？</value>
  </data>
  <data name="WeakAndExposedMasterPassword" xml:space="preserve">
    <value>主密码弱且曾经暴露</value>
  </data>
  <data name="WeakPasswordIdentifiedAndFoundInADataBreachAlertDescription" xml:space="preserve">
-    <value>密码太弱并出现在数据泄露。使用强悍且独特的密码有助保护您的账户。确定继续使用当前密码吗？</value>
+    <value>识别到弱密码且其出现在数据泄露中。请使用一个强且唯一的密码以保护你的账户。确定要使用这个密码吗？</value>
  </data>
  <data name="OrganizationSsoIdentifierRequired" xml:space="preserve">
    <value>必须填写组织 SSO 标识符。</value>
  </data>
  <data name="AddTheKeyToAnExistingOrNewItem" xml:space="preserve">
-    <value>将密钥添加到现有或新项目</value>
+    <value>将密钥添加到现有或新的项目</value>
  </data>
  <data name="ThereAreNoItemsInYourVaultThatMatchX" xml:space="preserve">
    <value>您的密码库中没有匹配 "{0}" 的项目</value>
  </data>
  <data name="SearchForAnItemOrAddANewItem" xml:space="preserve">
-    <value>搜索一个项目或添加一个新项目</value>
+    <value>搜索一个项目或添加一个新的项目</value>
  </data>
  <data name="ThereAreNoItemsThatMatchTheSearch" xml:space="preserve">
-    <value>没有匹配搜索的项目</value>
+    <value>没有匹配搜索条件的项目</value>
  </data>
 </root>
--- a/src/Core/Abstractions/IStateMigrationService.cs
+++ b/src/Core/Abstractions/IStateMigrationService.cs
@@ -4,7 +4,6 @@ namespace Bit.Core.Abstractions
 {
    public interface IStateMigrationService
    {
-        Task<bool> NeedsMigration();
-        Task Migrate();
+        Task MigrateIfNeededAsync();
    }
 }
--- a/src/Core/Services/StateMigrationService.cs
+++ b/src/Core/Services/StateMigrationService.cs
@@ -1,6 +1,7 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
+using System.Threading;
 using System.Threading.Tasks;
 using Bit.Core.Abstractions;
 using Bit.Core.Enums;
@@ -17,6 +18,7 @@ namespace Bit.Core.Services
        private readonly IStorageService _preferencesStorageService;
        private readonly IStorageService _liteDbStorageService;
        private readonly IStorageService _secureStorageService;
+        private readonly SemaphoreSlim _semaphore;

        private enum Storage
        {
@@ -31,9 +33,27 @@ namespace Bit.Core.Services
            _liteDbStorageService = liteDbStorageService;
            _preferencesStorageService = preferenceStorageService;
            _secureStorageService = secureStorageService;
+
+            _semaphore = new SemaphoreSlim(1);
        }

-        public async Task<bool> NeedsMigration()
+        public async Task MigrateIfNeededAsync()
+        {
+            await _semaphore.WaitAsync();
+            try
+            {
+                if (await IsMigrationNeededAsync())
+                {
+                    await PerformMigrationAsync();
+                }
+            }
+            finally
+            {
+                _semaphore.Release();
+            }
+        }
+
+        private async Task<bool> IsMigrationNeededAsync()
        {
            var lastVersion = await GetLastStateVersionAsync();
            if (lastVersion == 0)
@@ -45,7 +65,7 @@ namespace Bit.Core.Services
            return lastVersion < StateVersion;
        }

-        public async Task Migrate()
+        private async Task PerformMigrationAsync()
        {
            var lastVersion = await GetLastStateVersionAsync();
            switch (lastVersion)
@@ -394,10 +414,10 @@ namespace Bit.Core.Services
            // use values from first userId to apply globals
            if (firstUserId != null)
            {
-                var theme = await GetValueAsync<int?>(Storage.LiteDb, V3Keys.ThemeKey(firstUserId));
+                var theme = await GetValueAsync<string>(Storage.LiteDb, V3Keys.ThemeKey(firstUserId));
                await SetValueAsync(Storage.LiteDb, V4Keys.ThemeKey, theme);

-                var autoDarkTheme = await GetValueAsync<int?>(Storage.LiteDb, V3Keys.AutoDarkThemeKey(firstUserId));
+                var autoDarkTheme = await GetValueAsync<string>(Storage.LiteDb, V3Keys.AutoDarkThemeKey(firstUserId));
                await SetValueAsync(Storage.LiteDb, V4Keys.AutoDarkThemeKey, autoDarkTheme);

                var disableFavicon = await GetValueAsync<bool?>(Storage.LiteDb, V3Keys.DisableFaviconKey(firstUserId));
--- a/src/Core/Services/StateService.cs
+++ b/src/Core/Services/StateService.cs
@@ -526,8 +526,7 @@ namespace Bit.Core.Services
        {
            var reconciledOptions = ReconcileOptions(new StorageOptions { UserId = userId },
                await GetDefaultStorageOptionsAsync());
-            return await GetValueAsync<int?>(Constants.VaultTimeoutKey(reconciledOptions.UserId), reconciledOptions) ??
-                   Constants.VaultTimeoutDefault;
+            return await GetValueAsync<int?>(Constants.VaultTimeoutKey(reconciledOptions.UserId), reconciledOptions);
        }

        public async Task SetVaultTimeoutAsync(int? value, string userId = null)
@@ -542,7 +541,7 @@ namespace Bit.Core.Services
            var reconciledOptions = ReconcileOptions(new StorageOptions { UserId = userId },
                await GetDefaultStorageOptionsAsync());
            return await GetValueAsync<VaultTimeoutAction?>(Constants.VaultTimeoutActionKey(reconciledOptions.UserId),
-                reconciledOptions) ?? VaultTimeoutAction.Lock;
+                reconciledOptions);
        }

        public async Task SetVaultTimeoutActionAsync(VaultTimeoutAction? value, string userId = null)
@@ -1444,6 +1443,14 @@ namespace Bit.Core.Services
                }
                _state.Accounts[account.Profile.UserId] = account;
            }
+
+            // Check if account has logged in before by checking a guaranteed non-null pref
+            if (await GetVaultTimeoutActionAsync(account.Profile.UserId) == null)
+            {
+                // Account has never logged in, set defaults
+                await SetVaultTimeoutAsync(Constants.VaultTimeoutDefault, account.Profile.UserId);
+                await SetVaultTimeoutActionAsync(VaultTimeoutAction.Lock, account.Profile.UserId);
+            }
        }

        private StorageOptions ReconcileOptions(StorageOptions requestedOptions, StorageOptions defaultOptions)
@@ -1530,11 +1537,8 @@ namespace Bit.Core.Services
        {
            if (!_migrationChecked)
            {
-                var migrationService = ServiceContainer.Resolve<IStateMigrationService>("stateMigrationService");
-                if (await migrationService.NeedsMigration())
-                {
-                    await migrationService.Migrate();
-                }
+                var migrationService = ServiceContainer.Resolve<IStateMigrationService>();
+                await migrationService.MigrateIfNeededAsync();
                _migrationChecked = true;
            }

--- a/src/iOS.Autofill/Info.plist
+++ b/src/iOS.Autofill/Info.plist
@@ -11,7 +11,7 @@
 	<key>CFBundleIdentifier</key>
 	<string>com.8bit.bitwarden.autofill</string>
 	<key>CFBundleShortVersionString</key>
-	<string>2023.2.1</string>
+	<string>2023.3.3</string>
 	<key>CFBundleVersion</key>
 	<string>1</string>
 	<key>CFBundleLocalizations</key>
--- a/src/iOS.Extension/Info.plist
+++ b/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>2023.2.1</string>
+	<string>2023.3.3</string>
 	<key>CFBundleLocalizations</key>
 	<array>
 		<string>en</string>
--- a/src/iOS.ShareExtension/Info.plist
+++ b/src/iOS.ShareExtension/Info.plist
@@ -15,7 +15,7 @@
 	<key>CFBundlePackageType</key>
 	<string>XPC!</string>
 	<key>CFBundleShortVersionString</key>
-	<string>2023.2.1</string>
+	<string>2023.3.3</string>
 	<key>CFBundleVersion</key>
 	<string>1</string>
 	<key>MinimumOSVersion</key>
--- a/src/iOS/Info.plist
+++ b/src/iOS/Info.plist
@@ -11,7 +11,7 @@
 	<key>CFBundleIdentifier</key>
 	<string>com.8bit.bitwarden</string>
 	<key>CFBundleShortVersionString</key>
-	<string>2023.2.1</string>
+	<string>2023.3.3</string>
 	<key>CFBundleVersion</key>
 	<string>1</string>
 	<key>CFBundleIconName</key>
--- a/store/apple/it/copy.resx
+++ b/store/apple/it/copy.resx
@@ -124,43 +124,44 @@
  <data name="Description" xml:space="preserve">
    <value>Bitwarden, Inc. è la società madre di 8bit Solutions LLC.

-NOMINATO MIGLIOR PASSWORD MANAGER DA THE VERGE, US NEWS &amp; WORLD REPORT, CNET E ALTRO.
+NOMINATO MIGLIOR PASSWORD MANAGER DA THE VERGE, U.S. NEWS &amp; WORLD REPORT, CNET, E ALTRO.

-Gestisci, archivia, proteggi e condividi password illimitate su dispositivi illimitati da qualsiasi luogo. Bitwarden offre soluzioni di gestione delle password open source a tutti, a casa, al lavoro o in viaggio.
+Gestisci, archivia, proteggi, e condividi password illimitate su dispositivi illimitati da qualsiasi luogo. Bitwarden offre soluzioni di gestione delle password open-source a tutti, a casa, al lavoro, o in viaggio.

-Genera password complesse, uniche e casuali in base ai requisiti di sicurezza per ogni sito web che frequenti.
+Genera password forti, uniche, e casuali in base ai requisiti di sicurezza per ogni sito web che frequenti.

-Bitwarden Send trasmette rapidamente informazioni cifrate --- file e testo in chiaro - direttamente a chiunque.
+Bitwarden Send trasmette rapidamente informazioni criptate - via file e testo in chiaro - direttamente a chiunque.

-Bitwarden offre piani Teams ed Enterprise per le aziende in modo da poter condividere le password in modo sicuro con i colleghi.
+Bitwarden offre piani Teams ed Enterprise per le aziende così puoi condividere le password in modo sicuro con i tuoi colleghi.

-Perché scegliere Bitwarden:
+Perché Scegliere Bitwarden:

-Crittografia di livello mondiale
-Le password sono protette con cifratura end-to-end avanzata (AES-256 bit, hashtag con sale e PBKDF2 SHA-256) in modo che i tuoi dati rimangano al sicuro e privati.
+Criptografia Di Livello Mondiale
+Le password sono protette con criptografia end-to-end avanzata (AES-256 bit, salted hashing, e PBKDF2 SHA-256) per tenere i tuoi dati al sicuro e privati.

-Generatore di password integrato
-Genera password complesse, uniche e casuali in base ai requisiti di sicurezza per ogni sito web che frequenti.
+Generatore Di Password Integrato
+Genera password forti, uniche e casuali in base ai requisiti di sicurezza per ogni sito web che frequenti.

-Traduzioni globali
-Le traduzioni di Bitwarden esistono in 40 lingue e sono in crescita, grazie alla nostra comunità globale.
+Traduzioni Globali
+Le traduzioni di Bitwarden esistono in 40 lingue e sono in crescita grazie alla nostra comunità globale.

-Applicazioni multipiattaforma
-Proteggi e condividi i dati sensibili all'interno del tuo Bitwarden Vault da qualsiasi browser, dispositivo mobile o sistema operativo desktop e altro ancora.</value>
+Applicazioni Multipiattaforma
+Proteggi e condividi i dati sensibili all'interno della tua cassaforte di Bitwarden da qualsiasi browser, dispositivo mobile, o sistema operativo desktop, e altro.
+</value>
  <comment>Max 4000 characters</comment>
  </data>
  <data name="Keywords" xml:space="preserve">
-    <value>bitwarden,8bit,password,gestore password gratuito,gestore password,gestore login</value>
+    <value>bit warden,8bit,password,gestore password gratuito,gestore password,gestore login</value>
    <comment>Max 100 characters</comment>
  </data>
  <data name="Screenshot1" xml:space="preserve">
-    <value>Gestisci tutte le tue password ed i tuoi login da una cassaforte sicura</value>
+    <value>Gestisci tutte le tue password e i tuoi login da una cassaforte sicura</value>
  </data>
  <data name="Screenshot2" xml:space="preserve">
    <value>Genera automaticamente password complesse, casuali e sicure</value>
  </data>
  <data name="Screenshot3" xml:space="preserve">
-    <value>Proteggi la tua cassaforte con Touch ID, codice PIN o password principale</value>
+    <value>Proteggi la tua cassaforte con Touch ID, Face ID, PIN o password</value>
  </data>
  <data name="Screenshot4" xml:space="preserve">
    <value>Auto-completamento login da Safari, Chrome e centinaia di altre applicazioni</value>
--- a/store/apple/my/copy.resx
+++ b/store/apple/my/copy.resx
@@ -0,0 +1,172 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!--
+    Microsoft ResX Schema
+
+    Version 2.0
+
+    The primary goals of this format is to allow a simple XML format
+    that is mostly human readable. The generation and parsing of the
+    various data types are done through the TypeConverter classes
+    associated with the data types.
+
+    Example:
+
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">2.0</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        <value>[base64 mime encoded serialized .NET Framework object]</value>
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+        <comment>This is a comment</comment>
+    </data>
+
+    There are any number of "resheader" rows that contain simple
+    name/value pairs.
+
+    Each data row contains a name, and value. The row also contains a
+    type or mimetype. Type corresponds to a .NET class that support
+    text/value conversion through the TypeConverter architecture.
+    Classes that don't support this are serialized and stored with the
+    mimetype set.
+
+    The mimetype is used for serialized objects, and tells the
+    ResXResourceReader how to depersist the object. This is currently not
+    extensible. For a given mimetype the value must be set accordingly:
+
+    Note - application/x-microsoft.net.object.binary.base64 is the format
+    that the ResXResourceWriter will generate, however the reader can
+    read any of the formats listed below.
+
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with
+            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
+  <xsd:schema xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata" id="root">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace"/>
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0"/>
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string"/>
+              <xsd:attribute name="type" type="xsd:string"/>
+              <xsd:attribute name="mimetype" type="xsd:string"/>
+              <xsd:attribute ref="xml:space"/>
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string"/>
+              <xsd:attribute name="name" type="xsd:string"/>
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1"/>
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2"/>
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1"/>
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3"/>
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4"/>
+              <xsd:attribute ref="xml:space"/>
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1"/>
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required"/>
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <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 Password Manager</value>
+    <comment>Max 30 characters</comment>
+  </data>
+  <data name="Description" xml:space="preserve">
+    <value>Bitwarden, Inc. is the parent company of 8bit Solutions LLC.
+
+NAMED BEST PASSWORD MANAGER BY THE VERGE, U.S. NEWS &amp; WORLD REPORT, CNET, AND MORE.
+
+Manage, store, secure, and share unlimited passwords across unlimited devices from anywhere. Bitwarden delivers open source password management solutions to everyone, whether at  home, at work, or on the go.
+
+Generate strong, unique, and random passwords based on security requirements for every website you frequent.
+
+Bitwarden Send quickly transmits encrypted information --- files and plaintext -- directly to anyone.
+
+Bitwarden offers Teams and Enterprise plans for companies so you can securely share passwords with colleagues.
+
+Why Choose Bitwarden:
+
+World-Class Encryption
+Passwords are protected with advanced end-to-end encryption (AES-256 bit, salted hashtag, and PBKDF2 SHA-256) so your data stays secure and private.
+
+Built-in Password Generator
+Generate strong, unique, and random passwords based on security requirements for every website you frequent.
+
+Global Translations
+Bitwarden translations exist in 40 languages and are growing, thanks to our global community.
+
+Cross-Platform Applications
+Secure and share sensitive data within your Bitwarden Vault from any browser, mobile device, or desktop OS, and more.
+</value>
+  <comment>Max 4000 characters</comment>
+  </data>
+  <data name="Keywords" xml:space="preserve">
+    <value>bit warden,8bit,password,free password manager,password manager,login manager</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>
+  </data>
+  <data name="Screenshot2" xml:space="preserve">
+    <value>Automatically generate strong, random, and secure passwords</value>
+  </data>
+  <data name="Screenshot3" xml:space="preserve">
+    <value>Protect your vault with Touch ID, PIN code, or master password</value>
+  </data>
+  <data name="Screenshot4" xml:space="preserve">
+    <value>Auto-fill logins from Safari, Chrome, and hundreds of other apps</value>
+  </data>
+  <data name="Screenshot5" xml:space="preserve">
+    <value>Sync and access your vault from multiple devices</value>
+  </data>
+</root>
--- a/store/apple/uk/copy.resx
+++ b/store/apple/uk/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 - Менеджер паролів</value>
+    <value>Bitwarden – менеджер паролів</value>
    <comment>Max 30 characters</comment>
  </data>
  <data name="Description" xml:space="preserve">
@@ -128,25 +128,26 @@

 Зберігайте, захищайте, керуйте і надавайте доступ до паролів на різних пристроях де завгодно. Bitwarden пропонує рішення для керування паролями на основі відкритого програмного коду особистим та корпоративним користувачам на всіх пристроях.

-Генеруйте випадкові, надійні та унікальні паролі, які задовольняють вимоги безпеки, для кожного вебсайту та сервісу.
+Генеруйте надійні, випадкові та унікальні паролі, які відповідають вимогам безпеки, для кожного вебсайту та сервісу.

-Функція Bitwarden Send швидко та безпосередньо передає зашифровану інформацію будь-кому - файли та звичайний текст.
+Швидко відправляйте будь-кому зашифровану інформацію, як-от файли чи звичайний текст, за допомогою функції Bitwarden Send.

 Bitwarden пропонує командні та корпоративні тарифні плани для компаній, щоб ви могли безпечно обмінюватися паролями з колегами.

 Чому варто обрати Bitwarden:

-Шифрування світового рівня
-Паролі захищаються з використанням розширеного наскрізного шифрування (AES-256 bit, salted hashtag, та PBKDF2 SHA-256), тому ваші дані завжди захищені та приватні.
+Всесвітньо визнані стандарти шифрування
+Паролі захищаються з використанням розширеного наскрізного шифрування (AES-256 bit, хешування з сіллю та PBKDF2 SHA-256), тому ваші дані завжди захищені та приватні.

 Вбудований генератор паролів
-Генеруйте випадкові, надійні та унікальні паролі, які задовольняють вимоги безпеки, для кожного вебсайту та сервісу.
+Генеруйте надійні, випадкові та унікальні паролі, які відповідають вимогам безпеки, для кожного вебсайту та сервісу.

 Переклад багатьма мовами 
-Завдяки нашій глобальній спільноті, Bitwarden перекладено 40 мовами, і їх кількість продовжує зростати.
+Завдяки нашій глобальній спільноті, Bitwarden перекладено 40 мовами, і їх кількість зростає.

 Програми для різних платформ 
-Зберігайте і діліться важливими даними, а також користуйтеся іншими можливостями у вашому сховищі Bitwarden в будь-якому браузері, мобільному пристрої, чи комп'ютерній операційній системі.</value>
+Зберігайте і діліться важливими даними, а також користуйтеся іншими можливостями у вашому сховищі Bitwarden в будь-якому браузері, мобільному пристрої, чи комп'ютерній операційній системі.
+</value>
  <comment>Max 4000 characters</comment>
  </data>
  <data name="Keywords" xml:space="preserve">
@@ -157,7 +158,7 @@ Bitwarden пропонує командні та корпоративні тар
    <value>Керуйте всіма своїми записами в захищеному сховищі</value>
  </data>
  <data name="Screenshot2" xml:space="preserve">
-    <value>Автоматично генеруйте стійкі, випадкові та надійні паролі</value>
+    <value>Автоматично генеруйте надійні, випадкові та унікальні паролі</value>
  </data>
  <data name="Screenshot3" xml:space="preserve">
    <value>Захистіть своє сховище за допомогою Touch ID, PIN-коду, або головного пароля</value>
@@ -166,6 +167,6 @@ Bitwarden пропонує командні та корпоративні тар
    <value>Автозаповнення паролів у Safari, Chrome та сотнях інших програм</value>
  </data>
  <data name="Screenshot5" xml:space="preserve">
-    <value>Синхронізуйте й отримуйте доступ до вашого сховища на багатьох пристроях</value>
+    <value>Синхронізуйте й отримуйте доступ до свого сховища на різних пристроях</value>
  </data>
 </root>
--- a/store/google/it/copy.resx
+++ b/store/google/it/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="Title" xml:space="preserve">
-    <value>Bitwarden - Gestore di password</value>
+    <value>Bitwarden - Gestore di Password</value>
    <comment>Max 30 characters</comment>
  </data>
  <data name="ShortDescription" xml:space="preserve">
@@ -128,42 +128,43 @@
  <data name="FullDesciption" xml:space="preserve">
    <value>Bitwarden, Inc. è la società madre di 8bit Solutions LLC.

-NOMINATO MIGLIOR PASSWORD MANAGER DA THE VERGE, US NEWS &amp; WORLD REPORT, CNET E ALTRO.
+NOMINATO MIGLIOR PASSWORD MANAGER DA THE VERGE, U.S. NEWS &amp; WORLD REPORT, CNET, E ALTRO.

-Gestisci, archivia, proteggi e condividi password illimitate su dispositivi illimitati da qualsiasi luogo. Bitwarden offre soluzioni di gestione delle password open source a tutti, a casa, al lavoro o in viaggio.
+Gestisci, archivia, proteggi, e condividi password illimitate su dispositivi illimitati da qualsiasi luogo. Bitwarden offre soluzioni di gestione delle password open-source a tutti, a casa, al lavoro, o in viaggio.

-Genera password complesse, uniche e casuali in base ai requisiti di sicurezza per ogni sito web che frequenti.
+Genera password forti, uniche, e casuali in base ai requisiti di sicurezza per ogni sito web che frequenti.

-Bitwarden Send trasmette rapidamente informazioni cifrate --- file e testo in chiaro - direttamente a chiunque.
+Bitwarden Send trasmette rapidamente informazioni criptate - via file e testo in chiaro - direttamente a chiunque.

-Bitwarden offre piani Teams ed Enterprise per le aziende in modo da poter condividere le password in modo sicuro con i colleghi.
+Bitwarden offre piani Teams ed Enterprise per le aziende così puoi condividere le password in modo sicuro con i tuoi colleghi.

-Perché scegliere Bitwarden:
+Perché Scegliere Bitwarden:

-Crittografia di livello mondiale
-Le password sono protette con cifratura end-to-end avanzata (AES-256 bit, hashtag con sale e PBKDF2 SHA-256) in modo che i tuoi dati rimangano al sicuro e privati.
+Criptografia Di Livello Mondiale
+Le password sono protette con criptografia end-to-end avanzata (AES-256 bit, salted hashing, e PBKDF2 SHA-256) per tenere i tuoi dati al sicuro e privati.

-Generatore di password integrato
-Genera password complesse, uniche e casuali in base ai requisiti di sicurezza per ogni sito web che frequenti.
+Generatore Di Password Integrato
+Genera password forti, uniche e casuali in base ai requisiti di sicurezza per ogni sito web che frequenti.

-Traduzioni globali
-Le traduzioni di Bitwarden esistono in 40 lingue e sono in crescita, grazie alla nostra comunità globale.
+Traduzioni Globali
+Le traduzioni di Bitwarden esistono in 40 lingue e sono in crescita grazie alla nostra comunità globale.

-Applicazioni multipiattaforma
-Proteggi e condividi i dati sensibili all'interno del tuo Bitwarden Vault da qualsiasi browser, dispositivo mobile o sistema operativo desktop e altro ancora.</value>
+Applicazioni Multipiattaforma
+Proteggi e condividi i dati sensibili all'interno della tua cassaforte di Bitwarden da qualsiasi browser, dispositivo mobile, o sistema operativo desktop, e altro.
+</value>
  <comment>Max 4000 characters</comment>
  </data>
  <data name="FeatureGraphic" xml:space="preserve">
    <value>Un gestore di password sicuro e gratuito per tutti i tuoi dispositivi</value>
  </data>
  <data name="Screenshot1" xml:space="preserve">
-    <value>Gestisci tutte le tue password ed i tuoi login da una cassaforte sicura</value>
+    <value>Gestisci tutte le tue password e i tuoi login da una cassaforte sicura</value>
  </data>
  <data name="Screenshot2" xml:space="preserve">
    <value>Genera automaticamente password complesse, casuali e sicure</value>
  </data>
  <data name="Screenshot3" xml:space="preserve">
-    <value>Proteggi la tua cassaforte tramite impronta digitale, codice PIN o password principale</value>
+    <value>Proteggi la tua cassaforte con impronta digitale, codice PIN, o password</value>
  </data>
  <data name="Screenshot4" xml:space="preserve">
    <value>Riempi velocemente i login dal tuo browser e da altre app</value>
@@ -174,6 +175,6 @@ Proteggi e condividi i dati sensibili all'interno del tuo Bitwarden Vault da qua
 - Telefono
 - Tablet
 - Desktop
- Web</value>
+- Sito web</value>
  </data>
 </root>
--- a/store/google/my/copy.resx
+++ b/store/google/my/copy.resx
@@ -0,0 +1,180 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!--
+    Microsoft ResX Schema
+
+    Version 2.0
+
+    The primary goals of this format is to allow a simple XML format
+    that is mostly human readable. The generation and parsing of the
+    various data types are done through the TypeConverter classes
+    associated with the data types.
+
+    Example:
+
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">2.0</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        <value>[base64 mime encoded serialized .NET Framework object]</value>
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+        <comment>This is a comment</comment>
+    </data>
+
+    There are any number of "resheader" rows that contain simple
+    name/value pairs.
+
+    Each data row contains a name, and value. The row also contains a
+    type or mimetype. Type corresponds to a .NET class that support
+    text/value conversion through the TypeConverter architecture.
+    Classes that don't support this are serialized and stored with the
+    mimetype set.
+
+    The mimetype is used for serialized objects, and tells the
+    ResXResourceReader how to depersist the object. This is currently not
+    extensible. For a given mimetype the value must be set accordingly:
+
+    Note - application/x-microsoft.net.object.binary.base64 is the format
+    that the ResXResourceWriter will generate, however the reader can
+    read any of the formats listed below.
+
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with
+            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
+  <xsd:schema xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata" id="root">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace"/>
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0"/>
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string"/>
+              <xsd:attribute name="type" type="xsd:string"/>
+              <xsd:attribute name="mimetype" type="xsd:string"/>
+              <xsd:attribute ref="xml:space"/>
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string"/>
+              <xsd:attribute name="name" type="xsd:string"/>
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1"/>
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2"/>
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1"/>
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3"/>
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4"/>
+              <xsd:attribute ref="xml:space"/>
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1"/>
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required"/>
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <data name="Title" xml:space="preserve">
+    <value>Bitwarden Password Manager</value>
+    <comment>Max 30 characters</comment>
+  </data>
+  <data name="ShortDescription" xml:space="preserve">
+    <value>Bitwarden is a login and password manager that helps keep you safe while online.</value>
+    <comment>Max 80 characters</comment>
+  </data>
+  <data name="FullDesciption" xml:space="preserve">
+    <value>Bitwarden, Inc. is the parent company of 8bit Solutions LLC.
+
+NAMED BEST PASSWORD MANAGER BY THE VERGE, U.S. NEWS &amp; WORLD REPORT, CNET, AND MORE.
+
+Manage, store, secure, and share unlimited passwords across unlimited devices from anywhere. Bitwarden delivers open source password management solutions to everyone, whether at  home, at work, or on the go.
+
+Generate strong, unique, and random passwords based on security requirements for every website you frequent.
+
+Bitwarden Send quickly transmits encrypted information --- files and plaintext -- directly to anyone.
+
+Bitwarden offers Teams and Enterprise plans for companies so you can securely share passwords with colleagues.
+
+Why Choose Bitwarden:
+
+World-Class Encryption
+Passwords are protected with advanced end-to-end encryption (AES-256 bit, salted hashtag, and PBKDF2 SHA-256) so your data stays secure and private.
+
+Built-in Password Generator
+Generate strong, unique, and random passwords based on security requirements for every website you frequent.
+
+Global Translations
+Bitwarden translations exist in 40 languages and are growing, thanks to our global community.
+
+Cross-Platform Applications
+Secure and share sensitive data within your Bitwarden Vault from any browser, mobile device, or desktop OS, and more.
+</value>
+  <comment>Max 4000 characters</comment>
+  </data>
+  <data name="FeatureGraphic" xml:space="preserve">
+    <value>A secure and free password manager for all of your devices</value>
+  </data>
+  <data name="Screenshot1" xml:space="preserve">
+    <value>Manage all your logins and passwords from a secure vault</value>
+  </data>
+  <data name="Screenshot2" xml:space="preserve">
+    <value>Automatically generate strong, random, and secure passwords</value>
+  </data>
+  <data name="Screenshot3" xml:space="preserve">
+    <value>Protect your vault with fingerprint, PIN code, or master password</value>
+  </data>
+  <data name="Screenshot4" xml:space="preserve">
+    <value>Quickly auto-fill logins from within your web browser and other apps</value>
+  </data>
+  <data name="Screenshot5" xml:space="preserve">
+    <value>Sync and access your vault from multiple devices
+
+- Phone
+- Tablet
+- Desktop
+- Web</value>
+  </data>
+</root>
--- a/store/google/uk/copy.resx
+++ b/store/google/uk/copy.resx
@@ -118,11 +118,11 @@
    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
  </resheader>
  <data name="Title" xml:space="preserve">
-    <value>Bitwarden - Менеджер паролів</value>
+    <value>Bitwarden – менеджер паролів</value>
    <comment>Max 30 characters</comment>
  </data>
  <data name="ShortDescription" xml:space="preserve">
-    <value>Bitwarden - менеджер паролів, що допомагає вам бути в безпеці онлайн.</value>
+    <value>Bitwarden – менеджер паролів, що допомагає вам бути в безпеці онлайн.</value>
    <comment>Max 80 characters</comment>
  </data>
  <data name="FullDesciption" xml:space="preserve">
@@ -132,41 +132,42 @@

 Зберігайте, захищайте, керуйте і надавайте доступ до паролів на різних пристроях де завгодно. Bitwarden пропонує рішення для керування паролями на основі відкритого програмного коду особистим та корпоративним користувачам на всіх пристроях.

-Генеруйте випадкові, надійні та унікальні паролі, які задовольняють вимоги безпеки, для кожного вебсайту та сервісу.
+Генеруйте надійні, випадкові та унікальні паролі, які відповідають вимогам безпеки, для кожного вебсайту та сервісу.

-Функція Bitwarden Send швидко та безпосередньо передає зашифровану інформацію будь-кому - файли та звичайний текст.
+Швидко відправляйте будь-кому зашифровану інформацію, як-от файли чи звичайний текст, за допомогою функції Bitwarden Send.

 Bitwarden пропонує командні та корпоративні тарифні плани для компаній, щоб ви могли безпечно обмінюватися паролями з колегами.

 Чому варто обрати Bitwarden:

-Шифрування світового рівня
-Паролі захищаються з використанням розширеного наскрізного шифрування (AES-256 bit, salted hashtag, та PBKDF2 SHA-256), тому ваші дані завжди захищені та приватні.
+Всесвітньо визнані стандарти шифрування
+Паролі захищаються з використанням розширеного наскрізного шифрування (AES-256 bit, хешування з сіллю та PBKDF2 SHA-256), тому ваші дані завжди захищені та приватні.

 Вбудований генератор паролів
-Генеруйте випадкові, надійні та унікальні паролі, які задовольняють вимоги безпеки, для кожного вебсайту та сервісу.
+Генеруйте надійні, випадкові та унікальні паролі, які відповідають вимогам безпеки, для кожного вебсайту та сервісу.

 Переклад багатьма мовами 
-Завдяки нашій глобальній спільноті, Bitwarden перекладено 40 мовами, і їх кількість продовжує зростати.
+Завдяки нашій глобальній спільноті, Bitwarden перекладено 40 мовами, і їх кількість зростає.

 Програми для різних платформ 
-Зберігайте і діліться важливими даними, а також користуйтеся іншими можливостями у вашому сховищі Bitwarden в будь-якому браузері, мобільному пристрої, чи комп'ютерній операційній системі.</value>
+Зберігайте і діліться важливими даними, а також користуйтеся іншими можливостями у вашому сховищі Bitwarden в будь-якому браузері, мобільному пристрої, чи комп'ютерній операційній системі.
+</value>
  <comment>Max 4000 characters</comment>
  </data>
  <data name="FeatureGraphic" xml:space="preserve">
-    <value>Захищений і безкоштовний менеджер паролів для всіх ваших пристроїв</value>
+    <value>Захищений, безплатний менеджер паролів для всіх ваших пристроїв</value>
  </data>
  <data name="Screenshot1" xml:space="preserve">
    <value>Керуйте всіма своїми записами в захищеному сховищі</value>
  </data>
  <data name="Screenshot2" xml:space="preserve">
-    <value>Автоматично генеруйте стійкі, випадкові та надійні паролі</value>
+    <value>Автоматично генеруйте надійні, випадкові та унікальні паролі</value>
  </data>
  <data name="Screenshot3" xml:space="preserve">
    <value>Захистіть своє сховище за допомогою відбитку пальця, PIN-коду, або головного пароля</value>
  </data>
  <data name="Screenshot4" xml:space="preserve">
-    <value>Швидке автозаповнення паролів у веб-браузері та інших програмах</value>
+    <value>Швидко, автоматично заповнюйте паролі у веббраузері та інших програмах</value>
  </data>
  <data name="Screenshot5" xml:space="preserve">
    <value>Синхронізація і доступ до сховища з різних пристроїв
@@ -174,6 +175,6 @@ Bitwarden пропонує командні та корпоративні тар
 - Телефон
 - Планшет
 - Комп'ютер
- Веб-браузер</value>
+- Веббраузер</value>
  </data>
 </root>