EC-295 Added custom renderer for CollectionView to attach ItemTouchHelper callback to handle swiping natively in Android

# Conflicts:
#	src/App/Pages/Vault/GroupingsPage/GroupingsPage.xaml
#	src/App/Pages/Vault/GroupingsPage/GroupingsPageListItemSelector.cs
#	src/App/Pages/Vault/GroupingsPage/GroupingsPageViewModel.cs

.config/dotnet-tools.json

@@ -7,12 +7,6 @@
       "commands": [
         "dotnet-format"
       ]
-    },
-    "cake.tool": {
-      "version": "2.2.0",
-      "commands": [
-        "dotnet-cake"
-      ]
     }
   }
 }

.github/workflows/build.yml

@@ -59,10 +59,6 @@ jobs:
     name: Android
     runs-on: windows-2022
     needs: setup
-    strategy:
-      fail-fast: false
-      matrix:
-        variant: ['prod', 'qa']
     steps:
       - name: Setup NuGet
         uses: nuget/setup-nuget@b2bc17b761a1d88cab755a776c7922eb26eefbfa  # v1.0.6
@@ -71,7 +67,7 @@ jobs:
 
       - name: Set up MSBuild
         uses: microsoft/setup-msbuild@ab534842b4bdf384b8aaf93765dc6f721d9f5fab
-          
+
       - name: Work Around for broken Windows 2022 Runner Image
         run: |
           Set-Location "C:\Program Files (x86)\Microsoft Visual Studio\Installer\"
@@ -91,6 +87,7 @@ jobs:
               Write-Host "components were not installed"
               exit 1
           }
+
       - name: Print environment
         run: |
           nuget help | grep Version
@@ -101,8 +98,7 @@ jobs:
 
       - name: Checkout repo
         uses: actions/checkout@a12a3943b4bdde767164f792f33f40b04645d846
-        with:
-          fetch-depth: 0
+
       - name: Decrypt secrets
         env:
           DECRYPT_FILE_PASSWORD: ${{ secrets.DECRYPT_FILE_PASSWORD }}
@@ -113,17 +109,12 @@ jobs:
             --output ./src/Android/app_play-keystore.jks ./.github/secrets/app_play-keystore.jks.gpg
           gpg --quiet --batch --yes --decrypt --passphrase="$DECRYPT_FILE_PASSWORD" \
             --output ./src/Android/app_upload-keystore.jks ./.github/secrets/app_upload-keystore.jks.gpg
+          gpg --quiet --batch --yes --decrypt --passphrase="$DECRYPT_FILE_PASSWORD" \
+            --output ./src/Android/google-services.json ./.github/secrets/google-services.json.gpg
           gpg --quiet --batch --yes --decrypt --passphrase="$DECRYPT_FILE_PASSWORD" \
             --output $HOME/secrets/play_creds.json ./.github/secrets/play_creds.json.gpg
         shell: bash
-      - name: Decrypt secrets - Google Services
-        if: ${{ matrix.variant == 'prod' }}
-        env:
-          DECRYPT_FILE_PASSWORD: ${{ secrets.DECRYPT_FILE_PASSWORD }}
-        run: |
-          gpg --quiet --batch --yes --decrypt --passphrase="$DECRYPT_FILE_PASSWORD" \
-            --output ./src/Android/google-services.json ./.github/secrets/google-services.json.gpg
-        shell: bash
+
       - name: Increment version
         run: |
           BUILD_NUMBER=$((3000 + $GITHUB_RUN_NUMBER))
@@ -151,35 +142,26 @@ jobs:
         run: dotnet test test/Core.Test/Core.Test.csproj
 
       - name: Build Play Store publisher
-        if: ${{ matrix.variant == 'prod' }}
         run: dotnet build ./store/google/Publisher/Publisher.csproj -p:Configuration=Release
 
-      - name: Setup Android build  (${{ matrix.variant }})
-        run: dotnet cake build.cake --target Android --variant ${{ matrix.variant }}
-
-      - name: Build Android
+      - name: Build for Play Store
         run: |
           $configuration = "Release";
 
           Write-Output "########################################"
           Write-Output "##### Build $configuration Configuration"
           Write-Output "########################################"
-          msbuild "$($env:GITHUB_WORKSPACE + "/src/Android/Android.csproj")" "/p:Configuration=$configuration"
 
+          msbuild "$($env:GITHUB_WORKSPACE + "/src/Android/Android.csproj")" "/p:Configuration=$configuration"
         shell: pwsh
 
-      - name: Sign Android Build
+      - name: Sign for Play Store
         env:
           PLAY_KEYSTORE_PASSWORD: ${{ secrets.PLAY_KEYSTORE_PASSWORD }}
           UPLOAD_KEYSTORE_PASSWORD: ${{ secrets.UPLOAD_KEYSTORE_PASSWORD }}
         run: |
           $androidPath = $($env:GITHUB_WORKSPACE + "/src/Android/Android.csproj");
-          $packageName = "com.x8bit.bitwarden";
-          
-          if ("${{ matrix.variant }}" -ne "prod") 
-          {
-            $packageName = "com.x8bit.bitwarden.${{ matrix.variant }}";
-          }
+
           Write-Output "########################################"
           Write-Output "##### Sign Google Play Bundle Release Configuration"
           Write-Output "########################################"
@@ -193,8 +175,9 @@ jobs:
           Write-Output "##### Copy Google Play Bundle to project root"
           Write-Output "########################################"
 
-          $signedAabPath = $($env:GITHUB_WORKSPACE + "/src/Android/bin/Release/$($packageName)-Signed.aab");
-          $signedAabDestPath = $($env:GITHUB_WORKSPACE + "/$($packageName).aab");
+          $signedAabPath = $($env:GITHUB_WORKSPACE + "/src/Android/bin/Release/com.x8bit.bitwarden-Signed.aab");
+          $signedAabDestPath = $($env:GITHUB_WORKSPACE + "/com.x8bit.bitwarden.aab");
+
           Copy-Item $signedAabPath $signedAabDestPath
 
           Write-Output "########################################"
@@ -210,41 +193,33 @@ jobs:
           Write-Output "##### Copy Release APK to project root"
           Write-Output "########################################"
 
-          $signedApkPath = $($env:GITHUB_WORKSPACE + "/src/Android/bin/Release/$($packageName)-Signed.apk");
-          $signedApkDestPath = $($env:GITHUB_WORKSPACE + "/$($packageName).apk");
+          $signedApkPath = $($env:GITHUB_WORKSPACE + "/src/Android/bin/Release/com.x8bit.bitwarden-Signed.apk");
+          $signedApkDestPath = $($env:GITHUB_WORKSPACE + "/com.x8bit.bitwarden.apk");
 
           Copy-Item $signedApkPath $signedApkDestPath
         shell: pwsh
-      - name: Upload Prod .aab artifact
-        if: ${{ matrix.variant == 'prod' }}
+
+      - name: Upload Play Store .aab artifact
         uses: actions/upload-artifact@6673cd052c4cd6fcf4b4e6e60ea986c889389535
         with:
           name: com.x8bit.bitwarden.aab
           path: ./com.x8bit.bitwarden.aab
           if-no-files-found: error
 
-      - name: Upload Prod .apk artifact
-        if: ${{ matrix.variant == 'prod' }}
+      - name: Upload Play Store .apk artifact
         uses: actions/upload-artifact@6673cd052c4cd6fcf4b4e6e60ea986c889389535
         with:
           name: com.x8bit.bitwarden.apk
           path: ./com.x8bit.bitwarden.apk
           if-no-files-found: error
 
-      - name: Upload Other .apk artifact
-        if: ${{ matrix.variant != 'prod' }}
-        uses: actions/upload-artifact@6673cd052c4cd6fcf4b4e6e60ea986c889389535
-        with:
-          name: com.x8bit.bitwarden.${{ matrix.variant }}.apk
-          path: ./com.x8bit.bitwarden.${{ matrix.variant }}.apk
-          if-no-files-found: error
-
       - name: Deploy to Play Store
-        if: ${{ matrix.variant == 'prod' && (( github.ref == 'refs/heads/master'
-          && needs.setup.outputs.rc_branch_exists == 0
-          && needs.setup.outputs.hotfix_branch_exists == 0)
-          || (github.ref == 'refs/heads/rc' && needs.setup.outputs.hotfix_branch_exists == 0)
-          || github.ref == 'refs/heads/hotfix-rc' ) }}
+        if: |
+            (github.ref == 'refs/heads/master'
+              && needs.setup.outputs.rc_branch_exists == 0
+              && needs.setup.outputs.hotfix_branch_exists == 0)
+            || (github.ref == 'refs/heads/rc' && needs.setup.outputs.hotfix_branch_exists == 0)
+            || github.ref == 'refs/heads/hotfix-rc'
         run: |
           PUBLISHER_PATH="$GITHUB_WORKSPACE/store/google/Publisher/bin/Release/netcoreapp3.1/Publisher.dll"
           CREDS_PATH="$HOME/secrets/play_creds.json"

.github/workflows/release.yml

@@ -1,6 +1,5 @@
 ---
 name: Release
-run-name: Release ${{ inputs.release_type }}
 
 on:
   workflow_dispatch:
@@ -73,7 +72,7 @@ jobs:
           workflow_conclusion: success
           branch: ${{ steps.branch.outputs.branch-name }}
 
-      - name: Dry Run - Download all artifacts
+      - name: Download all artifacts
         if: ${{ github.event.inputs.release_type == 'Dry Run' }}
         uses: dawidd6/action-download-artifact@575b1e4167df67acf7e692af784566618b23c71e  # v2.17.10
         with:
@@ -134,7 +133,7 @@ jobs:
           branch: ${{ needs.release.outputs.branch-name }}
           name: com.x8bit.bitwarden-fdroid.apk
 
-      - name: Dry Run - Download F-Droid .apk artifact
+      - name: Download F-Droid .apk artifact
         if: ${{ github.event.inputs.release_type == 'Dry Run' }}
         uses: dawidd6/action-download-artifact@575b1e4167df67acf7e692af784566618b23c71e  # v2.17.10
         with:

.gitignore

@@ -208,5 +208,4 @@ FakesAssemblies/
 # Other
 project.lock.json
 .DS_Store
-src/App/Css
-tools
+src/App/Css

build.cake

@@ -1,345 +0,0 @@
-#addin nuget:?package=Cake.FileHelpers&version=5.0.0
-#addin nuget:?package=Cake.AndroidAppManifest&version=1.1.2
-#addin nuget:?package=Cake.Plist&version=0.7.0
-#addin nuget:?package=Cake.Incubator&version=7.0.0
-#tool dotnet:?package=GitVersion.Tool&version=5.10.3
-using Path = System.IO.Path;
-
-var debugScript = Argument<bool>("debugScript", false);
-var target = Argument("target", "Default");
-var configuration = Argument("configuration", "Release");
-var variant = Argument("variant", "dev");
-
-abstract record VariantConfig(
-    string AppName, 
-    string AndroidPackageName,
-    string iOSBundleId,
-    string ApsEnvironment
-    );
-
-const string BASE_BUNDLE_ID_DROID = "com.x8bit.bitwarden";
-const string BASE_BUNDLE_ID_IOS = "com.8bit.bitwarden";
-
-record Dev(): VariantConfig("Bitwarden Dev", $"{BASE_BUNDLE_ID_DROID}.dev", $"{BASE_BUNDLE_ID_IOS}.dev", "development");
-record QA(): VariantConfig("Bitwarden QA", $"{BASE_BUNDLE_ID_DROID}.qa", $"{BASE_BUNDLE_ID_IOS}.qa", "development");
-record Beta(): VariantConfig("Bitwarden Beta", $"{BASE_BUNDLE_ID_DROID}.beta", $"{BASE_BUNDLE_ID_IOS}.beta", "production");
-record Prod(): VariantConfig("Bitwarden", $"{BASE_BUNDLE_ID_DROID}", $"{BASE_BUNDLE_ID_IOS}", "production");
-
-VariantConfig GetVariant() => variant.ToLower() switch{
-    "qa" => new QA(),
-    "beta" => new Beta(),
-    "prod" => new Prod(),
-    _ => new Dev()
-};
-
-GitVersion _gitVersion; //will be set by GetGitInfo task
-var _slnPath = Path.Combine(""); //base path used to access files. If build.cake file is moved, just update this
-string _androidPackageName = string.Empty; //will be set by UpdateAndroidManifest task
-string CreateFeatureBranch(string prevVersionName, GitVersion git) => $"{prevVersionName}-{git.BranchName.Replace("/","-")}";
-string GetVersionName(string prevVersionName, VariantConfig buildVariant, GitVersion git) => buildVariant is Prod? prevVersionName : CreateFeatureBranch(prevVersionName, git); 
-int CreateBuildNumber(int previousNumber) => ++previousNumber; 
-
-Task("GetGitInfo")
-    .Does(()=> {
-        _gitVersion = GitVersion(new GitVersionSettings());
-
-        if(debugScript)
-        {
-            Information($"GitVersion Dump:\n{_gitVersion.Dump()}");
-        }
-
-         Information("Git data Load successfully.");
-    });
-
-#region Android
-Task("UpdateAndroidAppIcon")
-    .Does(()=>{
-        //TODO we'll implement variant icons later
-        //manifest.ApplicationIcon = "@mipmap/ic_launcher";
-        Information($"Updated Androix App Icon with success");
-    });
-
-
-Task("UpdateAndroidManifest")
-    .IsDependentOn("GetGitInfo")
-    .Does(()=> 
-    {
-        var buildVariant = GetVariant();
-        var manifestPath = Path.Combine(_slnPath, "src", "Android", "Properties", "AndroidManifest.xml");
-
-        // Cake.AndroidAppManifest doesn't currently enable us to access nested items so, quick (not ideal) fix:
-        var manifestText = FileReadText(manifestPath);
-        manifestText = manifestText.Replace("com.x8bit.bitwarden.", buildVariant.AndroidPackageName + ".");
-        manifestText = manifestText.Replace("android:label=\"Bitwarden\"", $"android:label=\"{buildVariant.AppName}\"");
-        FileWriteText(manifestPath, manifestText);
-
-        var manifest = DeserializeAppManifest(manifestPath);
-
-        var prevVersionCode = manifest.VersionCode;
-        var prevVersionName = manifest.VersionName;
-        _androidPackageName = manifest.PackageName;
-
-        //manifest.VersionCode = CreateBuildNumber(prevVersionCode);
-        manifest.VersionName = GetVersionName(prevVersionName, buildVariant, _gitVersion);
-        manifest.PackageName = buildVariant.AndroidPackageName;
-        manifest.ApplicationLabel = buildVariant.AppName;
-
-        //Information($"AndroidManigest.xml VersionCode from {prevVersionCode} to {manifest.VersionCode}");
-        Information($"AndroidManigest.xml VersionName from {prevVersionName} to {manifest.VersionName}");
-        Information($"AndroidManigest.xml PackageName from {_androidPackageName} to {buildVariant.AndroidPackageName}");
-        Information($"AndroidManigest.xml ApplicationLabel to {buildVariant.AppName}");
-    
-        SerializeAppManifest(manifestPath, manifest);
-
-        Information("AndroidManifest updated with success!");
-    });
-
-void ReplaceInFile(string filePath, string oldtext, string newtext)
-{
-    var fileText = FileReadText(filePath);
-
-    if(string.IsNullOrEmpty(fileText) || !fileText.Contains(oldtext))
-    {
-        throw new Exception($"Couldn't find {filePath} or it didn't contain: {oldtext}");
-    }
-
-    fileText = fileText.Replace(oldtext, newtext);
-
-    FileWriteText(filePath, fileText);
-    Information($"{filePath} modified successfully.");		
-}
-
-Task("UpdateAndroidCodeFiles")
-    .IsDependentOn("UpdateAndroidManifest")
-    .Does(()=> {
-        var buildVariant = GetVariant();
-
-        //We're not using _androidPackageName here because the codefile is currently slightly different string than the one in AndroidManifest.xml
-        var keyName = "com.8bit.bitwarden";
-        var fixedPackageName = buildVariant.AndroidPackageName.Replace("x8bit", "8bit");
-        var filePath = Path.Combine(_slnPath, "src", "Android", "Services", "BiometricService.cs");
-        ReplaceInFile(filePath, keyName, fixedPackageName);
-
-        var packageFileList = new string[] {
-            Path.Combine(_slnPath, "src", "Android", "MainActivity.cs"),
-            Path.Combine(_slnPath, "src", "Android", "MainApplication.cs"),
-            Path.Combine(_slnPath, "src", "Android", "Constants.cs"),
-            Path.Combine(_slnPath, "src", "Android", "Accessibility", "AccessibilityService.cs"),
-            Path.Combine(_slnPath, "src", "Android", "Autofill", "AutofillHelpers.cs"),
-            Path.Combine(_slnPath, "src", "Android", "Autofill", "AutofillService.cs"),
-            Path.Combine(_slnPath, "src", "Android", "Receivers", "ClearClipboardAlarmReceiver.cs"),
-            Path.Combine(_slnPath, "src", "Android", "Receivers", "EventUploadReceiver.cs"),
-            Path.Combine(_slnPath, "src", "Android", "Receivers", "PackageReplacedReceiver.cs"),
-            Path.Combine(_slnPath, "src", "Android", "Receivers", "RestrictionsChangedReceiver.cs"),
-            Path.Combine(_slnPath, "src", "Android", "Services", "DeviceActionService.cs"),
-            Path.Combine(_slnPath, "src", "Android", "Tiles", "AutofillTileService.cs"),
-            Path.Combine(_slnPath, "src", "Android", "Tiles", "GeneratorTileService.cs"),
-            Path.Combine(_slnPath, "src", "Android", "Tiles", "MyVaultTileService.cs"),
-            Path.Combine(_slnPath, "src", "Android", "google-services.json"),
-            Path.Combine(_slnPath, "store", "google", "Publisher", "Program.cs"),
-        };
-
-        foreach(string path in packageFileList)
-        {
-            ReplaceInFile(path, "com.x8bit.bitwarden", buildVariant.AndroidPackageName);
-        }
-
-        var labelFileList = new string[] {
-            Path.Combine(_slnPath, "src", "Android", "Autofill", "AutofillService.cs"),
-        };
-
-        foreach(string path in labelFileList)
-        {
-            ReplaceInFile(path, "Bitwarden\"", $"{buildVariant.AppName}\"");
-        }
-    });
-#endregion Android
-
-#region iOS
-enum iOSProjectType
-{
-    Null,
-    MainApp,
-    Autofill,
-    Extension,
-    ShareExtension
-}
-
-string GetiOSBundleId(VariantConfig buildVariant, iOSProjectType projectType) => projectType switch
-{
-    iOSProjectType.Autofill => $"{buildVariant.iOSBundleId}.autofill",
-    iOSProjectType.Extension => $"{buildVariant.iOSBundleId}.find-login-action-extension",
-    iOSProjectType.ShareExtension => $"{buildVariant.iOSBundleId}.share-extension",
-    _ => buildVariant.iOSBundleId
-};
-
-string GetiOSBundleName(VariantConfig buildVariant, iOSProjectType projectType) => projectType switch
-{
-    iOSProjectType.Autofill => $"{buildVariant.AppName} Autofill",
-    iOSProjectType.Extension => $"{buildVariant.AppName} Extension",
-    iOSProjectType.ShareExtension => $"{buildVariant.AppName} Share Extension",
-    _ => buildVariant.AppName
-};
-
-private void UpdateiOSInfoPlist(string plistPath, VariantConfig buildVariant, GitVersion git, iOSProjectType projectType = iOSProjectType.MainApp)
-{
-    var plistFile = File(plistPath);
-    dynamic plist = DeserializePlist(plistFile);
-
-    var prevVersionName = plist["CFBundleShortVersionString"];
-    var prevVersionString = plist["CFBundleVersion"];
-    var prevVersion = int.Parse(plist["CFBundleVersion"]);
-    var prevBundleId = plist["CFBundleIdentifier"];
-    var prevBundleName = plist["CFBundleName"];
-    //var newVersion = CreateBuildNumber(prevVersion).ToString();
-    var newVersionName = GetVersionName(prevVersionName, buildVariant, git);
-    var newBundleId = GetiOSBundleId(buildVariant, projectType);
-    var newBundleName = GetiOSBundleName(buildVariant, projectType);
-
-    plist["CFBundleName"] = newBundleName;
-    plist["CFBundleDisplayName"] = newBundleName;
-    //plist["CFBundleVersion"] = newVersion;
-    plist["CFBundleShortVersionString"] = newVersionName;
-    plist["CFBundleIdentifier"] = newBundleId;
-
-    if(projectType == iOSProjectType.MainApp)
-    {
-        plist["CFBundleURLTypes"][0]["CFBundleURLName"] = $"{buildVariant.iOSBundleId}.url";
-    }
-
-    if(projectType == iOSProjectType.Extension)
-    {
-        var keyText = plist["NSExtension"]["NSExtensionAttributes"]["NSExtensionActivationRule"];
-        plist["NSExtension"]["NSExtensionAttributes"]["NSExtensionActivationRule"] = keyText.Replace("com.8bit.bitwarden", buildVariant.iOSBundleId);
-    }
-
-    SerializePlist(plistFile, plist);
-
-    Information($"Changed app name from {prevBundleName} to {newBundleName}");
-    //Information($"Changed Bundle Version from {prevVersion} to {newVersion}");
-    Information($"Changed Bundle Short Version name from {prevVersionName} to {newVersionName}");
-    Information($"Changed Bundle Identifier from {prevBundleId} to {newBundleId}");
-    Information($"{plistPath} updated with success!");
-}
-
-private void UpdateiOSEntitlementsPlist(string entitlementsPath, VariantConfig buildVariant)
-{
-    var EntitlementlistFile = File(entitlementsPath);
-    dynamic Entitlements = DeserializePlist(EntitlementlistFile);
-
-    Entitlements["aps-environment"] = buildVariant.ApsEnvironment;
-    Entitlements["keychain-access-groups"] = new List<string>() { "$(AppIdentifierPrefix)" + buildVariant.iOSBundleId };
-    Entitlements["com.apple.security.application-groups"] = new List<string>() { $"group.{buildVariant.iOSBundleId}" };;
-
-    Information($"Changed ApsEnvironment name to {buildVariant.ApsEnvironment}");
-    Information($"Changed keychain-access-groups bundleID to {buildVariant.iOSBundleId}");
-
-    SerializePlist(EntitlementlistFile, Entitlements);
-
-    Information($"{entitlementsPath} updated with success!");
-}
-
-Task("UpdateiOSIcon")
-    .Does(()=>{
-        //TODO we'll implement variant icons later
-        Information($"Updating IOS App Icon");
-    });
-
-Task("UpdateiOSPlist")
-    .IsDependentOn("GetGitInfo")
-    .Does(()=> {
-        var buildVariant = GetVariant();
-        var infoPath = Path.Combine(_slnPath, "src", "iOS", "Info.plist");
-        var entitlementsPath = Path.Combine(_slnPath, "src", "iOS", "Entitlements.plist");
-        UpdateiOSInfoPlist(infoPath, buildVariant, _gitVersion, iOSProjectType.MainApp);
-        UpdateiOSEntitlementsPlist(entitlementsPath, buildVariant);
-    });
-
-Task("UpdateiOSAutofillPlist")
-    .IsDependentOn("GetGitInfo")
-    .IsDependentOn("UpdateiOSPlist")
-    .Does(()=> {
-        var buildVariant = GetVariant();
-        var infoPath = Path.Combine(_slnPath, "src", "iOS.Autofill", "Info.plist");
-        var entitlementsPath = Path.Combine(_slnPath, "src", "iOS.Autofill", "Entitlements.plist");
-        UpdateiOSInfoPlist(infoPath, buildVariant, _gitVersion, iOSProjectType.Autofill);
-        UpdateiOSEntitlementsPlist(entitlementsPath, buildVariant);
-    });
-
-Task("UpdateiOSExtensionPlist")
-    .IsDependentOn("GetGitInfo")
-    .IsDependentOn("UpdateiOSPlist")
-    .Does(()=> {
-        var buildVariant = GetVariant();
-        var infoPath = Path.Combine(_slnPath, "src", "iOS.Extension", "Info.plist");
-        var entitlementsPath = Path.Combine(_slnPath, "src", "iOS.Extension", "Entitlements.plist");
-        UpdateiOSInfoPlist(infoPath, buildVariant, _gitVersion, iOSProjectType.Extension);
-        UpdateiOSEntitlementsPlist(entitlementsPath, buildVariant);
-    });
-
-Task("UpdateiOSShareExtensionPlist")
-    .IsDependentOn("GetGitInfo")
-    .IsDependentOn("UpdateiOSPlist")
-    .Does(()=> {
-        var buildVariant = GetVariant();
-        var infoPath = Path.Combine(_slnPath, "src", "iOS.ShareExtension", "Info.plist");
-        var entitlementsPath = Path.Combine(_slnPath, "src", "iOS.ShareExtension", "Entitlements.plist");
-        UpdateiOSInfoPlist(infoPath, buildVariant, _gitVersion, iOSProjectType.ShareExtension);
-        UpdateiOSEntitlementsPlist(entitlementsPath, buildVariant);
-    });
-
-Task("UpdateiOSCodeFiles")
-    .IsDependentOn("UpdateiOSPlist")
-    .Does(()=> {
-        var buildVariant = GetVariant();
-        var fileList = new string[] {
-            Path.Combine(_slnPath, "src", "iOS.Core", "Utilities", "iOSCoreHelpers.cs"),
-            Path.Combine(_slnPath, "src", "iOS.Core", "Constants.cs"),
-            Path.Combine(".github", "resources", "export-options-ad-hoc.plist"),
-            Path.Combine(".github", "resources", "export-options-app-store.plist"),
-        };
-
-        foreach(string path in fileList)
-        {
-            ReplaceInFile(path, "com.8bit.bitwarden", buildVariant.iOSBundleId);
-        }
-    });
-#endregion iOS
-
-#region Main Tasks
-Task("Android")
-    //.IsDependentOn("UpdateAndroidAppIcon")
-    .IsDependentOn("UpdateAndroidManifest")
-    .IsDependentOn("UpdateAndroidCodeFiles")
-    .Does(()=>
-    {
-        Information("Android app updated");
-    });
-
-Task("iOS")
-    //.IsDependentOn("UpdateiOSIcon")
-    .IsDependentOn("UpdateiOSPlist")
-    .IsDependentOn("UpdateiOSAutofillPlist")
-    .IsDependentOn("UpdateiOSExtensionPlist")
-    .IsDependentOn("UpdateiOSShareExtensionPlist")
-    .IsDependentOn("UpdateiOSCodeFiles")
-    .Does(()=>
-    {
-        Information("iOS app updated");
-    });
-
-Task("Default")
-    .Does(() => {
-        var usage = @"Missing target.
-
-Usage:
-  dotnet cake build.cake --target (Android | iOS) --variant (dev | qa | beta | prod)
-
-Options:
- --debugScript=<bool> Script debug mode.	
-";
-        Information(usage);
-    });
-#endregion Main Tasks
-
-RunTarget(target);

src/Android/Android.csproj

@@ -156,7 +156,8 @@
     <Compile Include="Services\FileService.cs" />
     <Compile Include="Services\AutofillHandler.cs" />
     <Compile Include="Constants.cs" />
-    <Compile Include="Effects\RemoveFontPaddingEffect.cs" />
+    <Compile Include="Renderers\CollectionView\ExtendedCollectionViewRenderer.cs" />
+    <Compile Include="Utilities\RecyclerSwipeItemTouchCallback.cs" />
   </ItemGroup>
   <ItemGroup>
     <AndroidAsset Include="Assets\bwi-font.ttf" />
@@ -295,6 +296,7 @@
     <Folder Include="Resources\values-v30\" />
     <Folder Include="Resources\drawable-v26\" />
     <Folder Include="Resources\drawable-night-v26\" />
+    <Folder Include="Renderers\CollectionView\" />
   </ItemGroup>
   <Import Project="$(MSBuildExtensionsPath)\Xamarin\Android\Xamarin.Android.CSharp.targets" />
 </Project>

src/Android/Effects/RemoveFontPaddingEffect.cs

@@ -1,23 +0,0 @@
-using Android.Widget;
-using Bit.Droid.Effects;
-using Xamarin.Forms;
-using Xamarin.Forms.Platform.Android;
-
-[assembly: ExportEffect(typeof(RemoveFontPaddingEffect), nameof(RemoveFontPaddingEffect))]
-namespace Bit.Droid.Effects
-{
-    public class RemoveFontPaddingEffect : PlatformEffect
-    {
-        protected override void OnAttached()
-        {
-            if (Control is TextView textView)
-            {
-                textView.SetIncludeFontPadding(false);
-            }
-        }
-
-        protected override void OnDetached()
-        {
-        }
-    }
-}

src/Android/MainApplication.cs

@@ -20,6 +20,7 @@ using System.Net;
 using Bit.App.Utilities;
 using Bit.App.Pages;
 using Bit.App.Utilities.AccountManagement;
+using Bit.App.Utilities.Helpers;
 using Bit.App.Controls;
 #if !FDROID
 using Android.Gms.Security;
@@ -74,7 +75,16 @@ namespace Bit.Droid
                     ServiceContainer.Resolve<IAuthService>("authService"),
                     ServiceContainer.Resolve<ILogger>("logger"),
                     ServiceContainer.Resolve<IMessagingService>("messagingService"));
-                    ServiceContainer.Register<IAccountsManager>("accountsManager", accountsManager);
+                ServiceContainer.Register<IAccountsManager>("accountsManager", accountsManager);
+
+                var cipherHelper = new CipherHelper(
+                    ServiceContainer.Resolve<IPlatformUtilsService>("platformUtilsService"),
+                    ServiceContainer.Resolve<IEventService>("eventService"),
+                    ServiceContainer.Resolve<IVaultTimeoutService>("vaultTimeoutService"),
+                    ServiceContainer.Resolve<IClipboardService>("clipboardService"),
+                    ServiceContainer.Resolve<IPasswordRepromptService>("passwordRepromptService")
+                );
+                ServiceContainer.Register<ICipherHelper>("cipherHelper", cipherHelper);
             }
 #if !FDROID
             if (Build.VERSION.SdkInt <= BuildVersionCodes.Kitkat)

src/Android/Properties/AndroidManifest.xml

@@ -11,6 +11,7 @@
 	<uses-permission android:name="android.permission.SYSTEM_ALERT_WINDOW" />
 	<uses-permission android:name="android.permission.VIBRATE" />
 	<uses-permission android:name="com.samsung.android.providers.context.permission.WRITE_USE_APP_FEATURE_SURVEY" />
+	<uses-permission android:name="android.permission.VIBRATE" />
 	<uses-feature android:name="android.hardware.camera" android:required="false" />
 	<uses-feature android:name="android.hardware.camera.autofocus" android:required="false" />
 	<application android:label="Bitwarden" android:theme="@style/LaunchTheme" android:allowBackup="false" tools:replace="android:allowBackup" android:icon="@mipmap/ic_launcher" android:roundIcon="@mipmap/ic_launcher_round" android:networkSecurityConfig="@xml/network_security_config">

src/Android/Renderers/CollectionView/ExtendedCollectionViewRenderer.cs

@@ -0,0 +1,87 @@
+using System;
+using Android.Content;
+using AndroidX.RecyclerView.Widget;
+using Bit.App.Controls;
+using Bit.App.Utilities;
+using Bit.Core;
+using Bit.Droid.Renderers.CollectionView;
+using Bit.Droid.Utilities;
+using Xamarin.Forms;
+using Xamarin.Forms.Platform.Android;
+using static Android.Content.ClipData;
+using static AndroidX.RecyclerView.Widget.RecyclerView;
+
+[assembly: ExportRenderer(typeof(ExtendedCollectionView), typeof(ExtendedCollectionViewRenderer))]
+namespace Bit.Droid.Renderers.CollectionView
+{
+    public class CustomGroupableItemsViewAdapter<TItemsView, TItemsViewSource> : GroupableItemsViewAdapter<TItemsView, TItemsViewSource>
+        where TItemsView : GroupableItemsView
+        where TItemsViewSource : IGroupableItemsViewSource
+    {
+        protected internal CustomGroupableItemsViewAdapter(TItemsView groupableItemsView, Func<View, Context, ItemContentView> createView = null)
+            : base(groupableItemsView, createView)
+        {
+        }
+
+        public object GetItemAt(int position)
+        {
+            return ItemsSource.GetItem(position);
+        }
+    }
+
+    public class ExtendedCollectionViewRenderer : GroupableItemsViewRenderer<ExtendedCollectionView, CustomGroupableItemsViewAdapter<ExtendedCollectionView, IGroupableItemsViewSource>, IGroupableItemsViewSource>
+    {
+        ItemTouchHelper _itemTouchHelper;
+
+        public ExtendedCollectionViewRenderer(Context context) : base(context)
+        {
+        }
+
+        protected override CustomGroupableItemsViewAdapter<ExtendedCollectionView, IGroupableItemsViewSource> CreateAdapter()
+        {
+            return new CustomGroupableItemsViewAdapter<ExtendedCollectionView, IGroupableItemsViewSource>(ItemsView);
+        }
+
+        protected override void SetUpNewElement(ExtendedCollectionView newElement)
+        {
+            base.SetUpNewElement(newElement);
+
+            if (newElement is null)
+            {
+                return;
+            }
+
+            var itemTouchCallback = new RecyclerSwipeItemTouchCallback<CipherViewCellViewModel>(ItemTouchHelper.Right, this.Context, new CipherViewModelSwipeableItem(),
+                viewHolder =>
+                {
+                    if (viewHolder is TemplatedItemViewHolder templatedViewHolder
+                        &&
+                        templatedViewHolder.View?.BindingContext is CipherViewCellViewModel vm)
+                    {
+                        return vm;
+                    }
+                    return null;
+                });
+            itemTouchCallback.OnSwipedCommand = new Command<ViewHolder>(viewHolder =>
+            {
+                ItemsViewAdapter.NotifyItemChanged(viewHolder.LayoutPosition);
+
+                ItemsView.OnSwipeCommand?.Execute(ItemsViewAdapter.GetItemAt(viewHolder.BindingAdapterPosition));
+            });
+            _itemTouchHelper = new ItemTouchHelper(itemTouchCallback);
+            _itemTouchHelper.AttachToRecyclerView(this);
+        }
+
+        protected override void TearDownOldElement(ItemsView oldElement)
+        {
+            base.TearDownOldElement(oldElement);
+
+            if (oldElement is null)
+            {
+                return;
+            }
+
+            _itemTouchHelper.AttachToRecyclerView(null);
+        }
+    }
+}

src/Android/Renderers/ExtendedGridRenderer.cs

@@ -14,7 +14,7 @@ namespace Bit.Droid.Renderers
         protected override void OnElementChanged(ElementChangedEventArgs<View> elementChangedEvent)
         {
             base.OnElementChanged(elementChangedEvent);
-            if (elementChangedEvent.NewElement != null)
+            if (elementChangedEvent.NewElement is ExtendedGrid extGrid && extGrid.ApplyRipple)
             {
                 SetBackgroundResource(Resource.Drawable.list_item_bg);
             }

src/Android/Services/DeviceActionService.cs

@@ -520,11 +520,5 @@ namespace Bit.Droid.Services
             intent.SetData(uri);
             Application.Context.StartActivity(intent);
         }
-
-        public void CloseExtensionPopUp()
-        {
-            // only used by iOS
-            throw new NotImplementedException();
-        }
     }
 }

src/Android/Utilities/RecyclerSwipeItemTouchCallback.cs

@@ -0,0 +1,156 @@
+using System;
+using System.Collections.Generic;
+using System.Windows.Input;
+using Android.Graphics;
+using Android.Graphics.Drawables;
+using Android.Util;
+using Android.Views;
+using AndroidX.RecyclerView.Widget;
+using Bit.App.Abstractions;
+using Xamarin.Forms.Platform.Android;
+using FontImageSource = Xamarin.Forms.FontImageSource;
+
+namespace Bit.Droid.Utilities
+{
+    public class RecyclerSwipeItemTouchCallback<TItem> : ItemTouchHelper.SimpleCallback
+    {
+        private Paint _clearPaint;
+        private readonly ColorDrawable _background = new ColorDrawable();
+        private readonly Android.Content.Context _context;
+        private readonly ISwipeableItem<TItem> _swipeableItem;
+        private readonly Func<RecyclerView.ViewHolder, TItem> _viewHolderToTItem;
+        private Dictionary<string, Typeface> _fontFamilyTypefaceCache = new Dictionary<string, Typeface>();
+
+        public RecyclerSwipeItemTouchCallback(int swipeDir, Android.Content.Context context, ISwipeableItem<TItem> swipeableItem, Func<RecyclerView.ViewHolder, TItem> viewHolderToTItem)
+            : base(0, swipeDir)
+        {
+            _context = context;
+            _swipeableItem = swipeableItem;
+            _viewHolderToTItem = viewHolderToTItem;
+
+            _clearPaint = new Paint();
+            _clearPaint.SetXfermode(new PorterDuffXfermode(PorterDuff.Mode.Clear));
+        }
+
+        public ICommand OnSwipedCommand { get; set; }
+
+        public override bool OnMove(RecyclerView recyclerView, RecyclerView.ViewHolder viewHolder, RecyclerView.ViewHolder target)
+        {
+            return false;
+        }
+
+        public override void OnChildDrawOver(Canvas c, RecyclerView recyclerView,
+                                RecyclerView.ViewHolder viewHolder, float dX, float dY,
+                                int actionState, bool isCurrentlyActive)
+        {
+
+            var itemView = viewHolder.ItemView;
+            int itemHeight = itemView.Bottom - itemView.Top;
+            var isCanceled = (dX == 0f) && !isCurrentlyActive;
+
+            if (isCanceled)
+            {
+                ClearCanvas(c, itemView.Right + dX, itemView.Top, itemView.Right, itemView.Bottom);
+                base.OnChildDraw(c, recyclerView, viewHolder, dX, dY, actionState, false);
+                return;
+            }
+
+            if (!(_swipeableItem.GetSwipeIcon(_viewHolderToTItem(viewHolder)) is FontImageSource fontSource))
+            {
+                return;
+            }
+
+            using var paint = GetIconPaint(itemView, fontSource);
+
+            var width = (int)(paint.MeasureText(fontSource.Glyph) + .5f);
+            var baseline = (int)(-paint.Ascent() + .5f);
+            var height = (int)(baseline + paint.Descent() + .5f);
+
+            int itemTop = itemView.Top + (itemHeight - height) / 2;
+            int itemMargin = (itemHeight - height) / 2;
+            int itemBottom = itemTop + height;
+
+            _background.Color = _swipeableItem.GetBackgroundColor(_viewHolderToTItem(viewHolder)).ToAndroid();
+            if (dX < 0)
+            {
+                _background.SetBounds((int)(itemView.Right + dX), itemView.Top, itemView.Right, itemView.Bottom);
+                _background.Draw(c);
+
+                int itemLeft = itemView.Right - itemMargin - width;
+                int itemRight = itemView.Right - itemMargin;
+
+                c.DrawText(fontSource.Glyph, itemLeft, itemBottom, paint);
+            }
+            else
+            {
+                _background.SetBounds((int)(itemView.Left + dX), itemView.Top, itemView.Left, itemView.Bottom);
+                _background.Draw(c);
+
+                int itemLeft = itemView.Left + itemMargin;
+                int itemRight = itemView.Left + itemMargin + width;
+
+                c.DrawText(fontSource.Glyph, itemLeft, itemBottom, paint);
+            }
+
+            base.OnChildDraw(c, recyclerView, viewHolder, dX, dY, actionState, isCurrentlyActive);
+        }
+
+        private Paint GetIconPaint(View itemView, FontImageSource fontSource)
+        {
+            var paint = new Paint
+            {
+                TextSize = TypedValue.ApplyDimension(ComplexUnitType.Dip, (float)fontSource.Size, _context.Resources.DisplayMetrics),
+                Color = fontSource.Color.ToAndroid(),
+                TextAlign = Paint.Align.Left,
+                AntiAlias = true,
+            };
+
+            if (fontSource.FontFamily != null)
+            {
+                if (!_fontFamilyTypefaceCache.TryGetValue(fontSource.FontFamily, out var typeface))
+                {
+                    var font = new Xamarin.Forms.Font();
+                    // HACK: there is no way to set the font family of Font
+                    // and the only public extension method to get the typeface is thorugh a Xamarin.Forms.Font
+                    // so we use reflection here to set the font family and take advantage of ToTypeface method
+                    // Also, we need to box the font in order to use reflection to set the property because it's a struct
+                    object fontBoxed = font;
+                    var pinfo = typeof(Xamarin.Forms.Font)
+                        .GetProperty(nameof(Xamarin.Forms.Font.FontFamily));
+                    pinfo.SetValue(fontBoxed, fontSource.FontFamily, null);
+                    typeface = ((Xamarin.Forms.Font)fontBoxed).ToTypeface();
+                    _fontFamilyTypefaceCache.Add(fontSource.FontFamily, typeface);
+                }
+
+                paint.SetTypeface(typeface);
+            }
+
+            int alpha = Math.Abs(((int)((itemView.TranslationX / itemView.Width) * 510)));
+            paint.Alpha = Math.Min(alpha, 255);
+
+            return paint;
+        }
+
+        public override int GetSwipeDirs(RecyclerView recyclerView, RecyclerView.ViewHolder viewHolder)
+        {
+            if (viewHolder is TemplatedItemViewHolder templatedViewHolder
+                &&
+                _swipeableItem.CanSwipe(_viewHolderToTItem(viewHolder)))
+            {
+                return base.GetSwipeDirs(recyclerView, viewHolder);
+            }
+            return 0;
+        }
+
+        private void ClearCanvas(Canvas c, float left, float top, float right, float bottom)
+        {
+            if (c != null)
+                c.DrawRect(left, top, right, bottom, _clearPaint);
+        }
+
+        public override void OnSwiped(RecyclerView.ViewHolder viewHolder, int direction)
+        {
+            OnSwipedCommand?.Execute(viewHolder);
+        }
+    }
+}

src/App/Abstractions/IAccountsManager.cs

@@ -9,6 +9,5 @@ namespace Bit.App.Abstractions
         void Init(Func<AppOptions> getOptionsFunc, IAccountsManagerHost accountsManagerHost);
         Task NavigateOnAccountChangeAsync(bool? isAuthed = null);
         Task LogOutAsync(string userId, bool userInitiated, bool expired);
-        Task PromptToSwitchToExistingAccountAsync(string userId);
     }
 }

src/App/Abstractions/IDeviceActionService.cs

@@ -37,6 +37,5 @@ namespace Bit.App.Abstractions
         Task OnAccountSwitchCompleteAsync();
         Task SetScreenCaptureAllowedAsync();
         void OpenAppSettings();
-        void CloseExtensionPopUp();
     }
 }

src/App/Abstractions/ISwipeableItem.cs

@@ -0,0 +1,11 @@
+using Xamarin.Forms;
+
+namespace Bit.App.Abstractions
+{
+    public interface ISwipeableItem<TItem>
+    {
+        bool CanSwipe(TItem item);
+        FontImageSource GetSwipeIcon(TItem item);
+        Color GetBackgroundColor(TItem item);
+    }
+}

src/App/App.csproj

@@ -125,9 +125,6 @@
     <Compile Update="Pages\Accounts\LoginPasswordlessPage.xaml.cs">
       <DependentUpon>LoginPasswordlessPage.xaml</DependentUpon>
     </Compile>
-    <Compile Update="Pages\Accounts\LoginPasswordlessRequestPage.xaml.cs">
-      <DependentUpon>LoginPasswordlessRequestPage.xaml</DependentUpon>
-    </Compile>
   </ItemGroup>
 
   <ItemGroup>
@@ -141,8 +138,8 @@
     <Folder Include="Lists\ItemViewModels\CustomFields\" />
     <Folder Include="Controls\AccountSwitchingOverlay\" />
     <Folder Include="Utilities\AccountManagement\" />
+    <Folder Include="Utilities\Helpers\" />
     <Folder Include="Controls\DateTime\" />
-    <Folder Include="Controls\IconLabelButton\" />
   </ItemGroup>
 
   <ItemGroup>
@@ -433,7 +430,7 @@
     <None Remove="Lists\ItemViewModels\CustomFields\" />
     <None Remove="Controls\AccountSwitchingOverlay\" />
     <None Remove="Utilities\AccountManagement\" />
+    <None Remove="Utilities\Helpers\" />
     <None Remove="Controls\DateTime\" />
-    <None Remove="Controls\IconLabelButton\" />
   </ItemGroup>
 </Project>

src/App/App.xaml.cs

@@ -1,5 +1,4 @@
 using System;
-using System.Linq;
 using System.Threading.Tasks;
 using Bit.App.Abstractions;
 using Bit.App.Models;
@@ -34,9 +33,8 @@ namespace Bit.App
         private readonly IAccountsManager _accountsManager;
         private readonly IPushNotificationService _pushNotificationService;
         private static bool _isResumed;
-        // these variables are static because the app is launching new activities on notification click, creating new instances of App. 
+        // this variable is static because the app is launching new activities on notification click, creating new instances of App. 
         private static bool _pendingCheckPasswordlessLoginRequests;
-        private static object _processingLoginRequestLock = new object();
 
         public App(AppOptions appOptions)
         {
@@ -145,16 +143,9 @@ namespace Bit.App
                                 new NavigationPage(new RemoveMasterPasswordPage()));
                         });
                     }
-                    else if (message.Command == Constants.PasswordlessLoginRequestKey
-                        || message.Command == "unlocked"
-                        || message.Command == "syncCompleted"
-                        || message.Command == AccountsManagerMessageCommands.ACCOUNT_SWITCH_COMPLETED)
+                    else if (message.Command == "passwordlessLoginRequest" || message.Command == "unlocked" || message.Command == AccountsManagerMessageCommands.ACCOUNT_SWITCH_COMPLETED)
                     {
-                        lock (_processingLoginRequestLock)
-                        {
-                            // lock doesn't allow for async execution
-                            CheckPasswordlessLoginRequestsAsync().Wait();
-                        }
+                        CheckPasswordlessLoginRequestsAsync().FireAndForget();
                     }
                 }
                 catch (Exception ex)
@@ -171,6 +162,7 @@ namespace Bit.App
                 _pendingCheckPasswordlessLoginRequests = true;
                 return;
             }
+
             _pendingCheckPasswordlessLoginRequests = false;
             if (await _vaultTimeoutService.IsLockedAsync())
             {
@@ -190,11 +182,6 @@ namespace Bit.App
 
             // Delay to wait for the vault page to appear
             await Task.Delay(2000);
-            // if there is a request modal opened ignore all incoming requests
-            if (App.Current.MainPage.Navigation.ModalStack.Any(p => p is NavigationPage navPage && navPage.CurrentPage is LoginPasswordlessPage))
-            {
-                return;
-            }
             var loginRequestData = await _authService.GetPasswordlessLoginRequestByIdAsync(notification.Id);
             var page = new LoginPasswordlessPage(new LoginPasswordlessDetails()
             {
@@ -224,20 +211,13 @@ namespace Bit.App
             }
 
             var notificationUserEmail = await _stateService.GetEmailAsync(notification.UserId);
-            Device.BeginInvokeOnMainThread(async () =>
+            await Device.InvokeOnMainThreadAsync(async () =>
             {
-                try
+                var result = await _deviceActionService.DisplayAlertAsync(AppResources.LogInRequested, string.Format(AppResources.LoginAttemptFromXDoYouWantToSwitchToThisAccount, notificationUserEmail), AppResources.Cancel, AppResources.Ok);
+                if (result == AppResources.Ok)
                 {
-                    var result = await _deviceActionService.DisplayAlertAsync(AppResources.LogInRequested, string.Format(AppResources.LoginAttemptFromXDoYouWantToSwitchToThisAccount, notificationUserEmail), AppResources.Cancel, AppResources.Ok);
-                    if (result == AppResources.Ok)
-                    {
-                        await _stateService.SetActiveUserAsync(notification.UserId);
-                        _messagingService.Send(AccountsManagerMessageCommands.SWITCHED_ACCOUNT);
-                    }
-                }
-                catch (Exception ex)
-                {
-                    LoggerHelper.LogEvenIfCantBeResolved(ex);
+                    await _stateService.SetActiveUserAsync(notification.UserId);
+                    _messagingService.Send(AccountsManagerMessageCommands.SWITCHED_ACCOUNT);
                 }
             });
             return true;
@@ -262,7 +242,7 @@ namespace Bit.App
             }
             if (_pendingCheckPasswordlessLoginRequests)
             {
-                _messagingService.Send(Constants.PasswordlessLoginRequestKey);
+                CheckPasswordlessLoginRequestsAsync().FireAndForget();
             }
             if (Device.RuntimePlatform == Device.Android)
             {
@@ -298,7 +278,7 @@ namespace Bit.App
             _isResumed = true;
             if (_pendingCheckPasswordlessLoginRequests)
             {
-                _messagingService.Send(Constants.PasswordlessLoginRequestKey);
+                CheckPasswordlessLoginRequestsAsync().FireAndForget();
             }
             if (Device.RuntimePlatform == Device.Android)
             {
@@ -460,14 +440,7 @@ namespace Bit.App
             switch (navTarget)
             {
                 case NavigationTarget.HomeLogin:
-                    if (navParams is HomeNavigationParams homeParams)
-                    {
-                        Current.MainPage = new NavigationPage(new HomePage(Options, homeParams.ShouldCheckRememberEmail));
-                    }
-                    else
-                    {
-                        Current.MainPage = new NavigationPage(new HomePage(Options));
-                    }
+                    Current.MainPage = new NavigationPage(new HomePage(Options));
                     break;
                 case NavigationTarget.Login:
                     if (navParams is LoginNavigationParams loginParams)

src/App/Controls/AccountViewCell/AccountViewCellViewModel.cs

@@ -14,7 +14,7 @@ namespace Bit.App.Controls
         {
             AccountView = accountView;
             AvatarImageSource = ServiceContainer.Resolve<IAvatarImageSourcePool>("avatarImageSourcePool")
-                ?.GetOrCreateAvatar(AccountView.UserId, AccountView.Name, AccountView.Email);
+                                                ?.GetOrCreateAvatar(AccountView.Name, AccountView.Email);
         }
 
         public AccountView AccountView

src/App/Controls/AvatarImageSource.cs

@@ -3,7 +3,6 @@ using System.IO;
 using System.Text;
 using System.Threading;
 using System.Threading.Tasks;
-using Bit.Core.Utilities;
 using SkiaSharp;
 using Xamarin.Forms;
 
@@ -11,8 +10,7 @@ namespace Bit.App.Controls
 {
     public class AvatarImageSource : StreamImageSource
     {
-        private readonly string _text;
-        private readonly string _id;
+        private string _data;
 
         public override bool Equals(object obj)
         {
@@ -23,21 +21,20 @@ namespace Bit.App.Controls
 
             if (obj is AvatarImageSource avatar)
             {
-                return avatar._id == _id && avatar._text == _text;
+                return avatar._data == _data;
             }
 
             return base.Equals(obj);
         }
 
-        public override int GetHashCode() => _id?.GetHashCode() ?? _text?.GetHashCode() ?? -1;
+        public override int GetHashCode() => _data?.GetHashCode() ?? -1;
 
-        public AvatarImageSource(string userId = null, string name = null, string email = null)
+        public AvatarImageSource(string name = null, string email = null)
         {
-            _id = userId;
-            _text = name;
-            if (string.IsNullOrWhiteSpace(_text))
+            _data = name;
+            if (string.IsNullOrWhiteSpace(_data))
             {
-                _text = email;
+                _data = email;
             }
         }
 
@@ -55,24 +52,24 @@ namespace Bit.App.Controls
         private Stream Draw()
         {
             string chars;
-            string upperCaseText = null;
+            string upperData = null;
 
-            if (string.IsNullOrEmpty(_text))
+            if (string.IsNullOrEmpty(_data))
             {
                 chars = "..";
             }
-            else if (_text?.Length > 1)
+            else if (_data?.Length > 1)
             {
-                upperCaseText = _text.ToUpper();
-                chars = GetFirstLetters(upperCaseText, 2);
+                upperData = _data.ToUpper();
+                chars = GetFirstLetters(upperData, 2);
             }
             else
             {
-                chars = upperCaseText = _text.ToUpper();
+                chars = upperData = _data.ToUpper();
             }
 
-            var bgColor = CoreHelpers.StringToColor(_id ?? upperCaseText, "#33ffffff");
-            var textColor = CoreHelpers.TextColorFromBgColor(bgColor);
+            var bgColor = StringToColor(upperData);
+            var textColor = Color.White;
             var size = 50;
 
             using (var bitmap = new SKBitmap(size * 2,
@@ -88,7 +85,7 @@ namespace Bit.App.Controls
                         IsAntialias = true,
                         Style = SKPaintStyle.Fill,
                         StrokeJoin = SKStrokeJoin.Miter,
-                        Color = SKColor.Parse(bgColor)
+                        Color = SKColor.Parse(bgColor.ToHex())
                     })
                     {
                         var midX = canvas.LocalClipBounds.Size.ToSizeI().Width / 2;
@@ -100,7 +97,7 @@ namespace Bit.App.Controls
                             IsAntialias = true,
                             Style = SKPaintStyle.Fill,
                             StrokeJoin = SKStrokeJoin.Miter,
-                            Color = SKColor.Parse(bgColor)
+                            Color = SKColor.Parse(bgColor.ToHex())
                         })
                         {
                             canvas.DrawCircle(midX, midY, radius, circlePaint);
@@ -111,7 +108,7 @@ namespace Bit.App.Controls
                             {
                                 IsAntialias = true,
                                 Style = SKPaintStyle.Fill,
-                                Color = SKColor.Parse(textColor),
+                                Color = SKColor.Parse(textColor.ToHex()),
                                 TextSize = textSize,
                                 TextAlign = SKTextAlign.Center,
                                 Typeface = typeface

src/App/Controls/AvatarImageSourcePool.cs

@@ -5,19 +5,19 @@ namespace Bit.App.Controls
 {
     public interface IAvatarImageSourcePool
     {
-        AvatarImageSource GetOrCreateAvatar(string userId, string name, string email);
+        AvatarImageSource GetOrCreateAvatar(string name, string email);
     }
 
     public class AvatarImageSourcePool : IAvatarImageSourcePool
     {
         private readonly ConcurrentDictionary<string, AvatarImageSource> _cache = new ConcurrentDictionary<string, AvatarImageSource>();
 
-        public AvatarImageSource GetOrCreateAvatar(string userId, string name, string email)
+        public AvatarImageSource GetOrCreateAvatar(string name, string email)
         {
-            var key = $"{userId}{name}{email}";
+            var key = $"{name}{email}";
             if (!_cache.TryGetValue(key, out var avatar))
             {
-                avatar = new AvatarImageSource(userId, name, email);
+                avatar = new AvatarImageSource(name, email);
                 if (!_cache.TryAdd(key, avatar)
                     &&
                     !_cache.TryGetValue(key, out avatar)) // If add fails another thread created the avatar in between the first try get and the try add.

src/App/Controls/CipherViewCell/CipherViewModelSwipeableItem.cs

@@ -0,0 +1,89 @@
+using System.Collections.Generic;
+using Bit.App.Abstractions;
+using Bit.App.Utilities;
+using Bit.Core;
+using Bit.Core.Enums;
+using Xamarin.Forms;
+
+namespace Bit.App.Controls
+{
+    public class CipherViewModelSwipeableItem : ISwipeableItem<CipherViewCellViewModel>
+    {
+        readonly Dictionary<CipherType, FontImageSource> _imageCache = new Dictionary<CipherType, FontImageSource>();
+
+        public bool CanSwipe(CipherViewCellViewModel item)
+        {
+            if (item?.Cipher is null)
+            {
+                return false;
+            }
+
+            return item.Cipher.Type == CipherType.Login
+                   ||
+                   item.Cipher.Type == CipherType.Card
+                   ||
+                   item.Cipher.Type == CipherType.SecureNote;
+        }
+
+        public Xamarin.Forms.Color GetBackgroundColor(CipherViewCellViewModel item)
+        {
+            if (item?.Cipher is null)
+            {
+                return ThemeManager.GetResourceColor("PrimaryColor");
+            }
+
+            if (item.Cipher.Type == CipherType.Login
+                &&
+                string.IsNullOrEmpty(item.Cipher.Login?.Password))
+            {
+                return ThemeManager.GetResourceColor("SeparatorColor");
+            }
+
+            if (item.Cipher.Type == CipherType.Card
+                &&
+                string.IsNullOrEmpty(item.Cipher.Card?.Number))
+            {
+                return ThemeManager.GetResourceColor("SeparatorColor");
+            }
+
+            if (item.Cipher.Type == CipherType.SecureNote
+                &&
+                string.IsNullOrEmpty(item.Cipher.Notes))
+            {
+                return ThemeManager.GetResourceColor("SeparatorColor");
+            }
+
+            return ThemeManager.GetResourceColor("PrimaryColor");
+        }
+
+        public FontImageSource GetSwipeIcon(CipherViewCellViewModel item)
+        {
+            if (item?.Cipher is null)
+            {
+                return null;
+            }
+
+            if (!_imageCache.TryGetValue(item.Cipher.Type, out var image))
+            {
+                image = new IconFontImageSource { Color = ThemeManager.GetResourceColor("BackgroundColor") };
+                switch (item.Cipher.Type)
+                {
+                    case CipherType.Login:
+                        image.Glyph = BitwardenIcons.Key;
+                        break;
+                    case CipherType.Card:
+                        image.Glyph = BitwardenIcons.Hashtag;
+                        break;
+                    case CipherType.SecureNote:
+                        image.Glyph = BitwardenIcons.Clone;
+                        break;
+                    default:
+                        return null;
+                }
+                _imageCache.Add(item.Cipher.Type, image);
+            }
+
+            return image;
+        }
+    }
+}

src/App/Controls/ExtendedCollectionView.cs

@@ -1,9 +1,19 @@
-using Xamarin.Forms;
+using System.Windows.Input;
+using Xamarin.Forms;
 
 namespace Bit.App.Controls
 {
     public class ExtendedCollectionView : CollectionView
     {
+        public static BindableProperty OnSwipeCommandProperty =
+            BindableProperty.Create(nameof(OnSwipeCommand), typeof(ICommand), typeof(ExtendedCollectionView));
+
+        public ICommand OnSwipeCommand
+        {
+            get => (ICommand)GetValue(OnSwipeCommandProperty);
+            set => SetValue(OnSwipeCommandProperty, value);
+        }
+
         public string ExtraDataForLogging { get; set; }
     }
 }

src/App/Controls/ExtendedGrid.cs

@@ -4,5 +4,6 @@ namespace Bit.App.Controls
 {
     public class ExtendedGrid : Grid
     {
+        public bool ApplyRipple { get; set; } = true;
     }
 }

src/App/Controls/IconButton.cs

@@ -1,5 +1,4 @@
-using Bit.App.Effects;
-using Xamarin.Forms;
+using Xamarin.Forms;
 
 namespace Bit.App.Controls
 {
@@ -17,8 +16,6 @@ namespace Bit.App.Controls
                     FontFamily = "bwi-font.ttf#bwi-font";
                     break;
             }
-
-            Effects.Add(new RemoveFontPaddingEffect());
         }
     }
 }

src/App/Controls/IconFontImageSource.cs

@@ -0,0 +1,20 @@
+using Xamarin.Forms;
+
+namespace Bit.App.Controls
+{
+    public class IconFontImageSource : FontImageSource
+    {
+        public IconFontImageSource()
+        {
+            switch (Device.RuntimePlatform)
+            {
+                case Device.iOS:
+                    FontFamily = "bwi-font";
+                    break;
+                case Device.Android:
+                    FontFamily = "bwi-font.ttf#bwi-font";
+                    break;
+            }
+        }
+    }
+}

src/App/Controls/IconLabel.cs

@@ -1,5 +1,4 @@
-using Bit.App.Effects;
-using Xamarin.Forms;
+using Xamarin.Forms;
 
 namespace Bit.App.Controls
 {
@@ -18,8 +17,6 @@ namespace Bit.App.Controls
                     FontFamily = "bwi-font.ttf#bwi-font";
                     break;
             }
-
-            Effects.Add(new RemoveFontPaddingEffect());
         }
     }
 }

src/App/Controls/IconLabelButton/IconLabelButton.xaml

@@ -1,42 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Frame xmlns="http://xamarin.com/schemas/2014/forms" 
-    xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
-    x:Class="Bit.App.Controls.IconLabelButton"
-    xmlns:controls="clr-namespace:Bit.App.Controls"
-    x:Name="_iconLabelButton"
-    HeightRequest="45"
-    Padding="1"
-    StyleClass="btn-icon-secondary"
-    BackgroundColor="{Binding IconLabelBorderColor, Source={x:Reference _iconLabelButton}}"
-    BorderColor="Transparent"
-    HasShadow="False">
-    <Frame.GestureRecognizers>
-        <TapGestureRecognizer Command="{Binding ButtonCommand, Source={x:Reference _iconLabelButton}}" />
-    </Frame.GestureRecognizers>
-    <Frame
-        Margin="0"
-        Padding="0"
-        CornerRadius="{Binding CornerRadius, Source={x:Reference _iconLabelButton}}"
-        BackgroundColor="{Binding IconLabelBackgroundColor, Source={x:Reference _iconLabelButton}}"
-        BorderColor="Transparent"
-        IsClippedToBounds="True"
-        HasShadow="False">
-        <StackLayout
-            Orientation="Horizontal"
-            HorizontalOptions="Center">
-            <controls:IconLabel
-                VerticalOptions="Center"
-                HorizontalTextAlignment="Center"
-                FontSize="Large"
-                TextColor="{Binding IconLabelColor, Source={x:Reference _iconLabelButton}}"
-                Text="{Binding Icon, Source={x:Reference _iconLabelButton}}">
-            </controls:IconLabel>
-            <Label
-                VerticalOptions="Center"
-                HorizontalTextAlignment="Center"
-                TextColor="{Binding IconLabelColor, Source={x:Reference _iconLabelButton}}"
-                FontSize="Medium"
-                Text="{Binding Label, Source={x:Reference _iconLabelButton}}"/>
-        </StackLayout>
-    </Frame>
-</Frame>

src/App/Controls/IconLabelButton/IconLabelButton.xaml.cs

@@ -1,75 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using System.Windows.Input;
-using Bit.Core.Models.Domain;
-using Xamarin.Forms;
-using Xamarin.Forms.Xaml;
-
-namespace Bit.App.Controls
-{
-    public partial class IconLabelButton : Frame
-    {
-        public static readonly BindableProperty IconProperty = BindableProperty.Create(
-            nameof(Icon), typeof(string), typeof(IconLabelButton));
-
-        public static readonly BindableProperty LabelProperty = BindableProperty.Create(
-            nameof(Label), typeof(string), typeof(IconLabelButton));
-
-        public static readonly BindableProperty ButtonCommandProperty = BindableProperty.Create(
-            nameof(ButtonCommand), typeof(ICommand), typeof(IconLabelButton));
-
-        public static readonly BindableProperty IconLabelColorProperty = BindableProperty.Create(
-            nameof(IconLabelColor), typeof(Color), typeof(IconLabelButton), Color.White);
-
-        public static readonly BindableProperty IconLabelBackgroundColorProperty = BindableProperty.Create(
-            nameof(IconLabelBackgroundColor), typeof(Color), typeof(IconLabelButton), Color.White);
-
-        public static readonly BindableProperty IconLabelBorderColorProperty = BindableProperty.Create(
-            nameof(IconLabelBorderColor), typeof(Color), typeof(IconLabelButton), Color.White);
-
-        public IconLabelButton()
-        {
-            InitializeComponent();
-        }
-
-        public string Icon
-        {
-            get => GetValue(IconProperty) as string;
-            set => SetValue(IconProperty, value);
-        }
-
-        public string Label
-        {
-            get => GetValue(LabelProperty) as string;
-            set => SetValue(LabelProperty, value);
-        }
-
-        public ICommand ButtonCommand
-        {
-            get => GetValue(ButtonCommandProperty) as ICommand;
-            set => SetValue(ButtonCommandProperty, value);
-        }
-
-        public Color IconLabelColor
-        {
-            get { return (Color)GetValue(IconLabelColorProperty); }
-            set { SetValue(IconLabelColorProperty, value); }
-        }
-
-        public Color IconLabelBackgroundColor
-        {
-            get { return (Color)GetValue(IconLabelBackgroundColorProperty); }
-            set { SetValue(IconLabelBackgroundColorProperty, value); }
-        }
-
-        public Color IconLabelBorderColor
-        {
-            get { return (Color)GetValue(IconLabelBorderColorProperty); }
-            set { SetValue(IconLabelBorderColorProperty, value); }
-        }
-    }
-}
-

src/App/Effects/RemoveFontPaddingEffect.cs

@@ -1,13 +0,0 @@
-using System;
-using Xamarin.Forms;
-
-namespace Bit.App.Effects
-{
-    public class RemoveFontPaddingEffect : RoutingEffect
-    {
-        public RemoveFontPaddingEffect()
-            : base("Bitwarden.RemoveFontPaddingEffect")
-        { }
-    }
-}
-

src/App/Pages/Accounts/HintPage.xaml.cs

@@ -6,12 +6,11 @@ namespace Bit.App.Pages
     {
         private HintPageViewModel _vm;
 
-        public HintPage(string email = null)
+        public HintPage()
         {
             InitializeComponent();
             _vm = BindingContext as HintPageViewModel;
             _vm.Page = this;
-            _vm.Email = email;
             if (Device.RuntimePlatform == Device.Android)
             {
                 ToolbarItems.RemoveAt(0);

src/App/Pages/Accounts/HintPageViewModel.cs

@@ -15,7 +15,6 @@ namespace Bit.App.Pages
         private readonly IPlatformUtilsService _platformUtilsService;
         private readonly IApiService _apiService;
         private readonly ILogger _logger;
-        private string _email;
 
         public HintPageViewModel()
         {
@@ -35,12 +34,7 @@ namespace Bit.App.Pages
         }
 
         public ICommand SubmitCommand { get; }
-
-        public string Email
-        {
-            get => _email;
-            set => SetProperty(ref _email, value);
-        }
+        public string Email { get; set; }
 
         public async Task SubmitAsync()
         {

src/App/Pages/Accounts/HomePage.xaml

@@ -24,7 +24,6 @@
             UseOriginalImage="True"
             AutomationProperties.IsInAccessibleTree="True"
             AutomationProperties.Name="{u:I18n Account}" />
-        <ToolbarItem x:Name="_closeButton" Text="{u:I18n Close}" Command="{Binding CloseCommand}" Order="Primary" Priority="-1"/>
         <ToolbarItem
             Icon="cog_environment.png" Clicked="Environment_Clicked" Order="Primary"
             AutomationProperties.IsInAccessibleTree="True"
@@ -33,66 +32,30 @@
 
     <ContentPage.Resources>
         <ResourceDictionary>
-            <u:InverseBoolConverter x:Key="inverseBool" />
-            <StackLayout x:Name="_mainLayout" x:Key="mainLayout" Spacing="30" Padding="20, 50, 20, 0">
-                <Image
-                    x:Name="_logo"
-                    Source="logo.png"
-                    VerticalOptions="Center" />
-                <Label Text="{u:I18n LoginOrCreateNewAccount}"
-                        StyleClass="text-lg"
-                        HorizontalTextAlignment="Center"/>
-                <StackLayout
-                    StyleClass="box-row">
-                    <Label
-                        Text="{u:I18n EmailAddress}"
-                        StyleClass="box-label" />
-                    <Entry
-                        x:Name="_email"
-                        Text="{Binding Email}"
-                        Keyboard="Email"
-                        StyleClass="box-value">
-                        <VisualStateManager.VisualStateGroups>
-                            <VisualStateGroup x:Name="CommonStates">
-                                <VisualState x:Name="Disabled">
-                                    <VisualState.Setters>
-                                        <Setter Property="TextColor" Value="{DynamicResource MutedColor}" />
-                                    </VisualState.Setters>
-                                </VisualState>
-                            </VisualStateGroup>
-                        </VisualStateManager.VisualStateGroups>
-                    </Entry>
-                    <StackLayout
-                        Orientation="Horizontal"
-                        Margin="0, 16, 0 ,0">
-                        <StackLayout.GestureRecognizers>
-                            <TapGestureRecognizer
-                                Command="{Binding RememberEmailCommand}" />
-                        </StackLayout.GestureRecognizers>
-                        <Label
-                            Text="{u:I18n RememberMe}"
-                            StyleClass="text-sm"
-                            HorizontalOptions="FillAndExpand"
-                            VerticalOptions="Center"
-                            VerticalTextAlignment="Center"/>
-                        <Switch
-                            Scale="0.8"
-                            IsToggled="{Binding RememberEmail}"
-                            VerticalOptions="Center"/>
+            <StackLayout x:Name="_mainLayout" x:Key="mainLayout" Spacing="0" Padding="10, 5">
+                <StackLayout VerticalOptions="CenterAndExpand" Spacing="20">
+                    <Image
+                        x:Name="_logo"
+                        Source="logo.png"
+                        VerticalOptions="Center" />
+                    <Label Text="{u:I18n LoginOrCreateNewAccount}"
+                           StyleClass="text-lg"
+                           HorizontalTextAlignment="Center">
+                    </Label>
+                    <StackLayout Spacing="5">
+                        <Button Text="{u:I18n LogIn}"
+                                StyleClass="btn-primary"
+                                Clicked="LogIn_Clicked" />
+                        <Button Text="{u:I18n CreateAccount}"
+                                Clicked="Register_Clicked" />
+                        <Button Text="{u:I18n LogInSso}"
+                                Clicked="LogInSso_Clicked" />
+                        <Button Text="{u:I18n Cancel}"
+                                IsVisible="{Binding ShowCancelButton}"
+                                Margin="0,10,0,0"
+                                Clicked="Cancel_Clicked" />
                     </StackLayout>
                 </StackLayout>
-                <Button Text="{u:I18n Continue}"
-                        StyleClass="btn-primary"
-                        IsEnabled="{Binding CanContinue}"
-                        Command="{Binding ContinueCommand}" />
-                        
-                <Label FormattedText="{Binding CreateAccountText}"
-                       Margin="0, 10"
-                        StyleClass="box-footer-label">
-                    <Label.GestureRecognizers>
-                        <TapGestureRecognizer Command="{Binding CreateAccountCommand}" />
-                    </Label.GestureRecognizers>
-                </Label>
             </StackLayout>
         </ResourceDictionary>
     </ContentPage.Resources>

src/App/Pages/Accounts/HomePage.xaml.cs

@@ -10,35 +10,28 @@ namespace Bit.App.Pages
 {
     public partial class HomePage : BaseContentPage
     {
-        private bool _checkRememberedEmail;
         private readonly HomeViewModel _vm;
         private readonly AppOptions _appOptions;
         private IBroadcasterService _broadcasterService;
 
-        public HomePage(AppOptions appOptions = null, bool shouldCheckRememberEmail = true)
+        public HomePage(AppOptions appOptions = null)
         {
             _broadcasterService = ServiceContainer.Resolve<IBroadcasterService>("broadcasterService");
             _appOptions = appOptions;
             InitializeComponent();
             _vm = BindingContext as HomeViewModel;
             _vm.Page = this;
-            _vm.ShouldCheckRememberEmail = shouldCheckRememberEmail;
-            _vm.ShowCancelButton = _appOptions?.IosExtension ?? false;
-            _vm.StartLoginAction = async () => await StartLoginAsync();
+            _vm.StartLoginAction = () => Device.BeginInvokeOnMainThread(async () => await StartLoginAsync());
             _vm.StartRegisterAction = () => Device.BeginInvokeOnMainThread(async () => await StartRegisterAsync());
             _vm.StartSsoLoginAction = () => Device.BeginInvokeOnMainThread(async () => await StartSsoLoginAsync());
             _vm.StartEnvironmentAction = () => Device.BeginInvokeOnMainThread(async () => await StartEnvironmentAsync());
-            _vm.CloseAction = async () =>
-            {
-                await _accountListOverlay.HideAsync();
-                await Navigation.PopModalAsync();
-            };
             UpdateLogo();
 
-            if (!_vm.ShowCancelButton)
+            if (_appOptions?.IosExtension ?? false)
             {
-                ToolbarItems.Remove(_closeButton);
+                _vm.ShowCancelButton = true;
             }
+
             if (_appOptions?.HideAccountSwitcher ?? false)
             {
                 ToolbarItems.Remove(_accountAvatar);
@@ -59,7 +52,7 @@ namespace Bit.App.Pages
 
             if (!_appOptions?.HideAccountSwitcher ?? false)
             {
-                _vm.AvatarImageSource = await GetAvatarImageSourceAsync(false);
+                _vm.AvatarImageSource = await GetAvatarImageSourceAsync();
             }
             _broadcasterService.Subscribe(nameof(HomePage), (message) =>
             {
@@ -71,8 +64,6 @@ namespace Bit.App.Pages
                     });
                 }
             });
-
-            _vm.CheckNavigateLoginStep();
         }
 
         protected override bool OnBackButtonPressed()
@@ -105,12 +96,28 @@ namespace Bit.App.Pages
             }
         }
 
+        private void LogIn_Clicked(object sender, EventArgs e)
+        {
+            if (DoOnce())
+            {
+                _vm.StartLoginAction();
+            }
+        }
+
         private async Task StartLoginAsync()
         {
-            var page = new LoginPage(_vm.Email, _appOptions);
+            var page = new LoginPage(null, _appOptions);
             await Navigation.PushModalAsync(new NavigationPage(page));
         }
 
+        private void Register_Clicked(object sender, EventArgs e)
+        {
+            if (DoOnce())
+            {
+                _vm.StartRegisterAction();
+            }
+        }
+
         private async Task StartRegisterAsync()
         {
             var page = new RegisterPage(this);

src/App/Pages/Accounts/HomePageViewModel.cs

@@ -1,15 +1,8 @@
 using System;
-using System.Threading.Tasks;
-using Bit.App.Abstractions;
 using Bit.App.Controls;
 using Bit.App.Resources;
-using Bit.App.Utilities;
 using Bit.Core.Abstractions;
-using Bit.Core.Services;
 using Bit.Core.Utilities;
-using Xamarin.CommunityToolkit.ObjectModel;
-using Xamarin.Essentials;
-using Xamarin.Forms;
 
 namespace Bit.App.Pages
 {
@@ -19,37 +12,19 @@ namespace Bit.App.Pages
         private readonly IMessagingService _messagingService;
 
         private bool _showCancelButton;
-        private bool _rememberEmail;
-        private string _email;
-        private bool _isEmailEnabled;
-        private bool _canLogin;
-        private IPlatformUtilsService _platformUtilsService;
-        private ILogger _logger;
-        private IEnvironmentService _environmentService;
-        private IAccountsManager _accountManager;
 
         public HomeViewModel()
         {
-            _stateService = ServiceContainer.Resolve<IStateService>();
-            _messagingService = ServiceContainer.Resolve<IMessagingService>();
-            _platformUtilsService = ServiceContainer.Resolve<IPlatformUtilsService>();
-            _logger = ServiceContainer.Resolve<ILogger>();
-            _environmentService = ServiceContainer.Resolve<IEnvironmentService>();
-            _accountManager = ServiceContainer.Resolve<IAccountsManager>();
+            _stateService = ServiceContainer.Resolve<IStateService>("stateService");
+            _messagingService = ServiceContainer.Resolve<IMessagingService>("messagingService");
+            var logger = ServiceContainer.Resolve<ILogger>("logger");
 
             PageTitle = AppResources.Bitwarden;
 
-            AccountSwitchingOverlayViewModel = new AccountSwitchingOverlayViewModel(_stateService, _messagingService, _logger)
+            AccountSwitchingOverlayViewModel = new AccountSwitchingOverlayViewModel(_stateService, _messagingService, logger)
             {
                 AllowActiveAccountSelection = true
             };
-            RememberEmailCommand = new Command(() => RememberEmail = !RememberEmail);
-            ContinueCommand = new AsyncCommand(ContinueToLoginStepAsync, allowsMultipleExecutions: false);
-            CreateAccountCommand = new AsyncCommand(async () => await Device.InvokeOnMainThreadAsync(StartRegisterAction),
-                onException: _logger.Exception, allowsMultipleExecutions: false);
-            CloseCommand = new AsyncCommand(async () => await Device.InvokeOnMainThreadAsync(CloseAction),
-                onException: _logger.Exception, allowsMultipleExecutions: false);
-            InitAsync().FireAndForget();
         }
 
         public bool ShowCancelButton
@@ -58,102 +33,11 @@ namespace Bit.App.Pages
             set => SetProperty(ref _showCancelButton, value);
         }
 
-        public bool RememberEmail
-        {
-            get => _rememberEmail;
-            set => SetProperty(ref _rememberEmail, value);
-        }
-
-        public string Email
-        {
-            get => _email;
-            set => SetProperty(ref _email, value,
-                additionalPropertyNames: new[] { nameof(CanContinue) });
-        }
-
-        public bool CanContinue => !string.IsNullOrEmpty(Email);
-
-        public bool ShouldCheckRememberEmail { get; set; }
-
-        public FormattedString CreateAccountText
-        {
-            get
-            {
-                var fs = new FormattedString();
-                fs.Spans.Add(new Span
-                {
-                    Text = $"{AppResources.NewAroundHere} "
-                });
-                fs.Spans.Add(new Span
-                {
-                    Text = AppResources.CreateAccount,
-                    TextColor = ThemeManager.GetResourceColor("PrimaryColor")
-                });
-                return fs;
-            }
-        }
-
         public AccountSwitchingOverlayViewModel AccountSwitchingOverlayViewModel { get; }
         public Action StartLoginAction { get; set; }
         public Action StartRegisterAction { get; set; }
         public Action StartSsoLoginAction { get; set; }
         public Action StartEnvironmentAction { get; set; }
         public Action CloseAction { get; set; }
-        public Command RememberEmailCommand { get; set; }
-        public AsyncCommand ContinueCommand { get; }
-        public AsyncCommand CloseCommand { get; }
-        public AsyncCommand CreateAccountCommand { get; }
-
-        public async Task InitAsync()
-        {
-            Email = await _stateService.GetRememberedEmailAsync();
-            RememberEmail = !string.IsNullOrEmpty(Email);
-        }
-
-        public void CheckNavigateLoginStep()
-        {
-            if (ShouldCheckRememberEmail && RememberEmail)
-            {
-                StartLoginAction();
-            }
-            ShouldCheckRememberEmail = false;
-        }
-
-        public async Task ContinueToLoginStepAsync()
-        {
-            try
-            {
-                if (string.IsNullOrWhiteSpace(Email))
-                {
-                    await _platformUtilsService.ShowDialogAsync(
-                        string.Format(AppResources.ValidationFieldRequired, AppResources.EmailAddress),
-                        AppResources.AnErrorHasOccurred, AppResources.Ok);
-                    return;
-                }
-                if (!Email.Contains("@"))
-                {
-                    await _platformUtilsService.ShowDialogAsync(AppResources.InvalidEmail, AppResources.AnErrorHasOccurred,
-                        AppResources.Ok);
-                    return;
-                }
-                await _stateService.SetRememberedEmailAsync(RememberEmail ? Email : null);
-                var userId = await _stateService.GetUserIdAsync(Email);
-                if (!string.IsNullOrWhiteSpace(userId))
-                {
-                    var userEnvUrls = await _stateService.GetEnvironmentUrlsAsync(userId);
-                    if (userEnvUrls?.Base == _environmentService.BaseUrl)
-                    {
-                        await _accountManager.PromptToSwitchToExistingAccountAsync(userId);
-                        return;
-                    }
-                }
-                StartLoginAction();
-            }
-            catch (Exception ex)
-            {
-                _logger.Exception(ex);
-                await _platformUtilsService.ShowDialogAsync(AppResources.GenericErrorMessage, AppResources.AnErrorHasOccurred, AppResources.Ok);
-            }
-        }
     }
 }

src/App/Pages/Accounts/LoginPage.xaml

@@ -4,7 +4,6 @@
     xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
     x:Class="Bit.App.Pages.LoginPage"
     xmlns:pages="clr-namespace:Bit.App.Pages"
-    xmlns:core="clr-namespace:Bit.Core;assembly=BitwardenCore"
     xmlns:controls="clr-namespace:Bit.App.Controls"
     xmlns:u="clr-namespace:Bit.App.Utilities"
     x:DataType="pages:LoginPageViewModel"
@@ -47,13 +46,33 @@
                 Order="Secondary" />
 
             <ScrollView x:Name="_mainLayout" x:Key="mainLayout">
-                <StackLayout Spacing="0">
+                <StackLayout Spacing="20">
                     <StackLayout StyleClass="box">
+                        <StackLayout StyleClass="box-row">
+                            <Label
+                                Text="{u:I18n EmailAddress}"
+                                StyleClass="box-label" />
+                            <Entry
+                                x:Name="_email"
+                                Text="{Binding Email}"
+                                IsEnabled="{Binding IsEmailEnabled}"
+                                Keyboard="Email"
+                                StyleClass="box-value">
+                                <VisualStateManager.VisualStateGroups>
+                                    <VisualStateGroup x:Name="CommonStates">
+                                        <VisualState x:Name="Disabled">
+                                            <VisualState.Setters>
+                                                <Setter Property="TextColor" Value="{DynamicResource MutedColor}" />
+                                            </VisualState.Setters>
+                                        </VisualState>
+                                    </VisualStateGroup>
+                                </VisualStateManager.VisualStateGroups>
+                                </Entry>
+                        </StackLayout>
                         <Grid StyleClass="box-row">
                             <Grid.RowDefinitions>
                                 <RowDefinition Height="Auto" />
                                 <RowDefinition Height="*" />
-                                <RowDefinition Height="Auto" />
                             </Grid.RowDefinitions>
                             <Grid.ColumnDefinitions>
                                 <ColumnDefinition Width="*" />
@@ -62,7 +81,6 @@
                             <Label
                                 Text="{u:I18n MasterPassword}"
                                 StyleClass="box-label"
-                                Padding="0, 10, 0, 0"
                                 Grid.Row="0"
                                 Grid.Column="0" />
                             <controls:MonoEntry
@@ -80,60 +98,21 @@
                                 StyleClass="box-row-button, box-row-button-platform"
                                 Text="{Binding ShowPasswordIcon}"
                                 Command="{Binding TogglePasswordCommand}"
-                                Grid.Row="1"
+                                Grid.Row="0"
                                 Grid.Column="1"
-                                Grid.RowSpan="1"
+                                Grid.RowSpan="2"
                                 AutomationProperties.IsInAccessibleTree="True"
                                 AutomationProperties.Name="{u:I18n ToggleVisibility}"
                                 AutomationProperties.HelpText="{Binding PasswordVisibilityAccessibilityText}"/>
-                            <Label
-                                Text="{u:I18n GetMasterPasswordwordHint}"
-                                StyleClass="box-footer-label"
-                                TextColor="{DynamicResource HyperlinkColor}"
-                                Padding="0,5,0,0"
-                                Grid.Row="2"
-                                Grid.Column="0"
-                                Grid.ColumnSpan="2">
-                                <Label.GestureRecognizers>
-                                    <TapGestureRecognizer Tapped="Hint_Clicked" />
-                                </Label.GestureRecognizers>
-                            </Label>
                         </Grid>
                     </StackLayout>
-                    <StackLayout Padding="10, 10">
-                        <Button x:Name="_loginWithMasterPassword"
-                            Text="{u:I18n LogInWithMasterPassword}" 
+                    <StackLayout Padding="10, 0">
+                        <Button Text="{u:I18n LogIn}" 
                                 StyleClass="btn-primary"
                                 Clicked="LogIn_Clicked" />
-                        <controls:IconLabelButton
-                            HorizontalOptions="Fill"
-                            VerticalOptions="CenterAndExpand"
-                            Icon="{Binding Source={x:Static core:BitwardenIcons.Device}}"
-                            Label="{u:I18n LogInWithAnotherDevice}"
-                            ButtonCommand="{Binding LogInWithDeviceCommand}"
-                            IsVisible="{Binding IsKnownDevice}"/>
-                        <controls:IconLabelButton
-                            HorizontalOptions="Fill"
-                            VerticalOptions="CenterAndExpand"
-                            Icon="{Binding Source={x:Static core:BitwardenIcons.Suitcase}}"
-                            Label="{u:I18n LogInSso}">
-                            <controls:IconLabelButton.GestureRecognizers>
-                                <TapGestureRecognizer Tapped="LogInSSO_Clicked" />
-                            </controls:IconLabelButton.GestureRecognizers>
-                        </controls:IconLabelButton>
-                        <Label
-                            Text="{Binding LoggingInAsText}"
-                            StyleClass="text-sm"
-                            Margin="0,40,0,0"/>
-                        <Label
-                            Text="{u:I18n NotYou}"
-                            StyleClass="text-md"
-                            HorizontalOptions="Start"
-                            TextColor="{DynamicResource HyperlinkColor}">
-                            <Label.GestureRecognizers>
-                                <TapGestureRecognizer Tapped="Cancel_Clicked" />
-                            </Label.GestureRecognizers>
-                        </Label>
+                        <Button Text="{u:I18n Cancel}"
+                                IsVisible="{Binding ShowCancelButton}"
+                                Clicked="Cancel_Clicked" />
                     </StackLayout>
                 </StackLayout>
             </ScrollView>

src/App/Pages/Accounts/LoginPage.xaml.cs

@@ -3,9 +3,7 @@ using System.Threading.Tasks;
 using Bit.App.Models;
 using Bit.App.Utilities;
 using Bit.Core.Abstractions;
-using Bit.Core.Services;
 using Bit.Core.Utilities;
-using Xamarin.CommunityToolkit.ObjectModel;
 using Xamarin.Forms;
 
 namespace Bit.App.Pages
@@ -27,9 +25,8 @@ namespace Bit.App.Pages
             _vm.Page = this;
             _vm.StartTwoFactorAction = () => Device.BeginInvokeOnMainThread(async () => await StartTwoFactorAsync());
             _vm.LogInSuccessAction = () => Device.BeginInvokeOnMainThread(async () => await LogInSuccessAsync());
-            _vm.LogInWithDeviceAction = () => StartLoginWithDeviceAsync().FireAndForget();
-            _vm.StartSsoLoginAction = () => Device.BeginInvokeOnMainThread(async () => await StartSsoLoginAsync());
-            _vm.UpdateTempPasswordAction = () => Device.BeginInvokeOnMainThread(async () => await UpdateTempPasswordAsync());
+            _vm.UpdateTempPasswordAction =
+                () => Device.BeginInvokeOnMainThread(async () => await UpdateTempPasswordAsync());
             _vm.CloseAction = async () =>
             {
                 await _accountListOverlay.HideAsync();
@@ -45,6 +42,9 @@ namespace Bit.App.Pages
             _vm.Email = email;
             MasterPasswordEntry = _masterPassword;
 
+            _email.ReturnType = ReturnType.Next;
+            _email.ReturnCommand = new Command(() => _masterPassword.Focus());
+
             if (Device.RuntimePlatform == Device.iOS)
             {
                 ToolbarItems.Add(_moreItem);
@@ -54,6 +54,11 @@ namespace Bit.App.Pages
                 ToolbarItems.Add(_getPasswordHint);
             }
 
+            if (Device.RuntimePlatform == Device.Android && !_vm.IsEmailEnabled)
+            {
+                ToolbarItems.Add(_removeAccount);
+            }
+
             if (_appOptions?.IosExtension ?? false)
             {
                 _vm.ShowCancelButton = true;
@@ -73,20 +78,16 @@ namespace Bit.App.Pages
             _mainContent.Content = _mainLayout;
             _accountAvatar?.OnAppearing();
 
-            await _vm.InitAsync();
             if (!_appOptions?.HideAccountSwitcher ?? false)
             {
-                _vm.AvatarImageSource = await GetAvatarImageSourceAsync(_vm.EmailIsInSavedAccounts);
+                _vm.AvatarImageSource = await GetAvatarImageSourceAsync();
             }
+            await _vm.InitAsync();
             if (!_inputFocused)
             {
-                RequestFocus(_masterPassword);
+                RequestFocus(string.IsNullOrWhiteSpace(_vm.Email) ? _email : _masterPassword);
                 _inputFocused = true;
             }
-            if (Device.RuntimePlatform == Device.Android && !_vm.CanRemoveAccount)
-            {
-                ToolbarItems.Add(_removeAccount);
-            }
         }
 
         protected override bool OnBackButtonPressed()
@@ -114,31 +115,11 @@ namespace Bit.App.Pages
             }
         }
 
-        private void LogInSSO_Clicked(object sender, EventArgs e)
-        {
-            if (DoOnce())
-            {
-                _vm.StartSsoLoginAction();
-            }
-        }
-
-        private async Task StartLoginWithDeviceAsync()
-        {
-            var page = new LoginPasswordlessRequestPage(_vm.Email, _appOptions);
-            await Navigation.PushModalAsync(new NavigationPage(page));
-        }
-
-        private async Task StartSsoLoginAsync()
-        {
-            var page = new LoginSsoPage(_appOptions);
-            await Navigation.PushModalAsync(new NavigationPage(page));
-        }
-
         private void Hint_Clicked(object sender, EventArgs e)
         {
             if (DoOnce())
             {
-                _vm.ShowMasterPasswordHintAsync().FireAndForget();
+                Navigation.PushModalAsync(new NavigationPage(new HintPage()));
             }
         }
 

src/App/Pages/Accounts/LoginPageViewModel.cs

@@ -1,19 +1,13 @@
 using System;
-using System.Collections.Generic;
-using System.Linq;
 using System.Threading.Tasks;
 using System.Windows.Input;
 using Bit.App.Abstractions;
 using Bit.App.Controls;
-using Bit.App.Models;
 using Bit.App.Resources;
 using Bit.App.Utilities;
-using Bit.App.Utilities.AccountManagement;
 using Bit.Core;
 using Bit.Core.Abstractions;
 using Bit.Core.Exceptions;
-using Bit.Core.Models.View;
-using Bit.Core.Services;
 using Bit.Core.Utilities;
 using Xamarin.CommunityToolkit.ObjectModel;
 using Xamarin.Forms;
@@ -31,15 +25,12 @@ namespace Bit.App.Pages
         private readonly II18nService _i18nService;
         private readonly IMessagingService _messagingService;
         private readonly ILogger _logger;
-        private readonly IApiService _apiService;
-        private readonly IAppIdService _appIdService;
-        private readonly IAccountsManager _accountManager;
+
         private bool _showPassword;
         private bool _showCancelButton;
         private string _email;
         private string _masterPassword;
         private bool _isEmailEnabled;
-        private bool _isKnownDevice;
 
         public LoginPageViewModel()
         {
@@ -52,15 +43,11 @@ namespace Bit.App.Pages
             _i18nService = ServiceContainer.Resolve<II18nService>("i18nService");
             _messagingService = ServiceContainer.Resolve<IMessagingService>("messagingService");
             _logger = ServiceContainer.Resolve<ILogger>("logger");
-            _apiService = ServiceContainer.Resolve<IApiService>();
-            _appIdService = ServiceContainer.Resolve<IAppIdService>();
-            _accountManager = ServiceContainer.Resolve<IAccountsManager>();
 
             PageTitle = AppResources.Bitwarden;
             TogglePasswordCommand = new Command(TogglePassword);
             LogInCommand = new Command(async () => await LogInAsync());
             MoreCommand = new AsyncCommand(MoreAsync, onException: _logger.Exception, allowsMultipleExecutions: false);
-            LogInWithDeviceCommand = new AsyncCommand(() => Device.InvokeOnMainThreadAsync(LogInWithDeviceAction), onException: _logger.Exception, allowsMultipleExecutions: false);
 
             AccountSwitchingOverlayViewModel = new AccountSwitchingOverlayViewModel(_stateService, _messagingService, _logger)
             {
@@ -89,11 +76,7 @@ namespace Bit.App.Pages
         public string Email
         {
             get => _email;
-            set => SetProperty(ref _email, value,
-                additionalPropertyNames: new string[]
-                {
-                    nameof(LoggingInAsText)
-                });
+            set => SetProperty(ref _email, value);
         }
 
         public string MasterPassword
@@ -108,31 +91,20 @@ namespace Bit.App.Pages
             set => SetProperty(ref _isEmailEnabled, value);
         }
 
-        public bool IsKnownDevice
-        {
-            get => _isKnownDevice;
-            set => SetProperty(ref _isKnownDevice, value);
-        }
+        public bool IsIosExtension { get; set; }
 
         public AccountSwitchingOverlayViewModel AccountSwitchingOverlayViewModel { get; }
+
         public Command LogInCommand { get; }
         public Command TogglePasswordCommand { get; }
         public ICommand MoreCommand { get; internal set; }
-        public ICommand LogInWithDeviceCommand { get; }
         public string ShowPasswordIcon => ShowPassword ? BitwardenIcons.EyeSlash : BitwardenIcons.Eye;
         public string PasswordVisibilityAccessibilityText => ShowPassword ? AppResources.PasswordIsVisibleTapToHide : AppResources.PasswordIsNotVisibleTapToShow;
-        public string LoggingInAsText => string.Format(AppResources.LoggingInAsX, Email);
-        public bool IsIosExtension { get; set; }
-        public bool CanRemoveAccount { get; set; }
         public Action StartTwoFactorAction { get; set; }
         public Action LogInSuccessAction { get; set; }
-        public Action LogInWithDeviceAction { get; set; }
         public Action UpdateTempPasswordAction { get; set; }
-        public Action StartSsoLoginAction { get; set; }
         public Action CloseAction { get; set; }
 
-        public bool EmailIsInSavedAccounts => _stateService.AccountViews != null && _stateService.AccountViews.Any(e => e.Email == Email);
-
         protected override II18nService i18nService => _i18nService;
         protected override IEnvironmentService environmentService => _environmentService;
         protected override IDeviceActionService deviceActionService => _deviceActionService;
@@ -140,22 +112,9 @@ namespace Bit.App.Pages
 
         public async Task InitAsync()
         {
-            try
+            if (string.IsNullOrWhiteSpace(Email))
             {
-                await _deviceActionService.ShowLoadingAsync(AppResources.Loading);
-                await AccountSwitchingOverlayViewModel.RefreshAccountViewsAsync();
-                if (string.IsNullOrWhiteSpace(Email))
-                {
-                    Email = await _stateService.GetRememberedEmailAsync();
-                }
-                var deviceIdentifier = await _appIdService.GetAppIdAsync();
-                IsKnownDevice = await _apiService.GetKnownDeviceAsync(Email, deviceIdentifier);
-                CanRemoveAccount = await _stateService.GetActiveUserEmailAsync() != Email;
-                await _deviceActionService.HideLoadingAsync();
-            }
-            catch (Exception ex)
-            {
-                HandleException(ex);
+                Email = await _stateService.GetRememberedEmailAsync();
             }
         }
 
@@ -199,7 +158,7 @@ namespace Bit.App.Pages
                         var userEnvUrls = await _stateService.GetEnvironmentUrlsAsync(userId);
                         if (userEnvUrls?.Base == _environmentService.BaseUrl)
                         {
-                            await _accountManager.PromptToSwitchToExistingAccountAsync(userId);
+                            await PromptToSwitchToExistingAccountAsync(userId);
                             return;
                         }
                     }
@@ -211,6 +170,7 @@ namespace Bit.App.Pages
                 }
 
                 var response = await _authService.LogInAsync(Email, MasterPassword, _captchaToken);
+                await _stateService.SetRememberedEmailAsync(Email);
                 await AppHelpers.ResetInvalidUnlockAttemptsAsync();
 
                 if (response.CaptchaNeeded)
@@ -256,14 +216,19 @@ namespace Bit.App.Pages
 
         private async Task MoreAsync()
         {
-            var buttons = IsEmailEnabled || CanRemoveAccount
+            var buttons = IsEmailEnabled
                 ? new[] { AppResources.GetPasswordHint }
                 : new[] { AppResources.GetPasswordHint, AppResources.RemoveAccount };
             var selection = await _deviceActionService.DisplayActionSheetAsync(AppResources.Options, AppResources.Cancel, null, buttons);
 
             if (selection == AppResources.GetPasswordHint)
             {
-                await ShowMasterPasswordHintAsync();
+                var hintNavigationPage = new NavigationPage(new HintPage());
+                if (IsIosExtension)
+                {
+                    ThemeManager.ApplyResourcesTo(hintNavigationPage);
+                }
+                await Page.Navigation.PushModalAsync(hintNavigationPage);
             }
             else if (selection == AppResources.RemoveAccount)
             {
@@ -271,16 +236,6 @@ namespace Bit.App.Pages
             }
         }
 
-        public async Task ShowMasterPasswordHintAsync()
-        {
-            var hintNavigationPage = new NavigationPage(new HintPage(Email));
-            if (IsIosExtension)
-            {
-                ThemeManager.ApplyResourcesTo(hintNavigationPage);
-            }
-            await Page.Navigation.PushModalAsync(hintNavigationPage);
-        }
-
         public void TogglePassword()
         {
             ShowPassword = !ShowPassword;
@@ -306,14 +261,16 @@ namespace Bit.App.Pages
             }
         }
 
-        private void HandleException(Exception ex)
+        private async Task PromptToSwitchToExistingAccountAsync(string userId)
         {
-            Xamarin.Essentials.MainThread.InvokeOnMainThreadAsync(async () =>
+            var switchToAccount = await _platformUtilsService.ShowDialogAsync(
+                AppResources.SwitchToAlreadyAddedAccountConfirmation,
+                AppResources.AccountAlreadyAdded, AppResources.Yes, AppResources.Cancel);
+            if (switchToAccount)
             {
-                await _deviceActionService.HideLoadingAsync();
-                await _platformUtilsService.ShowDialogAsync(AppResources.GenericErrorMessage);
-            }).FireAndForget();
-            _logger.Exception(ex);
+                await _stateService.SetActiveUserAsync(userId);
+                _messagingService.Send("switchedAccount");
+            }
         }
     }
 }

src/App/Pages/Accounts/LoginPasswordlessPage.xaml.cs

@@ -14,7 +14,10 @@ namespace Bit.App.Pages
 
             _vm.LoginRequest = loginPasswordlessDetails;
 
-            ToolbarItems.Add(_closeItem);
+            if (Device.RuntimePlatform == Device.iOS)
+            {
+                ToolbarItems.Add(_closeItem);
+            }
         }
 
         private async void Close_Clicked(object sender, System.EventArgs e)

src/App/Pages/Accounts/LoginPasswordlessRequestPage.xaml

@@ -1,76 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<pages:BaseContentPage
-    xmlns="http://xamarin.com/schemas/2014/forms"
-    xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
-    x:Class="Bit.App.Pages.LoginPasswordlessRequestPage"
-    xmlns:pages="clr-namespace:Bit.App.Pages"
-    xmlns:controls="clr-namespace:Bit.App.Controls"
-    xmlns:u="clr-namespace:Bit.App.Utilities"
-    x:DataType="pages:LoginPasswordlessRequestViewModel"
-    Title="{Binding PageTitle}">
-
-    <ContentPage.BindingContext>
-        <pages:LoginPasswordlessRequestViewModel />
-    </ContentPage.BindingContext>
-
-    <ContentPage.ToolbarItems>
-        <ToolbarItem Text="{u:I18n Close}" Command="{Binding CloseCommand}" Order="Primary" Priority="-1" x:Name="_closeItem"/>
-    </ContentPage.ToolbarItems>
-
-    <ScrollView>
-        <StackLayout
-            Padding="7, 0, 7, 20">
-            <Label
-                Text="{u:I18n LogInInitiated}"
-                FontSize="Title"
-                FontAttributes="Bold"
-                Margin="0,14,0,21"/>
-            <Label
-                Text="{u:I18n ANotificationHasBeenSentToYourDevice}"
-                FontSize="Small"
-                Margin="0,0,0,10"/>
-            <Label
-                Text="{u:I18n PleaseMakeSureYourVaultIsUnlockedAndTheFingerprintPhraseMatchesOnTheOtherDevice}"
-                FontSize="Small"
-                Margin="0,0,0,24"/>
-            <Label
-                Text="{u:I18n FingerprintPhrase}"
-                FontSize="Small"
-                FontAttributes="Bold"/>
-            <controls:MonoLabel
-                FormattedText="{Binding FingerprintPhrase}"
-                FontSize="Medium"
-                TextColor="{DynamicResource FingerprintPhrase}"/>
-            <Label
-                Text="{u:I18n ResendNotification}"
-                StyleClass="text-md"
-                HorizontalOptions="Start"
-                Margin="0,40,0,0"
-                TextColor="{DynamicResource HyperlinkColor}">
-                <Label.GestureRecognizers>
-                    <TapGestureRecognizer Command="{Binding CreatePasswordlessLoginCommand}" />
-                </Label.GestureRecognizers>
-            </Label>
-            <StackLayout
-                Orientation="Horizontal"
-                Margin="0,30,0,0">
-                <Label
-                    Text="{u:I18n NeedAnotherOption}"
-                    FontSize="Small"
-                    VerticalTextAlignment="End"/>
-                <Label
-                    Text="{u:I18n ViewAllLoginOptions}"
-                    StyleClass="text-md"
-                    VerticalTextAlignment="End"
-                    VerticalOptions="CenterAndExpand"
-                    Margin="5, 0"
-                    TextColor="{DynamicResource HyperlinkColor}">
-                    <Label.GestureRecognizers>
-                        <TapGestureRecognizer Command="{Binding CloseCommand}" />
-                    </Label.GestureRecognizers>
-                </Label>
-            </StackLayout>
-               
-        </StackLayout>
-    </ScrollView>
-</pages:BaseContentPage>

src/App/Pages/Accounts/LoginPasswordlessRequestPage.xaml.cs

@@ -1,65 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Threading.Tasks;
-using Bit.App.Models;
-using Bit.App.Utilities;
-using Xamarin.Forms;
-
-namespace Bit.App.Pages
-{
-    public partial class LoginPasswordlessRequestPage : BaseContentPage
-    {
-        private LoginPasswordlessRequestViewModel _vm;
-        private readonly AppOptions _appOptions;
-
-        public LoginPasswordlessRequestPage(string email, AppOptions appOptions = null)
-        {
-            InitializeComponent();
-            _appOptions = appOptions;
-            _vm = BindingContext as LoginPasswordlessRequestViewModel;
-            _vm.Page = this;
-            _vm.Email = email;
-            _vm.StartTwoFactorAction = () => Device.BeginInvokeOnMainThread(async () => await StartTwoFactorAsync());
-            _vm.LogInSuccessAction = () => Device.BeginInvokeOnMainThread(async () => await LogInSuccessAsync());
-            _vm.UpdateTempPasswordAction = () => Device.BeginInvokeOnMainThread(async () => await UpdateTempPasswordAsync());
-            _vm.CloseAction = () => { Navigation.PopModalAsync(); };
-
-            _vm.CreatePasswordlessLoginCommand.Execute(null);
-        }
-
-        protected override void OnAppearing()
-        {
-            base.OnAppearing();
-            _vm.StartCheckLoginRequestStatus();
-        }
-
-        protected override void OnDisappearing()
-        {
-            base.OnDisappearing();
-            _vm.StopCheckLoginRequestStatus();
-        }
-
-        private async Task StartTwoFactorAsync()
-        {
-            var page = new TwoFactorPage(false, _appOptions);
-            await Navigation.PushModalAsync(new NavigationPage(page));
-        }
-
-        private async Task LogInSuccessAsync()
-        {
-            if (AppHelpers.SetAlternateMainPage(_appOptions))
-            {
-                return;
-            }
-            var previousPage = await AppHelpers.ClearPreviousPage();
-            Application.Current.MainPage = new TabsPage(_appOptions, previousPage);
-        }
-
-        private async Task UpdateTempPasswordAsync()
-        {
-            var page = new UpdateTempPasswordPage();
-            await Navigation.PushModalAsync(new NavigationPage(page));
-        }
-    }
-}
-

src/App/Pages/Accounts/LoginPasswordlessRequestViewModel.cs

@@ -1,194 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading;
-using System.Threading.Tasks;
-using System.Windows.Input;
-using Bit.App.Abstractions;
-using Bit.App.Resources;
-using Bit.App.Utilities;
-using Bit.Core;
-using Bit.Core.Abstractions;
-using Bit.Core.Enums;
-using Bit.Core.Models.Domain;
-using Bit.Core.Services;
-using Bit.Core.Utilities;
-using Xamarin.CommunityToolkit.ObjectModel;
-using Xamarin.Essentials;
-using Xamarin.Forms;
-
-namespace Bit.App.Pages
-{
-    public class LoginPasswordlessRequestViewModel : CaptchaProtectedViewModel
-    {
-        private const int REQUEST_TIME_UPDATE_PERIOD_IN_SECONDS = 4;
-
-        private IDeviceActionService _deviceActionService;
-        private IAuthService _authService;
-        private ISyncService _syncService;
-        private II18nService _i18nService;
-        private IStateService _stateService;
-        private IPlatformUtilsService _platformUtilsService;
-        private IEnvironmentService _environmentService;
-        private ILogger _logger;
-
-        protected override II18nService i18nService => _i18nService;
-        protected override IEnvironmentService environmentService => _environmentService;
-        protected override IDeviceActionService deviceActionService => _deviceActionService;
-        protected override IPlatformUtilsService platformUtilsService => _platformUtilsService;
-
-        private CancellationTokenSource _checkLoginRequestStatusCts;
-        private Task _checkLoginRequestStatusTask;
-        private string _fingerprintPhrase;
-        private string _email;
-        private string _requestId;
-        private string _requestAccessCode;
-        // Item1 publicKey, Item2 privateKey
-        private Tuple<byte[], byte[]> _requestKeyPair;
-
-        public LoginPasswordlessRequestViewModel()
-        {
-            _deviceActionService = ServiceContainer.Resolve<IDeviceActionService>();
-            _platformUtilsService = ServiceContainer.Resolve<IPlatformUtilsService>();
-            _environmentService = ServiceContainer.Resolve<IEnvironmentService>();
-            _authService = ServiceContainer.Resolve<IAuthService>();
-            _syncService = ServiceContainer.Resolve<ISyncService>();
-            _i18nService = ServiceContainer.Resolve<II18nService>();
-            _stateService = ServiceContainer.Resolve<IStateService>();
-            _logger = ServiceContainer.Resolve<ILogger>();
-
-            PageTitle = AppResources.LogInWithAnotherDevice;
-
-            CreatePasswordlessLoginCommand = new AsyncCommand(CreatePasswordlessLoginAsync,
-                onException: ex => HandleException(ex),
-                allowsMultipleExecutions: false);
-
-            CloseCommand = new AsyncCommand(() => Device.InvokeOnMainThreadAsync(CloseAction),
-                onException: _logger.Exception,
-                allowsMultipleExecutions: false);
-        }
-
-        public Action StartTwoFactorAction { get; set; }
-        public Action LogInSuccessAction { get; set; }
-        public Action UpdateTempPasswordAction { get; set; }
-        public Action CloseAction { get; set; }
-
-        public ICommand CreatePasswordlessLoginCommand { get; }
-        public ICommand CloseCommand { get; }
-
-        public string FingerprintPhrase
-        {
-            get => _fingerprintPhrase;
-            set => SetProperty(ref _fingerprintPhrase, value);
-        }
-
-        public string Email
-        {
-            get => _email;
-            set => SetProperty(ref _email, value);
-        }
-
-        public void StartCheckLoginRequestStatus()
-        {
-            try
-            {
-                _checkLoginRequestStatusCts?.Cancel();
-                _checkLoginRequestStatusCts = new CancellationTokenSource();
-                _checkLoginRequestStatusTask = new TimerTask(_logger, CheckLoginRequestStatus, _checkLoginRequestStatusCts).RunPeriodic(TimeSpan.FromSeconds(REQUEST_TIME_UPDATE_PERIOD_IN_SECONDS));
-            }
-            catch (Exception ex)
-            {
-                _logger.Exception(ex);
-            }
-        }
-
-        public void StopCheckLoginRequestStatus()
-        {
-            try
-            {
-                _checkLoginRequestStatusCts?.Cancel();
-                _checkLoginRequestStatusCts?.Dispose();
-                _checkLoginRequestStatusCts = null;
-            }
-            catch (Exception ex)
-            {
-                _logger.Exception(ex);
-            }
-        }
-
-        private async Task CheckLoginRequestStatus()
-        {
-            if (string.IsNullOrEmpty(_requestId) || string.IsNullOrEmpty(_requestAccessCode))
-            {
-                return;
-            }
-
-            try
-            {
-                var response = await _authService.GetPasswordlessLoginResponseAsync(_requestId, _requestAccessCode);
-
-                if (!response.RequestApproved)
-                {
-                    return;
-                }
-
-                StopCheckLoginRequestStatus();
-
-                var authResult = await _authService.LogInPasswordlessAsync(Email, _requestAccessCode, _requestId, _requestKeyPair.Item2, response.Key, response.MasterPasswordHash);
-                await AppHelpers.ResetInvalidUnlockAttemptsAsync();
-
-                if (await HandleCaptchaAsync(authResult.CaptchaSiteKey, authResult.CaptchaNeeded, CheckLoginRequestStatus))
-                {
-                    return;
-                }
-
-                if (authResult.TwoFactor)
-                {
-                    StartTwoFactorAction?.Invoke();
-                }
-                else if (authResult.ForcePasswordReset)
-                {
-                    UpdateTempPasswordAction?.Invoke();
-                }
-                else
-                {
-                    _syncService.FullSyncAsync(true).FireAndForget();
-                    LogInSuccessAction?.Invoke();
-                }
-            }
-            catch (Exception ex)
-            {
-                StartCheckLoginRequestStatus();
-                HandleException(ex);
-            }
-        }
-
-        private async Task CreatePasswordlessLoginAsync()
-        {
-            await Device.InvokeOnMainThreadAsync(() => _deviceActionService.ShowLoadingAsync(AppResources.Loading));
-
-            var response = await _authService.PasswordlessCreateLoginRequestAsync(_email);
-            if (response != null)
-            {
-                FingerprintPhrase = response.RequestFingerprint;
-                _requestId = response.Id;
-                _requestAccessCode = response.RequestAccessCode;
-                _requestKeyPair = response.RequestKeyPair;
-            }
-
-            await _deviceActionService.HideLoadingAsync();
-        }
-
-        private void HandleException(Exception ex)
-        {
-            Xamarin.Essentials.MainThread.InvokeOnMainThreadAsync(async () =>
-            {
-                await _deviceActionService.HideLoadingAsync();
-                await _platformUtilsService.ShowDialogAsync(AppResources.GenericErrorMessage);
-            }).FireAndForget();
-            _logger.Exception(ex);
-        }
-    }
-}
-

src/App/Pages/BaseContentPage.cs

@@ -129,8 +129,7 @@ namespace Bit.App.Pages
         {
             if (useCurrentActiveAccount)
             {
-                return new AvatarImageSource(await _stateService.GetActiveUserIdAsync(),
-                    await _stateService.GetNameAsync(), await _stateService.GetEmailAsync());
+                return new AvatarImageSource(await _stateService.GetNameAsync(), await _stateService.GetEmailAsync());
             }
             return new AvatarImageSource();
         }

src/App/Pages/CaptchaProtectedViewModel.cs

@@ -16,22 +16,6 @@ namespace Bit.App.Pages
         protected abstract IPlatformUtilsService platformUtilsService { get; }
         protected string _captchaToken = null;
 
-        protected async Task<bool> HandleCaptchaAsync(string captchaSiteKey, bool needsCaptcha, Func<Task> onSuccess)
-        {
-            if (!needsCaptcha)
-            {
-                _captchaToken = null;
-                return false;
-            }
-
-            if (await HandleCaptchaAsync(captchaSiteKey))
-            {
-                await onSuccess();
-                _captchaToken = null;
-            }
-            return true;
-        }
-
         protected async Task<bool> HandleCaptchaAsync(string CaptchaSiteKey)
         {
             var callbackUri = "bitwarden://captcha-callback";

src/App/Pages/Generator/GeneratorPage.xaml

@@ -21,7 +21,7 @@
             <u:InverseBoolConverter x:Key="inverseBool" />
             <u:LocalizableEnumConverter x:Key="localizableEnum" />
             <xct:EnumToBoolConverter x:Key="enumToBool"/>
-            <ToolbarItem Text="{u:I18n Cancel}" Command="{Binding CloseCommand}" Order="Primary" Priority="-1"
+            <ToolbarItem Text="{u:I18n Cancel}" Clicked="Close_Clicked" Order="Primary" Priority="-1"
                          x:Name="_closeItem" x:Key="closeItem" />
             <ToolbarItem Text="{u:I18n Select}"
                      Clicked="Select_Clicked"

src/App/Pages/Generator/GeneratorPage.xaml.cs

@@ -1,6 +1,5 @@
 using System;
 using System.Threading.Tasks;
-using Bit.App.Models;
 using Bit.App.Resources;
 using Bit.App.Styles;
 using Bit.Core.Abstractions;
@@ -19,11 +18,11 @@ namespace Bit.App.Pages
         private readonly Action<string> _selectAction;
         private readonly TabsPage _tabsPage;
 
-        public GeneratorPage(bool fromTabPage, Action<string> selectAction = null, TabsPage tabsPage = null, bool isUsernameGenerator = false, string emailWebsite = null, bool editMode = false, AppOptions appOptions = null)
+        public GeneratorPage(bool fromTabPage, Action<string> selectAction = null, TabsPage tabsPage = null, bool isUsernameGenerator = false, string emailWebsite = null, bool editMode = false)
         {
             _tabsPage = tabsPage;
             InitializeComponent();
-            _broadcasterService = ServiceContainer.Resolve<IBroadcasterService>();
+            _broadcasterService = ServiceContainer.Resolve<IBroadcasterService>("broadcasterService");
             _vm = BindingContext as GeneratorPageViewModel;
             _vm.Page = this;
             _fromTabPage = fromTabPage;
@@ -32,7 +31,6 @@ namespace Bit.App.Pages
             _vm.IsUsername = isUsernameGenerator;
             _vm.EmailWebsite = emailWebsite;
             _vm.EditMode = editMode;
-            _vm.IosExtension = appOptions?.IosExtension ?? false;
             var isIos = Device.RuntimePlatform == Device.iOS;
             if (selectAction != null)
             {
@@ -136,6 +134,14 @@ namespace Bit.App.Pages
             await _vm.SliderChangedAsync();
         }
 
+        private async void Close_Clicked(object sender, EventArgs e)
+        {
+            if (DoOnce())
+            {
+                await Navigation.PopModalAsync();
+            }
+        }
+
         public override async Task UpdateOnThemeChanged()
         {
             await base.UpdateOnThemeChanged();

src/App/Pages/Generator/GeneratorPageViewModel.cs

@@ -2,7 +2,6 @@
 using System.Collections.Generic;
 using System.Threading.Tasks;
 using System.Windows.Input;
-using Bit.App.Abstractions;
 using Bit.App.Resources;
 using Bit.App.Utilities;
 using Bit.Core;
@@ -22,7 +21,6 @@ namespace Bit.App.Pages
         private readonly IClipboardService _clipboardService;
         private readonly IUsernameGenerationService _usernameGenerationService;
         private readonly ITokenService _tokenService;
-        private readonly IDeviceActionService _deviceActionService;
         readonly LazyResolve<ILogger> _logger = new LazyResolve<ILogger>("logger");
 
         private PasswordGenerationOptions _options;
@@ -61,7 +59,6 @@ namespace Bit.App.Pages
             _clipboardService = ServiceContainer.Resolve<IClipboardService>();
             _usernameGenerationService = ServiceContainer.Resolve<IUsernameGenerationService>();
             _tokenService = ServiceContainer.Resolve<ITokenService>();
-            _deviceActionService = ServiceContainer.Resolve<IDeviceActionService>();
 
             PageTitle = AppResources.Generator;
             GeneratorTypeOptions = new List<GeneratorType> {
@@ -92,9 +89,8 @@ namespace Bit.App.Pages
             UsernameTypePromptHelpCommand = new Command(UsernameTypePromptHelp);
             RegenerateCommand = new AsyncCommand(RegenerateAsync, onException: ex => OnSubmitException(ex), allowsMultipleExecutions: false);
             RegenerateUsernameCommand = new AsyncCommand(RegenerateUsernameAsync, onException: ex => OnSubmitException(ex), allowsMultipleExecutions: false);
-            ToggleForwardedEmailHiddenValueCommand = new AsyncCommand(ToggleForwardedEmailHiddenValueAsync, onException: ex => _logger.Value.Exception(ex), allowsMultipleExecutions: false);
-            CopyCommand = new AsyncCommand(CopyAsync, onException: ex => _logger.Value.Exception(ex), allowsMultipleExecutions: false);
-            CloseCommand = new AsyncCommand(CloseAsync, onException: ex => _logger.Value.Exception(ex), allowsMultipleExecutions: false);
+            ToggleForwardedEmailHiddenValueCommand = new AsyncCommand(ToggleForwardedEmailHiddenValueAsync, onException: ex => OnSubmitException(ex), allowsMultipleExecutions: false);
+            CopyCommand = new AsyncCommand(CopyAsync, onException: ex => OnSubmitException(ex), allowsMultipleExecutions: false);
         }
 
         public List<GeneratorType> GeneratorTypeOptions { get; set; }
@@ -108,7 +104,6 @@ namespace Bit.App.Pages
         public ICommand RegenerateUsernameCommand { get; set; }
         public ICommand ToggleForwardedEmailHiddenValueCommand { get; set; }
         public ICommand CopyCommand { get; set; }
-        public ICommand CloseCommand { get; set; }
 
         public string Password
         {
@@ -145,8 +140,6 @@ namespace Bit.App.Pages
             set => SetProperty(ref _isUsername, value);
         }
 
-        public bool IosExtension { get; set; }
-
         public bool ShowTypePicker
         {
             get => _showTypePicker;
@@ -613,7 +606,6 @@ namespace Bit.App.Pages
             LoadFromOptions();
 
             _usernameOptions = await _usernameGenerationService.GetOptionsAsync();
-            await _tokenService.PrepareTokenForDecodingAsync();
             _usernameOptions.PlusAddressedEmail = _tokenService.GetEmail();
             _usernameOptions.EmailWebsite = EmailWebsite;
             _usernameOptions.CatchAllEmailType = _usernameOptions.PlusAddressedEmailType = string.IsNullOrWhiteSpace(EmailWebsite) || !EditMode ? UsernameEmailType.Random : UsernameEmailType.Website;
@@ -689,7 +681,6 @@ namespace Bit.App.Pages
                 return;
             }
 
-            _usernameOptions.EmailWebsite = EmailWebsite;
             await _usernameGenerationService.SaveOptionsAsync(_usernameOptions);
 
             if (regenerate && UsernameTypeSelected != UsernameType.ForwardedEmailAlias)
@@ -738,18 +729,6 @@ namespace Bit.App.Pages
             }
         }
 
-        public async Task CloseAsync()
-        {
-            if (IosExtension)
-            {
-                _deviceActionService.CloseExtensionPopUp();
-            }
-            else
-            {
-                await Page.Navigation.PopModalAsync();
-            }
-        }
-
         private void LoadFromOptions()
         {
             AllowAmbiguousChars = _options.AllowAmbiguousChar.GetValueOrDefault();
@@ -786,7 +765,6 @@ namespace Bit.App.Pages
             TriggerPropertyChanged(nameof(PlusAddressedEmail));
             TriggerPropertyChanged(nameof(GeneratorTypeSelected));
             TriggerPropertyChanged(nameof(UsernameTypeDescriptionLabel));
-            TriggerPropertyChanged(nameof(EmailWebsite));
         }
 
         private void SetOptions()

src/App/Pages/Vault/AutofillCiphersPageViewModel.cs

@@ -6,6 +6,7 @@ using Bit.App.Controls;
 using Bit.App.Models;
 using Bit.App.Resources;
 using Bit.App.Utilities;
+using Bit.App.Utilities.Helpers;
 using Bit.Core;
 using Bit.Core.Abstractions;
 using Bit.Core.Enums;
@@ -26,6 +27,7 @@ namespace Bit.App.Pages
         private readonly IStateService _stateService;
         private readonly IPasswordRepromptService _passwordRepromptService;
         private readonly IMessagingService _messagingService;
+        private readonly ICipherHelper _cipherHelper;
         private readonly ILogger _logger;
 
         private bool _showNoData;
@@ -42,6 +44,7 @@ namespace Bit.App.Pages
             _stateService = ServiceContainer.Resolve<IStateService>("stateService");
             _passwordRepromptService = ServiceContainer.Resolve<IPasswordRepromptService>("passwordRepromptService");
             _messagingService = ServiceContainer.Resolve<IMessagingService>("messagingService");
+            _cipherHelper = ServiceContainer.Resolve<ICipherHelper>("cipherHelper");
             _logger = ServiceContainer.Resolve<ILogger>("logger");
 
             GroupedItems = new ObservableRangeCollection<IGroupingsPageListItem>();
@@ -182,7 +185,7 @@ namespace Bit.App.Pages
             }
             if (_deviceActionService.SystemMajorVersion() < 21)
             {
-                await AppHelpers.CipherListOptions(Page, cipher, _passwordRepromptService);
+                await _cipherHelper.ShowCipherOptionsAsync(Page, cipher);
             }
             else
             {
@@ -243,7 +246,7 @@ namespace Bit.App.Pages
         {
             if ((Page as BaseContentPage).DoOnce())
             {
-                await AppHelpers.CipherListOptions(Page, cipher, _passwordRepromptService);
+                await _cipherHelper.ShowCipherOptionsAsync(Page, cipher);
             }
         }
     }

src/App/Pages/Vault/CiphersPageViewModel.cs

@@ -5,6 +5,7 @@ using System.Threading;
 using System.Threading.Tasks;
 using Bit.App.Abstractions;
 using Bit.App.Resources;
+using Bit.App.Utilities.Helpers;
 using Bit.Core.Abstractions;
 using Bit.Core.Enums;
 using Bit.Core.Exceptions;
@@ -25,6 +26,7 @@ namespace Bit.App.Pages
         private readonly IPasswordRepromptService _passwordRepromptService;
         private readonly IOrganizationService _organizationService;
         private readonly IPolicyService _policyService;
+        private readonly ICipherHelper _cipherHelper;
         private CancellationTokenSource _searchCancellationTokenSource;
         private readonly ILogger _logger;
 
@@ -43,6 +45,7 @@ namespace Bit.App.Pages
             _passwordRepromptService = ServiceContainer.Resolve<IPasswordRepromptService>("passwordRepromptService");
             _organizationService = ServiceContainer.Resolve<IOrganizationService>("organizationService");
             _policyService = ServiceContainer.Resolve<IPolicyService>("policyService");
+            _cipherHelper = ServiceContainer.Resolve<ICipherHelper>("cipherHelper");
             _logger = ServiceContainer.Resolve<ILogger>("logger");
 
             Ciphers = new ExtendedObservableCollection<CipherView>();
@@ -194,7 +197,7 @@ namespace Bit.App.Pages
                 }
                 if (_deviceActionService.SystemMajorVersion() < 21)
                 {
-                    await Utilities.AppHelpers.CipherListOptions(Page, cipher, _passwordRepromptService);
+                    await _cipherHelper.ShowCipherOptionsAsync(Page, cipher);
                 }
                 else
                 {
@@ -220,7 +223,7 @@ namespace Bit.App.Pages
         {
             if ((Page as BaseContentPage).DoOnce())
             {
-                await Utilities.AppHelpers.CipherListOptions(Page, cipher, _passwordRepromptService);
+                await _cipherHelper.ShowCipherOptionsAsync(Page, cipher);
             }
         }
     }

src/App/Pages/Vault/GroupingsPage/GroupingsPage.xaml

@@ -33,7 +33,9 @@
 
     <ContentPage.Resources>
         <ResourceDictionary>
-            <u:InverseBoolConverter x:Key="inverseBool" />
+            <xct:IsNotNullOrEmptyConverter x:Key="isNotNullOrEmptyConverter" />
+            <u:CipherTypeToSwipeActionGlyphConverter x:Key="cipherTypeToSwipeActionGlyphConverter" />
+            <u:CipherToSwipeBackgroundColor x:Key="cipherToSwipeBackgroundColor" />
 
             <ToolbarItem x:Name="_syncItem" x:Key="syncItem" Text="{u:I18n Sync}"
                          Clicked="Sync_Clicked" Order="Secondary" />
@@ -53,6 +55,27 @@
                     ButtonCommand="{Binding BindingContext.CipherOptionsCommand, Source={x:Reference _page}}"
                     WebsiteIconsEnabled="{Binding BindingContext.WebsiteIconsEnabled, Source={x:Reference _page}}" />
             </DataTemplate>
+            <DataTemplate x:Key="swipeableCipherTemplate"
+                          x:DataType="pages:GroupingsPageListItem">
+                <SwipeView Threshold="{Binding Source={x:Reference _page}, Path=SwipeThreshold}">
+                    <SwipeView.LeftItems>
+                        <SwipeItems Mode="Execute">
+                            <SwipeItem
+                                   BackgroundColor="{Binding Cipher, Converter={StaticResource cipherToSwipeBackgroundColor}}"
+                                   Command="{Binding Source={x:Reference _page}, Path=BindingContext.SwipeItemActionCommand}"
+                                   CommandParameter="{Binding .}"
+                                   IconImageSource="{Binding Cipher.Type, Converter={StaticResource cipherTypeToSwipeActionGlyphConverter}}">
+                            </SwipeItem>
+                        </SwipeItems>
+                    </SwipeView.LeftItems>
+                    <controls:CipherViewCell
+                        Cipher="{Binding Cipher}"
+                        ButtonCommand="{Binding BindingContext.CipherOptionsCommand, Source={x:Reference _page}}"
+                        WebsiteIconsEnabled="{Binding BindingContext.WebsiteIconsEnabled, Source={x:Reference _page}}"
+                        ApplyRipple="False"
+                        BackgroundColor="{DynamicResource BackgroundColor}"/>
+                </SwipeView>
+            </DataTemplate>
 
             <DataTemplate x:Key="authenticatorTemplate"
                           x:DataType="pages:GroupingsPageTOTPListItem">
@@ -113,8 +136,9 @@
             <pages:GroupingsPageListItemSelector x:Key="listItemDataTemplateSelector"
                                                  HeaderTemplate="{StaticResource headerTemplate}"
                                                  CipherTemplate="{StaticResource cipherTemplate}"
+                                                 GroupTemplate="{StaticResource groupTemplate}" 
                                                  AuthenticatorTemplate="{StaticResource authenticatorTemplate}"
-                                                 GroupTemplate="{StaticResource groupTemplate}" />
+                                                 SwipeableCipherTemplate="{StaticResource swipeableCipherTemplate}" />
 
             <StackLayout x:Key="mainLayout" x:Name="_mainLayout">
                 <StackLayout
@@ -165,7 +189,8 @@
                         SelectionMode="Single"
                         SelectionChanged="RowSelected"
                         StyleClass="list, list-platform"
-                        ExtraDataForLogging="Groupings Page" />
+                        ExtraDataForLogging="Groupings Page"
+                        OnSwipeCommand="{Binding SwipeItemActionCommand}"/>
                 </RefreshView>
             </StackLayout>
         </ResourceDictionary>

src/App/Pages/Vault/GroupingsPage/GroupingsPage.xaml.cs

@@ -28,6 +28,19 @@ namespace Bit.App.Pages
 
         private PreviousPageInfo _previousPage;
 
+        double _swipeThreshold;
+        public double SwipeThreshold
+        {
+            get
+            {
+                if (_swipeThreshold == default)
+                {
+                    _swipeThreshold = (Content?.Width ?? 500) / 2;
+                }
+                return _swipeThreshold;
+            }
+        }
+
         public GroupingsPage(bool mainPage, CipherType? type = null, string folderId = null,
             string collectionId = null, string pageTitle = null, string vaultFilterSelection = null,
             PreviousPageInfo previousPage = null, bool deleted = false, bool showTotp = false)

src/App/Pages/Vault/GroupingsPage/GroupingsPageListItemSelector.cs

@@ -7,6 +7,7 @@ namespace Bit.App.Pages
         public DataTemplate HeaderTemplate { get; set; }
         public DataTemplate CipherTemplate { get; set; }
         public DataTemplate GroupTemplate { get; set; }
+        public DataTemplate SwipeableCipherTemplate { get; set; }
         public DataTemplate AuthenticatorTemplate { get; set; }
 
         protected override DataTemplate OnSelectTemplate(object item, BindableObject container)
@@ -23,7 +24,16 @@ namespace Bit.App.Pages
 
             if (item is GroupingsPageListItem listItem)
             {
-                return listItem.Cipher != null ? CipherTemplate : GroupTemplate;
+                if (listItem.Cipher is null)
+                {
+                    return GroupTemplate;
+                }
+
+                return CipherTemplate;
+
+                //return listItem.Cipher.Type != Core.Enums.CipherType.Identity && SwipeableCipherTemplate != null
+                //        ? SwipeableCipherTemplate
+                //        : CipherTemplate;
             }
 
             return null;

src/App/Pages/Vault/GroupingsPage/GroupingsPageViewModel.cs

@@ -8,6 +8,7 @@ using Bit.App.Abstractions;
 using Bit.App.Controls;
 using Bit.App.Resources;
 using Bit.App.Utilities;
+using Bit.App.Utilities.Helpers;
 using Bit.Core.Abstractions;
 using Bit.Core.Enums;
 using Bit.Core.Models.Domain;
@@ -50,9 +51,9 @@ namespace Bit.App.Pages
         private readonly IPlatformUtilsService _platformUtilsService;
         private readonly IMessagingService _messagingService;
         private readonly IStateService _stateService;
-        private readonly IPasswordRepromptService _passwordRepromptService;
         private readonly IOrganizationService _organizationService;
         private readonly IPolicyService _policyService;
+        private readonly ICipherHelper _cipherHelper;
         private readonly ILogger _logger;
 
         public GroupingsPageViewModel()
@@ -66,9 +67,9 @@ namespace Bit.App.Pages
             _platformUtilsService = ServiceContainer.Resolve<IPlatformUtilsService>("platformUtilsService");
             _messagingService = ServiceContainer.Resolve<IMessagingService>("messagingService");
             _stateService = ServiceContainer.Resolve<IStateService>("stateService");
-            _passwordRepromptService = ServiceContainer.Resolve<IPasswordRepromptService>("passwordRepromptService");
             _organizationService = ServiceContainer.Resolve<IOrganizationService>("organizationService");
             _policyService = ServiceContainer.Resolve<IPolicyService>("policyService");
+            _cipherHelper = ServiceContainer.Resolve<ICipherHelper>("cipherHelper");
             _logger = ServiceContainer.Resolve<ILogger>("logger");
 
             Loading = true;
@@ -79,6 +80,7 @@ namespace Bit.App.Pages
                 await LoadAsync();
             });
             CipherOptionsCommand = new Command<CipherView>(CipherOptionsAsync);
+            SwipeItemActionCommand = new AsyncCommand<IGroupingsPageListItem>(SwipeItemActionAsync, onException: ex => _logger.Exception(ex), allowsMultipleExecutions: false);
             VaultFilterCommand = new AsyncCommand(VaultFilterOptionsAsync,
                 onException: ex => _logger.Exception(ex),
                 allowsMultipleExecutions: false);
@@ -169,6 +171,8 @@ namespace Bit.App.Pages
         public ObservableRangeCollection<IGroupingsPageListItem> GroupedItems { get; set; }
         public Command RefreshCommand { get; set; }
         public Command<CipherView> CipherOptionsCommand { get; set; }
+        public IAsyncCommand<IGroupingsPageListItem> SwipeItemActionCommand { get; }
+
         public bool LoadedOnce { get; set; }
 
         public async Task LoadAsync()
@@ -713,7 +717,43 @@ namespace Bit.App.Pages
         {
             if ((Page as BaseContentPage).DoOnce())
             {
-                await AppHelpers.CipherListOptions(Page, cipher, _passwordRepromptService);
+                await _cipherHelper.ShowCipherOptionsAsync(Page, cipher);
+            }
+        }
+
+        private async Task SwipeItemActionAsync(IGroupingsPageListItem listItem)
+        {
+            if (listItem is GroupingsPageListItem groupPageListItem && groupPageListItem.Cipher is CipherView cipher)
+            {
+                switch (cipher.Type)
+                {
+                    case CipherType.Login:
+                        if (string.IsNullOrEmpty(cipher.Login?.Password) || !await _cipherHelper.CopyPasswordAsync(cipher))
+                        {
+                            return;
+                        }
+                        break;
+                    case CipherType.Card:
+                        if (!await _cipherHelper.CopyCardNumberAsync(cipher))
+                        {
+                            return;
+                        }
+                        break;
+                    case CipherType.SecureNote:
+                        await _cipherHelper.CopyNotesAsync(cipher);
+                        break;
+                    default:
+                        _logger.Error($"The cipher type {cipher.Type} does not have any swipe action associated");
+                        return;
+                }
+
+                try
+                {
+                    Xamarin.Essentials.Vibration.Vibrate();
+                }
+                catch (Xamarin.Essentials.FeatureNotSupportedException)
+                {
+                }
             }
         }
     }

src/App/Resources/AppResources.Designer.cs

@@ -481,15 +481,6 @@ namespace Bit.App.Resources {
             }
         }
         
-        /// <summary>
-        ///   Looks up a localized string similar to A notification has been sent to your device..
-        /// </summary>
-        public static string ANotificationHasBeenSentToYourDevice {
-            get {
-                return ResourceManager.GetString("ANotificationHasBeenSentToYourDevice", resourceCulture);
-            }
-        }
-        
         /// <summary>
         ///   Looks up a localized string similar to API access token.
         /// </summary>
@@ -2902,15 +2893,6 @@ namespace Bit.App.Resources {
             }
         }
         
-        /// <summary>
-        ///   Looks up a localized string similar to Get master password hint.
-        /// </summary>
-        public static string GetMasterPasswordwordHint {
-            get {
-                return ResourceManager.GetString("GetMasterPasswordwordHint", resourceCulture);
-            }
-        }
-        
         /// <summary>
         ///   Looks up a localized string similar to Get your master password hint.
         /// </summary>
@@ -3424,15 +3406,6 @@ namespace Bit.App.Resources {
             }
         }
         
-        /// <summary>
-        ///   Looks up a localized string similar to Logging in as {0}.
-        /// </summary>
-        public static string LoggingInAsX {
-            get {
-                return ResourceManager.GetString("LoggingInAsX", resourceCulture);
-            }
-        }
-        
         /// <summary>
         ///   Looks up a localized string similar to Log In.
         /// </summary>
@@ -3461,11 +3434,10 @@ namespace Bit.App.Resources {
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Login attempt from:
-        ///{0}
-        ///Do you want to switch to this account?.
+        ///   Looks up a localized string similar to Login attempt from {0}. Do you want to switch to this account?.
         /// </summary>
-        public static string LoginAttemptFromXDoYouWantToSwitchToThisAccount {
+        public static string LoginAttemptFromXDoYouWantToSwitchToThisAccount
+        {
             get {
                 return ResourceManager.GetString("LoginAttemptFromXDoYouWantToSwitchToThisAccount", resourceCulture);
             }
@@ -3489,15 +3461,6 @@ namespace Bit.App.Resources {
             }
         }
         
-        /// <summary>
-        ///   Looks up a localized string similar to Log in initiated.
-        /// </summary>
-        public static string LogInInitiated {
-            get {
-                return ResourceManager.GetString("LogInInitiated", resourceCulture);
-            }
-        }
-        
         /// <summary>
         ///   Looks up a localized string similar to Login.
         /// </summary>
@@ -3579,24 +3542,6 @@ namespace Bit.App.Resources {
             }
         }
         
-        /// <summary>
-        ///   Looks up a localized string similar to Log In with another device.
-        /// </summary>
-        public static string LogInWithAnotherDevice {
-            get {
-                return ResourceManager.GetString("LogInWithAnotherDevice", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Log In with master password.
-        /// </summary>
-        public static string LogInWithMasterPassword {
-            get {
-                return ResourceManager.GetString("LogInWithMasterPassword", resourceCulture);
-            }
-        }
-        
         /// <summary>
         ///   Looks up a localized string similar to Log out.
         /// </summary>
@@ -3984,15 +3929,6 @@ namespace Bit.App.Resources {
             }
         }
         
-        /// <summary>
-        ///   Looks up a localized string similar to Need another option?.
-        /// </summary>
-        public static string NeedAnotherOption {
-            get {
-                return ResourceManager.GetString("NeedAnotherOption", resourceCulture);
-            }
-        }
-        
         /// <summary>
         ///   Looks up a localized string similar to Never.
         /// </summary>
@@ -4011,15 +3947,6 @@ namespace Bit.App.Resources {
             }
         }
         
-        /// <summary>
-        ///   Looks up a localized string similar to New around here?.
-        /// </summary>
-        public static string NewAroundHere {
-            get {
-                return ResourceManager.GetString("NewAroundHere", resourceCulture);
-            }
-        }
-        
         /// <summary>
         ///   Looks up a localized string similar to New custom field.
         /// </summary>
@@ -4254,15 +4181,6 @@ namespace Bit.App.Resources {
             }
         }
         
-        /// <summary>
-        ///   Looks up a localized string similar to Not you?.
-        /// </summary>
-        public static string NotYou {
-            get {
-                return ResourceManager.GetString("NotYou", resourceCulture);
-            }
-        }
-        
         /// <summary>
         ///   Looks up a localized string similar to This login does not have a username or password configured..
         /// </summary>
@@ -4732,15 +4650,6 @@ namespace Bit.App.Resources {
             }
         }
         
-        /// <summary>
-        ///   Looks up a localized string similar to Please make sure your vault is unlocked and the Fingerprint phrase matches on the other device..
-        /// </summary>
-        public static string PleaseMakeSureYourVaultIsUnlockedAndTheFingerprintPhraseMatchesOnTheOtherDevice {
-            get {
-                return ResourceManager.GetString("PleaseMakeSureYourVaultIsUnlockedAndTheFingerprintPhraseMatchesOnTheOtherDevice", resourceCulture);
-            }
-        }
-        
         /// <summary>
         ///   Looks up a localized string similar to Plus addressed email.
         /// </summary>
@@ -5039,15 +4948,6 @@ namespace Bit.App.Resources {
             }
         }
         
-        /// <summary>
-        ///   Looks up a localized string similar to Resend notification.
-        /// </summary>
-        public static string ResendNotification {
-            get {
-                return ResourceManager.GetString("ResendNotification", resourceCulture);
-            }
-        }
-        
         /// <summary>
         ///   Looks up a localized string similar to This organization has an enterprise policy that will automatically enroll you in password reset. Enrollment will allow organization administrators to change your master password..
         /// </summary>
@@ -6587,15 +6487,6 @@ namespace Bit.App.Resources {
             }
         }
         
-        /// <summary>
-        ///   Looks up a localized string similar to View all log in options.
-        /// </summary>
-        public static string ViewAllLoginOptions {
-            get {
-                return ResourceManager.GetString("ViewAllLoginOptions", resourceCulture);
-            }
-        }
-        
         /// <summary>
         ///   Looks up a localized string similar to View item.
         /// </summary>

src/App/Resources/AppResources.af.resx

@@ -2472,40 +2472,4 @@ kies u Voeg TOTP toe om die sleutel veilig te bewaar</value>
 {0}
 Do you want to switch to this account?</value>
   </data>
-  <data name="NewAroundHere" xml:space="preserve">
-    <value>New around here?</value>
-  </data>
-  <data name="GetMasterPasswordwordHint" xml:space="preserve">
-    <value>Get master password hint</value>
-  </data>
-  <data name="LoggingInAsX" xml:space="preserve">
-    <value>Logging in as {0}</value>
-  </data>
-  <data name="NotYou" xml:space="preserve">
-    <value>Not you?</value>
-  </data>
-  <data name="LogInWithMasterPassword" xml:space="preserve">
-    <value>Log in with master password</value>
-  </data>
-  <data name="LogInWithAnotherDevice" xml:space="preserve">
-    <value>Log In with another device</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>
-  </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>
-  </data>
-  <data name="ResendNotification" xml:space="preserve">
-    <value>Resend notification</value>
-  </data>
-  <data name="NeedAnotherOption" xml:space="preserve">
-    <value>Need another option?</value>
-  </data>
-  <data name="ViewAllLoginOptions" xml:space="preserve">
-    <value>View all log in options</value>
-  </data>
 </root>

src/App/Resources/AppResources.ar.resx

@@ -2319,64 +2319,64 @@
     <value>هل أنت متأكد من أنك تريد تمكين التقاط الشاشة؟</value>
   </data>
   <data name="LogInRequested" xml:space="preserve">
-    <value>طلب تسجيل الدخول</value>
+    <value>Login requested</value>
   </data>
   <data name="AreYouTryingToLogIn" xml:space="preserve">
-    <value>هل تحاول تسجيل الدخول؟</value>
+    <value>Are you trying to log in?</value>
   </data>
   <data name="LogInAttemptByXOnY" xml:space="preserve">
-    <value>محاولة تسجيل الدخول بواسطة {0} في {1}</value>
+    <value>Login attempt by {0} on {1}</value>
   </data>
   <data name="DeviceType" xml:space="preserve">
-    <value>نوع الجهاز</value>
+    <value>Device type</value>
   </data>
   <data name="IpAddress" xml:space="preserve">
-    <value>عنوان IP</value>
+    <value>IP address</value>
   </data>
   <data name="Time" xml:space="preserve">
-    <value>الوقت</value>
+    <value>Time</value>
   </data>
   <data name="Near" xml:space="preserve">
-    <value>قريب</value>
+    <value>Near</value>
   </data>
   <data name="ConfirmLogIn" xml:space="preserve">
-    <value>تأكيد تسجيل الدخول</value>
+    <value>Confirm login</value>
   </data>
   <data name="DenyLogIn" xml:space="preserve">
-    <value>رفض تسجيل الدخول</value>
+    <value>Deny login</value>
   </data>
   <data name="JustNow" xml:space="preserve">
-    <value>للتو</value>
+    <value>Just now</value>
   </data>
   <data name="XMinutesAgo" xml:space="preserve">
-    <value>منذ {0} دقائق</value>
+    <value>{0} minutes ago</value>
   </data>
   <data name="LogInAccepted" xml:space="preserve">
-    <value>تم تأكيد تسجيل الدخول</value>
+    <value>Login confirmed</value>
   </data>
   <data name="LogInDenied" xml:space="preserve">
-    <value>تم رفض تسجيل الدخول</value>
+    <value>Login denied</value>
   </data>
   <data name="ApproveLoginRequests" xml:space="preserve">
-    <value>الموافقة على طلبات تسجيل الدخول</value>
+    <value>Approve login requests</value>
   </data>
   <data name="UseThisDeviceToApproveLoginRequestsMadeFromOtherDevices" xml:space="preserve">
-    <value>استخدم هذا الجهاز للموافقة على طلبات تسجيل الدخول من الأجهزة الأخرى.</value>
+    <value>Use this device to approve login requests made from other devices.</value>
   </data>
   <data name="AllowNotifications" xml:space="preserve">
-    <value>السماح بالإشعارات</value>
+    <value>Allow notifications</value>
   </data>
   <data name="ReceivePushNotificationsForNewLoginRequests" xml:space="preserve">
-    <value>تلقي إشعارات دفع لطلبات تسجيل الدخول الجديدة</value>
+    <value>Receive push notifications for new login requests</value>
   </data>
   <data name="NoThanks" xml:space="preserve">
-    <value>ﻻ، شكرًا</value>
+    <value>No thanks</value>
   </data>
   <data name="ConfimLogInAttempForX" xml:space="preserve">
-    <value>تأكيد محاولة تسجيل الدخول لـ {0}</value>
+    <value>Confirm login attempt for {0}</value>
   </data>
   <data name="AllNotifications" xml:space="preserve">
-    <value>جميع الإشعارات</value>
+    <value>All notifications</value>
   </data>
   <data name="PasswordType" xml:space="preserve">
     <value>نوع كلمة المرور</value>
@@ -2454,59 +2454,23 @@
     <value>عشوائي</value>
   </data>
   <data name="AccessibilityServiceDisclosure" xml:space="preserve">
-    <value>كشف خدمة إمكانية الوصول</value>
+    <value>Accessibility Service Disclosure</value>
   </data>
   <data name="AccessibilityDisclosureText" xml:space="preserve">
-    <value>Bitwarden يستخدم خدمة إمكانية الوصول للبحث عن حقول تسجيل الدخول في التطبيقات ومواقع الويب، ثم يقوم بإنشاء معرفات الحقل المناسب لإدخال اسم المستخدم وكلمة المرور عند العثور على تطابق للتطبيق أو الموقع. ونحن لا نخزن أيا من المعلومات التي قدمتها لنا الخدمة، كما أننا لا نحاول السيطرة على أي عناصر على الشاشة تتجاوز إدخال نصوص وثائق التفويض.</value>
+    <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>
   </data>
   <data name="Accept" xml:space="preserve">
-    <value>قبول</value>
+    <value>Accept</value>
   </data>
   <data name="Decline" xml:space="preserve">
-    <value>رفض</value>
+    <value>Decline</value>
   </data>
   <data name="LoginRequestHasAlreadyExpired" xml:space="preserve">
-    <value>انتهت صلاحية طلب تسجيل الدخول.</value>
+    <value>Login request has already expired.</value>
   </data>
   <data name="LoginAttemptFromXDoYouWantToSwitchToThisAccount" xml:space="preserve">
-    <value>محاولة تسجيل الدخول من:
+    <value>Login attempt from:
 {0}
-هل تريد التبديل إلى هذا الحساب؟</value>
-  </data>
-  <data name="NewAroundHere" xml:space="preserve">
-    <value>جديد هنا؟</value>
-  </data>
-  <data name="GetMasterPasswordwordHint" xml:space="preserve">
-    <value>احصل على تلميح كلمة المرور الرئيسية</value>
-  </data>
-  <data name="LoggingInAsX" xml:space="preserve">
-    <value>تسجيل الدخول كـ {0}</value>
-  </data>
-  <data name="NotYou" xml:space="preserve">
-    <value>ليس أنت؟</value>
-  </data>
-  <data name="LogInWithMasterPassword" xml:space="preserve">
-    <value>تسجيل الدخول باستخدام كلمة المرور الرئيسية</value>
-  </data>
-  <data name="LogInWithAnotherDevice" xml:space="preserve">
-    <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>
-  </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>
-  </data>
-  <data name="ResendNotification" xml:space="preserve">
-    <value>Resend notification</value>
-  </data>
-  <data name="NeedAnotherOption" xml:space="preserve">
-    <value>Need another option?</value>
-  </data>
-  <data name="ViewAllLoginOptions" xml:space="preserve">
-    <value>View all log in options</value>
+Do you want to switch to this account?</value>
   </data>
 </root>

src/App/Resources/AppResources.az.resx

@@ -2471,40 +2471,4 @@ Skan prosesi avtomatik baş tutacaq.</value>
 {0}
 Bu hesaba keçmək istəyirsiniz?</value>
   </data>
-  <data name="NewAroundHere" xml:space="preserve">
-    <value>Burada yenisiniz?</value>
-  </data>
-  <data name="GetMasterPasswordwordHint" xml:space="preserve">
-    <value>Ana parol üçün məsləhət alın</value>
-  </data>
-  <data name="LoggingInAsX" xml:space="preserve">
-    <value>{0} olaraq giriş edilir</value>
-  </data>
-  <data name="NotYou" xml:space="preserve">
-    <value>Siz deyilsiniz?</value>
-  </data>
-  <data name="LogInWithMasterPassword" xml:space="preserve">
-    <value>Ana parolla giriş et</value>
-  </data>
-  <data name="LogInWithAnotherDevice" xml:space="preserve">
-    <value>Başqa cihazla giriş et</value>
-  </data>
-  <data name="LogInInitiated" xml:space="preserve">
-    <value>Giriş etmə başladıldı</value>
-  </data>
-  <data name="ANotificationHasBeenSentToYourDevice" xml:space="preserve">
-    <value>Cihazınıza bir bildiriş göndərildi.</value>
-  </data>
-  <data name="PleaseMakeSureYourVaultIsUnlockedAndTheFingerprintPhraseMatchesOnTheOtherDevice" xml:space="preserve">
-    <value>Zəhmət olmasa anbarınızın kilidinin açıq olduğuna və Barmaq izi ifadəsinin digər cihazda uyğun gəldiyinə əmin olun.</value>
-  </data>
-  <data name="ResendNotification" xml:space="preserve">
-    <value>Bildirişi təkrar göndər</value>
-  </data>
-  <data name="NeedAnotherOption" xml:space="preserve">
-    <value>Başqa bir seçimə ehtiyacınız var?</value>
-  </data>
-  <data name="ViewAllLoginOptions" xml:space="preserve">
-    <value>Bütün giriş etmə seçimlərinə bax</value>
-  </data>
 </root>

src/App/Resources/AppResources.be.resx

@@ -273,13 +273,13 @@
     <comment>The log out button text (verb).</comment>
   </data>
   <data name="LogoutConfirmation" xml:space="preserve">
-    <value>Вы сапраўды хочаце выйсці?</value>
+    <value>Вы ўпэўнены, што хочаце выйсці?</value>
   </data>
   <data name="RemoveAccount" xml:space="preserve">
     <value>Выдаліць уліковы запіс</value>
   </data>
   <data name="RemoveAccountConfirmation" xml:space="preserve">
-    <value>Вы сапраўды хочаце выдаліць уліковы запіс?</value>
+    <value>Вы ўпэўнены, што хочаце выдаліць уліковы запіс?</value>
   </data>
   <data name="AccountAlreadyAdded" xml:space="preserve">
     <value>Уліковы запіс ужо дададзены</value>
@@ -349,7 +349,7 @@
     <value>Адправіць</value>
   </data>
   <data name="Sync" xml:space="preserve">
-    <value>Сінхранізаваць</value>
+    <value>Сінхранізавана</value>
     <comment>The title for the sync page.</comment>
   </data>
   <data name="ThankYou" xml:space="preserve">
@@ -559,7 +559,7 @@
     <value>Дзеянне пасля заканчэння часу чакання сховішча</value>
   </data>
   <data name="VaultTimeoutLogOutConfirmation" xml:space="preserve">
-    <value>Выхад з сістэмы скасуе ўсе магчымасці доступу да сховішча і запатрабуе аўтэнтыфікацыю праз інтэрнэт пасля завяршэння часу чакання. Вы сапраўды хочаце выкарыстоўваць гэты параметр?</value>
+    <value>Выхад з сістэмы скасуе ўсе магчымасці доступу да сховішча і запатрабуе аўтэнтыфікацыю праз інтэрнэт пасля завяршэння часу чакання. Вы ўпэўнены, што хочаце выкарыстоўваць гэты параметр?</value>
   </data>
   <data name="LoggingIn" xml:space="preserve">
     <value>Уваход...</value>
@@ -644,7 +644,7 @@
     <value>Мы адправілі вам на электронную пошту падказку да асноўнага пароля.</value>
   </data>
   <data name="PasswordOverrideAlert" xml:space="preserve">
-    <value>Вы сапраўды хочаце перазапісаць бягучы пароль?</value>
+    <value>Вы ўпэўнены, што хочаце перазапісаць бягучы пароль?</value>
   </data>
   <data name="PushNotificationAlert" xml:space="preserve">
     <value>Bitwarden дазваляе аўтаматычна сінхранізаваць сховішча пры дапамозе push-апавяшчэнняў. Для максімальнай зручнасці, выберыце "Дазволіць" пры з'яўленні прапановы ўключыць push-апавяшчэнні.</value>
@@ -793,7 +793,7 @@
     <value>Вы сапраўды хочаце аўтазапоўніць або паглядзець гэты элемент?</value>
   </data>
   <data name="BitwardenAutofillServiceMatchConfirm" xml:space="preserve">
-    <value>Вы сапраўды хочаце выкарыстоўваць для аўтазапаўнення гэты элемент? Ён не дакладна адпавядае "{0}".</value>
+    <value>Вы ўпэўнены, што хочаце выкарыстоўваць для аўтазапаўнення гэты элемент? Ён не дакладна адпавядае "{0}".</value>
   </data>
   <data name="MatchingItems" xml:space="preserve">
     <value>Адпаведныя элементы</value>
@@ -883,7 +883,7 @@
     <comment>Message shown when downloading a file</comment>
   </data>
   <data name="AttachmentLargeWarning" xml:space="preserve">
-    <value>Гэта далучэнне мае памер {0}. Вы сапраўды хочаце спампаваць яго на сваю прыладу?</value>
+    <value>Гэта далучэнне мае памер {0}. Вы ўпэўнены, што хочаце спампаваць яго на сваю прыладу?</value>
     <comment>The placeholder will show the file size of the attachment. Ex "25 MB"</comment>
   </data>
   <data name="AuthenticatorKey" xml:space="preserve">
@@ -1561,7 +1561,7 @@
     <value>Выхад</value>
   </data>
   <data name="ExitConfirmation" xml:space="preserve">
-    <value>Вы сапраўды хочаце выйсці з Bitwarden?</value>
+    <value>Вы ўпэўнены, што хочаце выйсці з Bitwarden?</value>
   </data>
   <data name="PINRequireMasterPasswordRestart" xml:space="preserve">
     <value>Вы сапраўды хочаце, каб пасля перазапуску праграма патрабавала асноўны пароль для разблакіроўкі?</value>
@@ -1963,7 +1963,7 @@
     <value>Выдаліць пароль</value>
   </data>
   <data name="AreYouSureRemoveSendPassword" xml:space="preserve">
-    <value>Вы сапраўды хочаце выдаліць пароль?</value>
+    <value>Вы ўпэўнены, што хочаце выдаліць пароль?</value>
   </data>
   <data name="RemovingSendPassword" xml:space="preserve">
     <value>Выдаленне пароля</value>
@@ -2010,7 +2010,7 @@
     <comment>'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated.</comment>
   </data>
   <data name="AreYouSureDeleteSend" xml:space="preserve">
-    <value>Вы сапраўды хочаце выдаліць гэты Send?</value>
+    <value>Вы ўпэўнены, што хочаце выдаліць гэты Send?</value>
     <comment>'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated.</comment>
   </data>
   <data name="SendDeleted" xml:space="preserve">
@@ -2176,7 +2176,7 @@
     <value>Выдаленне вашага ўліковага запісу з'яўляецца незваротным дзеяннем</value>
   </data>
   <data name="DeleteAccountExplanation" xml:space="preserve">
-    <value>Ваш уліковы запіс і ўсе даныя сховішча будуць выдалены без магчымасці аднаўлення. Вы сапраўды хочаце працягнуць?</value>
+    <value>Ваш уліковы запіс і ўсе даныя сховішча будуць выдалены без магчымасці аднаўлення. Вы ўпэўнены, што хочаце працягнуць?</value>
   </data>
   <data name="DeletingYourAccount" xml:space="preserve">
     <value>Выдаленне вашага ўліковага запісу</value>
@@ -2315,7 +2315,7 @@
     <value>Дазволіць здымкі экрана</value>
   </data>
   <data name="AreYouSureYouWantToEnableScreenCapture" xml:space="preserve">
-    <value>Вы сапраўды хочаце дазволіць здымкі экрана?</value>
+    <value>Вы ўпэўнены, што хочаце дазволіць здымкі экрана?</value>
   </data>
   <data name="LogInRequested" xml:space="preserve">
     <value>Выкананы запыт уваходу</value>
@@ -2426,7 +2426,7 @@
     <value>Токен доступу да API</value>
   </data>
   <data name="AreYouSureYouWantToOverwriteTheCurrentUsername" xml:space="preserve">
-    <value>Вы сапраўды хочаце перазапісаць бягучае імя карыстальніка?</value>
+    <value>Вы ўпэўнены, што хочаце перазапісаць бягучае імя карыстальніка?</value>
   </data>
   <data name="GenerateUsername" xml:space="preserve">
     <value>Генерыраваць імя карыстальніка</value>
@@ -2472,40 +2472,4 @@
 {0}
 Вы сапраўды хочаце перайсці на гэты ўліковы запіс?</value>
   </data>
-  <data name="NewAroundHere" xml:space="preserve">
-    <value>Упершыню тут?</value>
-  </data>
-  <data name="GetMasterPasswordwordHint" xml:space="preserve">
-    <value>Атрымаць падказку да асноўнага пароля</value>
-  </data>
-  <data name="LoggingInAsX" xml:space="preserve">
-    <value>Увайсці як {0}</value>
-  </data>
-  <data name="NotYou" xml:space="preserve">
-    <value>Не вы?</value>
-  </data>
-  <data name="LogInWithMasterPassword" xml:space="preserve">
-    <value>Увайсці з асноўным паролем</value>
-  </data>
-  <data name="LogInWithAnotherDevice" xml:space="preserve">
-    <value>Увайсці з іншай прылады</value>
-  </data>
-  <data name="LogInInitiated" xml:space="preserve">
-    <value>Ініцыяваны ўваход</value>
-  </data>
-  <data name="ANotificationHasBeenSentToYourDevice" xml:space="preserve">
-    <value>Апавяшчэнне было адпраўлена на вашу прыладу.</value>
-  </data>
-  <data name="PleaseMakeSureYourVaultIsUnlockedAndTheFingerprintPhraseMatchesOnTheOtherDevice" xml:space="preserve">
-    <value>Пераканайцеся, што ваша сховішча разблакіравана, а фраза адбітка пальца супадае з іншай прыладай.</value>
-  </data>
-  <data name="ResendNotification" xml:space="preserve">
-    <value>Адправіць апавяшчэнне паўторна</value>
-  </data>
-  <data name="NeedAnotherOption" xml:space="preserve">
-    <value>Неабходны іншы варыянт?</value>
-  </data>
-  <data name="ViewAllLoginOptions" xml:space="preserve">
-    <value>Паглядзець усе варыянты ўваходу</value>
-  </data>
 </root>

src/App/Resources/AppResources.bg.resx

@@ -2473,40 +2473,4 @@ select Add TOTP to store the key safely</value>
 {0}
 Искате ли да превключите към тази регистрация?</value>
   </data>
-  <data name="NewAroundHere" xml:space="preserve">
-    <value>За пръв път ли сте тук?</value>
-  </data>
-  <data name="GetMasterPasswordwordHint" xml:space="preserve">
-    <value>Получете подсказване за главната парола</value>
-  </data>
-  <data name="LoggingInAsX" xml:space="preserve">
-    <value>Вписване като {0}</value>
-  </data>
-  <data name="NotYou" xml:space="preserve">
-    <value>Това не сте Вие?</value>
-  </data>
-  <data name="LogInWithMasterPassword" xml:space="preserve">
-    <value>Вписване с главната парола</value>
-  </data>
-  <data name="LogInWithAnotherDevice" xml:space="preserve">
-    <value>Вписване с друго устройство</value>
-  </data>
-  <data name="LogInInitiated" xml:space="preserve">
-    <value>Вписването е стартирано</value>
-  </data>
-  <data name="ANotificationHasBeenSentToYourDevice" xml:space="preserve">
-    <value>Към устройството Ви е изпратено известие.</value>
-  </data>
-  <data name="PleaseMakeSureYourVaultIsUnlockedAndTheFingerprintPhraseMatchesOnTheOtherDevice" xml:space="preserve">
-    <value>Уверете се, че трезорът Ви е отключен и че Уникалната фраза съвпада с другото устройство.</value>
-  </data>
-  <data name="ResendNotification" xml:space="preserve">
-    <value>Повторно изпращане на известието</value>
-  </data>
-  <data name="NeedAnotherOption" xml:space="preserve">
-    <value>Предпочитате друг вариант?</value>
-  </data>
-  <data name="ViewAllLoginOptions" xml:space="preserve">
-    <value>Вижте всички възможности за вписване</value>
-  </data>
 </root>

src/App/Resources/AppResources.bn.resx

@@ -1762,7 +1762,7 @@ Scanning will happen automatically.</value>
     <value>Syncing vault with pull down gesture.</value>
   </data>
   <data name="LogInSso" xml:space="preserve">
-    <value>Enterprise single sign-on</value>
+    <value>Enterprise Single Sign-On</value>
   </data>
   <data name="LogInSsoSummary" xml:space="preserve">
     <value>Quickly log in using your organization's single sign-on portal. Please enter your organization's identifier to begin.</value>
@@ -2473,40 +2473,4 @@ select Add TOTP to store the key safely</value>
 {0}
 Do you want to switch to this account?</value>
   </data>
-  <data name="NewAroundHere" xml:space="preserve">
-    <value>New around here?</value>
-  </data>
-  <data name="GetMasterPasswordwordHint" xml:space="preserve">
-    <value>Get master password hint</value>
-  </data>
-  <data name="LoggingInAsX" xml:space="preserve">
-    <value>Logging in as {0}</value>
-  </data>
-  <data name="NotYou" xml:space="preserve">
-    <value>Not you?</value>
-  </data>
-  <data name="LogInWithMasterPassword" xml:space="preserve">
-    <value>Log in with master password</value>
-  </data>
-  <data name="LogInWithAnotherDevice" xml:space="preserve">
-    <value>Log In with another device</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>
-  </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>
-  </data>
-  <data name="ResendNotification" xml:space="preserve">
-    <value>Resend notification</value>
-  </data>
-  <data name="NeedAnotherOption" xml:space="preserve">
-    <value>Need another option?</value>
-  </data>
-  <data name="ViewAllLoginOptions" xml:space="preserve">
-    <value>View all log in options</value>
-  </data>
 </root>

src/App/Resources/AppResources.bs.resx

@@ -2472,40 +2472,4 @@ select Add TOTP to store the key safely</value>
 {0}
 Do you want to switch to this account?</value>
   </data>
-  <data name="NewAroundHere" xml:space="preserve">
-    <value>New around here?</value>
-  </data>
-  <data name="GetMasterPasswordwordHint" xml:space="preserve">
-    <value>Get master password hint</value>
-  </data>
-  <data name="LoggingInAsX" xml:space="preserve">
-    <value>Logging in as {0}</value>
-  </data>
-  <data name="NotYou" xml:space="preserve">
-    <value>Not you?</value>
-  </data>
-  <data name="LogInWithMasterPassword" xml:space="preserve">
-    <value>Log in with master password</value>
-  </data>
-  <data name="LogInWithAnotherDevice" xml:space="preserve">
-    <value>Log In with another device</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>
-  </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>
-  </data>
-  <data name="ResendNotification" xml:space="preserve">
-    <value>Resend notification</value>
-  </data>
-  <data name="NeedAnotherOption" xml:space="preserve">
-    <value>Need another option?</value>
-  </data>
-  <data name="ViewAllLoginOptions" xml:space="preserve">
-    <value>View all log in options</value>
-  </data>
 </root>

src/App/Resources/AppResources.ca.resx

@@ -2472,40 +2472,4 @@ seleccioneu Afegeix TOTP per emmagatzemar la clau de manera segura</value>
 {0}
 Voleu canviar a aquest compte?</value>
   </data>
-  <data name="NewAroundHere" xml:space="preserve">
-    <value>Nou per ací?</value>
-  </data>
-  <data name="GetMasterPasswordwordHint" xml:space="preserve">
-    <value>Obteniu la pista de la contrasenya mestra</value>
-  </data>
-  <data name="LoggingInAsX" xml:space="preserve">
-    <value>Connectat com {0}</value>
-  </data>
-  <data name="NotYou" xml:space="preserve">
-    <value>No sou vosaltres?</value>
-  </data>
-  <data name="LogInWithMasterPassword" xml:space="preserve">
-    <value>Inicia sessió amb la teua contrasenya mestra</value>
-  </data>
-  <data name="LogInWithAnotherDevice" xml:space="preserve">
-    <value>Inicia sessió amb un altre dispositiu</value>
-  </data>
-  <data name="LogInInitiated" xml:space="preserve">
-    <value>S'ha iniciat la sessió</value>
-  </data>
-  <data name="ANotificationHasBeenSentToYourDevice" xml:space="preserve">
-    <value>S'ha enviat una notificació al vostre dispositiu.</value>
-  </data>
-  <data name="PleaseMakeSureYourVaultIsUnlockedAndTheFingerprintPhraseMatchesOnTheOtherDevice" xml:space="preserve">
-    <value>Assegureu-vos que la vostra caixa forta estiga desbloquejada i que la frase d'empremta digital coincidisca amb l'altre dispositiu.</value>
-  </data>
-  <data name="ResendNotification" xml:space="preserve">
-    <value>Torna a enviar la notificació</value>
-  </data>
-  <data name="NeedAnotherOption" xml:space="preserve">
-    <value>Necessiteu una altra opció?</value>
-  </data>
-  <data name="ViewAllLoginOptions" xml:space="preserve">
-    <value>Veure totes les opcions d'inici de sessió</value>
-  </data>
 </root>

src/App/Resources/AppResources.cs.resx

@@ -919,7 +919,7 @@ Načtení proběhne automaticky.</value>
     <value>Zkopírujte si TOTP ověřovací kód do schránky, pokud používáte autentizační klíč k přihlašování, před použitím automatického vyplňování.</value>
   </data>
   <data name="CopyTotpAutomatically" xml:space="preserve">
-    <value>Automaticky kopírovat TOTP</value>
+    <value>Copy TOTP automatically</value>
   </data>
   <data name="PremiumRequired" xml:space="preserve">
     <value>Pro použití této funkce je potřebné prémiové členství.</value>
@@ -1976,7 +1976,7 @@ Načtení proběhne automaticky.</value>
     <comment>'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated.</comment>
   </data>
   <data name="DisableSend" xml:space="preserve">
-    <value>Vypnout tento Send, aby k němu nikdo neměl přístup</value>
+    <value>Zakažte tento Send, aby k němu nikdo neměl přístup.</value>
     <comment>'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated.</comment>
   </data>
   <data name="NoSends" xml:space="preserve">
@@ -2044,7 +2044,7 @@ Načtení proběhne automaticky.</value>
     <value>Vlastní</value>
   </data>
   <data name="ShareOnSave" xml:space="preserve">
-    <value>Sdílet tento Send po uložení</value>
+    <value>Sdílet tento Send po uložení.</value>
     <comment>'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated.</comment>
   </data>
   <data name="SendDisabledWarning" xml:space="preserve">
@@ -2056,7 +2056,7 @@ Načtení proběhne automaticky.</value>
     <comment>'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated.</comment>
   </data>
   <data name="HideEmail" xml:space="preserve">
-    <value>Skrýt mou e-mailovou adresu před příjemci</value>
+    <value>Skrýt mou e-mailovou adresu před příjemci.</value>
   </data>
   <data name="SendOptionsPolicyInEffect" xml:space="preserve">
     <value>Jedna nebo více zásad organizace ovlivňuje nastavení Send.</value>
@@ -2092,7 +2092,7 @@ Načtení proběhne automaticky.</value>
     <value>Aktualizovat hlavní heslo</value>
   </data>
   <data name="UpdateMasterPasswordWarning" xml:space="preserve">
-    <value>Administrátor v organizaci nedávno změnil vaše hlavní heslo. Pro přístup k trezoru jej nyní musíte změnit. Pokračování vás odhlásí z vaší aktuální relace a bude nutné se znovu přihlásit. Aktivní relace na jiných zařízeních mohou zůstat aktivní až po dobu jedné hodiny.</value>
+    <value>Your master password was recently changed by an administrator in your organization. In order to access the vault, you must update your master password now. Proceeding will log you out of your current session, requiring you to log back in. Active sessions on other devices may continue to remain active for up to one hour.</value>
   </data>
   <data name="UpdatingPassword" xml:space="preserve">
     <value>Aktualizace hesla</value>
@@ -2218,10 +2218,10 @@ Načtení proběhne automaticky.</value>
     <value>Zadejte ověřovací kód, který byl odeslán na %@</value>
   </data>
   <data name="SubmitCrashLogs" xml:space="preserve">
-    <value>Odesílat záznamy o pádech</value>
+    <value>Odeslat protokoly o pádech</value>
   </data>
   <data name="SubmitCrashLogsDescription" xml:space="preserve">
-    <value>Pomozte zlepšovat stabilitu aplikace odesíláním hlášení o selháních.</value>
+    <value>Help Bitwarden improve app stability by submitting crash reports.</value>
   </data>
   <data name="OptionsExpanded" xml:space="preserve">
     <value>Options are expanded, tap to collapse.</value>
@@ -2251,19 +2251,19 @@ Načtení proběhne automaticky.</value>
     <value>Heslo není viditelné, klepněte pro zobrazení.</value>
   </data>
   <data name="FilterByVault" xml:space="preserve">
-    <value>Filtrovat položky podle trezoru</value>
+    <value>Filter items by vault</value>
   </data>
   <data name="AllVaults" xml:space="preserve">
-    <value>Všechny trezory</value>
+    <value>All vaults</value>
   </data>
   <data name="Vaults" xml:space="preserve">
-    <value>Trezory</value>
+    <value>Vaults</value>
   </data>
   <data name="VaultFilterDescription" xml:space="preserve">
-    <value>Trezor: {0}</value>
+    <value>Vault: {0}</value>
   </data>
   <data name="All" xml:space="preserve">
-    <value>Všechny</value>
+    <value>All</value>
   </data>
   <data name="Totp" xml:space="preserve">
     <value>TOTP</value>
@@ -2290,10 +2290,10 @@ Načtení proběhne automaticky.</value>
     <value>Enter key manually</value>
   </data>
   <data name="AddTotp" xml:space="preserve">
-    <value>Přidat TOTP</value>
+    <value>Add TOTP</value>
   </data>
   <data name="SetupTotp" xml:space="preserve">
-    <value>Nastavit TOTP</value>
+    <value>Set up TOTP</value>
   </data>
   <data name="OnceTheKeyIsSuccessfullyEntered" xml:space="preserve">
     <value>Once the key is successfully entered,
@@ -2303,7 +2303,7 @@ select Add TOTP to store the key safely</value>
     <value></value>
   </data>
   <data name="NeverLockWarning" xml:space="preserve">
-    <value>Nastavení zámku na „Nikdy“ ponechá váš trezor k dispozici komukoliv s přístupem k vašemu zařízení. Používáte-li tuto možnost, měli byste zajistit, aby vaše zařízení bylo náležitě chráněno.</value>
+    <value>Setting your lock options to “Never” keeps your vault available to anyone with access to your device. If you use this option, you should ensure that you keep your device properly protected.</value>
   </data>
   <data name="EnvironmentPageUrlsError" xml:space="preserve">
     <value>One or more of the URLs entered are invalid. Please revise it and try to save again.</value>
@@ -2387,13 +2387,13 @@ select Add TOTP to store the key safely</value>
     <value>Typ uživatelského jména</value>
   </data>
   <data name="PlusAddressedEmail" xml:space="preserve">
-    <value>E-mailová adresa s plusem</value>
+    <value>Plus addressed email</value>
   </data>
   <data name="CatchAllEmail" xml:space="preserve">
     <value>Catch-all email</value>
   </data>
   <data name="ForwardedEmailAlias" xml:space="preserve">
-    <value>Alias přeposílaného e-mailu</value>
+    <value>Forwarded email alias</value>
   </data>
   <data name="RandomWord" xml:space="preserve">
     <value>Náhodné slovo</value>
@@ -2447,7 +2447,7 @@ select Add TOTP to store the key safely</value>
     <value>Use your domain's configured catch-all inbox.</value>
   </data>
   <data name="ForwardedEmailDescription" xml:space="preserve">
-    <value>Vygeneruje alias e-mailu pomocí externí přeposílací služby.</value>
+    <value>Generate an email alias with an external forwarding service.</value>
   </data>
   <data name="Random" xml:space="preserve">
     <value>Náhodně</value>
@@ -2472,40 +2472,4 @@ select Add TOTP to store the key safely</value>
 {0}
 Do you want to switch to this account?</value>
   </data>
-  <data name="NewAroundHere" xml:space="preserve">
-    <value>New around here?</value>
-  </data>
-  <data name="GetMasterPasswordwordHint" xml:space="preserve">
-    <value>Get master password hint</value>
-  </data>
-  <data name="LoggingInAsX" xml:space="preserve">
-    <value>Logging in as {0}</value>
-  </data>
-  <data name="NotYou" xml:space="preserve">
-    <value>Not you?</value>
-  </data>
-  <data name="LogInWithMasterPassword" xml:space="preserve">
-    <value>Log in with master password</value>
-  </data>
-  <data name="LogInWithAnotherDevice" xml:space="preserve">
-    <value>Log In with another device</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>
-  </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>
-  </data>
-  <data name="ResendNotification" xml:space="preserve">
-    <value>Resend notification</value>
-  </data>
-  <data name="NeedAnotherOption" xml:space="preserve">
-    <value>Need another option?</value>
-  </data>
-  <data name="ViewAllLoginOptions" xml:space="preserve">
-    <value>View all log in options</value>
-  </data>
 </root>

src/App/Resources/AppResources.da.resx

@@ -2472,40 +2472,4 @@ vælg Tilføj TOTP for at gemme nøglen sikkert</value>
 {0}
 Vil du skifte til denne konto?</value>
   </data>
-  <data name="NewAroundHere" xml:space="preserve">
-    <value>Ny her?</value>
-  </data>
-  <data name="GetMasterPasswordwordHint" xml:space="preserve">
-    <value>Få hovedadgangskodetip</value>
-  </data>
-  <data name="LoggingInAsX" xml:space="preserve">
-    <value>Logger ind som {0}</value>
-  </data>
-  <data name="NotYou" xml:space="preserve">
-    <value>Ikke dig?</value>
-  </data>
-  <data name="LogInWithMasterPassword" xml:space="preserve">
-    <value>Log ind med hovedadgangskoden</value>
-  </data>
-  <data name="LogInWithAnotherDevice" xml:space="preserve">
-    <value>Log ind med en anden enhed</value>
-  </data>
-  <data name="LogInInitiated" xml:space="preserve">
-    <value>Indlogning påbegyndt</value>
-  </data>
-  <data name="ANotificationHasBeenSentToYourDevice" xml:space="preserve">
-    <value>En notifikation er sendt til din enhed.</value>
-  </data>
-  <data name="PleaseMakeSureYourVaultIsUnlockedAndTheFingerprintPhraseMatchesOnTheOtherDevice" xml:space="preserve">
-    <value>Sørg for, at din boks er oplåst, samt at Fingeraftrykssætningen på den anden enhed matcher.</value>
-  </data>
-  <data name="ResendNotification" xml:space="preserve">
-    <value>Gensend notifikation</value>
-  </data>
-  <data name="NeedAnotherOption" xml:space="preserve">
-    <value>Behov for en anden mulighed?</value>
-  </data>
-  <data name="ViewAllLoginOptions" xml:space="preserve">
-    <value>Vis alle indlogningsmuligheder</value>
-  </data>
 </root>

src/App/Resources/AppResources.de.resx

@@ -2471,40 +2471,4 @@ Das Scannen erfolgt automatisch.</value>
 {0}
 Möchtest du zu diesem Konto wechseln?</value>
   </data>
-  <data name="NewAroundHere" xml:space="preserve">
-    <value>Neu hier?</value>
-  </data>
-  <data name="GetMasterPasswordwordHint" xml:space="preserve">
-    <value>Hinweis zum Master-Passwort erhalten</value>
-  </data>
-  <data name="LoggingInAsX" xml:space="preserve">
-    <value>Anmelden als {0}</value>
-  </data>
-  <data name="NotYou" xml:space="preserve">
-    <value>Nicht du?</value>
-  </data>
-  <data name="LogInWithMasterPassword" xml:space="preserve">
-    <value>Mit Master-Passwort anmelden</value>
-  </data>
-  <data name="LogInWithAnotherDevice" xml:space="preserve">
-    <value>Mit einem anderen Gerät anmelden</value>
-  </data>
-  <data name="LogInInitiated" xml:space="preserve">
-    <value>Anmeldung initiiert</value>
-  </data>
-  <data name="ANotificationHasBeenSentToYourDevice" xml:space="preserve">
-    <value>Eine Benachrichtigung wurde an dein Gerät gesendet.</value>
-  </data>
-  <data name="PleaseMakeSureYourVaultIsUnlockedAndTheFingerprintPhraseMatchesOnTheOtherDevice" xml:space="preserve">
-    <value>Bitte stelle sicher, dass dein Tresor entsperrt ist und die Fingerabdruck-Phrase mit dem anderen Gerät übereinstimmt.</value>
-  </data>
-  <data name="ResendNotification" xml:space="preserve">
-    <value>Benachrichtigung erneut senden</value>
-  </data>
-  <data name="NeedAnotherOption" xml:space="preserve">
-    <value>Brauchst du eine andere Option?</value>
-  </data>
-  <data name="ViewAllLoginOptions" xml:space="preserve">
-    <value>Alle Anmelde-Optionen anzeigen</value>
-  </data>
 </root>

src/App/Resources/AppResources.el.resx

@@ -2472,40 +2472,4 @@
 {0}
 Do you want to switch to this account?</value>
   </data>
-  <data name="NewAroundHere" xml:space="preserve">
-    <value>New around here?</value>
-  </data>
-  <data name="GetMasterPasswordwordHint" xml:space="preserve">
-    <value>Get master password hint</value>
-  </data>
-  <data name="LoggingInAsX" xml:space="preserve">
-    <value>Logging in as {0}</value>
-  </data>
-  <data name="NotYou" xml:space="preserve">
-    <value>Not you?</value>
-  </data>
-  <data name="LogInWithMasterPassword" xml:space="preserve">
-    <value>Log in with master password</value>
-  </data>
-  <data name="LogInWithAnotherDevice" xml:space="preserve">
-    <value>Log In with another device</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>
-  </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>
-  </data>
-  <data name="ResendNotification" xml:space="preserve">
-    <value>Resend notification</value>
-  </data>
-  <data name="NeedAnotherOption" xml:space="preserve">
-    <value>Need another option?</value>
-  </data>
-  <data name="ViewAllLoginOptions" xml:space="preserve">
-    <value>View all log in options</value>
-  </data>
 </root>

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

@@ -2481,40 +2481,4 @@ select Add TOTP to store the key safely</value>
 {0}
 Do you want to switch to this account?</value>
   </data>
-  <data name="NewAroundHere" xml:space="preserve">
-    <value>Are you new here?</value>
-  </data>
-  <data name="GetMasterPasswordwordHint" xml:space="preserve">
-    <value>Get master password hint</value>
-  </data>
-  <data name="LoggingInAsX" xml:space="preserve">
-    <value>Logging in as {0}</value>
-  </data>
-  <data name="NotYou" xml:space="preserve">
-    <value>Not you?</value>
-  </data>
-  <data name="LogInWithMasterPassword" xml:space="preserve">
-    <value>Log in with master password</value>
-  </data>
-  <data name="LogInWithAnotherDevice" xml:space="preserve">
-    <value>Log in with another device</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>
-  </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>
-  </data>
-  <data name="ResendNotification" xml:space="preserve">
-    <value>Resend notification</value>
-  </data>
-  <data name="NeedAnotherOption" xml:space="preserve">
-    <value>Need another option?</value>
-  </data>
-  <data name="ViewAllLoginOptions" xml:space="preserve">
-    <value>View all log in options</value>
-  </data>
 </root>

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

@@ -2486,40 +2486,4 @@ select Add TOTP to store the key safely</value>
 {0}
 Do you want to switch to this account?</value>
   </data>
-  <data name="NewAroundHere" xml:space="preserve">
-    <value>New around here?</value>
-  </data>
-  <data name="GetMasterPasswordwordHint" xml:space="preserve">
-    <value>Get master password hint</value>
-  </data>
-  <data name="LoggingInAsX" xml:space="preserve">
-    <value>Logging in as {0}</value>
-  </data>
-  <data name="NotYou" xml:space="preserve">
-    <value>Not you?</value>
-  </data>
-  <data name="LogInWithMasterPassword" xml:space="preserve">
-    <value>Log in with master password</value>
-  </data>
-  <data name="LogInWithAnotherDevice" xml:space="preserve">
-    <value>Log In with another device</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>
-  </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>
-  </data>
-  <data name="ResendNotification" xml:space="preserve">
-    <value>Resend notification</value>
-  </data>
-  <data name="NeedAnotherOption" xml:space="preserve">
-    <value>Need another option?</value>
-  </data>
-  <data name="ViewAllLoginOptions" xml:space="preserve">
-    <value>View all log in options</value>
-  </data>
 </root>

src/App/Resources/AppResources.es.resx

@@ -2473,40 +2473,4 @@ seleccione Agregar TOTP para almacenar la clave de forma segura</value>
 {0}
 ¿Desea cambiar a esta cuenta?</value>
   </data>
-  <data name="NewAroundHere" xml:space="preserve">
-    <value>¿Nuevo por aquí?</value>
-  </data>
-  <data name="GetMasterPasswordwordHint" xml:space="preserve">
-    <value>Obtener pista de contraseña maestra</value>
-  </data>
-  <data name="LoggingInAsX" xml:space="preserve">
-    <value>Iniciando sesión como {0}</value>
-  </data>
-  <data name="NotYou" xml:space="preserve">
-    <value>¿No eres tú?</value>
-  </data>
-  <data name="LogInWithMasterPassword" xml:space="preserve">
-    <value>Iniciar sesión con contraseña maestra</value>
-  </data>
-  <data name="LogInWithAnotherDevice" xml:space="preserve">
-    <value>Iniciar sesión con otro dispositivo</value>
-  </data>
-  <data name="LogInInitiated" xml:space="preserve">
-    <value>Inicio de sesión en proceso</value>
-  </data>
-  <data name="ANotificationHasBeenSentToYourDevice" xml:space="preserve">
-    <value>Se ha enviado una notificación a tu dispositivo.</value>
-  </data>
-  <data name="PleaseMakeSureYourVaultIsUnlockedAndTheFingerprintPhraseMatchesOnTheOtherDevice" xml:space="preserve">
-    <value>Por favor, asegúrese de que su bóveda está desbloqueada y la frase de huella dactilar coincide en el otro dispositivo.</value>
-  </data>
-  <data name="ResendNotification" xml:space="preserve">
-    <value>Enviar nueva notificación</value>
-  </data>
-  <data name="NeedAnotherOption" xml:space="preserve">
-    <value>¿Necesitas otra opción?</value>
-  </data>
-  <data name="ViewAllLoginOptions" xml:space="preserve">
-    <value>Ver todas las opciones de inicio de sesión</value>
-  </data>
 </root>

src/App/Resources/AppResources.et.resx

@@ -2472,40 +2472,4 @@ Skaneerimine toimub automaatselt.</value>
 {0}
 Soovid selle konto peale lülituda?</value>
   </data>
-  <data name="NewAroundHere" xml:space="preserve">
-    <value>Oled siin uus?</value>
-  </data>
-  <data name="GetMasterPasswordwordHint" xml:space="preserve">
-    <value>Tuleta ülemparooli vihjega meelde</value>
-  </data>
-  <data name="LoggingInAsX" xml:space="preserve">
-    <value>Sisselogimas kui {0}</value>
-  </data>
-  <data name="NotYou" xml:space="preserve">
-    <value>Pole sina?</value>
-  </data>
-  <data name="LogInWithMasterPassword" xml:space="preserve">
-    <value>Logi sisse ülemparooliga</value>
-  </data>
-  <data name="LogInWithAnotherDevice" xml:space="preserve">
-    <value>Logi sisse läbi teise seadme</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>
-  </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>
-  </data>
-  <data name="ResendNotification" xml:space="preserve">
-    <value>Resend notification</value>
-  </data>
-  <data name="NeedAnotherOption" xml:space="preserve">
-    <value>Need another option?</value>
-  </data>
-  <data name="ViewAllLoginOptions" xml:space="preserve">
-    <value>View all log in options</value>
-  </data>
 </root>

src/App/Resources/AppResources.eu.resx

@@ -1575,7 +1575,7 @@
     <comment>'Nord' is the name of a specific color scheme. It should not be translated.</comment>
   </data>
   <data name="SolarizedDark" xml:space="preserve">
-    <value>Solarized iluna</value>
+    <value>Solarized Dark</value>
     <comment>'Solarized Dark' is the name of a specific color scheme. It should not be translated.</comment>
   </data>
   <data name="AutofillBlockedUris" xml:space="preserve">
@@ -2464,47 +2464,11 @@
     <value>Baztertu</value>
   </data>
   <data name="LoginRequestHasAlreadyExpired" xml:space="preserve">
-    <value>Sarbide eskaera iraungi da.</value>
+    <value>Login request has already expired.</value>
   </data>
   <data name="LoginAttemptFromXDoYouWantToSwitchToThisAccount" xml:space="preserve">
-    <value>Saio hasiera saiakera hemendik:
+    <value>Login attempt from:
 {0}
-Kontu honetara aldatu nahi duzu?</value>
-  </data>
-  <data name="NewAroundHere" xml:space="preserve">
-    <value>Berria hemendik?</value>
-  </data>
-  <data name="GetMasterPasswordwordHint" xml:space="preserve">
-    <value>Jaso pasahitz nagusiaren pista</value>
-  </data>
-  <data name="LoggingInAsX" xml:space="preserve">
-    <value>{0} bezala hasi saioa</value>
-  </data>
-  <data name="NotYou" xml:space="preserve">
-    <value>Ez zara zu?</value>
-  </data>
-  <data name="LogInWithMasterPassword" xml:space="preserve">
-    <value>Hasi saioa pasahitz nagusiarekin</value>
-  </data>
-  <data name="LogInWithAnotherDevice" xml:space="preserve">
-    <value>Hasi saioa beste gailu batekin</value>
-  </data>
-  <data name="LogInInitiated" xml:space="preserve">
-    <value>Saioa hastea martxan da</value>
-  </data>
-  <data name="ANotificationHasBeenSentToYourDevice" xml:space="preserve">
-    <value>Jakinarazpen bat bidali da zure gailura.</value>
-  </data>
-  <data name="PleaseMakeSureYourVaultIsUnlockedAndTheFingerprintPhraseMatchesOnTheOtherDevice" xml:space="preserve">
-    <value>Mesedez, ziurtatu kutxa gotorra desblokeatuta dagoela eta hatz-marka digitalaren esaldia bat datorrela beste gailuarekin.</value>
-  </data>
-  <data name="ResendNotification" xml:space="preserve">
-    <value>Berbidali jakinarazpena</value>
-  </data>
-  <data name="NeedAnotherOption" xml:space="preserve">
-    <value>Beste aukerarik behar al duzu?</value>
-  </data>
-  <data name="ViewAllLoginOptions" xml:space="preserve">
-    <value>Ikusi erregistro guztiak ezarpenetan</value>
+Do you want to switch to this account?</value>
   </data>
 </root>

src/App/Resources/AppResources.fa.resx

@@ -1576,7 +1576,7 @@
     <comment>'Nord' is the name of a specific color scheme. It should not be translated.</comment>
   </data>
   <data name="SolarizedDark" xml:space="preserve">
-    <value>تاریک خورشیدی</value>
+    <value>Solarized Dark</value>
     <comment>'Solarized Dark' is the name of a specific color scheme. It should not be translated.</comment>
   </data>
   <data name="AutofillBlockedUris" xml:space="preserve">
@@ -2473,40 +2473,4 @@
 {0}
 آیا می خواهید به این حساب تغییر دهید؟</value>
   </data>
-  <data name="NewAroundHere" xml:space="preserve">
-    <value>اینجا جدیده؟</value>
-  </data>
-  <data name="GetMasterPasswordwordHint" xml:space="preserve">
-    <value>دریافت راهنمای گذرواژه اصلی</value>
-  </data>
-  <data name="LoggingInAsX" xml:space="preserve">
-    <value>در حال ورود به عنوان {0}</value>
-  </data>
-  <data name="NotYou" xml:space="preserve">
-    <value>شما نیستید؟</value>
-  </data>
-  <data name="LogInWithMasterPassword" xml:space="preserve">
-    <value>با کلمه عبور اصلی وارد شوید</value>
-  </data>
-  <data name="LogInWithAnotherDevice" xml:space="preserve">
-    <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>
-  </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>
-  </data>
-  <data name="ResendNotification" xml:space="preserve">
-    <value>Resend notification</value>
-  </data>
-  <data name="NeedAnotherOption" xml:space="preserve">
-    <value>Need another option?</value>
-  </data>
-  <data name="ViewAllLoginOptions" xml:space="preserve">
-    <value>View all log in options</value>
-  </data>
 </root>

src/App/Resources/AppResources.fi.resx

@@ -1278,11 +1278,11 @@ Koodi luetaan automaattisesti.</value>
     <value>Esteettömyyspalvelu voi olla hyödyllinen sellaisten sovellusten kanssa, jotka eivät tue tavallista automaattisen täytön palvelua.</value>
   </data>
   <data name="DatePasswordUpdated" xml:space="preserve">
-    <value>Salasana päivitettiin</value>
+    <value>Salasana vaihdettiin</value>
     <comment>ex. Date this password was updated</comment>
   </data>
   <data name="DateUpdated" xml:space="preserve">
-    <value>Päivitettiin</value>
+    <value>Päivitetty</value>
     <comment>ex. Date this item was updated</comment>
   </data>
   <data name="AutofillActivated" xml:space="preserve">
@@ -1701,7 +1701,7 @@ Koodi luetaan automaattisesti.</value>
     <value>Liitteen tallennuksessa oli ongelma. Jos ongelma jatkuu, voit tehdä tallennuksen verkkoholvin kautta.</value>
   </data>
   <data name="SaveAttachmentSuccess" xml:space="preserve">
-    <value>Tiedostoliite tallennettiin</value>
+    <value>Tiedostoliitteen tallennus onnistui</value>
   </data>
   <data name="AutofillTileAccessibilityRequired" xml:space="preserve">
     <value>Ota "Automaattisen täytön esteettömyyspalvelu" käyttöön Bitwardenin asetuksista käyttääksesi automaattisen täytön pikavalintapalkkia.</value>
@@ -1861,7 +1861,7 @@ Koodi luetaan automaattisesti.</value>
     <value>Jos käytössä, esteettömyyspalvelu näyttää pikavalintapalkin laajentaakseen automaattisen täytön palvelun toiminnan kattamaan myös vanhemmat sovellukset, jotka eivät tue Android Autofill Framework -rajapintaa.</value>
   </data>
   <data name="PersonalOwnershipSubmitError" xml:space="preserve">
-    <value>Yrityskäytännön johdosta kohteiden tallennus henkilökohtaiseen holviin ei ole mahdollista. Muuta omistusasetus organisaatiolle ja valitse käytettävissä olevista kokoelmista.</value>
+    <value>Yrityksen asettaman käytännön johdosta kohteiden tallennus henkilökohtaiseen holviin ei ole mahdollista. Muuta omistusasetus organisaatiolle ja valitse käytettävissä olevista kokoelmista.</value>
   </data>
   <data name="PersonalOwnershipPolicyInEffect" xml:space="preserve">
     <value>Organisaatiokäytäntö vaikuttaa omistajuusvalintoihisi.</value>
@@ -2048,7 +2048,7 @@ Koodi luetaan automaattisesti.</value>
     <comment>'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated.</comment>
   </data>
   <data name="SendDisabledWarning" xml:space="preserve">
-    <value>Yrityskäytännön vuoksi voit poistaa vain olemassa olevan Sendin.</value>
+    <value>Yrityksen käytännön vuoksi voit poistaa vain olemassa olevan Sendin.</value>
     <comment>'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated.</comment>
   </data>
   <data name="AboutSend" xml:space="preserve">
@@ -2086,7 +2086,7 @@ Koodi luetaan automaattisesti.</value>
     <value>Captcha-vahvistus epäonnistui. Yritä uudelleen.</value>
   </data>
   <data name="UpdatedMasterPassword" xml:space="preserve">
-    <value>Pääsalasana päivitettiin</value>
+    <value>Pääsalasana vaihdettiin</value>
   </data>
   <data name="UpdateMasterPassword" xml:space="preserve">
     <value>Vaihda pääsalasana</value>
@@ -2324,7 +2324,7 @@ turvallisesti valitsemalla "Lisää TOTP"</value>
     <value>Yritätkö kirjautua sisään?</value>
   </data>
   <data name="LogInAttemptByXOnY" xml:space="preserve">
-    <value>Kirjautumisyritys tunnuksella {0} laitteella {1}</value>
+    <value>{0} yrittää kirjautua laitteella {1}</value>
   </data>
   <data name="DeviceType" xml:space="preserve">
     <value>Laitteen tyyppi</value>
@@ -2472,40 +2472,4 @@ turvallisesti valitsemalla "Lisää TOTP"</value>
 {0}
 Haluatko vaihtaa tähän tiliin?</value>
   </data>
-  <data name="NewAroundHere" xml:space="preserve">
-    <value>Oletko uusi täällä?</value>
-  </data>
-  <data name="GetMasterPasswordwordHint" xml:space="preserve">
-    <value>Pyydä pääsalasanan vihjettä</value>
-  </data>
-  <data name="LoggingInAsX" xml:space="preserve">
-    <value>Kirjaudutaan tunnuksella {0}</value>
-  </data>
-  <data name="NotYou" xml:space="preserve">
-    <value>Etkö se ollut sinä?</value>
-  </data>
-  <data name="LogInWithMasterPassword" xml:space="preserve">
-    <value>Kirjaudu pääsalasanalla</value>
-  </data>
-  <data name="LogInWithAnotherDevice" xml:space="preserve">
-    <value>Kirjaudu toisella laitteella</value>
-  </data>
-  <data name="LogInInitiated" xml:space="preserve">
-    <value>Kirjautuminen aloitettu</value>
-  </data>
-  <data name="ANotificationHasBeenSentToYourDevice" xml:space="preserve">
-    <value>Laitteellesi on lähetetty ilmoitus.</value>
-  </data>
-  <data name="PleaseMakeSureYourVaultIsUnlockedAndTheFingerprintPhraseMatchesOnTheOtherDevice" xml:space="preserve">
-    <value>Varmista, että holvisi on avattu ja tunnistelauseke täsmää toisella laitteella.</value>
-  </data>
-  <data name="ResendNotification" xml:space="preserve">
-    <value>Lähetä ilmoitus uudelleen</value>
-  </data>
-  <data name="NeedAnotherOption" xml:space="preserve">
-    <value>Tarvitsetko toisen vaihtoehdon?</value>
-  </data>
-  <data name="ViewAllLoginOptions" xml:space="preserve">
-    <value>Näytä kaikki kirjautumisvalinnat</value>
-  </data>
 </root>

src/App/Resources/AppResources.fil.resx

@@ -1762,7 +1762,7 @@ Scanning will happen automatically.</value>
     <value>Syncing vault with pull down gesture.</value>
   </data>
   <data name="LogInSso" xml:space="preserve">
-    <value>Enterprise single sign-on</value>
+    <value>Enterprise Single Sign-On</value>
   </data>
   <data name="LogInSsoSummary" xml:space="preserve">
     <value>Quickly log in using your organization's single sign-on portal. Please enter your organization's identifier to begin.</value>
@@ -2473,40 +2473,4 @@ select Add TOTP to store the key safely</value>
 {0}
 Do you want to switch to this account?</value>
   </data>
-  <data name="NewAroundHere" xml:space="preserve">
-    <value>New around here?</value>
-  </data>
-  <data name="GetMasterPasswordwordHint" xml:space="preserve">
-    <value>Get master password hint</value>
-  </data>
-  <data name="LoggingInAsX" xml:space="preserve">
-    <value>Logging in as {0}</value>
-  </data>
-  <data name="NotYou" xml:space="preserve">
-    <value>Not you?</value>
-  </data>
-  <data name="LogInWithMasterPassword" xml:space="preserve">
-    <value>Log in with master password</value>
-  </data>
-  <data name="LogInWithAnotherDevice" xml:space="preserve">
-    <value>Log In with another device</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>
-  </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>
-  </data>
-  <data name="ResendNotification" xml:space="preserve">
-    <value>Resend notification</value>
-  </data>
-  <data name="NeedAnotherOption" xml:space="preserve">
-    <value>Need another option?</value>
-  </data>
-  <data name="ViewAllLoginOptions" xml:space="preserve">
-    <value>View all log in options</value>
-  </data>
 </root>

src/App/Resources/AppResources.fr.resx

@@ -1576,7 +1576,7 @@ La numérisation se fera automatiquement.</value>
     <comment>'Nord' is the name of a specific color scheme. It should not be translated.</comment>
   </data>
   <data name="SolarizedDark" xml:space="preserve">
-    <value>Sombre "Solarized"</value>
+    <value>Solarized Dark</value>
     <comment>'Solarized Dark' is the name of a specific color scheme. It should not be translated.</comment>
   </data>
   <data name="AutofillBlockedUris" xml:space="preserve">
@@ -2470,42 +2470,6 @@ sélectionnez Ajouter TOTP pour stocker la clé en toute sécurité</value>
   <data name="LoginAttemptFromXDoYouWantToSwitchToThisAccount" xml:space="preserve">
     <value>Tentative de connexion depuis :
 {0}
-Voulez-vous basculer vers ce compte ?</value>
-  </data>
-  <data name="NewAroundHere" xml:space="preserve">
-    <value>Vous êtes nouveau ici ?</value>
-  </data>
-  <data name="GetMasterPasswordwordHint" xml:space="preserve">
-    <value>Obtenir l'indice du mot de passe maître</value>
-  </data>
-  <data name="LoggingInAsX" xml:space="preserve">
-    <value>Connecté en tant que {0}</value>
-  </data>
-  <data name="NotYou" xml:space="preserve">
-    <value>Ce n'est pas vous ?</value>
-  </data>
-  <data name="LogInWithMasterPassword" xml:space="preserve">
-    <value>Connectez-vous avec le mot de passe maître</value>
-  </data>
-  <data name="LogInWithAnotherDevice" xml:space="preserve">
-    <value>Connectez-vous avec un autre appareil</value>
-  </data>
-  <data name="LogInInitiated" xml:space="preserve">
-    <value>Connexion initiée</value>
-  </data>
-  <data name="ANotificationHasBeenSentToYourDevice" xml:space="preserve">
-    <value>Une notification a été envoyée à votre appareil.</value>
-  </data>
-  <data name="PleaseMakeSureYourVaultIsUnlockedAndTheFingerprintPhraseMatchesOnTheOtherDevice" xml:space="preserve">
-    <value>Veuillez vous assurer que votre coffre est déverrouillé et que l'empreinte digitale est identique sur l'autre appareil.</value>
-  </data>
-  <data name="ResendNotification" xml:space="preserve">
-    <value>Renvoyer la notification</value>
-  </data>
-  <data name="NeedAnotherOption" xml:space="preserve">
-    <value>Besoin d'une autre option ?</value>
-  </data>
-  <data name="ViewAllLoginOptions" xml:space="preserve">
-    <value>Voir toutes les options de connexion</value>
+Voulez-vous commuter sur ce compte ?</value>
   </data>
 </root>

src/App/Resources/AppResources.he.resx

@@ -2475,40 +2475,4 @@ select Add TOTP to store the key safely</value>
 {0}
 Do you want to switch to this account?</value>
   </data>
-  <data name="NewAroundHere" xml:space="preserve">
-    <value>New around here?</value>
-  </data>
-  <data name="GetMasterPasswordwordHint" xml:space="preserve">
-    <value>Get master password hint</value>
-  </data>
-  <data name="LoggingInAsX" xml:space="preserve">
-    <value>Logging in as {0}</value>
-  </data>
-  <data name="NotYou" xml:space="preserve">
-    <value>Not you?</value>
-  </data>
-  <data name="LogInWithMasterPassword" xml:space="preserve">
-    <value>Log in with master password</value>
-  </data>
-  <data name="LogInWithAnotherDevice" xml:space="preserve">
-    <value>Log In with another device</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>
-  </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>
-  </data>
-  <data name="ResendNotification" xml:space="preserve">
-    <value>Resend notification</value>
-  </data>
-  <data name="NeedAnotherOption" xml:space="preserve">
-    <value>Need another option?</value>
-  </data>
-  <data name="ViewAllLoginOptions" xml:space="preserve">
-    <value>View all log in options</value>
-  </data>
 </root>

src/App/Resources/AppResources.hi.resx

@@ -1763,7 +1763,7 @@ Scanning will happen automatically.</value>
     <value>Syncing vault with pull down gesture.</value>
   </data>
   <data name="LogInSso" xml:space="preserve">
-    <value>Enterprise single sign-on</value>
+    <value>Enterprise Single Sign-On</value>
   </data>
   <data name="LogInSsoSummary" xml:space="preserve">
     <value>Quickly log in using your organization's single sign-on portal. Please enter your organization's identifier to begin.</value>
@@ -2474,40 +2474,4 @@ select Add TOTP to store the key safely</value>
 {0}
 Do you want to switch to this account?</value>
   </data>
-  <data name="NewAroundHere" xml:space="preserve">
-    <value>New around here?</value>
-  </data>
-  <data name="GetMasterPasswordwordHint" xml:space="preserve">
-    <value>Get master password hint</value>
-  </data>
-  <data name="LoggingInAsX" xml:space="preserve">
-    <value>Logging in as {0}</value>
-  </data>
-  <data name="NotYou" xml:space="preserve">
-    <value>Not you?</value>
-  </data>
-  <data name="LogInWithMasterPassword" xml:space="preserve">
-    <value>Log in with master password</value>
-  </data>
-  <data name="LogInWithAnotherDevice" xml:space="preserve">
-    <value>Log In with another device</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>
-  </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>
-  </data>
-  <data name="ResendNotification" xml:space="preserve">
-    <value>Resend notification</value>
-  </data>
-  <data name="NeedAnotherOption" xml:space="preserve">
-    <value>Need another option?</value>
-  </data>
-  <data name="ViewAllLoginOptions" xml:space="preserve">
-    <value>View all log in options</value>
-  </data>
 </root>

src/App/Resources/AppResources.hr.resx

@@ -229,7 +229,7 @@
     <value>Mape</value>
   </data>
   <data name="FolderUpdated" xml:space="preserve">
-    <value>Mapa ažurirana</value>
+    <value>Mapa ažurirana.</value>
   </data>
   <data name="GoToWebsite" xml:space="preserve">
     <value>Idi na web stranicu</value>
@@ -282,7 +282,7 @@
     <value>Sigurno želiš ukoniti ovaj račun?</value>
   </data>
   <data name="AccountAlreadyAdded" xml:space="preserve">
-    <value>Račun već postoji</value>
+    <value>Račun je već dodan</value>
   </data>
   <data name="SwitchToAlreadyAddedAccountConfirmation" xml:space="preserve">
     <value>Želiš li se sada prebaciti na njega?</value>
@@ -300,7 +300,7 @@
     <comment>The title for the vault page.</comment>
   </data>
   <data name="Authenticator" xml:space="preserve">
-    <value>Autentikator</value>
+    <value>Authenticator</value>
     <comment>Authenticator TOTP feature</comment>
   </data>
   <data name="Name" xml:space="preserve">
@@ -342,7 +342,7 @@
     <comment>Reveal a hidden value (password).</comment>
   </data>
   <data name="ItemDeleted" xml:space="preserve">
-    <value>Stavka izbrisana</value>
+    <value>Stavka izbrisana.</value>
     <comment>Confirmation message after successfully deleting a login.</comment>
   </data>
   <data name="Submit" xml:space="preserve">
@@ -375,7 +375,7 @@
     <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} kopirano</value>
+    <value>{0} kopirano.</value>
     <comment>Confirmation message after suceessfully copying a value to the clipboard.</comment>
   </data>
   <data name="VerifyFingerprint" xml:space="preserve">
@@ -591,7 +591,7 @@
     <comment>Minimum numeric characters for password generator settings</comment>
   </data>
   <data name="MinSpecial" xml:space="preserve">
-    <value>Najmanje posebnih</value>
+    <value>Najmanje specijalnih</value>
     <comment>Minimum special characters for password generator settings</comment>
   </data>
   <data name="MoreSettings" xml:space="preserve">
@@ -604,7 +604,7 @@
     <value>Nikad</value>
   </data>
   <data name="NewItemCreated" xml:space="preserve">
-    <value>Stavka dodana</value>
+    <value>Stvorena nova stavka.</value>
   </data>
   <data name="NoFavorites" xml:space="preserve">
     <value>U tvom trezoru nema favorita.</value>
@@ -632,7 +632,7 @@
     <value>Ostalo</value>
   </data>
   <data name="PasswordGenerated" xml:space="preserve">
-    <value>Lozinka generirana</value>
+    <value>Lozinka generirana.</value>
   </data>
   <data name="PasswordGenerator" xml:space="preserve">
     <value>Generator lozinki</value>
@@ -647,7 +647,7 @@
     <value>Sigurno želiš prebrisati trenutnu lozinku?</value>
   </data>
   <data name="PushNotificationAlert" xml:space="preserve">
-    <value>Obzirom Bitwarden automatski sinkronizira tvoj trezor pomoću push obavijesti, za najbolje moguće iskustvo, u sljedećem upitu odobri Bitwardenu slanje push obavijesti.</value>
+    <value>bitwarden automatski sinkronizira vaš trezor pomoću push obavijesti. Za najbolji mogući doživljaj, molimo odaberite "Ok" u sljedećem upitu kada se zatraži da omogućite push obavijesti.</value>
     <comment>Push notifications for apple products</comment>
   </data>
   <data name="RateTheApp" xml:space="preserve">
@@ -657,7 +657,7 @@
     <value>Razmotri da nam pomogneš dobrom recenzijom!</value>
   </data>
   <data name="RegeneratePassword" xml:space="preserve">
-    <value>Ponovno generiraj lozinku</value>
+    <value>Obnovi lozinku</value>
   </data>
   <data name="RetypeMasterPassword" xml:space="preserve">
     <value>Ponovno upiši glavnu lozinku</value>
@@ -681,7 +681,7 @@
     <value>Informacije o stavci</value>
   </data>
   <data name="ItemUpdated" xml:space="preserve">
-    <value>Stavka spremljena</value>
+    <value>Stavka ažurirana.</value>
   </data>
   <data name="Submitting" xml:space="preserve">
     <value>Slanje...</value>
@@ -705,10 +705,10 @@
     <comment>What Apple calls their fingerprint reader.</comment>
   </data>
   <data name="TwoStepLogin" xml:space="preserve">
-    <value>Prijava dvostrukom autentifikacijom</value>
+    <value>Prijava u dva koraka</value>
   </data>
   <data name="TwoStepLoginConfirmation" xml:space="preserve">
-    <value>Prijava dvostrukom autentifikacijom čini tvoj račun još sigurnijim tako što će zahtijevati potvrdu prijave putem drugog uređaja kao što su sigurnosni ključ, autentifikatorske aplikacije, SMS-om, pozivom ili e-poštom. Prijavu dvostrukom autentifikacijom možeš omogućiti na web trezoru. Želiš li sada posjetiti bitwarden.com?</value>
+    <value>Prijava u dva koraka čini tvoj račun još sigurnijim tako što će zahtijevati da potvrdiš prijavu putem drugog uređaja kao što je sigurnosni ključ, autentifikatorske aplikacije, SMS-om, pozivom ili e-poštom. Prijavu u dva koraka možeš omogućiti na web trezoru. Želiš li sada posjetiti bitwarden.com?</value>
   </data>
   <data name="UnlockWith" xml:space="preserve">
     <value>Otključaj s {0}</value>
@@ -775,10 +775,10 @@
     <value>Omogućeno</value>
   </data>
   <data name="Off" xml:space="preserve">
-    <value>Isklj.</value>
+    <value>Off</value>
   </data>
   <data name="On" xml:space="preserve">
-    <value>Uklj.</value>
+    <value>On</value>
   </data>
   <data name="Status" xml:space="preserve">
     <value>Status</value>
@@ -831,7 +831,7 @@
     <comment>For 2FA whenever there are no available providers on this device.</comment>
   </data>
   <data name="NoTwoStepAvailable" xml:space="preserve">
-    <value>Ovaj račun ima omogućenu prijavu dvostrukom autentifikacijom, međutim ovaj uređaj ne podržava niti jednog konfiguriranog pružatelja prijave dvostrukom autentifikacijom. Koristi podržani uređaj i/ili dodaj dodatne pružatelje prijave dvostrukom autentifikacijom, bolje podržane na svim uređajima (npr. autentifikatorska aplikacija).</value>
+    <value>Ovaj račun ima omogućenu prijavu u dva koraka, međutim ovaj uređaj ne podržava niti jednog konfiguriranog pružatelja prijave u dva koraka. Koristi podržani uređaj i/ili dodaj dodatne pružatelje prijave u dva koraka, bolje podržane na svim uređajima (npr. autentifikatorska aplikacija).</value>
   </data>
   <data name="RecoveryCodeTitle" xml:space="preserve">
     <value>Kôd za oporavak</value>
@@ -846,17 +846,17 @@
     <comment>For 2FA</comment>
   </data>
   <data name="TwoStepLoginOptions" xml:space="preserve">
-    <value>Mogućnosti prijave dvostrukom autentifikacijom</value>
+    <value>Mogućnosti prijave u dva koraka</value>
   </data>
   <data name="UseAnotherTwoStepMethod" xml:space="preserve">
-    <value>Koristiti drugi način prijave dvostrukom autentifikacijom</value>
+    <value>Koristiti drugi način prijave u dva koraka</value>
   </data>
   <data name="VerificationEmailNotSent" xml:space="preserve">
     <value>Nije moguće slanje kontrolnog koda e-poštom. Pokušaj ponovno.</value>
     <comment>For 2FA</comment>
   </data>
   <data name="VerificationEmailSent" xml:space="preserve">
-    <value>E-pošta za potvrdu poslana</value>
+    <value>E-pošta za potvrdu poslana.</value>
     <comment>For 2FA</comment>
   </data>
   <data name="YubiKeyInstruction" xml:space="preserve">
@@ -900,7 +900,8 @@
     <value>Nije moguće očitati ključ za provjeru autentičnosti.</value>
   </data>
   <data name="PointYourCameraAtTheQRCode" xml:space="preserve">
-    <value>Za automatsko očitavanje, uperite kameru u QR kôd.</value>
+    <value>Point your camera at the QR Code.
+Scanning will happen automatically.</value>
   </data>
   <data name="ScanQrTitle" xml:space="preserve">
     <value>Skeniraj QR kôd</value>
@@ -915,10 +916,10 @@
     <value>Kopiraj TOTP</value>
   </data>
   <data name="CopyTotpAutomaticallyDescription" xml:space="preserve">
-    <value>Ako se za prijavu koristi dvostruka autentifikacija, TOTP kontrolni kôd se automatski kopira u međuspremnik nakon auto-ispune korisničkog imena i lozinke.</value>
+    <value>If a login has an authenticator key, copy the TOTP verification code to your clip-board when you auto-fill the login.</value>
   </data>
   <data name="CopyTotpAutomatically" xml:space="preserve">
-    <value>Automatski kopiraj TOTP</value>
+    <value>Copy TOTP automatically</value>
   </data>
   <data name="PremiumRequired" xml:space="preserve">
     <value>Za korištenje ove značajke potrebno je premium članstvo.</value>
@@ -977,7 +978,7 @@
     <comment>"Identity" refers to an identity server. See more context here https://en.wikipedia.org/wiki/Identity_management</comment>
   </data>
   <data name="SelfHostedEnvironment" xml:space="preserve">
-    <value>Vlastito poslužiteljsko okruženje</value>
+    <value>Vlastito hosting okruženje</value>
   </data>
   <data name="SelfHostedEnvironmentFooter" xml:space="preserve">
     <value>Navedi osnovni URL svoje lokalno smještene Bitwarden instalacije.</value>
@@ -1118,7 +1119,7 @@
     <value>rujan</value>
   </data>
   <data name="SSN" xml:space="preserve">
-    <value>Broj zdravstvenog osiguranja</value>
+    <value>Broj socijalnog osiguranja</value>
   </data>
   <data name="StateProvince" xml:space="preserve">
     <value>Država / Pokrajina</value>
@@ -1136,10 +1137,10 @@
     <value>Istek</value>
   </data>
   <data name="ShowWebsiteIcons" xml:space="preserve">
-    <value>Prikaži ikone mrežnih mjesta</value>
+    <value>Show website icons</value>
   </data>
   <data name="ShowWebsiteIconsDescription" xml:space="preserve">
-    <value>Prikaži prepoznatljivu sliku pored svake prijave.</value>
+    <value>Show a recognizable image next to each login.</value>
   </data>
   <data name="IconsUrl" xml:space="preserve">
     <value>URL poslužitelja ikona</value>
@@ -1172,7 +1173,7 @@
     <value>Usluga Bitwarden auto-ispune koristi Android Autofill Framework za pomoć pri ispunjavanju prijava, platnih kartica i identifikacijskih podataka u drugim aplikacijama na tvojem uređaju.</value>
   </data>
   <data name="BitwardenAutofillServiceDescription" xml:space="preserve">
-    <value>Koristi uslugu Bitwarden auto-ispune za ispunjavanje prijava, platnih kartica i identifikacijskih podataka u drugim aplikacijama.</value>
+    <value>Upotrijebite uslugu pristupačnosti usluge bitwarden da biste automatski ispunili prijave.</value>
   </data>
   <data name="BitwardenAutofillServiceOpenAutofillSettings" xml:space="preserve">
     <value>Otvori postavke auto-ispune</value>
@@ -1285,7 +1286,7 @@
     <comment>ex. Date this item was updated</comment>
   </data>
   <data name="AutofillActivated" xml:space="preserve">
-    <value>Automatsko popunjavanje uključeno!</value>
+    <value>Automatsko popunjavanje aktivirano!</value>
   </data>
   <data name="MustLogInMainAppAutofill" xml:space="preserve">
     <value>Prije korištenja automatskog popunjavanja, moraš se prijaviti u glavnu Bitwarden aplikaciju. </value>
@@ -1380,10 +1381,10 @@
     <value>Pretraživanje zbirke</value>
   </data>
   <data name="SearchFileSends" xml:space="preserve">
-    <value>Pretraži datotečne Sendove</value>
+    <value>Pretraži datoteke za slanje</value>
   </data>
   <data name="SearchTextSends" xml:space="preserve">
-    <value>Pretraži tekstualne Sendove</value>
+    <value>Pretraži tekstove za slanje</value>
   </data>
   <data name="SearchGroup" xml:space="preserve">
     <value>Pretraži {0}</value>
@@ -1549,13 +1550,13 @@
     <value>Zadana (sustav)</value>
   </data>
   <data name="DefaultDarkTheme" xml:space="preserve">
-    <value>Zadana tamna tema</value>
+    <value>Default dark theme</value>
   </data>
   <data name="DefaultDarkThemeDescription" xml:space="preserve">
-    <value>Odaberi korištenje tamnne teme kada ju uređaj zadano koristi.</value>
+    <value>Choose the dark theme to use when using Default (System) theme while your device's dark mode is in use.</value>
   </data>
   <data name="CopyNotes" xml:space="preserve">
-    <value>Kopiraj bilješku</value>
+    <value>Kopiraj bilješke</value>
   </data>
   <data name="Exit" xml:space="preserve">
     <value>Izlaz</value>
@@ -1579,19 +1580,19 @@
     <comment>'Solarized Dark' is the name of a specific color scheme. It should not be translated.</comment>
   </data>
   <data name="AutofillBlockedUris" xml:space="preserve">
-    <value>Auto-ispuna blokiranih URI-ja</value>
+    <value>Auto-fill blocked URIs</value>
   </data>
   <data name="AutofillBlockedUrisDescription" xml:space="preserve">
-    <value>Auto-ispuna neće biti ponuđena za blokirane URI-je. Odvoji višestruke URI-je zarezom. Npr. „https://twitter.com, androidapp://com.twitter.android”</value>
+    <value>Auto-fill will not be offered for blocked URIs. Separate multiple URIs with a comma. For example: "https://twitter.com, androidapp://com.twitter.android".</value>
   </data>
   <data name="AskToAddLogin" xml:space="preserve">
-    <value>Upitaj za dodavanje prijave</value>
+    <value>Ask to add login</value>
   </data>
   <data name="AskToAddLoginDescription" xml:space="preserve">
-    <value>Upitaj za dodavanje, ako se stavka već ne nalazi u trezoru.</value>
+    <value>Ask to add an item if one isn't found in your vault.</value>
   </data>
   <data name="OnRestart" xml:space="preserve">
-    <value>Pri ponovnom pokretanju</value>
+    <value>Kod ponovnog pokretanja</value>
   </data>
   <data name="AutofillServiceNotEnabled" xml:space="preserve">
     <value>Auto-ispuna olakšava siguran pristup tvom Bitwarden trezoru iz drugih aplikacija i na web stranicama. Izgleda da nije omogućena usluga auto-ispune za Bitwarden. Omogući uslugu auto-ispune u Bitwarden postavkama.</value>
@@ -1658,7 +1659,7 @@
     <value>Slanje verifikacijskog kôda e-poštom</value>
   </data>
   <data name="CodeSent" xml:space="preserve">
-    <value>Kôd poslan!</value>
+    <value>Kôd poslan</value>
   </data>
   <data name="ConfirmYourIdentity" xml:space="preserve">
     <value>Potvrdite lozinku za nastavak.</value>
@@ -1725,7 +1726,7 @@
     <comment>Message shown when interacting with the server</comment>
   </data>
   <data name="ItemRestored" xml:space="preserve">
-    <value>Stavka vraćena</value>
+    <value>Stavka je vraćena.</value>
     <comment>Confirmation message after successfully restoring a soft-deleted item</comment>
   </data>
   <data name="Trash" xml:space="preserve">
@@ -1827,10 +1828,10 @@
     <value>Usluge auto-ispune</value>
   </data>
   <data name="InlineAutofill" xml:space="preserve">
-    <value>Koristi izravnu auto-ispunu</value>
+    <value>Koristi izravno automatsko popunjavanje</value>
   </data>
   <data name="InlineAutofillDescription" xml:space="preserve">
-    <value>Korisiti izravnu auto-ispunu ako ga tvoj odabrani IME (tipkovnica) podržava. Ako postavke ne podržavaju (ili je ova opcija isključena) biti će korištena zadana usluga auto-ispune.</value>
+    <value>Korisiti izravno automatsko popunjavanje ako ga tvoj odabrani IME (tipkovnica) podržava. Ako postavke ne podržavaju (ili je ova opcija isključena) biti će korištena zadana usluga automatskog popunjavanja.</value>
   </data>
   <data name="Accessibility" xml:space="preserve">
     <value>Koristi pristupačnost</value>
@@ -1851,13 +1852,13 @@
     <value>Koristi preklapanje</value>
   </data>
   <data name="DrawOverDescription" xml:space="preserve">
-    <value>Omogućuje usluzi Bitwarden pristupačnosti prikaz iskočnog okvira prilikom odabira polja za prijavu.</value>
+    <value>Kada je uključeno, omogućuje usluzi Bitwarden pristupačnosti prikaz iskočnog okvira prilikom odabira polja za prijavu.</value>
   </data>
   <data name="DrawOverDescription2" xml:space="preserve">
     <value>Ako je uključena, usluga Bitwarden pristupačnosti prikazati će iskočni okvir prilikom odabira polja za prijavu kao pomoć pri auto-ispuni.</value>
   </data>
   <data name="DrawOverDescription3" xml:space="preserve">
-    <value>Ako je uključeno, pristupačnost će prikazati iskočni okvir kao pomoć usluzi auto-ispune za starije aplikacije koje ne podržavaju Android strukturu automatskog popunjavanja.</value>
+    <value>Ako je uključeno, pristupačnost će prikazati iskočni okvir kao pomoć usluzi automatskog popunjavanja za starije aplikacije koje ne podržavaju Android strukturu auotmatskog popunjavanja.</value>
   </data>
   <data name="PersonalOwnershipSubmitError" xml:space="preserve">
     <value>Pravila tvrtke onemogućuju spremanje stavki u osobni trezor. Promijeni vlasništvo stavke na tvrtku i odaberi dostupnu Zbirku.</value>
@@ -1975,7 +1976,7 @@
     <comment>'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated.</comment>
   </data>
   <data name="DisableSend" xml:space="preserve">
-    <value>Onemogući ovaj Send da mu nitko ne može pristupiti</value>
+    <value>Onemogući ovaj Send da mu nitko ne može pristupiti.</value>
     <comment>'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated.</comment>
   </data>
   <data name="NoSends" xml:space="preserve">
@@ -2005,7 +2006,7 @@
     <comment>'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated.</comment>
   </data>
   <data name="AddSend" xml:space="preserve">
-    <value>Novi Send</value>
+    <value>Dodaj Send</value>
     <comment>'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated.</comment>
   </data>
   <data name="AreYouSureDeleteSend" xml:space="preserve">
@@ -2013,15 +2014,15 @@
     <comment>'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated.</comment>
   </data>
   <data name="SendDeleted" xml:space="preserve">
-    <value>Send izbrisan</value>
+    <value>Send izbrisan.</value>
     <comment>'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated.</comment>
   </data>
   <data name="SendUpdated" xml:space="preserve">
-    <value>Send ažuriran</value>
+    <value>Send ažuriran.</value>
     <comment>'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated.</comment>
   </data>
   <data name="NewSendCreated" xml:space="preserve">
-    <value>Novi Send stvoren</value>
+    <value>Stvoren novi Send</value>
     <comment>'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated.</comment>
   </data>
   <data name="OneDay" xml:space="preserve">
@@ -2062,7 +2063,7 @@
     <comment>'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated.</comment>
   </data>
   <data name="SendFilePremiumRequired" xml:space="preserve">
-    <value>Kod besplatnog računa moguće je dijeljenje samo teksta. Za slanje datoteka potrebno je premium članstvo.</value>
+    <value>Kod besplatnog računa moguće je dijeljenje samo teksta. Za slanje datoteka potrebno je Premium članstvo.</value>
     <comment>'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated.</comment>
   </data>
   <data name="SendFileEmailVerificationRequired" xml:space="preserve">
@@ -2139,7 +2140,7 @@
     <value>Pravilo tvoje organizacije utječe na istek trezora. Najveće dozvoljeno vrijeme isteka je {0}:{1} h.</value>
   </data>
   <data name="VaultTimeoutToLarge" xml:space="preserve">
-    <value>Vrijeme isteka premašuje ograničenje koje je postavila tvoja organizacija.</value>
+    <value>Vrijeme isteka premašuje ograničenje koju je postavila tvoja organizacija.</value>
   </data>
   <data name="DisablePersonalVaultExportPolicyInEffect">
     <value>Jedno ili više pravila organizacija onemogućuje izvoz osobnog trezora. </value>
@@ -2157,10 +2158,10 @@
     <value>Odjavljen</value>
   </data>
   <data name="AccountSwitchedAutomatically" xml:space="preserve">
-    <value>Sljedeći dostupni račun je aktivan </value>
+    <value>Prebačen na sljedeći dostupni račun </value>
   </data>
   <data name="AccountLockedSuccessfully" xml:space="preserve">
-    <value>Račun zaključan</value>
+    <value>Račun je zaključan</value>
   </data>
   <data name="AccountLoggedOutSuccessfully" xml:space="preserve">
     <value>Račun uspješno odjavljen</value>
@@ -2187,7 +2188,7 @@
     <value>Nevažeći kôd za provjeru</value>
   </data>
   <data name="RequestOTP" xml:space="preserve">
-    <value>Zatraži jednokratnu lozinku</value>
+    <value>Zatražite jednokratnu lozinku</value>
   </data>
   <data name="SendCode" xml:space="preserve">
     <value>Pošalji kôd</value>
@@ -2196,7 +2197,7 @@
     <value>Šaljem</value>
   </data>
   <data name="CopySendLinkOnSave" xml:space="preserve">
-    <value>Nakon spremanja, kopiraj Send poveznicu</value>
+    <value>Kopiraj Send link nakon spremanja</value>
   </data>
   <data name="SendingCode" xml:space="preserve">
     <value>Šaljem kod</value>
@@ -2208,34 +2209,34 @@
     <value>Ponovno pošalji kod</value>
   </data>
   <data name="AVerificationCodeWasSentToYourEmail" xml:space="preserve">
-    <value>Kôd za potvrdu je poslan na vašu adresu e-pošte</value>
+    <value>Kod za potvrdu je poslan na vaš e-mail.</value>
   </data>
   <data name="AnErrorOccurredWhileSendingAVerificationCodeToYourEmailPleaseTryAgain" xml:space="preserve">
-    <value>Došlo je do pogreške prilikom slanja verifikacijskog koda. Molimo pokušaj ponovno</value>
+    <value>Došlo je do pogreške prilikom slanja kontrolnog koda na vaš email. Molim te pokušaj ponovno</value>
   </data>
   <data name="EnterTheVerificationCodeThatWasSentToYourEmail" xml:space="preserve">
-    <value>Unesite kôd za potvrdu primljen e-poštom</value>
+    <value>Unesite kontrolni kod koji vam je poslan na email</value>
   </data>
   <data name="SubmitCrashLogs" xml:space="preserve">
-    <value>Slanje zapisnika rušenja</value>
+    <value>Pošaljite dnevnik pogrešaka</value>
   </data>
   <data name="SubmitCrashLogsDescription" xml:space="preserve">
-    <value>Pomozi Bitwardenu poboljšati stabilnost aplikacije šaljući zapisnike o rušenju.</value>
+    <value>Pomozite Bitwardenu poboljšati stabilnost aplikacije šaljući izvješća o rušenju.</value>
   </data>
   <data name="OptionsExpanded" xml:space="preserve">
-    <value>Opcije su proširene, dodirni za sažimanje.</value>
+    <value>Opcije su proširene, dodirnite za sažimanje.</value>
   </data>
   <data name="OptionsCollapsed" xml:space="preserve">
-    <value>Opcije su sažete, dodirni za proširenje.</value>
+    <value>Opcije su sažete, dodirnite za proširenje.</value>
   </data>
   <data name="UppercaseAtoZ" xml:space="preserve">
-    <value>Velika slova (A - Z)</value>
+    <value>Velika slova (A-Z)</value>
   </data>
   <data name="LowercaseAtoZ" xml:space="preserve">
-    <value>Mala slova (a - z)</value>
+    <value>Mala slova (a-z)</value>
   </data>
   <data name="NumbersZeroToNine" xml:space="preserve">
-    <value>Brojevi (0 - 9)</value>
+    <value>Brojevi (0-9)</value>
   </data>
   <data name="SpecialCharacters" xml:space="preserve">
     <value>Posebni znakovi (!@#$%^&amp;*)</value>
@@ -2268,145 +2269,146 @@
     <value>TOTP</value>
   </data>
   <data name="VerificationCodes" xml:space="preserve">
-    <value>Kodovi za provjeru</value>
+    <value>Verification codes</value>
   </data>
   <data name="PremiumSubscriptionRequired" xml:space="preserve">
-    <value>Potrebna Premium pretplata</value>
+    <value>Premium subscription required</value>
   </data>
   <data name="CannotAddAuthenticatorKey" xml:space="preserve">
-    <value>Nije moguće dodati ključ za provjeru autentičnosti? </value>
+    <value>Cannot add authenticator key? </value>
   </data>
   <data name="ScanQRCode" xml:space="preserve">
-    <value>Očitaj QR kôd</value>
+    <value>Scan QR Code</value>
   </data>
   <data name="CannotScanQRCode" xml:space="preserve">
-    <value>Nije moguće očitati QR kôd? </value>
+    <value>Cannot scan QR Code? </value>
   </data>
   <data name="AuthenticatorKeyScanner" xml:space="preserve">
-    <value>Ključ za provjeru autentičnosti</value>
+    <value>Authenticator key</value>
   </data>
   <data name="EnterKeyManually" xml:space="preserve">
-    <value>Ručno unesi ključ</value>
+    <value>Enter key manually</value>
   </data>
   <data name="AddTotp" xml:space="preserve">
-    <value>Dodaj TOTP</value>
+    <value>Add TOTP</value>
   </data>
   <data name="SetupTotp" xml:space="preserve">
-    <value>Namjesti TOTP</value>
+    <value>Set up TOTP</value>
   </data>
   <data name="OnceTheKeyIsSuccessfullyEntered" xml:space="preserve">
-    <value>Jednom kada je ključ uspješno unesen, odaberi „Dodaj TOTP” za sigurno spremanje ključa</value>
+    <value>Once the key is successfully entered,
+select Add TOTP to store the key safely</value>
   </data>
   <data name="SelectAddTotpToStoreTheKeySafely" xml:space="preserve">
     <value></value>
   </data>
   <data name="NeverLockWarning" xml:space="preserve">
-    <value>Postavljanje zaključavanja na „Nikad” čini tvoj trezor dostupnim svima koji imaju pristupom tvom uređaju. Ako koristiš ovu mogućnost, pobrini se da je uređaj dostatno zaštićen.</value>
+    <value>Setting your lock options to “Never” keeps your vault available to anyone with access to your device. If you use this option, you should ensure that you keep your device properly protected.</value>
   </data>
   <data name="EnvironmentPageUrlsError" xml:space="preserve">
-    <value>Jedan ili više unesenih URL-ova nije ispravn. Molimo provjeri uneseni URL.</value>
+    <value>One or more of the URLs entered are invalid. Please revise it and try to save again.</value>
   </data>
   <data name="GenericErrorMessage" xml:space="preserve">
-    <value>Trenutno ne možemo obraditi tvoj zahtjev. Pokušaj ponovno ili nas kontaktiraj.</value>
+    <value>We were unable to process your request. Please try again or contact us.</value>
   </data>
   <data name="AllowScreenCapture" xml:space="preserve">
-    <value>Dozvoli snimanje zaslona</value>
+    <value>Allow screen capture</value>
   </data>
   <data name="AreYouSureYouWantToEnableScreenCapture" xml:space="preserve">
-    <value>Sigurno želiš uključiti snimanje zaslona?</value>
+    <value>Are you sure you want to turn on screen capture?</value>
   </data>
   <data name="LogInRequested" xml:space="preserve">
-    <value>Zatražena je prijava</value>
+    <value>Login requested</value>
   </data>
   <data name="AreYouTryingToLogIn" xml:space="preserve">
-    <value>Pokušavaš li se prijaviti?</value>
+    <value>Are you trying to log in?</value>
   </data>
   <data name="LogInAttemptByXOnY" xml:space="preserve">
-    <value>Pokušaj prijave {0} na {1}</value>
+    <value>Login attempt by {0} on {1}</value>
   </data>
   <data name="DeviceType" xml:space="preserve">
-    <value>Vrsta uređaja</value>
+    <value>Device type</value>
   </data>
   <data name="IpAddress" xml:space="preserve">
-    <value>IP adresa</value>
+    <value>IP address</value>
   </data>
   <data name="Time" xml:space="preserve">
-    <value>Vrijeme</value>
+    <value>Time</value>
   </data>
   <data name="Near" xml:space="preserve">
-    <value>Blizu</value>
+    <value>Near</value>
   </data>
   <data name="ConfirmLogIn" xml:space="preserve">
-    <value>Potvrdi prijavu</value>
+    <value>Confirm login</value>
   </data>
   <data name="DenyLogIn" xml:space="preserve">
-    <value>Odbij prijavu</value>
+    <value>Deny login</value>
   </data>
   <data name="JustNow" xml:space="preserve">
-    <value>Upravo</value>
+    <value>Just now</value>
   </data>
   <data name="XMinutesAgo" xml:space="preserve">
-    <value>prije {0} minute/a</value>
+    <value>{0} minutes ago</value>
   </data>
   <data name="LogInAccepted" xml:space="preserve">
-    <value>Prijava potvrđena</value>
+    <value>Login confirmed</value>
   </data>
   <data name="LogInDenied" xml:space="preserve">
-    <value>Prijava odbijena</value>
+    <value>Login denied</value>
   </data>
   <data name="ApproveLoginRequests" xml:space="preserve">
-    <value>Odobri pokušaje prijave</value>
+    <value>Approve login requests</value>
   </data>
   <data name="UseThisDeviceToApproveLoginRequestsMadeFromOtherDevices" xml:space="preserve">
-    <value>Koristi ovaj uređaj za odobrenje zahtjeva za prijavu na drugim uređajima.</value>
+    <value>Use this device to approve login requests made from other devices.</value>
   </data>
   <data name="AllowNotifications" xml:space="preserve">
-    <value>Dozvoli obavijesti</value>
+    <value>Allow notifications</value>
   </data>
   <data name="ReceivePushNotificationsForNewLoginRequests" xml:space="preserve">
-    <value>Primanje push obavijesti o novim zahtjevima za prijavu</value>
+    <value>Receive push notifications for new login requests</value>
   </data>
   <data name="NoThanks" xml:space="preserve">
-    <value>Ne hvala</value>
+    <value>No thanks</value>
   </data>
   <data name="ConfimLogInAttempForX" xml:space="preserve">
-    <value>Potvrdi pokušaj prijave za {0}</value>
+    <value>Confirm login attempt for {0}</value>
   </data>
   <data name="AllNotifications" xml:space="preserve">
-    <value>Sve obavijesti</value>
+    <value>All notifications</value>
   </data>
   <data name="PasswordType" xml:space="preserve">
-    <value>Tip lozinke</value>
+    <value>Password type</value>
   </data>
   <data name="WhatWouldYouLikeToGenerate" xml:space="preserve">
-    <value>Što želiš generirati?</value>
+    <value>What would you like to generate?</value>
   </data>
   <data name="UsernameType" xml:space="preserve">
-    <value>Tip korisničkog imena</value>
+    <value>Username type</value>
   </data>
   <data name="PlusAddressedEmail" xml:space="preserve">
-    <value>Plus adresa e-pošte</value>
+    <value>Plus addressed email</value>
   </data>
   <data name="CatchAllEmail" xml:space="preserve">
-    <value>Dohvati sve (catch-all) e-pošta</value>
+    <value>Catch-all email</value>
   </data>
   <data name="ForwardedEmailAlias" xml:space="preserve">
-    <value>Proslijeđeni pseudonim e-pošte</value>
+    <value>Forwarded email alias</value>
   </data>
   <data name="RandomWord" xml:space="preserve">
-    <value>Nasumična riječ</value>
+    <value>Random word</value>
   </data>
   <data name="EmailRequiredParenthesis" xml:space="preserve">
-    <value>Adresa e-pošte (obavezno)</value>
+    <value>Email (required)</value>
   </data>
   <data name="DomainNameRequiredParenthesis" xml:space="preserve">
-    <value>Naziv domene (obavezno)</value>
+    <value>Domain name (required)</value>
   </data>
   <data name="APIKeyRequiredParenthesis" xml:space="preserve">
-    <value>API ključ (obavezno)</value>
+    <value>API key (required)</value>
   </data>
   <data name="Service" xml:space="preserve">
-    <value>Usluga</value>
+    <value>Service</value>
   </data>
   <data name="AnonAddy" xml:space="preserve">
     <value>AnonAddy</value>
@@ -2421,89 +2423,53 @@
     <comment>"SimpleLogin" is the product name and should not be translated.</comment>
   </data>
   <data name="APIAccessToken" xml:space="preserve">
-    <value>Token za API pristup</value>
+    <value>API access token</value>
   </data>
   <data name="AreYouSureYouWantToOverwriteTheCurrentUsername" xml:space="preserve">
-    <value>Sigurno želiš prebrisati trenutno korisničko ime?</value>
+    <value>Are you sure you want to overwrite the current username?</value>
   </data>
   <data name="GenerateUsername" xml:space="preserve">
-    <value>Generiraj korisničko ime</value>
+    <value>Generate username</value>
   </data>
   <data name="EmailType" xml:space="preserve">
-    <value>Vrsta e-pošte</value>
+    <value>Email Type</value>
   </data>
   <data name="WebsiteRequired" xml:space="preserve">
-    <value>web stranica (obavezno)</value>
+    <value>Website (required)</value>
   </data>
   <data name="UnknownXErrorMessage" xml:space="preserve">
-    <value>Došlo je do nepoznate {0} greške.</value>
+    <value>Unknown {0} error occurred.</value>
   </data>
   <data name="PlusAddressedEmailDescription" xml:space="preserve">
-    <value>Koristi mogućnosti podadresiranja svog davatelja e-pošte</value>
+    <value>Use your email provider's subaddress capabilities</value>
   </data>
   <data name="CatchAllEmailDescription" xml:space="preserve">
-    <value>Koristi konfigurirani catch-all sandučić svoje domene.</value>
+    <value>Use your domain's configured catch-all inbox.</value>
   </data>
   <data name="ForwardedEmailDescription" xml:space="preserve">
-    <value>Generiraj pseudonim e-pošte s vanjskom uslugom prosljeđivanja.</value>
+    <value>Generate an email alias with an external forwarding service.</value>
   </data>
   <data name="Random" xml:space="preserve">
-    <value>Nasumično</value>
+    <value>Random</value>
   </data>
   <data name="AccessibilityServiceDisclosure" xml:space="preserve">
-    <value>Odobrenje servisa pristupačnosti</value>
+    <value>Accessibility Service Disclosure</value>
   </data>
   <data name="AccessibilityDisclosureText" xml:space="preserve">
-    <value>Bitwarden koristi servis pristupačnosti za pretragu polja za prijavu u aplikacijama i na web stranicama, te potom određuje ID polja za unos korisničkog imena i lozinke kada su pronađeni odgovarajući podaci. Ne spremamo podatke koje servis daje, niti pokušavamo upravljati bilo kojim elementima na zaslonu osim tekstualnog unosa vjerodajnica.</value>
+    <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>
   </data>
   <data name="Accept" xml:space="preserve">
-    <value>Prihvati</value>
+    <value>Accept</value>
   </data>
   <data name="Decline" xml:space="preserve">
-    <value>Odbij</value>
+    <value>Decline</value>
   </data>
   <data name="LoginRequestHasAlreadyExpired" xml:space="preserve">
-    <value>Zahtjev za prijavu je već istekao.</value>
+    <value>Login request has already expired.</value>
   </data>
   <data name="LoginAttemptFromXDoYouWantToSwitchToThisAccount" xml:space="preserve">
-    <value>Zahtjev za prijavu od:
+    <value>Login attempt from:
 {0}
-Želiš li se prebaciti na ovaj račun?</value>
-  </data>
-  <data name="NewAroundHere" xml:space="preserve">
-    <value>New around here?</value>
-  </data>
-  <data name="GetMasterPasswordwordHint" xml:space="preserve">
-    <value>Slanje podsjetnika glavne lozinke</value>
-  </data>
-  <data name="LoggingInAsX" xml:space="preserve">
-    <value>Prijava kao {0}</value>
-  </data>
-  <data name="NotYou" xml:space="preserve">
-    <value>Nisi ti?</value>
-  </data>
-  <data name="LogInWithMasterPassword" xml:space="preserve">
-    <value>Prijava glavnom lozinkom</value>
-  </data>
-  <data name="LogInWithAnotherDevice" xml:space="preserve">
-    <value>Prijava drugim uređajem</value>
-  </data>
-  <data name="LogInInitiated" xml:space="preserve">
-    <value>Prijava pokrenuta</value>
-  </data>
-  <data name="ANotificationHasBeenSentToYourDevice" xml:space="preserve">
-    <value>Obavijest je poslana na tvoj uređaj.</value>
-  </data>
-  <data name="PleaseMakeSureYourVaultIsUnlockedAndTheFingerprintPhraseMatchesOnTheOtherDevice" xml:space="preserve">
-    <value>Provjeri je li trezor otključan i slaže li se jedinstvena fraza s drugim uređajem.</value>
-  </data>
-  <data name="ResendNotification" xml:space="preserve">
-    <value>Ponovno pošalji obavijest</value>
-  </data>
-  <data name="NeedAnotherOption" xml:space="preserve">
-    <value>Trebaš drugu opciju?</value>
-  </data>
-  <data name="ViewAllLoginOptions" xml:space="preserve">
-    <value>Pogledaj sve mogućnosti prijave</value>
+Do you want to switch to this account?</value>
   </data>
 </root>

src/App/Resources/AppResources.hu.resx

@@ -1761,7 +1761,7 @@
     <value>A széf szinkronizálása lehúzó művelettel.</value>
   </data>
   <data name="LogInSso" xml:space="preserve">
-    <value>Vállalati egyszeri bejelentkezés</value>
+    <value>Vállalati önálló bejelentkezés</value>
   </data>
   <data name="LogInSsoSummary" xml:space="preserve">
     <value>Gyors bejelentkezés a szervezeti önálló bejelentkező portálba. A kezdéshez meg kell adni a szervezeti azonosítót.</value>
@@ -2471,40 +2471,4 @@ TOTP hozzáadása a kulcs biztonságos tárolásához lehetőséget.</value>
 {0}
 Szeretnénk átváltani erre a fiókra?</value>
   </data>
-  <data name="NewAroundHere" xml:space="preserve">
-    <value>Új felhasználó vagyunk?</value>
-  </data>
-  <data name="GetMasterPasswordwordHint" xml:space="preserve">
-    <value>Mesterjelszó emlékeztető kérése</value>
-  </data>
-  <data name="LoggingInAsX" xml:space="preserve">
-    <value>Bejelentkezve mint {0}</value>
-  </data>
-  <data name="NotYou" xml:space="preserve">
-    <value>Ez tévedés?</value>
-  </data>
-  <data name="LogInWithMasterPassword" xml:space="preserve">
-    <value>Bejelentkezés mesterjelszóval</value>
-  </data>
-  <data name="LogInWithAnotherDevice" xml:space="preserve">
-    <value>Bejelentkezés más eszközzel</value>
-  </data>
-  <data name="LogInInitiated" xml:space="preserve">
-    <value>A bejelentkezés elindításra került.</value>
-  </data>
-  <data name="ANotificationHasBeenSentToYourDevice" xml:space="preserve">
-    <value>A rendszer értesítést küldött az eszközre.</value>
-  </data>
-  <data name="PleaseMakeSureYourVaultIsUnlockedAndTheFingerprintPhraseMatchesOnTheOtherDevice" xml:space="preserve">
-    <value>Ellenőrizzük, hogy a széf feloldásra került és az Ujjlenyomat kifejezés egyezik a másik eszközön levővel.</value>
-  </data>
-  <data name="ResendNotification" xml:space="preserve">
-    <value>Értesítés újraküldése</value>
-  </data>
-  <data name="NeedAnotherOption" xml:space="preserve">
-    <value>Másik opció szükséges?</value>
-  </data>
-  <data name="ViewAllLoginOptions" xml:space="preserve">
-    <value>Összes bejelentkezési opció megtekintése</value>
-  </data>
 </root>

src/App/Resources/AppResources.id.resx

@@ -2472,40 +2472,4 @@ select Add TOTP to store the key safely</value>
 {0}
 Do you want to switch to this account?</value>
   </data>
-  <data name="NewAroundHere" xml:space="preserve">
-    <value>New around here?</value>
-  </data>
-  <data name="GetMasterPasswordwordHint" xml:space="preserve">
-    <value>Get master password hint</value>
-  </data>
-  <data name="LoggingInAsX" xml:space="preserve">
-    <value>Logging in as {0}</value>
-  </data>
-  <data name="NotYou" xml:space="preserve">
-    <value>Not you?</value>
-  </data>
-  <data name="LogInWithMasterPassword" xml:space="preserve">
-    <value>Log in with master password</value>
-  </data>
-  <data name="LogInWithAnotherDevice" xml:space="preserve">
-    <value>Log In with another device</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>
-  </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>
-  </data>
-  <data name="ResendNotification" xml:space="preserve">
-    <value>Resend notification</value>
-  </data>
-  <data name="NeedAnotherOption" xml:space="preserve">
-    <value>Need another option?</value>
-  </data>
-  <data name="ViewAllLoginOptions" xml:space="preserve">
-    <value>View all log in options</value>
-  </data>
 </root>

src/App/Resources/AppResources.it.resx

@@ -1575,7 +1575,7 @@
     <comment>'Nord' is the name of a specific color scheme. It should not be translated.</comment>
   </data>
   <data name="SolarizedDark" xml:space="preserve">
-    <value>Solarizzato scuro</value>
+    <value>Solarized Dark</value>
     <comment>'Solarized Dark' is the name of a specific color scheme. It should not be translated.</comment>
   </data>
   <data name="AutofillBlockedUris" xml:space="preserve">
@@ -2468,44 +2468,8 @@ seleziona Aggiungi TOTP per salvare la chiave in modo sicuro</value>
     <value>La richiesta di accesso è già scaduta.</value>
   </data>
   <data name="LoginAttemptFromXDoYouWantToSwitchToThisAccount" xml:space="preserve">
-    <value>Tentativo di accesso da:
+    <value>Login attempt from:
 {0}
-Vuoi passare a questo account?</value>
-  </data>
-  <data name="NewAroundHere" xml:space="preserve">
-    <value>Nuovo da queste parti?</value>
-  </data>
-  <data name="GetMasterPasswordwordHint" xml:space="preserve">
-    <value>Ottieni l'indizio della password principale</value>
-  </data>
-  <data name="LoggingInAsX" xml:space="preserve">
-    <value>Accesso come {0}</value>
-  </data>
-  <data name="NotYou" xml:space="preserve">
-    <value>Non sei tu?</value>
-  </data>
-  <data name="LogInWithMasterPassword" xml:space="preserve">
-    <value>Accedi con la password principale</value>
-  </data>
-  <data name="LogInWithAnotherDevice" xml:space="preserve">
-    <value>Accedi con un altro dispositivo</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>
-  </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>
-  </data>
-  <data name="ResendNotification" xml:space="preserve">
-    <value>Resend notification</value>
-  </data>
-  <data name="NeedAnotherOption" xml:space="preserve">
-    <value>Need another option?</value>
-  </data>
-  <data name="ViewAllLoginOptions" xml:space="preserve">
-    <value>View all log in options</value>
+Do you want to switch to this account?</value>
   </data>
 </root>

src/App/Resources/AppResources.ja.resx

@@ -2472,40 +2472,4 @@
 {0}
 このアカウントに切り替えますか？</value>
   </data>
-  <data name="NewAroundHere" xml:space="preserve">
-    <value>初めてですか?</value>
-  </data>
-  <data name="GetMasterPasswordwordHint" xml:space="preserve">
-    <value>マスターパスワードのヒントを取得する</value>
-  </data>
-  <data name="LoggingInAsX" xml:space="preserve">
-    <value>{0} としてログイン</value>
-  </data>
-  <data name="NotYou" xml:space="preserve">
-    <value>あなたではないですか？</value>
-  </data>
-  <data name="LogInWithMasterPassword" xml:space="preserve">
-    <value>マスターパスワードでログイン</value>
-  </data>
-  <data name="LogInWithAnotherDevice" xml:space="preserve">
-    <value>別のデバイスでログイン</value>
-  </data>
-  <data name="LogInInitiated" xml:space="preserve">
-    <value>ログイン開始</value>
-  </data>
-  <data name="ANotificationHasBeenSentToYourDevice" xml:space="preserve">
-    <value>デバイスに通知を送信しました。</value>
-  </data>
-  <data name="PleaseMakeSureYourVaultIsUnlockedAndTheFingerprintPhraseMatchesOnTheOtherDevice" xml:space="preserve">
-    <value>保管庫がロックされていることと、パスフレーズが他のデバイスと一致していることを確認してください。</value>
-  </data>
-  <data name="ResendNotification" xml:space="preserve">
-    <value>通知を再送信する</value>
-  </data>
-  <data name="NeedAnotherOption" xml:space="preserve">
-    <value>別の選択肢が必要ですか？</value>
-  </data>
-  <data name="ViewAllLoginOptions" xml:space="preserve">
-    <value>すべてのログインオプションを表示</value>
-  </data>
 </root>

src/App/Resources/AppResources.ka.resx

@@ -1762,7 +1762,7 @@ Scanning will happen automatically.</value>
     <value>Syncing vault with pull down gesture.</value>
   </data>
   <data name="LogInSso" xml:space="preserve">
-    <value>Enterprise single sign-on</value>
+    <value>Enterprise Single Sign-On</value>
   </data>
   <data name="LogInSsoSummary" xml:space="preserve">
     <value>Quickly log in using your organization's single sign-on portal. Please enter your organization's identifier to begin.</value>
@@ -2473,40 +2473,4 @@ select Add TOTP to store the key safely</value>
 {0}
 Do you want to switch to this account?</value>
   </data>
-  <data name="NewAroundHere" xml:space="preserve">
-    <value>New around here?</value>
-  </data>
-  <data name="GetMasterPasswordwordHint" xml:space="preserve">
-    <value>Get master password hint</value>
-  </data>
-  <data name="LoggingInAsX" xml:space="preserve">
-    <value>Logging in as {0}</value>
-  </data>
-  <data name="NotYou" xml:space="preserve">
-    <value>Not you?</value>
-  </data>
-  <data name="LogInWithMasterPassword" xml:space="preserve">
-    <value>Log in with master password</value>
-  </data>
-  <data name="LogInWithAnotherDevice" xml:space="preserve">
-    <value>Log In with another device</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>
-  </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>
-  </data>
-  <data name="ResendNotification" xml:space="preserve">
-    <value>Resend notification</value>
-  </data>
-  <data name="NeedAnotherOption" xml:space="preserve">
-    <value>Need another option?</value>
-  </data>
-  <data name="ViewAllLoginOptions" xml:space="preserve">
-    <value>View all log in options</value>
-  </data>
 </root>

src/App/Resources/AppResources.kn.resx

@@ -2473,40 +2473,4 @@ select Add TOTP to store the key safely</value>
 {0}
 Do you want to switch to this account?</value>
   </data>
-  <data name="NewAroundHere" xml:space="preserve">
-    <value>New around here?</value>
-  </data>
-  <data name="GetMasterPasswordwordHint" xml:space="preserve">
-    <value>Get master password hint</value>
-  </data>
-  <data name="LoggingInAsX" xml:space="preserve">
-    <value>Logging in as {0}</value>
-  </data>
-  <data name="NotYou" xml:space="preserve">
-    <value>Not you?</value>
-  </data>
-  <data name="LogInWithMasterPassword" xml:space="preserve">
-    <value>Log in with master password</value>
-  </data>
-  <data name="LogInWithAnotherDevice" xml:space="preserve">
-    <value>Log In with another device</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>
-  </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>
-  </data>
-  <data name="ResendNotification" xml:space="preserve">
-    <value>Resend notification</value>
-  </data>
-  <data name="NeedAnotherOption" xml:space="preserve">
-    <value>Need another option?</value>
-  </data>
-  <data name="ViewAllLoginOptions" xml:space="preserve">
-    <value>View all log in options</value>
-  </data>
 </root>

src/App/Resources/AppResources.ko.resx

@@ -2472,40 +2472,4 @@ select Add TOTP to store the key safely</value>
 {0}
 Do you want to switch to this account?</value>
   </data>
-  <data name="NewAroundHere" xml:space="preserve">
-    <value>New around here?</value>
-  </data>
-  <data name="GetMasterPasswordwordHint" xml:space="preserve">
-    <value>Get master password hint</value>
-  </data>
-  <data name="LoggingInAsX" xml:space="preserve">
-    <value>Logging in as {0}</value>
-  </data>
-  <data name="NotYou" xml:space="preserve">
-    <value>Not you?</value>
-  </data>
-  <data name="LogInWithMasterPassword" xml:space="preserve">
-    <value>Log in with master password</value>
-  </data>
-  <data name="LogInWithAnotherDevice" xml:space="preserve">
-    <value>Log In with another device</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>
-  </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>
-  </data>
-  <data name="ResendNotification" xml:space="preserve">
-    <value>Resend notification</value>
-  </data>
-  <data name="NeedAnotherOption" xml:space="preserve">
-    <value>Need another option?</value>
-  </data>
-  <data name="ViewAllLoginOptions" xml:space="preserve">
-    <value>View all log in options</value>
-  </data>
 </root>

src/App/Resources/AppResources.lt.resx

@@ -1762,7 +1762,7 @@ Scanning will happen automatically.</value>
     <value>Syncing vault with pull down gesture.</value>
   </data>
   <data name="LogInSso" xml:space="preserve">
-    <value>Enterprise single sign-on</value>
+    <value>Enterprise Single Sign-On</value>
   </data>
   <data name="LogInSsoSummary" xml:space="preserve">
     <value>Quickly log in using your organization's single sign-on portal. Please enter your organization's identifier to begin.</value>
@@ -2473,40 +2473,4 @@ select Add TOTP to store the key safely</value>
 {0}
 Do you want to switch to this account?</value>
   </data>
-  <data name="NewAroundHere" xml:space="preserve">
-    <value>New around here?</value>
-  </data>
-  <data name="GetMasterPasswordwordHint" xml:space="preserve">
-    <value>Get master password hint</value>
-  </data>
-  <data name="LoggingInAsX" xml:space="preserve">
-    <value>Logging in as {0}</value>
-  </data>
-  <data name="NotYou" xml:space="preserve">
-    <value>Not you?</value>
-  </data>
-  <data name="LogInWithMasterPassword" xml:space="preserve">
-    <value>Log in with master password</value>
-  </data>
-  <data name="LogInWithAnotherDevice" xml:space="preserve">
-    <value>Log In with another device</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>
-  </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>
-  </data>
-  <data name="ResendNotification" xml:space="preserve">
-    <value>Resend notification</value>
-  </data>
-  <data name="NeedAnotherOption" xml:space="preserve">
-    <value>Need another option?</value>
-  </data>
-  <data name="ViewAllLoginOptions" xml:space="preserve">
-    <value>View all log in options</value>
-  </data>
 </root>

src/App/Resources/AppResources.lv.resx

@@ -2472,40 +2472,4 @@ jāizvēlas "Pievienot TOTP", lai droši glabātu atslēgu.</value>
 {0}
 Vai pārslēgties uz šo kontu?</value>
   </data>
-  <data name="NewAroundHere" xml:space="preserve">
-    <value>Jauns šeit?</value>
-  </data>
-  <data name="GetMasterPasswordwordHint" xml:space="preserve">
-    <value>Saņemt galvenās paroles norādi</value>
-  </data>
-  <data name="LoggingInAsX" xml:space="preserve">
-    <value>Pierakstās kā {0}</value>
-  </data>
-  <data name="NotYou" xml:space="preserve">
-    <value>Tas neesi Tu?</value>
-  </data>
-  <data name="LogInWithMasterPassword" xml:space="preserve">
-    <value>Pierakstīties ar galveno paroli</value>
-  </data>
-  <data name="LogInWithAnotherDevice" xml:space="preserve">
-    <value>Pierakstīties ar citu ierīci</value>
-  </data>
-  <data name="LogInInitiated" xml:space="preserve">
-    <value>Uzsākta pierakstīšanās</value>
-  </data>
-  <data name="ANotificationHasBeenSentToYourDevice" xml:space="preserve">
-    <value>Uz ierīci ir nosūtīts paziņojums.</value>
-  </data>
-  <data name="PleaseMakeSureYourVaultIsUnlockedAndTheFingerprintPhraseMatchesOnTheOtherDevice" xml:space="preserve">
-    <value>Jāpārliecinās, ka glabātava ir atslēgta un atpazīšanas vārdkopa ir tāda pati arī citā ierīcē.</value>
-  </data>
-  <data name="ResendNotification" xml:space="preserve">
-    <value>Atkārtoti nosūtīt paziņojumu</value>
-  </data>
-  <data name="NeedAnotherOption" xml:space="preserve">
-    <value>Nepieciešama cita iespēja?</value>
-  </data>
-  <data name="ViewAllLoginOptions" xml:space="preserve">
-    <value>Apskatīt visas pierakstīšanās iespējas</value>
-  </data>
 </root>

src/App/Resources/AppResources.ml.resx

@@ -2472,40 +2472,4 @@ select Add TOTP to store the key safely</value>
 {0}
 Do you want to switch to this account?</value>
   </data>
-  <data name="NewAroundHere" xml:space="preserve">
-    <value>New around here?</value>
-  </data>
-  <data name="GetMasterPasswordwordHint" xml:space="preserve">
-    <value>Get master password hint</value>
-  </data>
-  <data name="LoggingInAsX" xml:space="preserve">
-    <value>Logging in as {0}</value>
-  </data>
-  <data name="NotYou" xml:space="preserve">
-    <value>Not you?</value>
-  </data>
-  <data name="LogInWithMasterPassword" xml:space="preserve">
-    <value>Log in with master password</value>
-  </data>
-  <data name="LogInWithAnotherDevice" xml:space="preserve">
-    <value>Log In with another device</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>
-  </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>
-  </data>
-  <data name="ResendNotification" xml:space="preserve">
-    <value>Resend notification</value>
-  </data>
-  <data name="NeedAnotherOption" xml:space="preserve">
-    <value>Need another option?</value>
-  </data>
-  <data name="ViewAllLoginOptions" xml:space="preserve">
-    <value>View all log in options</value>
-  </data>
 </root>

src/App/Resources/AppResources.nb.resx

@@ -1576,7 +1576,7 @@ Skanning skjer automatisk.</value>
     <comment>'Nord' is the name of a specific color scheme. It should not be translated.</comment>
   </data>
   <data name="SolarizedDark" xml:space="preserve">
-    <value>Solarisert mørk</value>
+    <value>Solarized Dark</value>
     <comment>'Solarized Dark' is the name of a specific color scheme. It should not be translated.</comment>
   </data>
   <data name="AutofillBlockedUris" xml:space="preserve">
@@ -2469,44 +2469,8 @@ velg Legg til TOTP for å lagre nøkkelen sikkert</value>
     <value>Innloggingsforespørselen har allerede utløpt.</value>
   </data>
   <data name="LoginAttemptFromXDoYouWantToSwitchToThisAccount" xml:space="preserve">
-    <value>Innloggingsforsøk:
+    <value>Login attempt from:
 {0}
-Vil du bytte til denne kontoen?</value>
-  </data>
-  <data name="NewAroundHere" xml:space="preserve">
-    <value>Nytt rundt her?</value>
-  </data>
-  <data name="GetMasterPasswordwordHint" xml:space="preserve">
-    <value>Få et hint om superpassordet</value>
-  </data>
-  <data name="LoggingInAsX" xml:space="preserve">
-    <value>Logger inn som {0}</value>
-  </data>
-  <data name="NotYou" xml:space="preserve">
-    <value>Ikke du?</value>
-  </data>
-  <data name="LogInWithMasterPassword" xml:space="preserve">
-    <value>Logg inn med hovedpassord</value>
-  </data>
-  <data name="LogInWithAnotherDevice" xml:space="preserve">
-    <value>Logg inn med en annen enhet</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>
-  </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>
-  </data>
-  <data name="ResendNotification" xml:space="preserve">
-    <value>Resend notification</value>
-  </data>
-  <data name="NeedAnotherOption" xml:space="preserve">
-    <value>Need another option?</value>
-  </data>
-  <data name="ViewAllLoginOptions" xml:space="preserve">
-    <value>View all log in options</value>
+Do you want to switch to this account?</value>
   </data>
 </root>

src/App/Resources/AppResources.nl.resx

@@ -342,7 +342,7 @@
     <comment>Reveal a hidden value (password).</comment>
   </data>
   <data name="ItemDeleted" xml:space="preserve">
-    <value>Item is verwijderd</value>
+    <value>Item is verwijderd.</value>
     <comment>Confirmation message after successfully deleting a login.</comment>
   </data>
   <data name="Submit" xml:space="preserve">
@@ -2218,10 +2218,10 @@ Het scannen gebeurt automatisch.</value>
     <value>Voer de verificatiecode in die we naar je e-mail is gestuurd</value>
   </data>
   <data name="SubmitCrashLogs" xml:space="preserve">
-    <value>Crashes rapporteren</value>
+    <value>Submit crash logs</value>
   </data>
   <data name="SubmitCrashLogsDescription" xml:space="preserve">
-    <value>Help Bitwarden de app-stabiliteit te verbeteren door crashrapporten te versturen.</value>
+    <value>Help Bitwarden improve app stability by submitting crash reports.</value>
   </data>
   <data name="OptionsExpanded" xml:space="preserve">
     <value>Opties zijn uitgebreid, tik om te storten.</value>
@@ -2306,10 +2306,10 @@ kies je TOTP toevoegen om de sleutel veilig op te slaan</value>
     <value>De vergrendelingsoptie "Nooit" houdt je kluis beschikbaar voor iedereen met toegang tot je apparaat. Als je deze optie gebruikt, moet je ervoor zorgen dat je je apparaat naar behoren beschermt.</value>
   </data>
   <data name="EnvironmentPageUrlsError" xml:space="preserve">
-    <value>Een of meerdere van de ingevoerde URL's zijn ongeldig. Controleer en probeer opnieuw op te slaan.</value>
+    <value>One or more of the URLs entered are invalid. Please revise it and try to save again.</value>
   </data>
   <data name="GenericErrorMessage" xml:space="preserve">
-    <value>We kunnen uw aanvraag niet verwerken. Probeer het opnieuw of neem contact met ons op.</value>
+    <value>We were unable to process your request. Please try again or contact us.</value>
   </data>
   <data name="AllowScreenCapture" xml:space="preserve">
     <value>Schermopname toestaan</value>
@@ -2453,59 +2453,23 @@ kies je TOTP toevoegen om de sleutel veilig op te slaan</value>
     <value>Willekeurig</value>
   </data>
   <data name="AccessibilityServiceDisclosure" xml:space="preserve">
-    <value>Toegankelijksheidsservice-melding</value>
+    <value>Accessibility Service Disclosure</value>
   </data>
   <data name="AccessibilityDisclosureText" xml:space="preserve">
-    <value>Bitwarden gebruikt de toegankelijkheidsservice om inlogvelden in apps en op websites te vinden, de juiste veld ID's te bepalen om de gebruikersnaam en het wachtwoord in te voeren wanneer een bijpassend paar gevonden is voor de app of site. We slaan geen informatie op die de service ons levert, ook controleren we geen elementen op het scherm naast de tekstinvoer van inloggegevens.</value>
+    <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>
   </data>
   <data name="Accept" xml:space="preserve">
-    <value>Accepteren</value>
+    <value>Accept</value>
   </data>
   <data name="Decline" xml:space="preserve">
-    <value>Weigeren</value>
+    <value>Decline</value>
   </data>
   <data name="LoginRequestHasAlreadyExpired" xml:space="preserve">
     <value>Inlogverzoek is al verlopen.</value>
   </data>
   <data name="LoginAttemptFromXDoYouWantToSwitchToThisAccount" xml:space="preserve">
-    <value>Inlogpoging vanaf:
+    <value>Login attempt from:
 {0}
-Wilt u naar dit account wisselen?</value>
-  </data>
-  <data name="NewAroundHere" xml:space="preserve">
-    <value>Nieuw hier?</value>
-  </data>
-  <data name="GetMasterPasswordwordHint" xml:space="preserve">
-    <value>Hoofdwachtwoordhint krijgen</value>
-  </data>
-  <data name="LoggingInAsX" xml:space="preserve">
-    <value>Inloggen als {0}</value>
-  </data>
-  <data name="NotYou" xml:space="preserve">
-    <value>Ben jij dit niet?</value>
-  </data>
-  <data name="LogInWithMasterPassword" xml:space="preserve">
-    <value>Inloggen met je hoofdwachtwoord</value>
-  </data>
-  <data name="LogInWithAnotherDevice" xml:space="preserve">
-    <value>Inloggen met een ander apparaat</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>
-  </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>
-  </data>
-  <data name="ResendNotification" xml:space="preserve">
-    <value>Resend notification</value>
-  </data>
-  <data name="NeedAnotherOption" xml:space="preserve">
-    <value>Need another option?</value>
-  </data>
-  <data name="ViewAllLoginOptions" xml:space="preserve">
-    <value>View all log in options</value>
+Do you want to switch to this account?</value>
   </data>
 </root>

src/App/Resources/AppResources.nn.resx

@@ -1762,7 +1762,7 @@ Scanning will happen automatically.</value>
     <value>Syncing vault with pull down gesture.</value>
   </data>
   <data name="LogInSso" xml:space="preserve">
-    <value>Enterprise single sign-on</value>
+    <value>Enterprise Single Sign-On</value>
   </data>
   <data name="LogInSsoSummary" xml:space="preserve">
     <value>Quickly log in using your organization's single sign-on portal. Please enter your organization's identifier to begin.</value>
@@ -2473,40 +2473,4 @@ select Add TOTP to store the key safely</value>
 {0}
 Do you want to switch to this account?</value>
   </data>
-  <data name="NewAroundHere" xml:space="preserve">
-    <value>New around here?</value>
-  </data>
-  <data name="GetMasterPasswordwordHint" xml:space="preserve">
-    <value>Get master password hint</value>
-  </data>
-  <data name="LoggingInAsX" xml:space="preserve">
-    <value>Logging in as {0}</value>
-  </data>
-  <data name="NotYou" xml:space="preserve">
-    <value>Not you?</value>
-  </data>
-  <data name="LogInWithMasterPassword" xml:space="preserve">
-    <value>Log in with master password</value>
-  </data>
-  <data name="LogInWithAnotherDevice" xml:space="preserve">
-    <value>Log In with another device</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>
-  </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>
-  </data>
-  <data name="ResendNotification" xml:space="preserve">
-    <value>Resend notification</value>
-  </data>
-  <data name="NeedAnotherOption" xml:space="preserve">
-    <value>Need another option?</value>
-  </data>
-  <data name="ViewAllLoginOptions" xml:space="preserve">
-    <value>View all log in options</value>
-  </data>
 </root>

src/App/Resources/AppResources.pl.resx

@@ -152,11 +152,11 @@
     <comment>Copy some value to your clipboard.</comment>
   </data>
   <data name="CopyPassword" xml:space="preserve">
-    <value>Kopiuj hasło</value>
+    <value>Skopiuj hasło</value>
     <comment>The button text that allows a user to copy the login's password to their clipboard.</comment>
   </data>
   <data name="CopyUsername" xml:space="preserve">
-    <value>Kopiuj nazwę użytkownika</value>
+    <value>Skopiuj nazwę użytkownika</value>
     <comment>The button text that allows a user to copy the login's username to their clipboard.</comment>
   </data>
   <data name="Credits" xml:space="preserve">
@@ -179,7 +179,7 @@
     <value>Edycja</value>
   </data>
   <data name="EditFolder" xml:space="preserve">
-    <value>Edytuj folder</value>
+    <value>Edytuj Folder</value>
   </data>
   <data name="Email" xml:space="preserve">
     <value>Adres e-mail</value>
@@ -229,7 +229,7 @@
     <value>Foldery</value>
   </data>
   <data name="FolderUpdated" xml:space="preserve">
-    <value>Folder został zapisany</value>
+    <value>Folder zaktualizowany.</value>
   </data>
   <data name="GoToWebsite" xml:space="preserve">
     <value>Przejdź do strony</value>
@@ -247,7 +247,7 @@
     <comment>Description message for the alert when internet connection is required to continue.</comment>
   </data>
   <data name="InternetConnectionRequiredTitle" xml:space="preserve">
-    <value>Połączenie z Internetem jest wymagane</value>
+    <value>Wymagane połączenie z Internetem</value>
     <comment>Title for the alert when internet connection is required to continue.</comment>
   </data>
   <data name="InvalidMasterPassword" xml:space="preserve">
@@ -296,7 +296,7 @@
     <comment>Text to define that there are more options things to see.</comment>
   </data>
   <data name="MyVault" xml:space="preserve">
-    <value>Mój sejf</value>
+    <value>Sejf</value>
     <comment>The title for the vault page.</comment>
   </data>
   <data name="Authenticator" xml:space="preserve">
@@ -342,7 +342,7 @@
     <comment>Reveal a hidden value (password).</comment>
   </data>
   <data name="ItemDeleted" xml:space="preserve">
-    <value>Element został usunięty</value>
+    <value>Element został usunięty.</value>
     <comment>Confirmation message after successfully deleting a login.</comment>
   </data>
   <data name="Submit" xml:space="preserve">
@@ -364,7 +364,7 @@
     <comment>Label for a uri/url.</comment>
   </data>
   <data name="UseFingerprintToUnlock" xml:space="preserve">
-    <value>Odblokuj odciskiem palca</value>
+    <value>Odblokuj za pomocą odcisku palca</value>
   </data>
   <data name="Username" xml:space="preserve">
     <value>Nazwa użytkownika</value>
@@ -514,7 +514,7 @@
     <value>Odcisk palca</value>
   </data>
   <data name="GeneratePassword" xml:space="preserve">
-    <value>Wygeneruj hasło</value>
+    <value>Generuj hasło</value>
   </data>
   <data name="GetPasswordHint" xml:space="preserve">
     <value>Uzyskaj podpowiedź do hasła głównego</value>
@@ -604,7 +604,7 @@
     <value>Nigdy</value>
   </data>
   <data name="NewItemCreated" xml:space="preserve">
-    <value>Element został dodany</value>
+    <value>Element został utworzony.</value>
   </data>
   <data name="NoFavorites" xml:space="preserve">
     <value>Brak ulubionych w sejfie.</value>
@@ -657,7 +657,7 @@
     <value>Wesprzyj nas pozytywną opinią!</value>
   </data>
   <data name="RegeneratePassword" xml:space="preserve">
-    <value>Wygeneruj ponownie hasło</value>
+    <value>Wygeneruj hasło ponownie</value>
   </data>
   <data name="RetypeMasterPassword" xml:space="preserve">
     <value>Wpisz ponownie hasło główne</value>
@@ -681,7 +681,7 @@
     <value>Informacje o elemencie</value>
   </data>
   <data name="ItemUpdated" xml:space="preserve">
-    <value>Element został zapisany</value>
+    <value>Element został zaktualizowany.</value>
   </data>
   <data name="Submitting" xml:space="preserve">
     <value>Wysyłanie...</value>
@@ -692,10 +692,10 @@
     <comment>Message shown when interacting with the server</comment>
   </data>
   <data name="SyncingComplete" xml:space="preserve">
-    <value>Synchronizacja została zakończona</value>
+    <value>Synchronizacja została zakończona.</value>
   </data>
   <data name="SyncingFailed" xml:space="preserve">
-    <value>Synchronizacja nie powiodła się</value>
+    <value>Synchronizacja nie powiodła się.</value>
   </data>
   <data name="SyncVaultNow" xml:space="preserve">
     <value>Synchronizuj sejf</value>
@@ -856,18 +856,18 @@
     <comment>For 2FA</comment>
   </data>
   <data name="VerificationEmailSent" xml:space="preserve">
-    <value>Kod weryfikacyjny został wysłany</value>
+    <value>Kod weryfikacyjny został wysłany.</value>
     <comment>For 2FA</comment>
   </data>
   <data name="YubiKeyInstruction" xml:space="preserve">
     <value>Przyłóż klucz YubiKey NEO z tyłu urządzenia lub włóż klucz do portu USB urządzenia, a następnie dotknij jego przycisku.</value>
   </data>
   <data name="YubiKeyTitle" xml:space="preserve">
-    <value>Klucz bezpieczeństwa YubiKey</value>
+    <value>Klucz bezpieczeństwa YubiKey NEO</value>
     <comment>"YubiKey" is the product name and should not be translated.</comment>
   </data>
   <data name="AddNewAttachment" xml:space="preserve">
-    <value>Dodaj nowy załącznik</value>
+    <value>Dodaj załącznik</value>
   </data>
   <data name="Attachments" xml:space="preserve">
     <value>Załączniki</value>
@@ -919,7 +919,7 @@ Skanowanie nastąpi automatycznie.</value>
     <value>Jeśli dane logowania posiadają dołączony klucz uwierzytelniający TOTP, kod weryfikacyjny jest automatycznie kopiowany do schowka przy każdym autouzupełnieniu danych logowania.</value>
   </data>
   <data name="CopyTotpAutomatically" xml:space="preserve">
-    <value>Kopiuj kod TOTP automatycznie</value>
+    <value>Kopiuj TOTP automatycznie</value>
   </data>
   <data name="PremiumRequired" xml:space="preserve">
     <value>Konto Premium jest wymagane, aby skorzystać z tej funkcji.</value>
@@ -996,7 +996,7 @@ Skanowanie nastąpi automatycznie.</value>
     <value>Pola niestandardowe</value>
   </data>
   <data name="CopyNumber" xml:space="preserve">
-    <value>Kopiuj numer</value>
+    <value>Kopiuj numer karty</value>
   </data>
   <data name="CopySecurityCode" xml:space="preserve">
     <value>Kopiuj kod zabezpieczający</value>
@@ -1256,7 +1256,7 @@ Skanowanie nastąpi automatycznie.</value>
     <comment>URI match detection for auto-fill.</comment>
   </data>
   <data name="YesAndSave" xml:space="preserve">
-    <value>Tak i zapisz</value>
+    <value>Tak i Zapisz</value>
   </data>
   <data name="AutofillAndSave" xml:space="preserve">
     <value>Autouzupełnij i zapisz</value>
@@ -1278,7 +1278,7 @@ Skanowanie nastąpi automatycznie.</value>
     <value>Usługa ułatwienia dostępu może być pomocna w sytuacji, gdy aplikacje nie obsługują standardowej usługi autouzupełniania.</value>
   </data>
   <data name="DatePasswordUpdated" xml:space="preserve">
-    <value>Hasło zostało zaktualizowane</value>
+    <value>Aktualizacja hasła</value>
     <comment>ex. Date this password was updated</comment>
   </data>
   <data name="DateUpdated" xml:space="preserve">
@@ -1366,7 +1366,7 @@ Skanowanie nastąpi automatycznie.</value>
     <value>Wartość</value>
   </data>
   <data name="PasswordHistory" xml:space="preserve">
-    <value>Historia hasła</value>
+    <value>Historia haseł</value>
   </data>
   <data name="Types" xml:space="preserve">
     <value>Rodzaje</value>
@@ -1726,7 +1726,7 @@ Skanowanie nastąpi automatycznie.</value>
     <comment>Message shown when interacting with the server</comment>
   </data>
   <data name="ItemRestored" xml:space="preserve">
-    <value>Element został przywrócony</value>
+    <value>Element został przywrócony.</value>
     <comment>Confirmation message after successfully restoring a soft-deleted item</comment>
   </data>
   <data name="Trash" xml:space="preserve">
@@ -2006,7 +2006,7 @@ Skanowanie nastąpi automatycznie.</value>
     <comment>'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated.</comment>
   </data>
   <data name="AddSend" xml:space="preserve">
-    <value>Nowa wysyłka</value>
+    <value>Dodaj wysyłkę</value>
     <comment>'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated.</comment>
   </data>
   <data name="AreYouSureDeleteSend" xml:space="preserve">
@@ -2014,15 +2014,15 @@ Skanowanie nastąpi automatycznie.</value>
     <comment>'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated.</comment>
   </data>
   <data name="SendDeleted" xml:space="preserve">
-    <value>Wysyłka została usunięta</value>
+    <value>Wysyłka została usunięta.</value>
     <comment>'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated.</comment>
   </data>
   <data name="SendUpdated" xml:space="preserve">
-    <value>Wysyłka została zapisana</value>
+    <value>Wysyłka została zaktualizowana.</value>
     <comment>'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated.</comment>
   </data>
   <data name="NewSendCreated" xml:space="preserve">
-    <value>Wysyłka została utworzona</value>
+    <value>Wysyłka została utworzona.</value>
     <comment>'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated.</comment>
   </data>
   <data name="OneDay" xml:space="preserve">
@@ -2185,7 +2185,7 @@ Skanowanie nastąpi automatycznie.</value>
     <value>Konto zostało trwale usunięte</value>
   </data>
   <data name="InvalidVerificationCode" xml:space="preserve">
-    <value>Kod weryfikacyjny jest nieprawidłowy</value>
+    <value>Kod weryfikacyjny jest nieprawidłowy.</value>
   </data>
   <data name="RequestOTP" xml:space="preserve">
     <value>Poproś o jednorazowe hasło</value>
@@ -2242,7 +2242,7 @@ Skanowanie nastąpi automatycznie.</value>
     <value>Znaki specjalne (!@#$%^&amp;*)</value>
   </data>
   <data name="TapToGoBack" xml:space="preserve">
-    <value>Kliknij, aby wrócić</value>
+    <value>Dotknij, aby wrócić</value>
   </data>
   <data name="PasswordIsVisibleTapToHide" xml:space="preserve">
     <value>Hasło jest widoczne. Kliknij, aby je ukryć.</value>
@@ -2287,7 +2287,7 @@ Skanowanie nastąpi automatycznie.</value>
     <value>Klucz uwierzytelniający</value>
   </data>
   <data name="EnterKeyManually" xml:space="preserve">
-    <value>Wpisz klucz ręcznie</value>
+    <value>Wprowadź klucz ręcznie</value>
   </data>
   <data name="AddTotp" xml:space="preserve">
     <value>Dodaj TOTP</value>
@@ -2312,10 +2312,10 @@ wybierz Dodaj TOTP, aby bezpiecznie przechowywać klucz</value>
     <value>Nie mogliśmy przetworzyć żądania. Spróbuj ponownie lub skontaktuj się z nami.</value>
   </data>
   <data name="AllowScreenCapture" xml:space="preserve">
-    <value>Wykonywanie zrzutów ekranu</value>
+    <value>Pozwól na robienie zrzutów ekranu</value>
   </data>
   <data name="AreYouSureYouWantToEnableScreenCapture" xml:space="preserve">
-    <value>Czy na pewno chcesz zezwolić na wykonywanie zrzutów ekranu?</value>
+    <value>Jesteś pewien, że chcesz włączyć możliwość robienia zrzutów ekranu?</value>
   </data>
   <data name="LogInRequested" xml:space="preserve">
     <value>Wysłano prośbę o logowanie</value>
@@ -2327,7 +2327,7 @@ wybierz Dodaj TOTP, aby bezpiecznie przechowywać klucz</value>
     <value>Próba logowania przez {0} na {1}</value>
   </data>
   <data name="DeviceType" xml:space="preserve">
-    <value>Rodzaj urządzenia</value>
+    <value>Typ urządzenia</value>
   </data>
   <data name="IpAddress" xml:space="preserve">
     <value>Adres IP</value>
@@ -2348,13 +2348,13 @@ wybierz Dodaj TOTP, aby bezpiecznie przechowywać klucz</value>
     <value>Teraz</value>
   </data>
   <data name="XMinutesAgo" xml:space="preserve">
-    <value>{0} min temu</value>
+    <value>{0} minut temu</value>
   </data>
   <data name="LogInAccepted" xml:space="preserve">
-    <value>Logowanie zostało potwierdzone</value>
+    <value>Logowanie potwierdzone</value>
   </data>
   <data name="LogInDenied" xml:space="preserve">
-    <value>Logowanie zostało odrzucone</value>
+    <value>Logowanie odrzucone</value>
   </data>
   <data name="ApproveLoginRequests" xml:space="preserve">
     <value>Zatwierdź prośby o logowanie</value>
@@ -2472,40 +2472,4 @@ wybierz Dodaj TOTP, aby bezpiecznie przechowywać klucz</value>
 {0}
 Czy chcesz przełączyć się na to konto?</value>
   </data>
-  <data name="NewAroundHere" xml:space="preserve">
-    <value>Jesteś tu nowy(a)?</value>
-  </data>
-  <data name="GetMasterPasswordwordHint" xml:space="preserve">
-    <value>Uzyskaj podpowiedź hasła głównego</value>
-  </data>
-  <data name="LoggingInAsX" xml:space="preserve">
-    <value>Logowanie jako {0}</value>
-  </data>
-  <data name="NotYou" xml:space="preserve">
-    <value>To nie Ty?</value>
-  </data>
-  <data name="LogInWithMasterPassword" xml:space="preserve">
-    <value>Logowanie hasłem głównym</value>
-  </data>
-  <data name="LogInWithAnotherDevice" xml:space="preserve">
-    <value>Logowanie innym urządzeniem</value>
-  </data>
-  <data name="LogInInitiated" xml:space="preserve">
-    <value>Logowanie rozpoczęte</value>
-  </data>
-  <data name="ANotificationHasBeenSentToYourDevice" xml:space="preserve">
-    <value>Powiadomienie zostało wysłane na urządzenie.</value>
-  </data>
-  <data name="PleaseMakeSureYourVaultIsUnlockedAndTheFingerprintPhraseMatchesOnTheOtherDevice" xml:space="preserve">
-    <value>Upewnij się, że sejf jest odblokowany, a unikalny identyfikator konta pasuje do drugiego urządzenia.</value>
-  </data>
-  <data name="ResendNotification" xml:space="preserve">
-    <value>Wyślij ponownie powiadomienie</value>
-  </data>
-  <data name="NeedAnotherOption" xml:space="preserve">
-    <value>Potrzebujesz innego sposobu?</value>
-  </data>
-  <data name="ViewAllLoginOptions" xml:space="preserve">
-    <value>Zobacz wszystkie sposoby logowania</value>
-  </data>
 </root>

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

@@ -1576,7 +1576,7 @@ A leitura será feita automaticamente.</value>
     <comment>'Nord' is the name of a specific color scheme. It should not be translated.</comment>
   </data>
   <data name="SolarizedDark" xml:space="preserve">
-    <value>Escuro Solarizado</value>
+    <value>Solarized Dark</value>
     <comment>'Solarized Dark' is the name of a specific color scheme. It should not be translated.</comment>
   </data>
   <data name="AutofillBlockedUris" xml:space="preserve">
@@ -2473,40 +2473,4 @@ selecione Adicionar TOTP para armazenar a chave de forma segura</value>
 {0}
 Você deseja mudar para esta conta?</value>
   </data>
-  <data name="NewAroundHere" xml:space="preserve">
-    <value>Novo por aqui?</value>
-  </data>
-  <data name="GetMasterPasswordwordHint" xml:space="preserve">
-    <value>Obter dica da senha mestra</value>
-  </data>
-  <data name="LoggingInAsX" xml:space="preserve">
-    <value>Entrando como {0}</value>
-  </data>
-  <data name="NotYou" xml:space="preserve">
-    <value>Não é você?</value>
-  </data>
-  <data name="LogInWithMasterPassword" xml:space="preserve">
-    <value>Entrar com a senha mestra</value>
-  </data>
-  <data name="LogInWithAnotherDevice" xml:space="preserve">
-    <value>Entrar com outro dispositivo</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>
-  </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>
-  </data>
-  <data name="ResendNotification" xml:space="preserve">
-    <value>Resend notification</value>
-  </data>
-  <data name="NeedAnotherOption" xml:space="preserve">
-    <value>Need another option?</value>
-  </data>
-  <data name="ViewAllLoginOptions" xml:space="preserve">
-    <value>View all log in options</value>
-  </data>
 </root>

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

@@ -2472,40 +2472,4 @@ select Add TOTP to store the key safely</value>
 {0}
 Deseja mudar para esta conta?</value>
   </data>
-  <data name="NewAroundHere" xml:space="preserve">
-    <value>Novo por aqui?</value>
-  </data>
-  <data name="GetMasterPasswordwordHint" xml:space="preserve">
-    <value>Obter dica da palavra-passe mestra</value>
-  </data>
-  <data name="LoggingInAsX" xml:space="preserve">
-    <value>A iniciar sessão como {0}</value>
-  </data>
-  <data name="NotYou" xml:space="preserve">
-    <value>Utilizador incorreto?</value>
-  </data>
-  <data name="LogInWithMasterPassword" xml:space="preserve">
-    <value>Iniciar sessão com a palavra-passe mestra</value>
-  </data>
-  <data name="LogInWithAnotherDevice" xml:space="preserve">
-    <value>Iniciar sessão com outro dispositivo</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>
-  </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>
-  </data>
-  <data name="ResendNotification" xml:space="preserve">
-    <value>Resend notification</value>
-  </data>
-  <data name="NeedAnotherOption" xml:space="preserve">
-    <value>Need another option?</value>
-  </data>
-  <data name="ViewAllLoginOptions" xml:space="preserve">
-    <value>View all log in options</value>
-  </data>
 </root>

src/App/Resources/AppResources.resx

@@ -1762,7 +1762,7 @@ Scanning will happen automatically.</value>
     <value>Syncing vault with pull down gesture.</value>
   </data>
   <data name="LogInSso" xml:space="preserve">
-    <value>Enterprise single sign-on</value>
+    <value>Enterprise Single Sign-On</value>
   </data>
   <data name="LogInSsoSummary" xml:space="preserve">
     <value>Quickly log in using your organization's single sign-on portal. Please enter your organization's identifier to begin.</value>
@@ -2473,40 +2473,4 @@ select Add TOTP to store the key safely</value>
 {0}
 Do you want to switch to this account?</value>
   </data>
-  <data name="NewAroundHere" xml:space="preserve">
-    <value>New around here?</value>
-  </data>
-  <data name="GetMasterPasswordwordHint" xml:space="preserve">
-    <value>Get master password hint</value>
-  </data>
-  <data name="LoggingInAsX" xml:space="preserve">
-    <value>Logging in as {0}</value>
-  </data>
-  <data name="NotYou" xml:space="preserve">
-    <value>Not you?</value>
-  </data>
-  <data name="LogInWithMasterPassword" xml:space="preserve">
-    <value>Log in with master password</value>
-  </data>
-  <data name="LogInWithAnotherDevice" xml:space="preserve">
-    <value>Log In with another device</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>
-  </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>
-  </data>
-  <data name="ResendNotification" xml:space="preserve">
-    <value>Resend notification</value>
-  </data>
-  <data name="NeedAnotherOption" xml:space="preserve">
-    <value>Need another option?</value>
-  </data>
-  <data name="ViewAllLoginOptions" xml:space="preserve">
-    <value>View all log in options</value>
-  </data>
 </root>

src/App/Resources/AppResources.ro.resx

@@ -2472,40 +2472,4 @@ selectați „Adăugare TOTP” pentru a stoca cheia în siguranță</value>
 {0}
 Doriți să comutați la acest cont?</value>
   </data>
-  <data name="NewAroundHere" xml:space="preserve">
-    <value>Sunteți nou pe aici?</value>
-  </data>
-  <data name="GetMasterPasswordwordHint" xml:space="preserve">
-    <value>Obțineți indiciul parolei principale</value>
-  </data>
-  <data name="LoggingInAsX" xml:space="preserve">
-    <value>Autentificare ca {0}</value>
-  </data>
-  <data name="NotYou" xml:space="preserve">
-    <value>Nu sunteți dvs.?</value>
-  </data>
-  <data name="LogInWithMasterPassword" xml:space="preserve">
-    <value>Autentificați-vă cu parola principală</value>
-  </data>
-  <data name="LogInWithAnotherDevice" xml:space="preserve">
-    <value>Autentificați-vă cu un alt dispozitiv</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>
-  </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>
-  </data>
-  <data name="ResendNotification" xml:space="preserve">
-    <value>Resend notification</value>
-  </data>
-  <data name="NeedAnotherOption" xml:space="preserve">
-    <value>Need another option?</value>
-  </data>
-  <data name="ViewAllLoginOptions" xml:space="preserve">
-    <value>View all log in options</value>
-  </data>
 </root>

src/App/Resources/AppResources.ru.resx

@@ -705,10 +705,10 @@
     <comment>What Apple calls their fingerprint reader.</comment>
   </data>
   <data name="TwoStepLogin" xml:space="preserve">
-    <value>Двухэтапная аутентификация</value>
+    <value>Двухфакторная аутентификация</value>
   </data>
   <data name="TwoStepLoginConfirmation" xml:space="preserve">
-    <value>Двухэтапная аутентификация делает аккаунт более защищенным, поскольку требуется подтверждение входа при помощи другого устройства, например, ключа безопасности, приложения-аутентификатора, SMS, телефонного звонка или электронной почты. Двухэтапная аутентификация включается на bitwarden.com. Перейти на сайт сейчас?</value>
+    <value>Двухэтапная аутентификация повышает защиту вашего аккаунта, требуя подтверждения входа на другом устройстве, например, с помощью ключа безопасности, приложения-аутентификатора, SMS, телефонного звонка или email. Двухфакторная аутентификация включается на bitwarden.com. Перейти на сайт сейчас?</value>
   </data>
   <data name="UnlockWith" xml:space="preserve">
     <value>Разблокировка {0}</value>
@@ -831,7 +831,7 @@
     <comment>For 2FA whenever there are no available providers on this device.</comment>
   </data>
   <data name="NoTwoStepAvailable" xml:space="preserve">
-    <value>У этой учетной записи включена двухэтапная аутентификация, однако ни один из настроенных вариантов не поддерживается на этом устройстве. Используйте поддерживаемое устройство и/или добавьте другие варианты, которые поддерживаются на большинстве устройств (например, приложение-аутентификатор).</value>
+    <value>Для этой учетной записи включена двухфакторная аутентификация, однако ни один из настроенных вариантов аутентификации не поддерживается на этом устройстве. Используйте поддерживаемое устройство и/или добавьте другие варианты, которые поддерживаются на большинстве устройств (например, приложение-аутентификатор).</value>
   </data>
   <data name="RecoveryCodeTitle" xml:space="preserve">
     <value>Код восстановления</value>
@@ -846,10 +846,10 @@
     <comment>For 2FA</comment>
   </data>
   <data name="TwoStepLoginOptions" xml:space="preserve">
-    <value>Настройки двухэтапной аутентификации</value>
+    <value>Настройки двухфакторной аутентификации</value>
   </data>
   <data name="UseAnotherTwoStepMethod" xml:space="preserve">
-    <value>Использовать другой метод двухэтапной аутентификации</value>
+    <value>Использовать другой метод двухфакторной аутентификации</value>
   </data>
   <data name="VerificationEmailNotSent" xml:space="preserve">
     <value>Не удалось отправить письмо подтверждения. Повторить.</value>
@@ -919,7 +919,7 @@
     <value>Если к вашему логину прикреплен ключ аутентификации, то код подтверждения TOTP будет скопирован при автозаполнении логина.</value>
   </data>
   <data name="CopyTotpAutomatically" xml:space="preserve">
-    <value>Скопировать TOTP автоматически</value>
+    <value>Копировать TOTP автоматически</value>
   </data>
   <data name="PremiumRequired" xml:space="preserve">
     <value>Для использования этой функции требуется Премиум.</value>
@@ -1471,7 +1471,7 @@
     <value>Экспортировать хранилище</value>
   </data>
   <data name="LockNow" xml:space="preserve">
-    <value>Заблокировать</value>
+    <value>Заблокировать сейчас</value>
   </data>
   <data name="PIN" xml:space="preserve">
     <value>PIN-код</value>
@@ -1614,10 +1614,10 @@
     <value>Общие</value>
   </data>
   <data name="ToggleVisibility" xml:space="preserve">
-    <value>Вкл/выкл видимость</value>
+    <value>Изменить видимость</value>
   </data>
   <data name="LoginExpired" xml:space="preserve">
-    <value>Истек срок действия вашего сеанса.</value>
+    <value>Истек срок действия вашей сессии.</value>
   </data>
   <data name="BiometricsDirection" xml:space="preserve">
     <value>Биометрическая верификация.</value>
@@ -1762,7 +1762,7 @@
     <value>Синхронизация хранилища жестом смахивания вниз.</value>
   </data>
   <data name="LogInSso" xml:space="preserve">
-    <value>Единая корпоративная авторизация</value>
+    <value>Единая корпоративная авторизация (SSO)</value>
   </data>
   <data name="LogInSsoSummary" xml:space="preserve">
     <value>Авторизуйтесь при помощи единого корпоративного портала. Чтобы начать, введите идентификатор вашей организации.</value>
@@ -2092,7 +2092,7 @@
     <value>Обновить мастер-пароль</value>
   </data>
   <data name="UpdateMasterPasswordWarning" xml:space="preserve">
-    <value>Мастер-пароль недавно был изменен администратором вашей организации. Чтобы получить доступ к хранилищу, вы должны обновить мастер-пароль сейчас. В результате текущий сеанс будет завершен, потребуется повторный вход. Активные сеансы на других устройствах могут оставаться активными в течение одного часа.</value>
+    <value>Мастер-пароль недавно был изменен администратором вашей организации. Чтобы получить доступ к хранилищу, вы должны обновить мастер-пароль сейчас. В результате текущая сессия будет завершена, потребуется повторный вход. Активные сессии на других устройствах могут оставаться активными в течение одного часа.</value>
   </data>
   <data name="UpdatingPassword" xml:space="preserve">
     <value>Обновление пароля</value>
@@ -2472,40 +2472,4 @@
 {0}
 Хотите переключиться на этот аккаунт?</value>
   </data>
-  <data name="NewAroundHere" xml:space="preserve">
-    <value>Вы здесь впервые?</value>
-  </data>
-  <data name="GetMasterPasswordwordHint" xml:space="preserve">
-    <value>Получить подсказку к мастер-паролю</value>
-  </data>
-  <data name="LoggingInAsX" xml:space="preserve">
-    <value>Войти как {0}</value>
-  </data>
-  <data name="NotYou" xml:space="preserve">
-    <value>Не вы?</value>
-  </data>
-  <data name="LogInWithMasterPassword" xml:space="preserve">
-    <value>Войти с мастер-паролем</value>
-  </data>
-  <data name="LogInWithAnotherDevice" xml:space="preserve">
-    <value>Войти с другого устройства</value>
-  </data>
-  <data name="LogInInitiated" xml:space="preserve">
-    <value>Вход инициирован</value>
-  </data>
-  <data name="ANotificationHasBeenSentToYourDevice" xml:space="preserve">
-    <value>На ваше устройство отправлено уведомление.</value>
-  </data>
-  <data name="PleaseMakeSureYourVaultIsUnlockedAndTheFingerprintPhraseMatchesOnTheOtherDevice" xml:space="preserve">
-    <value>Убедитесь, что ваше хранилище разблокировано, а фраза отпечатка соответствует другому устройству.</value>
-  </data>
-  <data name="ResendNotification" xml:space="preserve">
-    <value>Отправить уведомление повторно</value>
-  </data>
-  <data name="NeedAnotherOption" xml:space="preserve">
-    <value>Нужен другой вариант?</value>
-  </data>
-  <data name="ViewAllLoginOptions" xml:space="preserve">
-    <value>Посмотреть все варианты авторизации</value>
-  </data>
 </root>

src/App/Resources/AppResources.si.resx

@@ -1762,7 +1762,7 @@ Scanning will happen automatically.</value>
     <value>Syncing vault with pull down gesture.</value>
   </data>
   <data name="LogInSso" xml:space="preserve">
-    <value>Enterprise single sign-on</value>
+    <value>Enterprise Single Sign-On</value>
   </data>
   <data name="LogInSsoSummary" xml:space="preserve">
     <value>Quickly log in using your organization's single sign-on portal. Please enter your organization's identifier to begin.</value>
@@ -2473,40 +2473,4 @@ select Add TOTP to store the key safely</value>
 {0}
 Do you want to switch to this account?</value>
   </data>
-  <data name="NewAroundHere" xml:space="preserve">
-    <value>New around here?</value>
-  </data>
-  <data name="GetMasterPasswordwordHint" xml:space="preserve">
-    <value>Get master password hint</value>
-  </data>
-  <data name="LoggingInAsX" xml:space="preserve">
-    <value>Logging in as {0}</value>
-  </data>
-  <data name="NotYou" xml:space="preserve">
-    <value>Not you?</value>
-  </data>
-  <data name="LogInWithMasterPassword" xml:space="preserve">
-    <value>Log in with master password</value>
-  </data>
-  <data name="LogInWithAnotherDevice" xml:space="preserve">
-    <value>Log In with another device</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>
-  </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>
-  </data>
-  <data name="ResendNotification" xml:space="preserve">
-    <value>Resend notification</value>
-  </data>
-  <data name="NeedAnotherOption" xml:space="preserve">
-    <value>Need another option?</value>
-  </data>
-  <data name="ViewAllLoginOptions" xml:space="preserve">
-    <value>View all log in options</value>
-  </data>
 </root>