[SG-765] Add cancel button to passwordless login modal on android

.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"

.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,6 @@
     <Compile Include="Services\FileService.cs" />
     <Compile Include="Services\AutofillHandler.cs" />
     <Compile Include="Constants.cs" />
-    <Compile Include="Effects\RemoveFontPaddingEffect.cs" />
   </ItemGroup>
   <ItemGroup>
     <AndroidAsset Include="Assets\bwi-font.ttf" />

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/App/App.csproj

@@ -139,7 +139,6 @@
     <Folder Include="Controls\AccountSwitchingOverlay\" />
     <Folder Include="Utilities\AccountManagement\" />
     <Folder Include="Controls\DateTime\" />
-    <Folder Include="Controls\IconLabelButton\" />
   </ItemGroup>
 
   <ItemGroup>
@@ -431,6 +430,5 @@
     <None Remove="Controls\AccountSwitchingOverlay\" />
     <None Remove="Utilities\AccountManagement\" />
     <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,13 +143,9 @@ namespace Bit.App
                                 new NavigationPage(new RemoveMasterPasswordPage()));
                         });
                     }
-                    else if (message.Command == Constants.PasswordlessLoginRequestKey || message.Command == "unlocked" || 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)
@@ -168,6 +162,7 @@ namespace Bit.App
                 _pendingCheckPasswordlessLoginRequests = true;
                 return;
             }
+
             _pendingCheckPasswordlessLoginRequests = false;
             if (await _vaultTimeoutService.IsLockedAsync())
             {
@@ -187,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()
             {
@@ -221,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;
@@ -259,7 +242,7 @@ namespace Bit.App
             }
             if (_pendingCheckPasswordlessLoginRequests)
             {
-                _messagingService.Send(Constants.PasswordlessLoginRequestKey);
+                CheckPasswordlessLoginRequestsAsync().FireAndForget();
             }
             if (Device.RuntimePlatform == Device.Android)
             {
@@ -295,7 +278,7 @@ namespace Bit.App
             _isResumed = true;
             if (_pendingCheckPasswordlessLoginRequests)
             {
-                _messagingService.Send(Constants.PasswordlessLoginRequestKey);
+                CheckPasswordlessLoginRequestsAsync().FireAndForget();
             }
             if (Device.RuntimePlatform == Device.Android)
             {

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/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,40 +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}}"
-    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}}"
-        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(Command), 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 checkRememberedEmail = true)
+        public HomePage(AppOptions appOptions = null)
         {
             _broadcasterService = ServiceContainer.Resolve<IBroadcasterService>("broadcasterService");
             _appOptions = appOptions;
             InitializeComponent();
             _vm = BindingContext as HomeViewModel;
             _vm.Page = this;
-            _vm.CheckHasRememberedEmail = checkRememberedEmail;
-            _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);
@@ -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,14 +1,8 @@
 using System;
-using System.Threading.Tasks;
 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
 {
@@ -18,33 +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;
 
         public HomeViewModel()
         {
             _stateService = ServiceContainer.Resolve<IStateService>("stateService");
             _messagingService = ServiceContainer.Resolve<IMessagingService>("messagingService");
-            _platformUtilsService = ServiceContainer.Resolve<IPlatformUtilsService>();
-            _logger = ServiceContainer.Resolve<ILogger>("logger");
+            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
@@ -53,92 +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 CheckHasRememberedEmail { 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 (CheckHasRememberedEmail && RememberEmail)
-            {
-                StartLoginAction();
-            }
-            CheckHasRememberedEmail = 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);
-                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 LogInCommand}"
-                            IsVisible="False"/>
-                        <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

@@ -4,7 +4,6 @@ using Bit.App.Models;
 using Bit.App.Utilities;
 using Bit.Core.Abstractions;
 using Bit.Core.Utilities;
-using Xamarin.CommunityToolkit.ObjectModel;
 using Xamarin.Forms;
 
 namespace Bit.App.Pages
@@ -26,7 +25,6 @@ namespace Bit.App.Pages
             _vm.Page = this;
             _vm.StartTwoFactorAction = () => Device.BeginInvokeOnMainThread(async () => await StartTwoFactorAsync());
             _vm.LogInSuccessAction = () => Device.BeginInvokeOnMainThread(async () => await LogInSuccessAsync());
-            _vm.StartSsoLoginAction = () => Device.BeginInvokeOnMainThread(async () => await StartSsoLoginAsync());
             _vm.UpdateTempPasswordAction =
                 () => Device.BeginInvokeOnMainThread(async () => await UpdateTempPasswordAsync());
             _vm.CloseAction = async () =>
@@ -44,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);
@@ -84,7 +85,7 @@ namespace Bit.App.Pages
             await _vm.InitAsync();
             if (!_inputFocused)
             {
-                RequestFocus(_masterPassword);
+                RequestFocus(string.IsNullOrWhiteSpace(_vm.Email) ? _email : _masterPassword);
                 _inputFocused = true;
             }
         }
@@ -114,25 +115,11 @@ namespace Bit.App.Pages
             }
         }
 
-        private void LogInSSO_Clicked(object sender, EventArgs e)
-        {
-            if (DoOnce())
-            {
-                _vm.StartSsoLoginAction();
-            }
-        }
-
-        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

@@ -3,13 +3,11 @@ 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.Core;
 using Bit.Core.Abstractions;
 using Bit.Core.Exceptions;
-using Bit.Core.Services;
 using Bit.Core.Utilities;
 using Xamarin.CommunityToolkit.ObjectModel;
 using Xamarin.Forms;
@@ -27,14 +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 bool _showPassword;
         private bool _showCancelButton;
         private string _email;
         private string _masterPassword;
         private bool _isEmailEnabled;
-        private bool _isKnownDevice;
 
         public LoginPageViewModel()
         {
@@ -47,8 +43,6 @@ 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>();
 
             PageTitle = AppResources.Bitwarden;
             TogglePasswordCommand = new Command(TogglePassword);
@@ -82,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
@@ -101,12 +91,6 @@ 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; }
@@ -116,11 +100,9 @@ namespace Bit.App.Pages
         public ICommand MoreCommand { get; internal set; }
         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 Action StartTwoFactorAction { get; set; }
         public Action LogInSuccessAction { get; set; }
         public Action UpdateTempPasswordAction { get; set; }
-        public Action StartSsoLoginAction { get; set; }
         public Action CloseAction { get; set; }
 
         protected override II18nService i18nService => _i18nService;
@@ -130,14 +112,10 @@ namespace Bit.App.Pages
 
         public async Task InitAsync()
         {
-            await _deviceActionService.ShowLoadingAsync(AppResources.Loading);
             if (string.IsNullOrWhiteSpace(Email))
             {
                 Email = await _stateService.GetRememberedEmailAsync();
             }
-            var deviceIdentifier = await _appIdService.GetAppIdAsync();
-            IsKnownDevice = await _apiService.GetKnownDeviceAsync(Email, deviceIdentifier);
-            await _deviceActionService.HideLoadingAsync();
         }
 
         public async Task LogInAsync(bool showLoading = true, bool checkForExistingAccount = false)
@@ -192,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)
@@ -244,7 +223,12 @@ namespace Bit.App.Pages
 
             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)
             {
@@ -252,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;

src/App/Resources/AppResources.Designer.cs

@@ -2893,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>
@@ -3415,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>
@@ -3452,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);
             }
@@ -3561,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 +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>
@@ -4227,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>

src/App/Resources/AppResources.af.resx

@@ -2472,22 +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>
 </root>

src/App/Resources/AppResources.ar.resx

@@ -2473,22 +2473,4 @@
 {0}
 هل تريد التبديل إلى هذا الحساب؟</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>
 </root>

src/App/Resources/AppResources.az.resx

@@ -2471,22 +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>
 </root>

src/App/Resources/AppResources.be.resx

@@ -2472,22 +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>
 </root>

src/App/Resources/AppResources.bg.resx

@@ -2473,22 +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>
 </root>

src/App/Resources/AppResources.bn.resx

@@ -2473,22 +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>
 </root>

src/App/Resources/AppResources.bs.resx

@@ -2472,22 +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>
 </root>

src/App/Resources/AppResources.ca.resx

@@ -2472,22 +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>
 </root>

src/App/Resources/AppResources.cs.resx

@@ -2472,22 +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>
 </root>

src/App/Resources/AppResources.da.resx

@@ -2472,22 +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>
 </root>

src/App/Resources/AppResources.de.resx

@@ -2471,22 +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>
 </root>

src/App/Resources/AppResources.el.resx

@@ -2472,22 +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>
 </root>

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

@@ -2481,22 +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>
 </root>

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

@@ -2486,22 +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>
 </root>

src/App/Resources/AppResources.es.resx

@@ -2473,22 +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>
 </root>

src/App/Resources/AppResources.et.resx

@@ -2472,22 +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>
 </root>

src/App/Resources/AppResources.eu.resx

@@ -2471,22 +2471,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>
 </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,22 +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>
 </root>

src/App/Resources/AppResources.fi.resx

@@ -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,22 +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 ole 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>
 </root>

src/App/Resources/AppResources.fil.resx

@@ -2473,22 +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>
 </root>

src/App/Resources/AppResources.fr.resx

@@ -2472,22 +2472,4 @@ sélectionnez Ajouter TOTP pour stocker la clé en toute sécurité</value>
 {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>
 </root>

src/App/Resources/AppResources.he.resx

@@ -2475,22 +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>
 </root>

src/App/Resources/AppResources.hi.resx

@@ -2474,22 +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>
 </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">
@@ -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>
@@ -1901,7 +1902,7 @@
     <value>Datoteka koju želiš poslati</value>
   </data>
   <data name="FileTypeIsSelected" xml:space="preserve">
-    <value>Odabran je datotečni Send.</value>
+    <value>Odabrana je vrsta datoteke.</value>
   </data>
   <data name="FileTypeIsNotSelected" xml:space="preserve">
     <value>Vrsta datoteke nije odabrana, dodirnite za odabir.</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">
@@ -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,71 +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>Kreiraj 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>
+Do you want to switch to this account?</value>
   </data>
 </root>

src/App/Resources/AppResources.hu.resx

@@ -2471,22 +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>
 </root>

src/App/Resources/AppResources.id.resx

@@ -2472,22 +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>
 </root>

src/App/Resources/AppResources.it.resx

@@ -2472,22 +2472,4 @@ seleziona Aggiungi TOTP per salvare la chiave in modo sicuro</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>
 </root>

src/App/Resources/AppResources.ja.resx

@@ -2472,22 +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>
 </root>

src/App/Resources/AppResources.ka.resx

@@ -2473,22 +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>
 </root>

src/App/Resources/AppResources.kn.resx

@@ -2473,22 +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>
 </root>

src/App/Resources/AppResources.ko.resx

@@ -2472,22 +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>
 </root>

src/App/Resources/AppResources.lt.resx

@@ -2473,22 +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>
 </root>

src/App/Resources/AppResources.lv.resx

@@ -2472,22 +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>
 </root>

src/App/Resources/AppResources.ml.resx

@@ -2472,22 +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>
 </root>

src/App/Resources/AppResources.nb.resx

@@ -2473,22 +2473,4 @@ velg Legg til TOTP for å lagre nøkkelen sikkert</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>
 </root>

src/App/Resources/AppResources.nl.resx

@@ -2472,22 +2472,4 @@ kies je TOTP toevoegen om de sleutel veilig op te slaan</value>
 {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>
 </root>

src/App/Resources/AppResources.nn.resx

@@ -2473,22 +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>
 </root>

src/App/Resources/AppResources.pl.resx

@@ -2472,22 +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>
 </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,22 +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>
 </root>

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

@@ -2472,22 +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>
 </root>

src/App/Resources/AppResources.resx

@@ -2473,22 +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>
 </root>

src/App/Resources/AppResources.ro.resx

@@ -2472,22 +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>
 </root>

src/App/Resources/AppResources.ru.resx

@@ -2472,22 +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>
 </root>

src/App/Resources/AppResources.si.resx

@@ -2473,22 +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>
 </root>

src/App/Resources/AppResources.sk.resx

@@ -2472,22 +2472,4 @@ Pridať TOTP, aby ste kľúč bezpečne uložili</value>
 {0}
 Chcete prepnúť na toto konto?</value>
   </data>
-  <data name="NewAroundHere" xml:space="preserve">
-    <value>Ste tu nový?</value>
-  </data>
-  <data name="GetMasterPasswordwordHint" xml:space="preserve">
-    <value>Získať nápoveď pre hlavné heslo</value>
-  </data>
-  <data name="LoggingInAsX" xml:space="preserve">
-    <value>Prihlasujete sa ako {0}</value>
-  </data>
-  <data name="NotYou" xml:space="preserve">
-    <value>Nie ste to vy?</value>
-  </data>
-  <data name="LogInWithMasterPassword" xml:space="preserve">
-    <value>Prihlásenie pomocou hlavného hesla</value>
-  </data>
-  <data name="LogInWithAnotherDevice" xml:space="preserve">
-    <value>Prihlásenie pomocou iného zariadenia</value>
-  </data>
 </root>

src/App/Resources/AppResources.sl.resx

@@ -2473,22 +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>
 </root>

src/App/Resources/AppResources.sr.resx

@@ -2474,22 +2474,4 @@
 {0}
 Да ли желите да пређете на овај налог?</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>
 </root>

src/App/Resources/AppResources.sv.resx

@@ -229,7 +229,7 @@
     <value>Mappar</value>
   </data>
   <data name="FolderUpdated" xml:space="preserve">
-    <value>Mappen uppdaterades</value>
+    <value>Mapp sparad</value>
   </data>
   <data name="GoToWebsite" xml:space="preserve">
     <value>Gå till webbplats</value>
@@ -279,7 +279,7 @@
     <value>Ta bort konto</value>
   </data>
   <data name="RemoveAccountConfirmation" xml:space="preserve">
-    <value>Är du säker på att du vill ta bort detta konto?</value>
+    <value>Vill du ta bort kontot?</value>
   </data>
   <data name="AccountAlreadyAdded" xml:space="preserve">
     <value>Kontot har redan lagts till</value>
@@ -428,7 +428,7 @@
     <value>Undvik tvetydiga tecken</value>
   </data>
   <data name="BitwardenAppExtension" xml:space="preserve">
-    <value>Bitwarden apptillägg</value>
+    <value>Bitwarden Apptillägg</value>
   </data>
   <data name="BitwardenAppExtensionAlert2" xml:space="preserve">
     <value>Det enklaste sättet att lägga till nya inloggningar i ditt valv är genom apptillägget. Läs mer om Bitwardens apptillägg genom att navigera till fliken "Inställningar".</value>
@@ -657,7 +657,7 @@
     <value>Överväg gärna att hjälpa oss genom att ge oss en bra recension!</value>
   </data>
   <data name="RegeneratePassword" xml:space="preserve">
-    <value>Återskapa lösenord</value>
+    <value>Skapa nytt lösenord</value>
   </data>
   <data name="RetypeMasterPassword" xml:space="preserve">
     <value>Ange huvudlösenordet igen</value>
@@ -681,7 +681,7 @@
     <value>Objektinformation</value>
   </data>
   <data name="ItemUpdated" xml:space="preserve">
-    <value>Objektet uppdaterades</value>
+    <value>Objekt har sparats</value>
   </data>
   <data name="Submitting" xml:space="preserve">
     <value>Skickar...</value>
@@ -708,7 +708,7 @@
     <value>Tvåfaktorsautentisering</value>
   </data>
   <data name="TwoStepLoginConfirmation" xml:space="preserve">
-    <value>Tvåstegsverifiering gör ditt konto säkrare genom att kräva att du verifierar din inloggning med en annan enhet, t.ex. en säkerhetsnyckel, autentiseringsapp, SMS, telefonsamtal eller e-post. Tvåstegsverifiering kan aktiveras i Bitwardens webbvalv. Vill du besöka webbplatsen nu?</value>
+    <value>Tvåstegsverifiering gör ditt konto säkrare genom att kräva att du verifierar din inloggning med en annan enhet, t.ex. en säkerhetsnyckel, autentiseringsapp, SMS, telefonsamtal eller e-post. Tvåstegsverifiering kan aktiveras i Bitwarden.com webbvalv. Vill du besöka webbplatsen nu?</value>
   </data>
   <data name="UnlockWith" xml:space="preserve">
     <value>Lås upp med {0}</value>
@@ -857,7 +857,7 @@ Vänligen använd en enhet som stöds och/eller lägg till fler metoder som har
     <comment>For 2FA</comment>
   </data>
   <data name="VerificationEmailSent" xml:space="preserve">
-    <value>Verifieringsmeddelande har skickats</value>
+    <value>E-postmeddelande för bekräftelse har skickats</value>
     <comment>For 2FA</comment>
   </data>
   <data name="YubiKeyInstruction" xml:space="preserve">
@@ -901,7 +901,7 @@ Vänligen använd en enhet som stöds och/eller lägg till fler metoder som har
     <value>Kan inte läsa autentiseringsnyckeln.</value>
   </data>
   <data name="PointYourCameraAtTheQRCode" xml:space="preserve">
-    <value>Rikta kameran mot QR-koden.
+    <value>Peka kameran på QR-koden.
 Skanningen sker automatiskt.</value>
   </data>
   <data name="ScanQrTitle" xml:space="preserve">
@@ -1382,10 +1382,10 @@ Skanningen sker automatiskt.</value>
     <value>Sök i samling</value>
   </data>
   <data name="SearchFileSends" xml:space="preserve">
-    <value>Sök bland Sends-filer</value>
+    <value>Sök i Sends filer</value>
   </data>
   <data name="SearchTextSends" xml:space="preserve">
-    <value>Sök bland Sends-textmeddelanden</value>
+    <value>Sök i Sends textmeddelanden</value>
   </data>
   <data name="SearchGroup" xml:space="preserve">
     <value>Sök {0}</value>
@@ -1584,7 +1584,7 @@ Skanningen sker automatiskt.</value>
     <value>Fyll automatiskt i blockerade URI:er</value>
   </data>
   <data name="AutofillBlockedUrisDescription" xml:space="preserve">
-    <value>Automatisk ifyllnad kommer inte att erbjudas för blockerade URI:er. Separera flera URI:er med kommatecken. Till exempel: "https://twitter.com, androidapp://com.twitter.android".</value>
+    <value>Automatisk fyllning kommer inte att erbjudas för blockerade URI:er. Separera flera URI:er med kommatecken. Till exempel: "https://twitter.com, androidapp://com.twitter.android".</value>
   </data>
   <data name="AskToAddLogin" xml:space="preserve">
     <value>Be om att lägga till inloggning</value>
@@ -1894,7 +1894,7 @@ Skanningen sker automatiskt.</value>
     <value>Texten du vill skicka.</value>
   </data>
   <data name="HideTextByDefault" xml:space="preserve">
-    <value>Dölj texten som standard när denna Send öppnas</value>
+    <value>Dölj först texten när denna Send öppnas</value>
     <comment>'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated.</comment>
   </data>
   <data name="TypeFile" xml:space="preserve">
@@ -1935,7 +1935,7 @@ Skanningen sker automatiskt.</value>
     <value>Utgångstid</value>
   </data>
   <data name="ExpirationDateInfo" xml:space="preserve">
-    <value>Om angiven kommer åtkomst till denna Send att upphöra på angivet datum och tid.</value>
+    <value>Om angiven kommer åtkomst till denna Skicka att upphöra på angivet datum och tid.</value>
     <comment>'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated.</comment>
   </data>
   <data name="Expired" xml:space="preserve">
@@ -1945,7 +1945,7 @@ Skanningen sker automatiskt.</value>
     <value>Maximalt antal åtkomster</value>
   </data>
   <data name="MaximumAccessCountInfo" xml:space="preserve">
-    <value>Om angivet kommer användare inte längre kunna komma åt denna Send när det maximala antalet åtkomster har uppnåtts.</value>
+    <value>Om angivet kommer användare inte längre kunna komma åt denna Skicka när det maximala antalet åtkomster har uppnåtts.</value>
     <comment>'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated.</comment>
   </data>
   <data name="MaximumAccessCountReached" xml:space="preserve">
@@ -1958,7 +1958,7 @@ Skanningen sker automatiskt.</value>
     <value>Nytt lösenord</value>
   </data>
   <data name="PasswordInfo" xml:space="preserve">
-    <value>Kräv valfritt ett lösenord för att användare ska komma åt denna Send.</value>
+    <value>Kräv eventuellt lösenord av användare för att komma åt detta Skicka.</value>
     <comment>'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated.</comment>
   </data>
   <data name="RemovePassword" xml:space="preserve">
@@ -1978,7 +1978,7 @@ Skanningen sker automatiskt.</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>Inaktivera denna Send så att ingen kan komma åt den</value>
+    <value>Inaktivera detta Skicka så att ingen kan komma åt den</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">
@@ -1996,11 +1996,11 @@ Skanningen sker automatiskt.</value>
     <value>Dela länk</value>
   </data>
   <data name="SendLink" xml:space="preserve">
-    <value>Send-länk</value>
+    <value>Send link</value>
     <comment>'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated.</comment>
   </data>
   <data name="SearchSends" xml:space="preserve">
-    <value>Sök bland Send</value>
+    <value>Search Sends</value>
     <comment>'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated.</comment>
   </data>
   <data name="EditSend" xml:space="preserve">
@@ -2008,7 +2008,7 @@ Skanningen sker automatiskt.</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>Skapa ny Send</value>
+    <value>Lägg till 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">
@@ -2050,7 +2050,7 @@ Skanningen sker automatiskt.</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>På grund av en företagspolicy kan du bara radera en befintlig Send.</value>
+    <value>På grund av företagspolicy kan du bara ta bort en befintlig Skickning.</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">
@@ -2121,7 +2121,7 @@ Skanningen sker automatiskt.</value>
     <value>FIDO2 WebAuthn</value>
   </data>
   <data name="Fido2Instruction" xml:space="preserve">
-    <value>För att fortsätta, ha din FIDO2 WebAuthn-kompatibla säkerhetsnyckel redo, följ sedan instruktionerna efter att du klickat på "Autentisera WebAuthn" på nästa skärm.</value>
+    <value>För att fortsätta, ha din FIDO2 WebAuthn aktiverad säkerhetsnyckel redo, följ sedan instruktionerna efter att du klickat på "Authenticate WebAuthn" på nästa skärm.</value>
   </data>
   <data name="Fido2Desc" xml:space="preserve">
     <value>Autentisering med FIDO2 WebAuthn, du kan autentisera med en extern säkerhetsnyckel.</value>
@@ -2166,10 +2166,10 @@ Skanningen sker automatiskt.</value>
     <value>Kontot är låst</value>
   </data>
   <data name="AccountLoggedOutSuccessfully" xml:space="preserve">
-    <value>Kontot har loggats ut</value>
+    <value>Framgångsrikt utloggad</value>
   </data>
   <data name="AccountRemovedSuccessfully" xml:space="preserve">
-    <value>Kontot har tagits bort</value>
+    <value>Lyckades ta bort konto</value>
   </data>
   <data name="DeleteAccount" xml:space="preserve">
     <value>Radera konto</value>
@@ -2193,7 +2193,7 @@ Skanningen sker automatiskt.</value>
     <value>Begär engångslösenord</value>
   </data>
   <data name="SendCode" xml:space="preserve">
-    <value>Send-kod</value>
+    <value>Skicka kod</value>
   </data>
   <data name="Sending" xml:space="preserve">
     <value>Skickar</value>
@@ -2220,7 +2220,7 @@ Skanningen sker automatiskt.</value>
     <value>Ange verifieringskoden som skickades till din e-postadress</value>
   </data>
   <data name="SubmitCrashLogs" xml:space="preserve">
-    <value>Skicka in kraschloggar</value>
+    <value>Skicka in fellogg</value>
   </data>
   <data name="SubmitCrashLogsDescription" xml:space="preserve">
     <value>Hjälp Bitwarden att förbättra appens stabilitet genom att skicka in kraschrapporter.</value>
@@ -2271,7 +2271,7 @@ Skanningen sker automatiskt.</value>
     <value>TOTP</value>
   </data>
   <data name="VerificationCodes" xml:space="preserve">
-    <value>Verifieringskoder</value>
+    <value>Bekräftelsekoder</value>
   </data>
   <data name="PremiumSubscriptionRequired" xml:space="preserve">
     <value>Premium-prenumeration krävs</value>
@@ -2305,7 +2305,7 @@ välj Lägg till TOTP för att lagra nyckeln på ett säkert sätt</value>
     <value></value>
   </data>
   <data name="NeverLockWarning" xml:space="preserve">
-    <value>Att ställa in låsalternativ till “Aldrig” håller ditt valv tillgängligt för alla med tillgång till din enhet. Om du använder det här alternativet bör du se till att du håller din enhet ordentligt skyddad.</value>
+    <value>Ställa in dina låsalternativ till “Never” håller ditt valv tillgängligt för alla med tillgång till din enhet. Om du använder det här alternativet bör du se till att du håller din enhet ordentligt skyddad.</value>
   </data>
   <data name="EnvironmentPageUrlsError" xml:space="preserve">
     <value>En eller flera av de angivna webbadresserna är ogiltiga. Vänligen ändra det och försök att spara igen.</value>
@@ -2395,7 +2395,7 @@ välj Lägg till TOTP för att lagra nyckeln på ett säkert sätt</value>
     <value>E-post med catch-all</value>
   </data>
   <data name="ForwardedEmailAlias" xml:space="preserve">
-    <value>Vidarebefordrat e-postalias</value>
+    <value>Vidarebefordrad e-postalias</value>
   </data>
   <data name="RandomWord" xml:space="preserve">
     <value>Slumpmässigt ord</value>
@@ -2458,10 +2458,10 @@ välj Lägg till TOTP för att lagra nyckeln på ett säkert sätt</value>
     <value>Delgivning av tillgänglighetstjänst</value>
   </data>
   <data name="AccessibilityDisclosureText" xml:space="preserve">
-    <value>Bitwarden använder tillgänglighetstjänsten för att söka efter inloggningsfält i appar och på webbplatser. Därefter fastställs lämpliga fältidentifierare för att mata in användarnamn och lösenord när en träff för appen eller webbplatsen hittas. Vi lagrar inte några av de uppgifter som hittas av tjänsten, vi gör inte heller några försök att kontrollera några element på skärmen bortom textinmatning av identitetshandlingarna.</value>
+    <value>Bitwarden använder tillgänglighetstjänsten för att söka efter inloggningsfält i appar och på webbplatser. Därefter fastställs lämpliga fältidentifierare för att mata in användarnamn och lösenord när en träff för appen eller webbplatsen hittas. Vi lagrar inte någon av de uppgifter som hittas av tjänsten, Vi gör inte heller några försök att kontrollera några element på skärmen bortom textinmatning av identitetshandlingarna.</value>
   </data>
   <data name="Accept" xml:space="preserve">
-    <value>Acceptera</value>
+    <value>Godkänn</value>
   </data>
   <data name="Decline" xml:space="preserve">
     <value>Neka</value>
@@ -2474,22 +2474,4 @@ välj Lägg till TOTP för att lagra nyckeln på ett säkert sätt</value>
 {0}
 Vill du byta till detta konto?</value>
   </data>
-  <data name="NewAroundHere" xml:space="preserve">
-    <value>Är du ny här?</value>
-  </data>
-  <data name="GetMasterPasswordwordHint" xml:space="preserve">
-    <value>Hämta huvudlösenordsledtråd</value>
-  </data>
-  <data name="LoggingInAsX" xml:space="preserve">
-    <value>Loggar in som {0}</value>
-  </data>
-  <data name="NotYou" xml:space="preserve">
-    <value>Är det inte du?</value>
-  </data>
-  <data name="LogInWithMasterPassword" xml:space="preserve">
-    <value>Logga in med huvudlösenord</value>
-  </data>
-  <data name="LogInWithAnotherDevice" xml:space="preserve">
-    <value>Logga in med en annan enhet</value>
-  </data>
 </root>

src/App/Resources/AppResources.ta.resx

@@ -2473,22 +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>
 </root>

src/App/Resources/AppResources.th.resx

@@ -2480,22 +2480,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>
 </root>

src/App/Resources/AppResources.tr.resx

@@ -152,11 +152,11 @@
     <comment>Copy some value to your clipboard.</comment>
   </data>
   <data name="CopyPassword" xml:space="preserve">
-    <value>Parolayı kopyala</value>
+    <value>Parolayı Kopyala</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>Kullanıcı adını kopyala</value>
+    <value>Kullanıcı Adını Kopyala</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">
@@ -229,7 +229,7 @@
     <value>Klasörler</value>
   </data>
   <data name="FolderUpdated" xml:space="preserve">
-    <value>Klasör kaydedildi</value>
+    <value>Klasör güncellendi.</value>
   </data>
   <data name="GoToWebsite" xml:space="preserve">
     <value>Web sitesine git</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>İnternet bağlantısı gerekli</value>
+    <value>İnternet Bağlantısı Gerekiyor</value>
     <comment>Title for the alert when internet connection is required to continue.</comment>
   </data>
   <data name="InvalidMasterPassword" xml:space="preserve">
@@ -342,7 +342,7 @@
     <comment>Reveal a hidden value (password).</comment>
   </data>
   <data name="ItemDeleted" xml:space="preserve">
-    <value>Kayıt silindi</value>
+    <value>Kayıt silindi.</value>
     <comment>Confirmation message after successfully deleting a login.</comment>
   </data>
   <data name="Submit" xml:space="preserve">
@@ -375,11 +375,11 @@
     <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} kopyalandı</value>
+    <value>{0} kopyalandı.</value>
     <comment>Confirmation message after suceessfully copying a value to the clipboard.</comment>
   </data>
   <data name="VerifyFingerprint" xml:space="preserve">
-    <value>Parmak izini doğrula</value>
+    <value>Parmak İzini Doğrula</value>
   </data>
   <data name="VerifyMasterPassword" xml:space="preserve">
     <value>Ana parolayı doğrula</value>
@@ -428,7 +428,7 @@
     <value>Okurken karışabilecek karakterleri kullanma</value>
   </data>
   <data name="BitwardenAppExtension" xml:space="preserve">
-    <value>Bitwarden uygulama uzantısı</value>
+    <value>Bitwarden Uygulama Uzantısı</value>
   </data>
   <data name="BitwardenAppExtensionAlert2" xml:space="preserve">
     <value>Kasanıza yeni hesaplar eklemenin en kolay yolu Bitwarden uygulama uzantısıdır. Bitwarden uygulama uzantısı hakkında daha fazla bilgi almak için "Ayarlar" ekranına bakabilirsiniz.</value>
@@ -604,7 +604,7 @@
     <value>Asla</value>
   </data>
   <data name="NewItemCreated" xml:space="preserve">
-    <value>Kayıt eklendi</value>
+    <value>Yeni kayıt oluşturuldu.</value>
   </data>
   <data name="NoFavorites" xml:space="preserve">
     <value>Kasanızda hiç favoriniz yok.</value>
@@ -632,10 +632,10 @@
     <value>Diğer</value>
   </data>
   <data name="PasswordGenerated" xml:space="preserve">
-    <value>Parola oluşturuldu</value>
+    <value>Parola oluşturuldu.</value>
   </data>
   <data name="PasswordGenerator" xml:space="preserve">
-    <value>Parola üretici</value>
+    <value>Parola Oluşturucu</value>
   </data>
   <data name="PasswordHint" xml:space="preserve">
     <value>Parola ipucu</value>
@@ -663,7 +663,7 @@
     <value>Ana parolayı tekrar yazın</value>
   </data>
   <data name="SearchVault" xml:space="preserve">
-    <value>Kasada ara</value>
+    <value>Kasada Ara</value>
   </data>
   <data name="Security" xml:space="preserve">
     <value>Güvenlik</value>
@@ -681,7 +681,7 @@
     <value>Hesap Bilgileri</value>
   </data>
   <data name="ItemUpdated" xml:space="preserve">
-    <value>Kayıt kaydedildi</value>
+    <value>Hesap güncellendi.</value>
   </data>
   <data name="Submitting" xml:space="preserve">
     <value>Gönderiliyor...</value>
@@ -692,10 +692,10 @@
     <comment>Message shown when interacting with the server</comment>
   </data>
   <data name="SyncingComplete" xml:space="preserve">
-    <value>Eşitleme tamamlandı</value>
+    <value>Eşitleme tamamlandı.</value>
   </data>
   <data name="SyncingFailed" xml:space="preserve">
-    <value>Eşitleme başarısız oldu</value>
+    <value>Eşitleme başarısız oldu.</value>
   </data>
   <data name="SyncVaultNow" xml:space="preserve">
     <value>Kasayı şimdi eşitle</value>
@@ -708,7 +708,7 @@
     <value>İki aşamalı giriş</value>
   </data>
   <data name="TwoStepLoginConfirmation" xml:space="preserve">
-    <value>İki aşamalı giriş, hesabınıza girererken işlemi bir güvenlik anahtarı, şifrematik uygulaması, SMS, telefon araması veya e-posta gibi ek bir yöntemle doğrulamanızı isteyerek hesabınızın güvenliğini artırır. İki aşamalı giriş özelliğini bitwarden.com web kasası üzerinden ayarlayabilirsiniz. Şimdi siteye gitmek ister misiniz?</value>
+    <value>İki aşamalı giriş, hesabınıza girererken işlemi bir güvenlik anahtarı, şifrematik uygulaması, SMS, telefon araması veya e-posta gibi ek bir yöntemle doğrulamanızı isteyerek hesabınızın güvenliğini artırır. İki aşamalı giriş özelliğini bitwarden.com web kasası üzerinden etkinleştirebilirsiniz. Şimdi siteye gitmek ister misiniz?</value>
   </data>
   <data name="UnlockWith" xml:space="preserve">
     <value>Kilidi {0} ile aç</value>
@@ -856,14 +856,14 @@
     <comment>For 2FA</comment>
   </data>
   <data name="VerificationEmailSent" xml:space="preserve">
-    <value>Doğrulama e-postası gönderildi</value>
+    <value>Doğrulama e-postası gönderildi.</value>
     <comment>For 2FA</comment>
   </data>
   <data name="YubiKeyInstruction" xml:space="preserve">
     <value>Devam etmek için YubiKey NEO anahtarınızı cihazınızın arkasına doğru tutun veya YubiKey'i cihazınızın USB portuna takıp düğmesine dokunun.</value>
   </data>
   <data name="YubiKeyTitle" xml:space="preserve">
-    <value>YubiKey güvenlik anahtarı</value>
+    <value>YubiKey Güvenlik Anahtarı</value>
     <comment>"YubiKey" is the product name and should not be translated.</comment>
   </data>
   <data name="AddNewAttachment" xml:space="preserve">
@@ -1143,7 +1143,7 @@ Kod otomatik olarak taranacaktır.</value>
     <value>Hesapların yanında tanıdık görseller göster.</value>
   </data>
   <data name="IconsUrl" xml:space="preserve">
-    <value>Simge sunucusu URL'si</value>
+    <value>Sunucu URL simgeleri</value>
   </data>
   <data name="AutofillWithBitwarden" xml:space="preserve">
     <value>Bitwarden ile otomatik doldur</value>
@@ -1213,7 +1213,7 @@ Kod otomatik olarak taranacaktır.</value>
     <value>Metin</value>
   </data>
   <data name="NewCustomField" xml:space="preserve">
-    <value>Yeni özel alan</value>
+    <value>Yeni Özel Alan</value>
   </data>
   <data name="SelectTypeField" xml:space="preserve">
     <value>Ne tür bir özel alan eklemek istiyorsunuz?</value>
@@ -1252,11 +1252,11 @@ Kod otomatik olarak taranacaktır.</value>
     <value>URI eşleşme tespiti</value>
   </data>
   <data name="MatchDetection" xml:space="preserve">
-    <value>Eşleşme tespiti</value>
+    <value>Eşleşme Tespiti</value>
     <comment>URI match detection for auto-fill.</comment>
   </data>
   <data name="YesAndSave" xml:space="preserve">
-    <value>Evet ve kaydet</value>
+    <value>Evet, Kaydet</value>
   </data>
   <data name="AutofillAndSave" xml:space="preserve">
     <value>Otomatik doldur ve kaydet</value>
@@ -1278,7 +1278,7 @@ Kod otomatik olarak taranacaktır.</value>
     <value>Erişilebilirlik hizmeti, standart otomatik doldurma hizmetini desteklemeyen uygulamalarda işe yarayabilir.</value>
   </data>
   <data name="DatePasswordUpdated" xml:space="preserve">
-    <value>Parola güncellendi</value>
+    <value>Parola Güncellendi</value>
     <comment>ex. Date this password was updated</comment>
   </data>
   <data name="DateUpdated" xml:space="preserve">
@@ -1337,10 +1337,10 @@ Kod otomatik olarak taranacaktır.</value>
     <value>Hesaplar</value>
   </data>
   <data name="SecureNotes" xml:space="preserve">
-    <value>Güvenli notlar</value>
+    <value>Güvenli Notlar</value>
   </data>
   <data name="AllItems" xml:space="preserve">
-    <value>Tüm kayıtlar</value>
+    <value>Tüm Öğeler</value>
   </data>
   <data name="URIs" xml:space="preserve">
     <value>URl'ler</value>
@@ -1480,7 +1480,7 @@ Kod otomatik olarak taranacaktır.</value>
     <value>Kilidi aç</value>
   </data>
   <data name="UnlockVault" xml:space="preserve">
-    <value>Kasa kilidini aç</value>
+    <value>Kasanı Aç</value>
   </data>
   <data name="ThirtyMinutes" xml:space="preserve">
     <value>30 dakika</value>
@@ -1556,7 +1556,7 @@ Kod otomatik olarak taranacaktır.</value>
     <value>Varsayılan (sistem) temayı kullanırken cihazınızın koyu modu açıldığında koyu temaya geçmek için bunu seçin.</value>
   </data>
   <data name="CopyNotes" xml:space="preserve">
-    <value>Notu kopyala</value>
+    <value>Notları kopyala</value>
   </data>
   <data name="Exit" xml:space="preserve">
     <value>Çıkış</value>
@@ -1595,7 +1595,7 @@ Kod otomatik olarak taranacaktır.</value>
     <value>Uygulama yeniden başlatılınca</value>
   </data>
   <data name="AutofillServiceNotEnabled" xml:space="preserve">
-    <value>Otomatik doldurma, web sitelerinden ve uygulamalardan Bitwarden kasanıza güvenle erişmenizi kolaylaştırır. Bitwarden otomatik doldurma hizmetini henüz ayarlamamışsınız. "Ayarlar" ekranından otomatik doldurmayı ayarlayın.</value>
+    <value>Otomatik doldurma, web sitelerinden ve uygulamalardan Bitwarden kasanıza güvenle erişmenizi kolaylaştırır. Bitwarden otomatik doldurma hizmetini henüz etkinleştirmemişsiniz. "Ayarlar" ekranından otomatik doldurmayı etkinleştirin.</value>
   </data>
   <data name="ThemeAppliedOnRestart" xml:space="preserve">
     <value>Tema değişiklikleriniz uygulama yeniden başlatılınca uygulanacaktır.</value>
@@ -1632,7 +1632,7 @@ Kod otomatik olarak taranacaktır.</value>
     <value>Bitwarden'la ilgilenmeniz gerekiyor: Bitwarden ayarlarından "Otomatik doldurma erişilebilirlik hizmeti"ne bakın</value>
   </data>
   <data name="BitwardenAutofillServiceOverlayPermission" xml:space="preserve">
-    <value>3. Android'in uygulama ayarları bölümünde Bitwarden'ı bulun ve "Diğer uygulamaların üzerinde görüntüle" ayarını ("Gelişmiş" altında) açın.</value>
+    <value>3. Android'in uygulama ayarları bölümünde Bitwarden'ı bulun ve "diğer uygulamaların üstünde göster" ayarını açın. ("Gelişmiş" altında olabilir.)</value>
   </data>
   <data name="OverlayPermission" xml:space="preserve">
     <value>İzin</value>
@@ -1726,7 +1726,7 @@ Kod otomatik olarak taranacaktır.</value>
     <comment>Message shown when interacting with the server</comment>
   </data>
   <data name="ItemRestored" xml:space="preserve">
-    <value>Kayıt geri yüklendi</value>
+    <value>Kayıt geri yüklendi.</value>
     <comment>Confirmation message after successfully restoring a soft-deleted item</comment>
   </data>
   <data name="Trash" xml:space="preserve">
@@ -1756,7 +1756,7 @@ Kod otomatik olarak taranacaktır.</value>
     <value>Otomatik doldurma için biyometrik kilit açma devre dışı. Ana parolanın doğrulanması bekleniyor.</value>
   </data>
   <data name="EnableSyncOnRefresh" xml:space="preserve">
-    <value>Yenileme sırasında eşitlemeye izin ver</value>
+    <value>Yenileme sırasında eşitlemeyi etkinleştir</value>
   </data>
   <data name="EnableSyncOnRefreshDescription" xml:space="preserve">
     <value>Parmağımla aşağı çektiğimde kasayı eşitle.</value>
@@ -1774,7 +1774,7 @@ Kod otomatik olarak taranacaktır.</value>
     <value>Şu anda SSO ile giriş yapılamıyor</value>
   </data>
   <data name="SetMasterPassword" xml:space="preserve">
-    <value>Ana parolayı belirle</value>
+    <value>Ana Parola Belirleyin</value>
   </data>
   <data name="SetMasterPasswordSummary" xml:space="preserve">
     <value>SSO ile girişinizi tamamlamak için lütfen kasanıza erişirken kullanacağınız ana parolayı belirleyin.</value>
@@ -1831,7 +1831,7 @@ Kod otomatik olarak taranacaktır.</value>
     <value>Satır içi otomatik doldurmayı kullan</value>
   </data>
   <data name="InlineAutofillDescription" xml:space="preserve">
-    <value>Seçtiğiniz IME (klavye) destekliyorsa satır içi otomatik doldurmayı kullanabilirsiniz. Yapılandırmanız desteklenmiyorsa (veya bu seçenek kapalıysa) varsayılan otomatik doldurma kutusu kullanılacaktır.</value>
+    <value>Seçtiğiniz IME (klavye) destekliyorsa satır içi otomatik doldurmayı kullanabilirsiniz. Yapılandırmanız desteklenmiyorsa (veya bu seçenek devre dışıysa) varsayılan otomatik doldurma kutusu kullanılacaktır.</value>
   </data>
   <data name="Accessibility" xml:space="preserve">
     <value>Erişilebilirliği kullan</value>
@@ -1840,13 +1840,13 @@ Kod otomatik olarak taranacaktır.</value>
     <value>Uygulamalarda ve web'de hesap bilgilerinizi otomatik olarak doldurmak için Bitwarden erişilebilirlik hizmetini kullanabilirsiniz. Bu özelliği açarsanız giriş alanlarını seçtiğinizde bir açılır pencere karşınıza çıkacaktır.</value>
   </data>
   <data name="AccessibilityDescription2" xml:space="preserve">
-    <value>Uygulamalarda ve web'de hesap bilgilerinizi otomatik olarak doldurmak için Bitwarden erişilebilirlik hizmetini kullanın. ("Üstünde gösterme"nin de açılması gerekir.)</value>
+    <value>Uygulamalarda ve web'de hesap bilgilerinizi otomatik olarak doldurmak için Bitwarden erişilebilirlik hizmetini kullanın.  ("Üstünde gösterme"nin açılması gerekir.)</value>
   </data>
   <data name="AccessibilityDescription3" xml:space="preserve">
     <value>Bitwarden erişilebilirlik hizmetini açarak otomatik doldurma hızlı eylem kutusunu kullanabilir ve/veya üstünde gösterme yöntemiyle (bu özellliği açarsanız) açılır pencere açabilirisiniz.</value>
   </data>
   <data name="AccessibilityDescription4" xml:space="preserve">
-    <value>Otomatik doldurma hızlı eylem kutusunu kullanmak veya üstünde gösterme yöntemiyle (açıldıysa) otomatik doldurma hizmetini taklit etmek için gereklidir.</value>
+    <value>Otomatik doldurma hızlı eylem kutusunu kullanmak veya üstünde gösterme yöntemiyle (etkinleştirildiyse) otomatik doldurma hizmetini taklit etmek için gereklidir.</value>
   </data>
   <data name="DrawOver" xml:space="preserve">
     <value>Üstünde göstermeyi kullan</value>
@@ -1855,13 +1855,13 @@ Kod otomatik olarak taranacaktır.</value>
     <value>Bu seçeneği açarsanız, giriş formları seçildiğinde Bitwarden erişilebilirlik hizmeti bir açılır pencere görüntüleyebilir.</value>
   </data>
   <data name="DrawOverDescription2" xml:space="preserve">
-    <value>Bu seçeneği açarsanız, giriş formları seçildiğinde Bitwarden Erişilebilirlik Hizmeti formu otomatik doldurmanızı sağlamak için bir pencere açar.</value>
+    <value>Bu seçeneği açarsanız, giriş formları seçildiğinde Bitwarden Erişilebilirlik Hizmeti formu otomatik doldurmanızı sağlamak için bir pencere açabilir.</value>
   </data>
   <data name="DrawOverDescription3" xml:space="preserve">
     <value>Bu seçeneği açarsanız, Android'in otomatik doldurma özelliğini desteklemeyen eski uygulamalarda bu özelliği taklit eden bir pencere açılacaktır.</value>
   </data>
   <data name="PersonalOwnershipSubmitError" xml:space="preserve">
-    <value>Bir kuruluş ilkesi nedeniyle kişisel kasanıza hesap kaydetmeniz kısıtlanmış. Sahip seçeneğini bir kuruluş olarak değiştirin ve mevcut koleksiyonlar arasından seçim yapın.</value>
+    <value>Kurumsal ilkeler nedeniyle kişisel kasanıza hesap kaydetmeniz kısıtlanmış. Sahip seçeneğini bir kuruluş olarak değiştirin ve mevcut koleksiyonlar arasından seçim yapın.</value>
   </data>
   <data name="PersonalOwnershipPolicyInEffect" xml:space="preserve">
     <value>Bir kuruluş ilkesi sahiplik seçeneklerinizi etkiliyor.</value>
@@ -2006,7 +2006,7 @@ Kod otomatik olarak taranacaktır.</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>Yeni Send</value>
+    <value>Send ekle</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 @@ Kod otomatik olarak taranacaktır.</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>Send silindi</value>
+    <value>Send silindi.</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 kaydedildi</value>
+    <value>Send güncellendi.</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>Send oluşturuldu</value>
+    <value>Yeni Send oluşturuldu.</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 @@ Kod otomatik olarak taranacaktır.</value>
     <value>Hesabınız kalıcı olarak silinmiştir</value>
   </data>
   <data name="InvalidVerificationCode" xml:space="preserve">
-    <value>Doğrulama kodu geçersiz</value>
+    <value>Doğrulama kodu geçersiz.</value>
   </data>
   <data name="RequestOTP" xml:space="preserve">
     <value>Tek kullanımlık parola iste</value>
@@ -2302,7 +2302,7 @@ Kod otomatik olarak taranacaktır.</value>
     <value></value>
   </data>
   <data name="NeverLockWarning" xml:space="preserve">
-    <value>Kilit seçeneklerinizi "Asla" olarak ayarlarsanız cihazınıza erişebilen herkes kasanıza da erişebilir. Bu seçeneği kullanırsanız cihazınızı uygun şekilde koruduğunuzdan emin olmalısınız.</value>
+    <value>Kilit seçeneklerinizi "Hiçbir zaman" olarak ayarlamak, kasanızın cihazınıza erişimi olan herkesin kullanımına açık olmasını sağlar. Bu seçeneği kullanırsanız, cihazınızı uygun şekilde koruduğunuzdan emin olmalısınız.</value>
   </data>
   <data name="EnvironmentPageUrlsError" xml:space="preserve">
     <value>Girilen adreslerden biri veya birkaçı geçersiz. Lütfen düzeltip yeniden kaydetmeyi deneyin.</value>
@@ -2314,7 +2314,7 @@ Kod otomatik olarak taranacaktır.</value>
     <value>Ekran kaydına izin ver</value>
   </data>
   <data name="AreYouSureYouWantToEnableScreenCapture" xml:space="preserve">
-    <value>Ekran kaydını açmak istediğinizden emin misiniz?</value>
+    <value>Ekran kaydını etkinleştirmek istediğinizden emin misiniz?</value>
   </data>
   <data name="LogInRequested" xml:space="preserve">
     <value>Giriş istendi</value>
@@ -2323,7 +2323,7 @@ Kod otomatik olarak taranacaktır.</value>
     <value>Giriş yapmaya mı çalışıyorsunuz?</value>
   </data>
   <data name="LogInAttemptByXOnY" xml:space="preserve">
-    <value>{0} - {1} giriş denemesi</value>
+    <value>Login attempt by {0} on {1}</value>
   </data>
   <data name="DeviceType" xml:space="preserve">
     <value>Cihaz türü</value>
@@ -2452,41 +2452,23 @@ Kod otomatik olarak taranacaktır.</value>
     <value>Rastgele</value>
   </data>
   <data name="AccessibilityServiceDisclosure" xml:space="preserve">
-    <value>Erişilebilirlik Hizmeti Beyanı</value>
+    <value>Accessibility Service Disclosure</value>
   </data>
   <data name="AccessibilityDisclosureText" xml:space="preserve">
-    <value>Bitwarden; uygulamalarda ve web sitelerinde giriş alanlarını bulmak ve eşleşme bulunduğunda kullanıcı adı ve parolayı doldurmak için erişilebilirlik hizmetini kullanır. Hizmetin bize sunduğu hiçbir bilgiyi saklamayız ve hesap bilgilerinin girilmesi dışında ekrandaki öğeleri değiştirmek için herhangi bir girişimde bulunmayız.</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>Kabul et</value>
+    <value>Accept</value>
   </data>
   <data name="Decline" xml:space="preserve">
-    <value>Reddet</value>
+    <value>Decline</value>
   </data>
   <data name="LoginRequestHasAlreadyExpired" xml:space="preserve">
     <value>Giriş isteğinin süresi doldu.</value>
   </data>
   <data name="LoginAttemptFromXDoYouWantToSwitchToThisAccount" xml:space="preserve">
-    <value>Giriş denemesi yapan hesap:
+    <value>Login attempt from:
 {0}
-Bu hesaba geçmek ister misiniz?</value>
-  </data>
-  <data name="NewAroundHere" xml:space="preserve">
-    <value>Buralarda yeni misiniz?</value>
-  </data>
-  <data name="GetMasterPasswordwordHint" xml:space="preserve">
-    <value>Ana parola ipucunu al</value>
-  </data>
-  <data name="LoggingInAsX" xml:space="preserve">
-    <value>{0} olarak giriş yapılıyor</value>
-  </data>
-  <data name="NotYou" xml:space="preserve">
-    <value>Siz değil misiniz?</value>
-  </data>
-  <data name="LogInWithMasterPassword" xml:space="preserve">
-    <value>Ana parola ile giriş yap</value>
-  </data>
-  <data name="LogInWithAnotherDevice" xml:space="preserve">
-    <value>Başka bir cihazla giriş yap</value>
+Do you want to switch to this account?</value>
   </data>
 </root>

src/App/Resources/AppResources.uk.resx

@@ -2472,22 +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>
 </root>

src/App/Resources/AppResources.vi.resx

@@ -2472,22 +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>
 </root>

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

@@ -1152,7 +1152,7 @@
     <value>密码库已锁定</value>
   </data>
   <data name="GoToMyVault" xml:space="preserve">
-    <value>转到我的密码库</value>
+    <value>转到密码库</value>
   </data>
   <data name="Collections" xml:space="preserve">
     <value>集合</value>
@@ -2472,22 +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>
 </root>

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

@@ -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>我的密碼庫</value>
+    <value>密碼庫</value>
     <comment>The title for the vault page.</comment>
   </data>
   <data name="Authenticator" xml:space="preserve">
@@ -425,7 +425,7 @@
     <value>自動填入服務</value>
   </data>
   <data name="AvoidAmbiguousCharacters" xml:space="preserve">
-    <value>避免易混淆的字元</value>
+    <value>避免使用易混淆的字元</value>
   </data>
   <data name="BitwardenAppExtension" xml:space="preserve">
     <value>Bitwarden App 延伸功能</value>
@@ -461,7 +461,7 @@
     <value>繼續</value>
   </data>
   <data name="CreateAccount" xml:space="preserve">
-    <value>建立帳戶</value>
+    <value>新增帳戶</value>
   </data>
   <data name="CreatingAccount" xml:space="preserve">
     <value>正在建立帳戶...</value>
@@ -681,7 +681,7 @@
     <value>項目資訊</value>
   </data>
   <data name="ItemUpdated" xml:space="preserve">
-    <value>項目已儲存</value>
+    <value>已更新項目。</value>
   </data>
   <data name="Submitting" xml:space="preserve">
     <value>正在送出...</value>
@@ -827,7 +827,7 @@
     <comment>For 2FA</comment>
   </data>
   <data name="LoginUnavailable" xml:space="preserve">
-    <value>登入無法使用</value>
+    <value>無法登入</value>
     <comment>For 2FA whenever there are no available providers on this device.</comment>
   </data>
   <data name="NoTwoStepAvailable" xml:space="preserve">
@@ -937,7 +937,7 @@
     <value>檔案</value>
   </data>
   <data name="NoFileChosen" xml:space="preserve">
-    <value>未選擇任何檔案</value>
+    <value>未選擇檔案</value>
   </data>
   <data name="NoAttachments" xml:space="preserve">
     <value>沒有附件。</value>
@@ -1143,7 +1143,7 @@
     <value>在每個登入資料旁顯示一個可辨識的圖片。</value>
   </data>
   <data name="IconsUrl" xml:space="preserve">
-    <value>圖示伺服器 URL</value>
+    <value>圖標伺服器 URL</value>
   </data>
   <data name="AutofillWithBitwarden" xml:space="preserve">
     <value>使用 Bitwarden 自動填入</value>
@@ -1152,7 +1152,7 @@
     <value>密碼庫已鎖定</value>
   </data>
   <data name="GoToMyVault" xml:space="preserve">
-    <value>前往我的密碼庫</value>
+    <value>前往密碼庫</value>
   </data>
   <data name="Collections" xml:space="preserve">
     <value>集合</value>
@@ -1614,7 +1614,7 @@
     <value>共用</value>
   </data>
   <data name="ToggleVisibility" xml:space="preserve">
-    <value>切換可見性</value>
+    <value>切換顯示</value>
   </data>
   <data name="LoginExpired" xml:space="preserve">
     <value>您的登入階段已逾期。</value>
@@ -1726,7 +1726,7 @@
     <comment>Message shown when interacting with the server</comment>
   </data>
   <data name="ItemRestored" xml:space="preserve">
-    <value>項目已還原</value>
+    <value>已還原項目。</value>
     <comment>Confirmation message after successfully restoring a soft-deleted item</comment>
   </data>
   <data name="Trash" xml:space="preserve">
@@ -2006,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>建立新 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="AreYouSureDeleteSend" xml:space="preserve">
@@ -2472,22 +2472,4 @@
 {0}
 您想要切換至這個帳戶嗎？</value>
   </data>
-  <data name="NewAroundHere" xml:space="preserve">
-    <value>New around here?</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>
 </root>

src/App/Services/PushNotificationListenerService.cs

@@ -157,7 +157,7 @@ namespace Bit.App.Services
                     };
 
                     _pushNotificationService.Value.SendLocalNotification(AppResources.LogInRequested, String.Format(AppResources.ConfimLogInAttempForX, userEmail), notificationData);
-                    _messagingService.Value.Send(Constants.PasswordlessLoginRequestKey, passwordlessLoginMessage);
+                    _messagingService.Value.Send("passwordlessLoginRequest", passwordlessLoginMessage);
                     break;
                 default:
                     break;

src/App/Styles/Android.xaml

@@ -80,7 +80,6 @@
                 Value="{DynamicResource StepperForegroundColor}" />
     </Style>
     <Style TargetType="Frame" 
-           ApplyToDerivedTypes="True"
            Class="btn-icon-row">
         <Setter Property="BackgroundColor"
                 Value="{DynamicResource ButtonBackgroundColor}" />

src/App/Styles/Base.xaml

@@ -130,36 +130,7 @@
         <Setter Property="BackgroundColor"
                 Value="{DynamicResource FabColor}" />
     </Style>
-    
-    <Style TargetType="controls:IconLabelButton" 
-           ApplyToDerivedTypes="True"
-           Class="btn-icon-secondary">
-        <Setter Property="IconLabelColor"
-                Value="{DynamicResource ButtonTextColorOpacity}" />
-        <Setter Property="IconLabelBorderColor"
-                Value="{DynamicResource ButtonBorderColor}" />
-        <Setter Property="IconLabelBackgroundColor"
-                Value="{DynamicResource BackgroundColor}" />
-        <Setter Property="CornerRadius"
-                Value="5" />
-        <Setter Property="VisualStateManager.VisualStateGroups">
-            <VisualStateGroupList>
-                <VisualStateGroup x:Name="CommonStates">
-                    <VisualState x:Name="Normal" />
-                    <VisualState x:Name="Disabled">
-                        <VisualState.Setters>
-                            <Setter Property="IconLabelColor"
-                                    Value="{DynamicResource ButtonTextColorDisabled}" />
-                            <Setter Property="IconLabelBackgroundColor"
-                                    Value="{DynamicResource ButtonBackgroundColorDisabled}" />
-                            <Setter Property="IconLabelBorderColor"
-                                    Value="{DynamicResource ButtonBackgroundColorDisabled}" />
-                        </VisualState.Setters>
-                    </VisualState>
-                </VisualStateGroup>
-            </VisualStateGroupList>
-        </Setter>
-    </Style>
+
     <!-- Title -->
     <Style TargetType="Button"
            Class="btn-title"
@@ -547,19 +518,4 @@
         <Setter Property="Radius"
                 Value="15" />
     </Style>
-    
-    <Style TargetType="Entry" Class="entry-visual-disabled">
-        <Setter Property="VisualStateManager.VisualStateGroups">
-            <VisualStateGroupList>
-                <VisualStateGroup x:Name="CommonStates">
-                    <VisualState x:Name="Disabled">
-                        <VisualState.Setters>
-                            <Setter Property="TextColor"
-                                    Value="{DynamicResource MutedColor}" />
-                        </VisualState.Setters>
-                    </VisualState>
-                </VisualStateGroup>
-            </VisualStateGroupList>
-        </Setter>
-    </Style>
 </ResourceDictionary>

src/App/Styles/iOS.xaml

@@ -93,7 +93,6 @@
                 Value="{DynamicResource StepperForegroundColor}" />
     </Style>
     <Style TargetType="Frame" 
-           ApplyToDerivedTypes="True"
            Class="btn-icon-row">
         <Setter Property="BackgroundColor"
                 Value="{DynamicResource ButtonBackgroundColor}" />

src/Core/Abstractions/IApiService.cs

@@ -86,6 +86,5 @@ namespace Bit.Core.Abstractions
         Task<PasswordlessLoginResponse> GetAuthRequestAsync(string id);
         Task<PasswordlessLoginResponse> PutAuthRequestAsync(string id, string key, string masterPasswordHash, string deviceIdentifier, bool requestApproved);
         Task<string> GetUsernameFromAsync(ForwardedEmailServiceType service, UsernameGeneratorConfig config);
-        Task<bool> GetKnownDeviceAsync(string email, string deviceIdentifier);
     }
 }

src/Core/BitwardenIcons.cs

@@ -112,7 +112,5 @@
         public const string File = "\xe96e";
         public const string Paste = "\xe96f";
         public const string ViewCellMenu = "\xe5d3";
-        public const string Device = "\xe986";
-        public const string Suitcase = "\xe98c";
     }
 }

src/Core/Constants.cs

@@ -37,7 +37,6 @@
         public const string iOSNotificationClearActionId = "Clear";
         public const string NotificationData = "notificationData";
         public const string NotificationDataType = "Type";
-        public const string PasswordlessLoginRequestKey = "passwordlessLoginRequest";
         public const int SelectFileRequestCode = 42;
         public const int SelectFilePermissionRequestCode = 43;
         public const int SaveFileRequestCode = 44;

src/Core/Services/ApiService.cs

@@ -547,11 +547,6 @@ namespace Bit.Core.Services
             return SendAsync<object, PasswordlessLoginResponse>(HttpMethod.Put, $"/auth-requests/{id}", request, true, true);
         }
 
-        public Task<bool> GetKnownDeviceAsync(string email, string deviceIdentifier)
-        {
-            return SendAsync<object, bool>(HttpMethod.Get, $"/devices/knowndevice/{email}/{deviceIdentifier}", null, false, true);
-        }
-
         #endregion
 
         #region Helpers
@@ -795,6 +790,8 @@ namespace Bit.Core.Services
             if (authed
                 &&
                 (
+                    (tokenError && response.StatusCode == HttpStatusCode.BadRequest)
+                    ||
                     (logoutOnUnauthorized && response.StatusCode == HttpStatusCode.Unauthorized)
                     ||
                     response.StatusCode == HttpStatusCode.Forbidden
@@ -811,17 +808,6 @@ namespace Bit.Core.Services
                     var responseJsonString = await response.Content.ReadAsStringAsync();
                     responseJObject = JObject.Parse(responseJsonString);
                 }
-
-                if (authed && tokenError
-                    &&
-                    response.StatusCode == HttpStatusCode.BadRequest
-                    &&
-                    responseJObject?["error"]?.ToString() == "invalid_grant")
-                {
-                    await _logoutCallbackAsync(new Tuple<string, bool, bool>(null, false, true));
-                    return null;
-                }
-
                 return new ErrorResponse(responseJObject, response.StatusCode, tokenError);
             }
             catch

src/Core/Services/StateService.cs

@@ -68,6 +68,7 @@ namespace Bit.Core.Services
             _state.ActiveUserId = userId;
 
             // Update pre-auth settings based on now-active user
+            await SetRememberedEmailAsync(await GetEmailAsync());
             await SetRememberedOrgIdentifierAsync(await GetRememberedOrgIdentifierAsync());
             await SetPreAuthEnvironmentUrlsAsync(await GetEnvironmentUrlsAsync());
         }

src/iOS.Autofill/CredentialProviderViewController.cs

@@ -425,16 +425,15 @@ namespace Bit.iOS.Autofill
             }
         }
 
-        private void LaunchHomePage(bool checkRememberedEmail = true)
+        private void LaunchHomePage()
         {
-            var appOptions = new AppOptions { IosExtension = true };
-            var homePage = new HomePage(appOptions, checkRememberedEmail: checkRememberedEmail);
-            var app = new App.App(appOptions);
+            var homePage = new HomePage();
+            var app = new App.App(new AppOptions { IosExtension = true });
             ThemeManager.SetTheme(app.Resources);
             ThemeManager.ApplyResourcesTo(homePage);
             if (homePage.BindingContext is HomeViewModel vm)
             {
-                vm.StartLoginAction = () => DismissViewController(false, () => LaunchLoginFlow(vm.Email));
+                vm.StartLoginAction = () => DismissViewController(false, () => LaunchLoginFlow());
                 vm.StartRegisterAction = () => DismissViewController(false, () => LaunchRegisterFlow());
                 vm.StartSsoLoginAction = () => DismissViewController(false, () => LaunchLoginSsoFlow());
                 vm.StartEnvironmentAction = () => DismissViewController(false, () => LaunchEnvironmentFlow());
@@ -457,8 +456,8 @@ namespace Bit.iOS.Autofill
             ThemeManager.ApplyResourcesTo(environmentPage);
             if (environmentPage.BindingContext is EnvironmentPageViewModel vm)
             {
-                vm.SubmitSuccessAction = () => DismissViewController(false, () => LaunchHomePage(checkRememberedEmail: false));
-                vm.CloseAction = () => DismissViewController(false, () => LaunchHomePage(checkRememberedEmail: false));
+                vm.SubmitSuccessAction = () => DismissViewController(false, () => LaunchHomePage());
+                vm.CloseAction = () => DismissViewController(false, () => LaunchHomePage());
             }
 
             var navigationPage = new NavigationPage(environmentPage);
@@ -476,7 +475,7 @@ namespace Bit.iOS.Autofill
             if (registerPage.BindingContext is RegisterPageViewModel vm)
             {
                 vm.RegistrationSuccess = () => DismissViewController(false, () => LaunchLoginFlow(vm.Email));
-                vm.CloseAction = () => DismissViewController(false, () => LaunchHomePage(checkRememberedEmail: false));
+                vm.CloseAction = () => DismissViewController(false, () => LaunchHomePage());
             }
 
             var navigationPage = new NavigationPage(registerPage);
@@ -496,9 +495,8 @@ namespace Bit.iOS.Autofill
             {
                 vm.StartTwoFactorAction = () => DismissViewController(false, () => LaunchTwoFactorFlow(false));
                 vm.UpdateTempPasswordAction = () => DismissViewController(false, () => LaunchUpdateTempPasswordFlow());
-                vm.StartSsoLoginAction = () => DismissViewController(false, () => LaunchLoginSsoFlow());
                 vm.LogInSuccessAction = () => DismissLockAndContinue();
-                vm.CloseAction = () => DismissViewController(false, () => LaunchHomePage(checkRememberedEmail: false));
+                vm.CloseAction = () => DismissViewController(false, () => LaunchHomePage());
             }
 
             var navigationPage = new NavigationPage(loginPage);

src/iOS.Extension/LoadingViewController.cs

@@ -446,16 +446,15 @@ namespace Bit.iOS.Extension
             });
         }
 
-        private void LaunchHomePage(bool checkRememberedEmail = true)
+        private void LaunchHomePage()
         {
-            var appOptions = new AppOptions { IosExtension = true };
-            var homePage = new HomePage(appOptions, checkRememberedEmail: checkRememberedEmail);
-            var app = new App.App(appOptions);
+            var homePage = new HomePage();
+            var app = new App.App(new AppOptions { IosExtension = true });
             ThemeManager.SetTheme(app.Resources);
             ThemeManager.ApplyResourcesTo(homePage);
             if (homePage.BindingContext is HomeViewModel vm)
             {
-                vm.StartLoginAction = () => DismissViewController(false, () => LaunchLoginFlow(vm.Email));
+                vm.StartLoginAction = () => DismissViewController(false, () => LaunchLoginFlow());
                 vm.StartRegisterAction = () => DismissViewController(false, () => LaunchRegisterFlow());
                 vm.StartSsoLoginAction = () => DismissViewController(false, () => LaunchLoginSsoFlow());
                 vm.StartEnvironmentAction = () => DismissViewController(false, () => LaunchEnvironmentFlow());
@@ -478,8 +477,8 @@ namespace Bit.iOS.Extension
             ThemeManager.ApplyResourcesTo(environmentPage);
             if (environmentPage.BindingContext is EnvironmentPageViewModel vm)
             {
-                vm.SubmitSuccessAction = () => DismissViewController(false, () => LaunchHomePage(checkRememberedEmail: false));
-                vm.CloseAction = () => DismissViewController(false, () => LaunchHomePage(checkRememberedEmail: false));
+                vm.SubmitSuccessAction = () => DismissViewController(false, () => LaunchHomePage());
+                vm.CloseAction = () => DismissViewController(false, () => LaunchHomePage());
             }
 
             var navigationPage = new NavigationPage(environmentPage);
@@ -497,7 +496,7 @@ namespace Bit.iOS.Extension
             if (registerPage.BindingContext is RegisterPageViewModel vm)
             {
                 vm.RegistrationSuccess = () => DismissViewController(false, () => LaunchLoginFlow(vm.Email));
-                vm.CloseAction = () => DismissViewController(false, () => LaunchHomePage(checkRememberedEmail: false));
+                vm.CloseAction = () => DismissViewController(false, () => LaunchHomePage());
             }
 
             var navigationPage = new NavigationPage(registerPage);
@@ -517,9 +516,8 @@ namespace Bit.iOS.Extension
             {
                 vm.StartTwoFactorAction = () => DismissViewController(false, () => LaunchTwoFactorFlow(false));
                 vm.UpdateTempPasswordAction = () => DismissViewController(false, () => LaunchUpdateTempPasswordFlow());
-                vm.StartSsoLoginAction = () => DismissViewController(false, () => LaunchLoginSsoFlow());
                 vm.LogInSuccessAction = () => DismissLockAndContinue();
-                vm.CloseAction = () => DismissViewController(false, () => LaunchHomePage(checkRememberedEmail: false));
+                vm.CloseAction = () => CompleteRequest(null, null);
             }
 
             var navigationPage = new NavigationPage(loginPage);

src/iOS.ShareExtension/LoadingViewController.cs

@@ -287,13 +287,13 @@ namespace Bit.iOS.ShareExtension
             return _app;
         }
 
-        private void LaunchHomePage(bool checkRememberedEmail = true)
+        private void LaunchHomePage()
         {
-            var homePage = new HomePage(_appOptions.Value, checkRememberedEmail: checkRememberedEmail);
+            var homePage = new HomePage();
             SetupAppAndApplyResources(homePage);
             if (homePage.BindingContext is HomeViewModel vm)
             {
-                vm.StartLoginAction = () => DismissAndLaunch(() => LaunchLoginFlow(vm.Email));
+                vm.StartLoginAction = () => DismissAndLaunch(() => LaunchLoginFlow());
                 vm.StartRegisterAction = () => DismissAndLaunch(() => LaunchRegisterFlow());
                 vm.StartSsoLoginAction = () => DismissAndLaunch(() => LaunchLoginSsoFlow());
                 vm.StartEnvironmentAction = () => DismissAndLaunch(() => LaunchEnvironmentFlow());
@@ -311,8 +311,8 @@ namespace Bit.iOS.ShareExtension
             ThemeManager.ApplyResourcesTo(environmentPage);
             if (environmentPage.BindingContext is EnvironmentPageViewModel vm)
             {
-                vm.SubmitSuccessAction = () => DismissAndLaunch(() => LaunchHomePage(checkRememberedEmail: false));
-                vm.CloseAction = () => DismissAndLaunch(() => LaunchHomePage(checkRememberedEmail: false));
+                vm.SubmitSuccessAction = () => DismissAndLaunch(() => LaunchHomePage());
+                vm.CloseAction = () => DismissAndLaunch(() => LaunchHomePage());
             }
 
             NavigateToPage(environmentPage);
@@ -325,7 +325,7 @@ namespace Bit.iOS.ShareExtension
             if (registerPage.BindingContext is RegisterPageViewModel vm)
             {
                 vm.RegistrationSuccess = () => DismissAndLaunch(() => LaunchLoginFlow(vm.Email));
-                vm.CloseAction = () => DismissAndLaunch(() => LaunchHomePage(checkRememberedEmail: false));
+                vm.CloseAction = () => DismissAndLaunch(() => LaunchHomePage());
             }
             NavigateToPage(registerPage);
         }
@@ -338,12 +338,11 @@ namespace Bit.iOS.ShareExtension
             {
                 vm.StartTwoFactorAction = () => DismissAndLaunch(() => LaunchTwoFactorFlow(false));
                 vm.UpdateTempPasswordAction = () => DismissAndLaunch(() => LaunchUpdateTempPasswordFlow());
-                vm.StartSsoLoginAction = () => DismissAndLaunch(() => LaunchLoginSsoFlow());
                 vm.LogInSuccessAction = () =>
                 {
                     DismissLockAndContinue();
                 };
-                vm.CloseAction = () => DismissAndLaunch(() => LaunchHomePage(checkRememberedEmail: false));
+                vm.CloseAction = () => CompleteRequest();
             }
             NavigateToPage(loginPage);
 
@@ -427,7 +426,7 @@ namespace Bit.iOS.ShareExtension
             switch (navTarget)
             {
                 case NavigationTarget.HomeLogin:
-                    ExecuteLaunch(() => LaunchHomePage());
+                    ExecuteLaunch(LaunchHomePage);
                     break;
                 case NavigationTarget.Login:
                     if (navParams is LoginNavigationParams loginParams)

store/apple/hr/copy.resx

@@ -118,7 +118,7 @@
     <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
   <data name="Name" xml:space="preserve">
-    <value>Bitwarden - besplatni upravitelj lozinki</value>
+    <value>Bitwarden - Besplatni upravitelj lozinki</value>
     <comment>Max 30 characters</comment>
   </data>
   <data name="Description" xml:space="preserve">