switch to access token, bump version

* New translations AppResources.resx (Dutch)

* New translations AppResources.resx (Slovak)

.github/resources/export-options-ad-hoc.plist

@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+    <key>method</key>
+    <string>ad-hoc</string>
+    <key>provisioningProfiles</key>
+    <dict>
+        <key>com.8bit.bitwarden</key>
+        <string>Ad hoc: Bitwarden 2020</string>
+        <key>com.8bit.bitwarden.autofill</key>
+        <string>Ad hoc: Autofill 2020</string>
+        <key>com.8bit.bitwarden.find-login-action-extension</key>
+        <string>Ad hoc: Extension 2020</string>
+    </dict>
+</dict>
+</plist>

.github/resources/export-options-app-store.plist

@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+    <key>method</key>
+    <string>app-store</string>
+    <key>provisioningProfiles</key>
+    <dict>
+        <key>com.8bit.bitwarden</key>
+        <string>Dist: Bitwarden 2020</string>
+        <key>com.8bit.bitwarden.autofill</key>
+        <string>Dist: Autofill 2020</string>
+        <key>com.8bit.bitwarden.find-login-action-extension</key>
+        <string>Dist: Extension 2020</string>
+    </dict>
+</dict>
+</plist>

.github/scripts/android/build.ps1

@@ -0,0 +1,13 @@
+param (
+  [Parameter(Mandatory=$true)]
+  [string] $configuration
+)
+
+$rootPath = $env:GITHUB_WORKSPACE;
+$androidPath = $($rootPath + "/src/Android/Android.csproj");
+
+Write-Output "########################################"
+Write-Output "##### Build $configuration Configuration"
+Write-Output "########################################"
+
+msbuild "$($androidPath)" "/p:Configuration=$configuration"

.github/scripts/android/clean-fdroid.ps1

@@ -0,0 +1,75 @@
+$rootPath = $env:GITHUB_WORKSPACE;
+
+$androidPath = $($rootPath + "/src/Android/Android.csproj");
+$appPath = $($rootPath + "/src/App/App.csproj");
+
+$androidManifest = $($rootPath + "/src/Android/Properties/AndroidManifest.xml");
+
+Write-Output "########################################"
+Write-Output "##### Clean Android and App"
+Write-Output "########################################"
+
+msbuild "$($androidPath)" "/t:Clean" "/p:Configuration=FDroid"
+msbuild "$($appPath)" "/t:Clean" "/p:Configuration=FDroid"
+
+Write-Output "########################################"
+Write-Output "##### Backup project files"
+Write-Output "########################################"
+
+Copy-Item $androidManifest $($androidManifest + ".original");
+Copy-Item $androidPath $($androidPath + ".original");
+Copy-Item $appPath $($appPath + ".original");
+
+Write-Output "########################################"
+Write-Output "##### Cleanup Android Manifest"
+Write-Output "########################################"
+
+$xml=New-Object XML;
+$xml.Load($androidManifest);
+
+$nsAndroid=New-Object System.Xml.XmlNamespaceManager($xml.NameTable);
+$nsAndroid.AddNamespace("android", "http://schemas.android.com/apk/res/android");
+
+$firebaseReceiver1=$xml.SelectSingleNode(`
+    "/manifest/application/receiver[@android:name='com.google.firebase.iid.FirebaseInstanceIdInternalReceiver']", `
+    $nsAndroid);
+$firebaseReceiver1.ParentNode.RemoveChild($firebaseReceiver1);
+
+$firebaseReceiver2=$xml.SelectSingleNode(`
+    "/manifest/application/receiver[@android:name='com.google.firebase.iid.FirebaseInstanceIdReceiver']", `
+    $nsAndroid);
+$firebaseReceiver2.ParentNode.RemoveChild($firebaseReceiver2);
+
+$xml.Save($androidManifest);
+
+Write-Output "########################################"
+Write-Output "##### Uninstall from Android.csproj"
+Write-Output "########################################"
+
+$xml=New-Object XML;
+$xml.Load($androidPath);
+
+$ns=New-Object System.Xml.XmlNamespaceManager($xml.NameTable);
+$ns.AddNamespace("ns", $xml.DocumentElement.NamespaceURI);
+
+$firebaseNode=$xml.SelectSingleNode(`
+    "/ns:Project/ns:ItemGroup/ns:PackageReference[@Include='Xamarin.Firebase.Messaging']", $ns);
+$firebaseNode.ParentNode.RemoveChild($firebaseNode);
+
+$safetyNetNode=$xml.SelectSingleNode(`
+    "/ns:Project/ns:ItemGroup/ns:PackageReference[@Include='Xamarin.GooglePlayServices.SafetyNet']", $ns);
+$safetyNetNode.ParentNode.RemoveChild($safetyNetNode);
+
+$xml.Save($androidPath);
+
+Write-Output "########################################"
+Write-Output "##### Uninstall from App.csproj"
+Write-Output "########################################"
+
+$xml=New-Object XML;
+$xml.Load($appPath);
+
+$appCenterNode=$xml.SelectSingleNode("/Project/ItemGroup/PackageReference[@Include='Microsoft.AppCenter.Crashes']");
+$appCenterNode.ParentNode.RemoveChild($appCenterNode);
+
+$xml.Save($appPath);

.github/scripts/android/compile-fdroid.sh

@@ -0,0 +1,24 @@
+#!/usr/bin/env bash
+
+cd $GITHUB_WORKSPACE
+mkdir dist
+cp CNAME ./dist
+cd store
+chmod 600 fdroid/config.py fdroid/keystore.jks
+mkdir -p temp/fdroid
+TEMP_DIR="$GITHUB_WORKSPACE/store/temp/fdroid"
+cd fdroid
+echo "keypass=\"$FDROID_STORE_KEYSTORE_PASSWORD\"" >>config.py
+echo "keystorepass=\"$FDROID_STORE_KEYSTORE_PASSWORD\"" >>config.py
+echo "local_copy_dir=\"$TEMP_DIR\"" >>config.py
+mkdir -p repo
+curl -Lo repo/com.x8bit.bitwarden-fdroid.apk \
+https://github.com/bitwarden/mobile/releases/download/$RELEASE_TAG_NAME/com.x8bit.bitwarden-fdroid.apk
+fdroid update
+fdroid server update
+cd ..
+rm -rf temp/fdroid/archive
+mv -v temp/fdroid ../dist
+cd fdroid
+cp index.html btn.png qr.png ../../dist/fdroid
+cd $GITHUB_WORKSPACE

.github/scripts/android/decrypt-secrets.ps1

@@ -0,0 +1,22 @@
+$rootPath = $env:GITHUB_WORKSPACE;
+
+$decryptSecretPath = $($rootPath + "/.github/scripts/decrypt-secret.ps1");
+
+$appKeystorePlayFilename = "app_play-keystore.jks";
+$appKeystorePlayPath = $($rootPath + "/src/Android/$appKeystorePlayFilename");
+$appKeystoreUploadFilename = "app_upload-keystore.jks";
+$appKeystoreUploadPath = $($rootPath + "/src/Android/$appKeystoreUploadFilename");
+$appKeystoreFdroidFilename = "app_fdroid-keystore.jks";
+$appKeystoreFdroidPath = $($rootPath + "/src/Android/$appKeystoreFdroidFilename");
+$googleServicesFilename = "google-services.json";
+$googleServicesPath = $($rootPath + "/src/Android/$googleServicesFilename");
+
+Invoke-Expression `
+    "& `"$decryptSecretPath`" -filename $($appKeystorePlayFilename + ".gpg") -output $($appKeystorePlayPath)"
+Invoke-Expression `
+    "& `"$decryptSecretPath`" -filename $($appKeystoreUploadFilename + ".gpg") -output $($appKeystoreUploadPath)"
+Invoke-Expression `
+    "& `"$decryptSecretPath`" -filename $($appKeystoreFdroidFilename + ".gpg") -output $($appKeystoreFdroidPath)"
+Invoke-Expression `
+    "& `"$decryptSecretPath`" -filename $($googleServicesFilename + ".gpg") -output $($googleServicesPath)"
+Invoke-Expression "& `"$decryptSecretPath`" -filename play_creds.json.gpg"

.github/scripts/android/deploy-play.ps1

@@ -0,0 +1,9 @@
+$rootPath = $env:GITHUB_WORKSPACE;
+$homePath = Resolve-Path "~" | Select-Object -ExpandProperty Path;
+
+$publisherPath = $($rootPath + "/store/google/Publisher/bin/Release/netcoreapp2.0/Publisher.dll");
+$credsPath = $($homePath + "/secrets/play_creds.json");
+$aabPath = $($rootPath + "/com.x8bit.bitwarden.aab");
+$track = "alpha";
+
+dotnet $publisherPath $credsPath $aabPath $track

.github/scripts/android/increment-version.ps1

@@ -0,0 +1,16 @@
+$rootPath = $env:GITHUB_WORKSPACE;
+$buildNumber = 3000 + [int]$env:GITHUB_RUN_NUMBER;
+
+Write-Output "########################################"
+Write-Output "##### Setting Version Code $buildNumber"
+Write-Output "########################################"
+
+$androidManifest = $($rootPath + "/src/Android/Properties/AndroidManifest.xml");
+
+$xml=New-Object XML;
+$xml.Load($androidManifest);
+
+$node=$xml.SelectNodes("/manifest");
+$node.SetAttribute("android:versionCode", [string]$buildNumber);
+
+$xml.Save($androidManifest);

.github/scripts/android/sign-fdroid.ps1

@@ -0,0 +1,23 @@
+$rootPath = $env:GITHUB_WORKSPACE;
+
+$androidPath = $($rootPath + "/src/Android/Android.csproj");
+
+$appKeystoreFdroidFilename = "app_fdroid-keystore.jks";
+
+Write-Output "########################################"
+Write-Output "##### Sign FDroid Configuration"
+Write-Output "########################################"
+
+msbuild "$($androidPath)" "/t:SignAndroidPackage" "/p:Configuration=FDroid" "/p:AndroidKeyStore=true" `
+    "/p:AndroidSigningKeyAlias=bitwarden" "/p:AndroidSigningKeyPass=$($env:FDROID_KEYSTORE_PASSWORD)" `
+    "/p:AndroidSigningKeyStore=$($appKeystoreFdroidFilename)" `
+    "/p:AndroidSigningStorePass=$($env:FDROID_KEYSTORE_PASSWORD)" "/v:quiet"
+
+Write-Output "########################################"
+Write-Output "##### Copy FDroid apk to project root"
+Write-Output "########################################"
+
+$signedApkPath = $($rootPath + "/src/Android/bin/FDroid/com.x8bit.bitwarden-Signed.apk");
+$signedApkDestPath = $($rootPath + "/com.x8bit.bitwarden-fdroid.apk");
+
+Copy-Item $signedApkPath $signedApkDestPath

.github/scripts/android/sign-play.ps1

@@ -0,0 +1,42 @@
+$rootPath = $env:GITHUB_WORKSPACE;
+
+$androidPath = $($rootPath + "/src/Android/Android.csproj");
+
+$appKeystorePlayFilename = "app_play-keystore.jks";
+$appKeystoreUploadFilename = "app_upload-keystore.jks";
+
+Write-Output "########################################"
+Write-Output "##### Sign Google Play Bundle Release Configuration"
+Write-Output "########################################"
+
+msbuild "$($androidPath)" "/t:SignAndroidPackage" "/p:Configuration=Release" "/p:AndroidKeyStore=true" `
+    "/p:AndroidSigningKeyAlias=upload" "/p:AndroidSigningKeyPass=$($env:UPLOAD_KEYSTORE_PASSWORD)" `
+    "/p:AndroidSigningKeyStore=$($appKeystoreUploadFilename)" `
+    "/p:AndroidSigningStorePass=$($env:UPLOAD_KEYSTORE_PASSWORD)" "/p:AndroidPackageFormat=aab" "/v:quiet"
+
+Write-Output "########################################"
+Write-Output "##### Copy Google Play Bundle to project root"
+Write-Output "########################################"
+
+$signedAabPath = $($rootPath + "/src/Android/bin/Release/com.x8bit.bitwarden-Signed.aab");
+$signedAabDestPath = $($rootPath + "/com.x8bit.bitwarden.aab");
+
+Copy-Item $signedAabPath $signedAabDestPath
+
+Write-Output "########################################"
+Write-Output "##### Sign APK Release Configuration"
+Write-Output "########################################"
+
+msbuild "$($androidPath)" "/t:SignAndroidPackage" "/p:Configuration=Release" "/p:AndroidKeyStore=true" `
+    "/p:AndroidSigningKeyAlias=bitwarden" "/p:AndroidSigningKeyPass=$($env:PLAY_KEYSTORE_PASSWORD)" `
+    "/p:AndroidSigningKeyStore=$($appKeystorePlayFilename)" `
+    "/p:AndroidSigningStorePass=$($env:PLAY_KEYSTORE_PASSWORD)" "/v:quiet"
+	
+Write-Output "########################################"
+Write-Output "##### Copy Release APK to project root"
+Write-Output "########################################"
+
+$signedApkPath = $($rootPath + "/src/Android/bin/Release/com.x8bit.bitwarden-Signed.apk");
+$signedApkDestPath = $($rootPath + "/com.x8bit.bitwarden.apk");
+
+Copy-Item $signedApkPath $signedApkDestPath

.github/scripts/decrypt-secret.ps1

@@ -0,0 +1,29 @@
+param (
+  [Parameter(Mandatory=$true)]
+  [string] $filename,
+  [string] $output
+)
+
+$homePath = Resolve-Path "~" | Select-Object -ExpandProperty Path
+$rootPath = $env:GITHUB_WORKSPACE
+
+$secretInputPath = $rootPath + "/.github/secrets"
+$input = $secretInputPath + "/" + $filename
+
+$passphrase = $env:DECRYPT_FILE_PASSWORD
+$secretOutputPath = $homePath + "/secrets"
+
+if ([string]::IsNullOrEmpty($output)) {
+  if ($filename.EndsWith(".gpg")) {
+    $output = $secretOutputPath + "/" + $filename.TrimEnd(".gpg")
+  } else {
+    $output = $secretOutputPath + "/" + $filename + ".plaintext"
+  }
+}
+
+if (!(Test-Path -Path $secretOutputPath))  
+{
+  New-Item -ItemType Directory -Path $secretOutputPath 
+}
+
+gpg --quiet --batch --yes --decrypt --passphrase="$passphrase" --output $output $input

.github/scripts/ios/build.ps1

@@ -0,0 +1,29 @@
+param (
+  [Parameter(Mandatory=$true)]
+  [string] $configuration,
+  [string] $platform = "iPhone",
+  [switch] $archive
+)
+
+$rootPath = $env:GITHUB_WORKSPACE;
+$iosPath = $($rootPath + "/src/iOS/iOS.csproj");
+
+if ($archive)
+{
+  Write-Output "########################################"
+  Write-Output "##### Archive $configuration Configuration for $platform Platform"
+  Write-Output "########################################"
+  msbuild "$($iosPath)" "/p:Platform=$platform" "/p:Configuration=$configuration" `
+    "/p:ArchiveOnBuild=true" "/t:`"Build`""
+
+  Write-Output "########################################"
+  Write-Output "##### Done"
+  Write-Output "########################################"
+  ls ~/Library/Developer/Xcode/Archives
+} else
+{
+  Write-Output "########################################"
+  Write-Output "##### Build $configuration Configuration for $platform Platform"
+  Write-Output "########################################"
+  msbuild "$($iosPath)" "/p:Platform=$platform" "/p:Configuration=$configuration" "/t:`"Build`""
+}

.github/scripts/ios/decrypt-secrets.ps1

@@ -0,0 +1,9 @@
+$rootPath = $env:GITHUB_WORKSPACE;
+
+$decryptSecretPath = $($rootPath + "/.github/scripts/decrypt-secret.ps1");
+
+Invoke-Expression "& `"$decryptSecretPath`" -filename bitwarden-mobile-key.p12.gpg"
+Invoke-Expression "& `"$decryptSecretPath`" -filename iphone-distribution-cert.p12.gpg"
+Invoke-Expression "& `"$decryptSecretPath`" -filename dist_autofill.mobileprovision.gpg"
+Invoke-Expression "& `"$decryptSecretPath`" -filename dist_bitwarden.mobileprovision.gpg"
+Invoke-Expression "& `"$decryptSecretPath`" -filename dist_extension.mobileprovision.gpg"

.github/scripts/ios/deploy-app-store.ps1

@@ -0,0 +1,5 @@
+$rootPath = $env:GITHUB_WORKSPACE;
+$ipaPath = "$rootPath/bitwarden-export/Bitwarden.ipa"
+
+xcrun altool --upload-app --type ios --file "$ipaPath" `
+    --username "$env:APPLE_ID_USERNAME" --password "$env:APPLE_ID_PASSWORD"

.github/scripts/ios/export-ipa.ps1

@@ -0,0 +1,13 @@
+param (
+  [Parameter(Mandatory=$true)]
+  [string] $method
+)
+
+$rootPath = $env:GITHUB_WORKSPACE;
+$homePath = Resolve-Path "~" | Select-Object -ExpandProperty Path
+
+$exportOptionsPath = "$rootPath/.github/resources/export-options-$method.plist";
+$archivePath = "$homePath/Library/Developer/Xcode/Archives/*/*.xcarchive";
+$exportPath = "$rootPath/bitwarden-export";
+
+xcodebuild -exportArchive -archivePath $archivePath -exportPath $exportPath -exportOptionsPlist $exportOptionsPath

.github/scripts/ios/increment-version.ps1

@@ -0,0 +1,26 @@
+$rootPath = $env:GITHUB_WORKSPACE;
+$buildNumber = 100 + [int]$env:GITHUB_RUN_NUMBER;
+
+$bitwardenInfo = $($rootPath + "/src/iOS/Info.plist");
+$extensionInfo = $($rootPath + "/src/iOS.Extension/Info.plist");
+$autofillInfo = $($rootPath + "/src/iOS.Autofill/Info.plist");
+
+Write-Output "########################################"
+Write-Output "##### Setting CFBundleVersion $buildNumber"
+Write-Output "########################################"
+
+function Update-Version($file) {
+    $xml=New-Object XML;
+    $xml.Load($file);
+
+    Select-Xml -xml $xml -XPath "//dict/key[. = 'CFBundleVersion']/following-sibling::string[1]" |
+    %{ 
+        $_.Node.InnerXml = $buildNumber
+    }
+
+    $xml.Save($file);
+}
+
+Update-Version $bitwardenInfo
+Update-Version $extensionInfo
+Update-Version $autofillInfo

.github/scripts/ios/setup-keychain.ps1

@@ -0,0 +1,13 @@
+$homePath = Resolve-Path "~" | Select-Object -ExpandProperty Path;
+$secretsPath = $homePath + "/secrets"
+
+$mobileKeyPath = $($secretsPath + "/bitwarden-mobile-key.p12");
+$distCertPath = $($secretsPath + "/iphone-distribution-cert.p12");
+
+security create-keychain -p $env:KEYCHAIN_PASSWORD build.keychain
+security default-keychain -s build.keychain
+security unlock-keychain -p $env:KEYCHAIN_PASSWORD build.keychain
+security set-keychain-settings -lut 1200 build.keychain
+security import $mobileKeyPath -k build.keychain -P $env:MOBILE_KEY_PASSWORD -T /usr/bin/codesign -T /usr/bin/security
+security import $distCertPath -k build.keychain -P $env:DIST_CERT_PASSWORD -T /usr/bin/codesign -T /usr/bin/security
+security set-key-partition-list -S apple-tool:,apple:,codesign: -s -k $env:KEYCHAIN_PASSWORD build.keychain

.github/scripts/ios/setup-profiles.ps1

@@ -0,0 +1,21 @@
+$homePath = Resolve-Path "~" | Select-Object -ExpandProperty Path;
+$secretsPath = $homePath + "/secrets"
+
+$autofillProfilePath = $($secretsPath + "/dist_autofill.mobileprovision");
+$bitwardenProfilePath = $($secretsPath + "/dist_bitwarden.mobileprovision");
+$extensionProfilePath = $($secretsPath + "/dist_extension.mobileprovision");
+$profilesDirPath = "~/Library/MobileDevice/Provisioning Profiles"
+
+if (!(Test-Path -Path $profilesDirPath))  
+{
+    New-Item -ItemType Directory -Path $profilesDirPath 
+}
+
+$autofill_uuid = grep UUID -A1 -a $autofillProfilePath | grep -io "[-A-F0-9]\{36\}"
+Copy-Item $autofillProfilePath -destination "$profilesDirPath/$autofill_uuid.mobileprovision"
+
+$bitwarden_uuid = grep UUID -A1 -a $bitwardenProfilePath | grep -io "[-A-F0-9]\{36\}"
+Copy-Item $bitwardenProfilePath -destination "$profilesDirPath/$bitwarden_uuid.mobileprovision"
+
+$extension_uuid = grep UUID -A1 -a $extensionProfilePath | grep -io "[-A-F0-9]\{36\}"
+Copy-Item $extensionProfilePath -destination "$profilesDirPath/$extension_uuid.mobileprovision"

.github/secrets/google-services.json.gpg

@@ -0,0 +1,3 @@
+<EFBFBD>
+	K<>Y#<23>(<28><><EFBFBD><EFBFBD>
EI֐߄T?)l<><6C><EFBFBD><18><><10>"=<3D>|<7C>'e<><0E>m<EFBFBD>/~<7E><>'F<><46>><3E><><EFBFBD><EFBFBD>l<EFBFBD>b<EFBFBD>[<5B>+R<><52>iL<69><4C>"<22><><EFBFBD>~V:<3A><>p<EFBFBD>a<17>ڵel%8t<38><74>튖<EFBFBD>y<<3C>n<EFBFBD><6E><EFBFBD>aU<61>w<16>JD<4A><44><1F><>We<57>9<EFBFBD><39><EFBFBD><EFBFBD><x8d<38>O<EFBFBD>j\<14>ד<EFBFBD><D793><EFBFBD>Vq<56><71>֋
+Ǻ<EFBFBD>-<2D>#<23><><11><>]$<24>(<28>l,<2C>Br<42><02><>d<><64><EFBFBD>•a-<2D><><EFBFBD>:<3A><>:<3A><04>9b,!Em<02><19><>Qf<>D<EFBFBD>g<EFBFBD><06><0E>x(P<>ȡ~<7E>͹<EFBFBD><CDB9>	<09><>[<06><>!:<3A>;f<><66>

.github/workflows/build.yml

@@ -0,0 +1,299 @@
+name: Build
+
+on:
+  push:
+    branches-ignore:
+      - 'l10n_master'
+      - 'gh-pages'
+  release:
+    types:
+      - published
+
+jobs:
+
+  cloc:
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: Checkout repo
+        uses: actions/checkout@v2
+
+      - name: Set up cloc
+        run: |
+          sudo apt-get update
+          sudo apt-get -y install cloc
+
+      - name: Print lines of code
+        run: cloc --vcs git --exclude-dir Resources,store,test,Properties --include-lang C#,XAML
+
+  android:
+    runs-on: windows-latest
+
+    steps:
+      - name: Set up NuGet
+        uses: nuget/setup-nuget@v1
+        with:
+          nuget-version: 'latest'
+
+      - name: Set up MSBuild
+        uses: microsoft/setup-msbuild@v1.0.0
+
+      - name: Print environment
+        run: |
+          nuget help
+          msbuild -version
+          dotnet --info
+          Write-Output "GitHub ref: $env:GITHUB_REF"
+          Write-Output "GitHub event: $env:GITHUB_EVENT"
+        shell: pwsh
+        env:
+          GITHUB_REF: ${{ github.ref }}
+          GITHUB_EVENT: ${{ github.event_name }}
+
+      - name: Checkout repo
+        uses: actions/checkout@v2
+
+      - name: Decrypt secrets
+        if: github.ref == 'refs/heads/master' || github.event_name == 'release'
+        run: ./.github/scripts/android/decrypt-secrets.ps1
+        shell: pwsh
+        env:
+          DECRYPT_FILE_PASSWORD: ${{ secrets.DECRYPT_FILE_PASSWORD }}
+
+      - name: Increment version
+        if: github.ref == 'refs/heads/master' || github.event_name == 'release'
+        run: ./.github/scripts/android/increment-version.ps1
+        shell: pwsh
+
+      - name: Restore packages
+        run: nuget restore
+
+      - name: Build Play Store publisher
+        run: dotnet build ./store/google/Publisher/Publisher.csproj -p:Configuration=Release
+
+      - name: Build for Play Store
+        run: ./.github/scripts/android/build.ps1 -configuration Release
+        shell: pwsh
+
+      - name: Sign for Play Store
+        if: github.ref == 'refs/heads/master' || github.event_name == 'release'
+        run: ./.github/scripts/android/sign-play.ps1
+        shell: pwsh
+        env:
+          PLAY_KEYSTORE_PASSWORD: ${{ secrets.PLAY_KEYSTORE_PASSWORD }}
+          UPLOAD_KEYSTORE_PASSWORD: ${{ secrets.UPLOAD_KEYSTORE_PASSWORD }}
+
+      - name: Upload Play Store .aab artifact
+        if: github.ref == 'refs/heads/master' || github.event_name == 'release'
+        uses: actions/upload-artifact@v2
+        with:
+          name: com.x8bit.bitwarden.aab
+          path: ./com.x8bit.bitwarden.aab
+
+      - name: Upload Play Store .apk artifact
+        if: github.ref == 'refs/heads/master' || github.event_name == 'release'
+        uses: actions/upload-artifact@v2
+        with:
+          name: com.x8bit.bitwarden.apk
+          path: ./com.x8bit.bitwarden.apk
+
+      - name: Clean for F-Droid
+        run: ./.github/scripts/android/clean-fdroid.ps1
+        shell: pwsh
+
+      - name: Restore packages
+        run: nuget restore
+
+      - name: Build for F-Droid
+        run: ./.github/scripts/android/build.ps1 -configuration FDroid
+        shell: pwsh
+
+      - name: Sign for F-Droid
+        if: github.ref == 'refs/heads/master' || github.event_name == 'release'
+        run: ./.github/scripts/android/sign-fdroid.ps1
+        shell: pwsh
+        env:
+          FDROID_KEYSTORE_PASSWORD: ${{ secrets.FDROID_KEYSTORE_PASSWORD }}
+
+      - name: Upload F-Droid .apk artifact
+        if: github.ref == 'refs/heads/master' || github.event_name == 'release'
+        uses: actions/upload-artifact@v2
+        with:
+          name: com.x8bit.bitwarden-fdroid.apk
+          path: ./com.x8bit.bitwarden-fdroid.apk
+
+      - name: Deploy to Play Store
+        if: github.ref == 'refs/heads/master' || github.event_name == 'release'
+        run: ./.github/scripts/android/deploy-play.ps1
+        shell: pwsh
+
+      - name: Upload release assets
+        if: github.event_name == 'release'
+        run: |
+          hub release edit `
+            -a ./com.x8bit.bitwarden.aab `
+            -a ./com.x8bit.bitwarden.apk `
+            -a ./com.x8bit.bitwarden-fdroid.apk `
+            -m "Version $($env:RELEASE_TAG_NAME.TrimStart('v'))" `
+            $env:RELEASE_TAG_NAME
+        shell: pwsh
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          RELEASE_TAG_NAME: ${{ github.event.release.tag_name }}
+  
+  android-ubuntu:
+    runs-on: ubuntu-latest
+    needs: android
+
+    steps:
+      - name: Set up Node
+        if: github.event_name == 'release'
+        uses: actions/setup-node@v1
+        with:
+          node-version: '10.x'
+
+      - name: Set up F-Droid server
+        if: github.event_name == 'release'
+        run: |
+          sudo apt-get -qq update
+          sudo apt-get -qqy install --no-install-recommends fdroidserver wget
+
+      - name: Set up git credentials
+        if: github.event_name == 'release'
+        env:
+          ACCESS_TOKEN: ${{ secrets.ACCESS_TOKEN }}
+        run: |
+          git config --global credential.helper store
+          echo "https://${ACCESS_TOKEN}:x-oauth-basic@github.com" >> ~/.git-credentials
+          git config --global user.email "ci@bitwarden.com"
+          git config --global user.name "Bitwarden CI"
+
+      - name: Print environment
+        if: github.event_name == 'release'
+        run: |
+          node --version
+          npm --version
+          git --version
+          Write-Output "GitHub ref: $env:GITHUB_REF"
+          Write-Output "GitHub event: $env:GITHUB_EVENT"
+        shell: pwsh
+        env:
+          GITHUB_REF: ${{ github.ref }}
+          GITHUB_EVENT: ${{ github.event_name }}
+
+      - name: Checkout repo
+        if: github.event_name == 'release'
+        uses: actions/checkout@v2
+
+      - name: Install Node dependencies
+        if: github.event_name == 'release'
+        run: npm install
+
+      - name: Decrypt secrets
+        if: github.event_name == 'release'
+        run: |
+          ./.github/scripts/decrypt-secret.ps1 -filename store_fdroid-keystore.jks.gpg `
+            -output ./store/fdroid/keystore.jks
+        shell: pwsh
+        env:
+          DECRYPT_FILE_PASSWORD: ${{ secrets.DECRYPT_FILE_PASSWORD }}
+
+      - name: Compile for F-Droid Store
+        if: github.event_name == 'release'
+        run: |
+            sudo chmod +x ./.github/scripts/android/compile-fdroid.sh
+            ./.github/scripts/android/compile-fdroid.sh
+        env:
+          FDROID_STORE_KEYSTORE_PASSWORD: ${{ secrets.FDROID_STORE_KEYSTORE_PASSWORD }}
+          RELEASE_TAG_NAME: ${{ github.event.release.tag_name }}
+
+      - name: Deploy to gh-pages
+        if: github.event_name == 'release'
+        run: npm run deploy
+
+  ios:
+    runs-on: macos-latest
+
+    steps:
+      - name: Print environment
+        run: |
+          nuget help
+          msbuild -version
+          dotnet --info
+          Write-Output "GitHub ref: $env:GITHUB_REF"
+          Write-Output "GitHub event: $env:GITHUB_EVENT"
+        shell: pwsh
+        env:
+          GITHUB_REF: ${{ github.ref }}
+          GITHUB_EVENT: ${{ github.event_name }}
+
+      - name: Checkout repo
+        uses: actions/checkout@v2
+
+      - name: Decrypt secrets
+        run: ./.github/scripts/ios/decrypt-secrets.ps1
+        shell: pwsh
+        env:
+          DECRYPT_FILE_PASSWORD: ${{ secrets.DECRYPT_FILE_PASSWORD }}
+
+      - name: Increment version
+        if: github.ref == 'refs/heads/master' || github.event_name == 'release'
+        run: ./.github/scripts/ios/increment-version.ps1
+        shell: pwsh
+
+      - name: Set up keychain
+        run: ./.github/scripts/ios/setup-keychain.ps1
+        shell: pwsh
+        env:
+          KEYCHAIN_PASSWORD: ${{ secrets.IOS_KEYCHAIN_PASSWORD }}
+          MOBILE_KEY_PASSWORD: ${{ secrets.IOS_KEY_PASSWORD }}
+          DIST_CERT_PASSWORD: ${{ secrets.IOS_DIST_CERT_PASSWORD }}
+
+      - name: Set up provisioning profiles
+        run: ./.github/scripts/ios/setup-profiles.ps1
+        shell: pwsh
+
+      - name: Restore packages
+        run: nuget restore
+
+      - name: Archive Build for App Store
+        if: github.ref == 'refs/heads/master' || github.event_name == 'release'
+        run: ./.github/scripts/ios/build.ps1 -configuration AppStore -platform iPhone -archive
+        shell: pwsh
+
+      - name: Build for App Store
+        if: github.ref != 'refs/heads/master'
+        run: ./.github/scripts/ios/build.ps1 -configuration AppStore -platform iPhone
+        shell: pwsh
+
+      - name: Export .ipa for App Store
+        if: github.ref == 'refs/heads/master' || github.event_name == 'release'
+        run: ./.github/scripts/ios/export-ipa.ps1 -method app-store
+        shell: pwsh
+
+      - name: Upload App Store .ipa artifact
+        if: github.ref == 'refs/heads/master' || github.event_name == 'release'
+        uses: actions/upload-artifact@v2
+        with:
+          name: Bitwarden.ipa
+          path: ./bitwarden-export/Bitwarden.ipa
+
+      - name: Deploy to App Store
+        if: github.ref == 'refs/heads/master' || github.event_name == 'release'
+        run: ./.github/scripts/ios/deploy-app-store.ps1
+        shell: pwsh
+        env:
+          APPLE_ID_USERNAME: ${{ secrets.APPLE_ID_USERNAME }}
+          APPLE_ID_PASSWORD: ${{ secrets.APPLE_ID_PASSWORD }}
+
+      - name: Upload release assets
+        if: github.event_name == 'release'
+        run: |
+          hub release edit `
+            -a ./bitwarden-export/Bitwarden.ipa `
+            -m "Version $($env:RELEASE_TAG_NAME.TrimStart('v'))" `
+            $env:RELEASE_TAG_NAME
+        shell: pwsh
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          RELEASE_TAG_NAME: ${{ github.event.release.tag_name }}

bitwarden-mobile.sln

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

src/Android/Accessibility/AccessibilityHelpers.cs

@@ -70,6 +70,7 @@ namespace Bit.Droid.Accessibility
             new Browser("org.adblockplus.browser", "url_bar,url_bar_title"), // 2nd = Legacy (before v2)
             new Browser("org.adblockplus.browser.beta", "url_bar,url_bar_title"), // 2nd = Legacy (before v2)
             new Browser("org.bromite.bromite", "url_bar"),
+            new Browser("org.bromite.chromium", "url_bar"),
             new Browser("org.chromium.chrome", "url_bar"),
             new Browser("org.codeaurora.swe.browser", "url_bar"),
             new Browser("org.gnu.icecat", "url_bar_title,mozac_browser_toolbar_url_view"), // 2nd = Anticipation
@@ -85,6 +86,7 @@ namespace Bit.Droid.Accessibility
             new Browser("org.mozilla.rocket", "display_url"),
             new Browser("org.torproject.torbrowser", "url_bar_title,mozac_browser_toolbar_url_view"), // 2nd = Anticipation
             new Browser("org.torproject.torbrowser_alpha", "url_bar_title,mozac_browser_toolbar_url_view"), // 2nd = Anticipation
+            new Browser("org.ungoogled.chromium", "url_bar"),
 
             // [Section B] Entries only present here
             //
@@ -306,11 +308,13 @@ namespace Bit.Droid.Accessibility
         public static AccessibilityNodeInfo GetUsernameEditText(string uriString, 
             IEnumerable<AccessibilityNodeInfo> allEditTexts)
         {
+            string uriAuthority = null;
             string uriKey = null;
             string uriLocalPath = null;
             if (Uri.TryCreate(uriString, UriKind.Absolute, out var uri))
             {
-                uriKey = uri.Authority;
+                uriAuthority = uri.Authority;
+                uriKey = uriAuthority.StartsWith("www.") ? uriAuthority.Substring(4) : uriAuthority;
                 uriLocalPath = uri.LocalPath;
             }
 
@@ -600,7 +604,12 @@ namespace Bit.Droid.Accessibility
         
         public static bool IsAutofillServicePromptVisible(IEnumerable<AccessibilityWindowInfo> windows)
         {
-            return windows?.Any(w => w.Title?.ToLower().Contains("autofill") ?? false) ?? false;
+            // Autofill framework not available until API 26
+            if (Build.VERSION.SdkInt >= BuildVersionCodes.O) 
+            {
+                return windows?.Any(w => w.Title?.ToLower().Contains("autofill") ?? false) ?? false;
+            }
+            return false;
         }
 
         public static int GetNodeHeight(AccessibilityNodeInfo node)

src/Android/Android.csproj

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

src/Android/Autofill/AutofillHelpers.cs

@@ -75,6 +75,7 @@ namespace Bit.Droid.Autofill
             "org.adblockplus.browser",
             "org.adblockplus.browser.beta",
             "org.bromite.bromite",
+            "org.bromite.chromium",
             "org.chromium.chrome",
             "org.codeaurora.swe.browser",
             "org.gnu.icecat",
@@ -88,6 +89,7 @@ namespace Bit.Droid.Autofill
             "org.mozilla.rocket",
             "org.torproject.torbrowser",
             "org.torproject.torbrowser_alpha",
+            "org.ungoogled.chromium",
         };
 
         // The URLs are blacklisted from autofilling

src/Android/Properties/AndroidManifest.xml

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

src/Android/Renderers/CustomEntryRenderer.cs

@@ -1,5 +1,9 @@
-using Android.Content;
+using System.ComponentModel;
+using Android.Content;
+using Android.Graphics;
+using Android.Text;
 using Android.Views.InputMethods;
+using Android.Widget;
 using Bit.Droid.Renderers;
 using Xamarin.Forms;
 using Xamarin.Forms.Platform.Android;
@@ -24,5 +28,42 @@ namespace Bit.Droid.Renderers
                     (ImeAction)ImeFlags.NoExtractUi;
             }
         }
+
+        // Workaround for failure to disable text prediction on non-password fields
+        // see https://github.com/xamarin/Xamarin.Forms/issues/10857
+        protected override void OnElementPropertyChanged(object sender, PropertyChangedEventArgs e)
+        {
+            base.OnElementPropertyChanged(sender, e);
+            
+            // Check if changed property is "IsPassword", otherwise ignore
+            if (e.PropertyName == Entry.IsPasswordProperty.PropertyName)
+            {
+                // Check if field type is text, otherwise ignore (numeric passwords, etc.)
+                EditText.InputType = Element.Keyboard.ToInputType();
+                if ((EditText.InputType & InputTypes.ClassText) == InputTypes.ClassText)
+                {
+                    if (Element.IsPassword)
+                    {
+                        // Element is a password field, set inputType to TextVariationPassword which disables
+                        // predictive text by default
+                        EditText.InputType = EditText.InputType | InputTypes.TextVariationPassword;
+                    }
+                    else
+                    {
+                        // Element is not a password field, set inputType to TextVariationVisiblePassword to
+                        // disable predictive text while still displaying the content.
+                        EditText.InputType = EditText.InputType | InputTypes.TextVariationVisiblePassword;
+                    }
+                    
+                    // The workaround above forces a reset of the style properties, so we need to re-apply the font.
+                    // see https://xamarin.github.io/bugzilla-archives/33/33666/bug.html
+                    var typeface = Typeface.CreateFromAsset(Context.Assets, "RobotoMono_Regular.ttf");
+                    if (Control is TextView label)
+                    {
+                        label.Typeface = typeface;
+                    }
+                }
+            }
+        }
     }
 }

src/Android/Resources/drawable/ic_launcher_foreground.xml

@@ -1,13 +1,33 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:aapt="http://schemas.android.com/aapt"
     android:width="108dp"
     android:height="108dp"
-    android:viewportWidth="1024.4897"
-    android:viewportHeight="1024.4897">
-  <group android:translateX="300.2449"
-      android:translateY="261.2449">
-    <path
-        android:pathData="M393.4,52.2C389.7,48.5 385.3,46.6 380.3,46.6L43.7,46.6C38.6,46.6 34.3,48.5 30.6,52.2C26.9,55.9 25,60.2 25,65.3L25,289.7C25,306.4 28.3,323.1 34.8,339.5C41.3,356 49.4,370.6 59.1,383.3C68.7,396.1 80.2,408.5 93.6,420.5C106.9,432.6 119.3,442.6 130.6,450.6C141.9,458.6 153.7,466.1 166,473.2C178.3,480.3 187,485.1 192.2,487.7C197.4,490.2 201.5,492.2 204.6,493.5C206.9,494.7 209.5,495.3 212.2,495.3C214.9,495.3 217.5,494.7 219.8,493.5C222.9,492.1 227.1,490.2 232.2,487.7C237.4,485.2 246.1,480.3 258.4,473.2C270.7,466.1 282.5,458.5 293.8,450.6C305.1,442.6 317.4,432.6 330.8,420.5C344.1,408.4 355.6,396 365.3,383.3C374.9,370.5 383,355.9 389.5,339.5C396,323 399.3,306.4 399.3,289.7L399.3,65.3C399,60.2 397.1,55.9 393.4,52.2ZM350,291.8C350,373 212,443 212,443L212,94.6L350,94.6L350,291.8Z"
-        android:fillColor="#ffffff"
-        android:fillType="nonZero"/>
-  </group>
+    android:viewportWidth="108"
+    android:viewportHeight="108">
+    <group
+        android:scaleX="0.099"
+        android:scaleY="0.099"
+        android:translateX="24.3"
+        android:translateY="24.3">
+        <path android:pathData="M482,103l418,418l-235,434l-495,-495l130,75l175,-175z">
+            <aapt:attr name="android:fillColor">
+                <gradient
+                    android:endX="573.9931"
+                    android:endY="815.5847"
+                    android:startX="57.80515"
+                    android:startY="213.12973"
+                    android:type="linear">
+                    <item
+                        android:color="#3F000000"
+                        android:offset="0" />
+                    <item
+                        android:color="#00000000"
+                        android:offset="1" />
+                </gradient>
+            </aapt:attr>
+        </path>
+        <path
+            android:fillColor="#ffffff"
+            android:pathData="M481.4,102.2c-3.7,-3.7 -8.1,-5.6 -13.1,-5.6L131.7,96.6c-5.1,0 -9.4,1.9 -13.1,5.6C114.9,105.9 113,110.2 113,115.3v224.4c0,16.7 3.3,33.4 9.8,49.8c6.5,16.5 14.6,31.1 24.3,43.8c9.6,12.8 21.1,25.2 34.5,37.2c13.3,12.1 25.7,22.1 37,30.1c11.3,8 23.1,15.5 35.4,22.6c12.3,7.1 21,11.9 26.2,14.5c5.2,2.5 9.3,4.5 12.4,5.8c2.3,1.2 4.9,1.8 7.6,1.8c2.7,0 5.3,-0.6 7.6,-1.8c3.1,-1.4 7.3,-3.3 12.4,-5.8c5.2,-2.5 13.9,-7.4 26.2,-14.5c12.3,-7.1 24.1,-14.7 35.4,-22.6c11.3,-8 23.6,-18 37,-30.1c13.3,-12.1 24.8,-24.5 34.5,-37.2c9.6,-12.8 17.7,-27.4 24.2,-43.8c6.5,-16.5 9.8,-33.1 9.8,-49.8L487.3,115.3C487,110.2 485.1,105.9 481.4,102.2zM438,341.8C438,423 300,493 300,493L300,144.6h138C438,144.6 438,260.6 438,341.8z" />
+    </group>
 </vector>

src/Android/Resources/drawable/icon.xml

@@ -1,12 +1,30 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:aapt="http://schemas.android.com/aapt"
     android:width="1024dp"
     android:height="1024dp"
     android:viewportWidth="1024"
     android:viewportHeight="1024">
-  <path
-      android:pathData="M1024,864c0,88.4 -71.6,160 -160,160H160C71.6,1024 0,952.4 0,864V160C0,71.6 71.6,0 160,0h704c88.4,0 160,71.6 160,160V864z"
-      android:fillColor="#175DDC"/>
-  <path
-      android:pathData="M829.8,128.6c-6.5,-6.5 -14.2,-9.7 -23,-9.7H217.2c-8.9,0 -16.5,3.2 -23,9.7c-6.5,6.5 -9.7,14.2 -9.7,23v393.1c0,29.3 5.7,58.4 17.1,87.3c11.4,28.8 25.6,54.4 42.5,76.8c16.9,22.3 37,44.1 60.4,65.3c23.4,21.2 45,38.7 64.7,52.7c19.8,14 40.4,27.2 61.9,39.7c21.5,12.5 36.8,20.9 45.8,25.3c9,4.4 16.3,7.9 21.7,10.2c4.1,2 8.5,3.1 13.3,3.1c4.8,0 9.2,-1 13.3,-3.1c5.5,-2.4 12.7,-5.8 21.8,-10.2c9,-4.4 24.3,-12.9 45.8,-25.3c21.5,-12.5 42.1,-25.7 61.9,-39.7c19.8,-14 41.4,-31.6 64.8,-52.7c23.4,-21.2 43.5,-42.9 60.4,-65.3c16.9,-22.4 31,-47.9 42.5,-76.8c11.4,-28.8 17.1,-57.9 17.1,-87.3V151.7C839.6,142.8 836.3,135.1 829.8,128.6zM753.8,548.4c0,142.3 -241.8,264.9 -241.8,264.9V203.1h241.8C753.8,203.1 753.8,406.1 753.8,548.4z"
-      android:fillColor="#FFFFFF"/>
+    <path
+        android:fillColor="#175DDC"
+        android:pathData="M1024,864c0,88.4 -71.6,160 -160,160H160C71.6,1024 0,952.4 0,864V160C0,71.6 71.6,0 160,0h704c88.4,0 160,71.6 160,160V864z" />
+    <path android:pathData="M803.2,195.8l668.8,668.8l-376,694.4l-792,-792l208,120l280,-280z">
+        <aapt:attr name="android:fillColor">
+            <gradient
+                android:endX="922.23486"
+                android:endY="1353.2649"
+                android:startX="96.33417"
+                android:startY="389.33688"
+                android:type="linear">
+                <item
+                    android:color="#3F000000"
+                    android:offset="0" />
+                <item
+                    android:color="#00000000"
+                    android:offset="1" />
+            </gradient>
+        </aapt:attr>
+    </path>
+    <path
+        android:fillColor="#ffffff"
+        android:pathData="M802.24,194.52c-5.92,-5.92 -12.96,-8.96 -20.96,-8.96L242.72,185.56c-8.16,0 -15.04,3.04 -20.96,8.96C215.84,200.44 212.8,207.32 212.8,215.48l0,359.04c0,26.72 5.28,53.44 15.68,79.68c10.4,26.4 23.36,49.76 38.88,70.08c15.36,20.48 33.76,40.32 55.2,59.52c21.28,19.36 41.12,35.36 59.2,48.16c18.08,12.8 36.96,24.8 56.64,36.16c19.68,11.36 33.6,19.04 41.92,23.2c8.32,4 14.88,7.2 19.84,9.28c3.68,1.92 7.84,2.88 12.16,2.88c4.32,0 8.48,-0.96 12.16,-2.88c4.96,-2.24 11.68,-5.28 19.84,-9.28c8.32,-4 22.24,-11.84 41.92,-23.2c19.68,-11.36 38.56,-23.52 56.64,-36.16c18.08,-12.8 37.76,-28.8 59.2,-48.16c21.28,-19.36 39.68,-39.2 55.2,-59.52c15.36,-20.48 28.32,-43.84 38.72,-70.08c10.4,-26.4 15.68,-52.96 15.68,-79.68L811.68,215.48C811.2,207.32 808.16,200.44 802.24,194.52zM732.8,577.88C732.8,707.8 512,819.8 512,819.8L512,262.36l220.8,0C732.8,262.36 732.8,447.96 732.8,577.88z" />
 </vector>

src/Android/Resources/xml/autofillservice.xml

@@ -121,6 +121,9 @@
   <compatibility-package
     android:name="org.bromite.bromite"
     android:maxLongVersionCode="10000000000"/>
+  <compatibility-package
+    android:name="org.bromite.chromium"
+    android:maxLongVersionCode="10000000000"/>
   <compatibility-package
     android:name="org.chromium.chrome"
     android:maxLongVersionCode="10000000000"/>
@@ -160,4 +163,7 @@
   <compatibility-package
     android:name="org.torproject.torbrowser_alpha"
     android:maxLongVersionCode="10000000000"/>
+  <compatibility-package
+    android:name="org.ungoogled.chromium"
+    android:maxLongVersionCode="10000000000"/>
 </autofill-service>

src/Android/Services/DeviceActionService.cs

@@ -8,12 +8,9 @@ using Android.App;
 using Android.App.Assist;
 using Android.Content;
 using Android.Content.PM;
-using Android.Hardware.Biometrics;
-using Android.Hardware.Fingerprints;
 using Android.Nfc;
 using Android.OS;
 using Android.Provider;
-using Android.Runtime;
 using Android.Text;
 using Android.Text.Method;
 using Android.Views.Autofill;
@@ -31,7 +28,6 @@ using Bit.Core.Models.View;
 using Bit.Core.Utilities;
 using Bit.Droid.Autofill;
 using Plugin.CurrentActivity;
-using Plugin.Fingerprint;
 
 namespace Bit.Droid.Services
 {
@@ -389,71 +385,16 @@ namespace Bit.Droid.Services
 
         public bool SupportsFaceBiometric()
         {
+            // only used by iOS
             return false;
         }
 
         public Task<bool> SupportsFaceBiometricAsync()
         {
+            // only used by iOS
             return Task.FromResult(SupportsFaceBiometric());
         }
 
-        public async Task<bool> BiometricAvailableAsync()
-        {
-            if (UseNativeBiometric())
-            {
-                var activity = (MainActivity)CrossCurrentActivity.Current.Activity;
-                var manager = activity.GetSystemService(Context.BiometricService) as BiometricManager;
-                return manager.CanAuthenticate() == BiometricCode.Success;
-            }
-            else
-            {
-                try
-                {
-                    return await CrossFingerprint.Current.IsAvailableAsync();
-                }
-                catch
-                {
-                    return false;
-                }
-            }
-        }
-
-        public bool UseNativeBiometric()
-        {
-            return (int)Build.VERSION.SdkInt >= 29;
-        }
-
-        public Task<bool> AuthenticateBiometricAsync(string text = null)
-        {
-            if (string.IsNullOrWhiteSpace(text))
-            {
-                text = AppResources.BiometricsDirection;
-            }
-
-            var activity = (MainActivity)CrossCurrentActivity.Current.Activity;
-            using (var builder = new BiometricPrompt.Builder(activity))
-            {
-                builder.SetTitle(text);
-                builder.SetConfirmationRequired(false);
-                builder.SetNegativeButton(AppResources.Cancel, activity.MainExecutor,
-                    new DialogInterfaceOnClickListener
-                    {
-                        Clicked = () => { }
-                    });
-                var prompt = builder.Build();
-                var result = new TaskCompletionSource<bool>();
-                prompt.Authenticate(new CancellationSignal(), activity.MainExecutor,
-                    new BiometricAuthenticationCallback
-                    {
-                        Success = authResult => result.TrySetResult(true),
-                        Error = () => result.TrySetResult(false),
-                        Failed = () => { },
-                        Help = (helpCode, helpString) => { }
-                    });
-                return result.Task;
-            }
-        }
-
         public bool SupportsNfc()
         {
             var activity = (MainActivity)CrossCurrentActivity.Current.Activity;
@@ -870,48 +811,5 @@ namespace Bit.Droid.Services
                 Context.ClipboardService) as Android.Content.ClipboardManager;
             clipboardManager.PrimaryClip = ClipData.NewPlainText("bitwarden", text);
         }
-
-        private class BiometricAuthenticationCallback : BiometricPrompt.AuthenticationCallback
-        {
-            public Action<BiometricPrompt.AuthenticationResult> Success { get; set; }
-            public Action Error { get; set; }
-            public Action Failed { get; set; }
-            public Action<BiometricAcquiredStatus, Java.Lang.ICharSequence> Help { get; set; }
-
-            public override void OnAuthenticationSucceeded(BiometricPrompt.AuthenticationResult authResult)
-            {
-                base.OnAuthenticationSucceeded(authResult);
-                Success?.Invoke(authResult);
-            }
-
-            public override void OnAuthenticationError([GeneratedEnum] BiometricErrorCode errorCode, Java.Lang.ICharSequence errString)
-            {
-                base.OnAuthenticationError(errorCode, errString);
-                Error?.Invoke();
-            }
-
-            public override void OnAuthenticationFailed()
-            {
-                base.OnAuthenticationFailed();
-                Failed?.Invoke();
-            }
-
-            public override void OnAuthenticationHelp([GeneratedEnum] BiometricAcquiredStatus helpCode,
-                Java.Lang.ICharSequence helpString)
-            {
-                base.OnAuthenticationHelp(helpCode, helpString);
-                Help?.Invoke(helpCode, helpString);
-            }
-        }
-
-        private class DialogInterfaceOnClickListener : Java.Lang.Object, IDialogInterfaceOnClickListener
-        {
-            public Action Clicked { get; set; }
-
-            public void OnClick(IDialogInterface dialog, int which)
-            {
-                Clicked?.Invoke();
-            }
-        }
     }
 }

src/Android/ci-build-apks.ps1

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

src/App/Abstractions/IDeviceActionService.cs

@@ -23,9 +23,6 @@ namespace Bit.App.Abstractions
         void RateApp();
         bool SupportsFaceBiometric();
         Task<bool> SupportsFaceBiometricAsync();
-        Task<bool> BiometricAvailableAsync();
-        bool UseNativeBiometric();
-        Task<bool> AuthenticateBiometricAsync(string text = null);
         bool SupportsNfc();
         bool SupportsCamera();
         bool SupportsAutofillService();

src/App/App.xaml.cs

@@ -219,7 +219,7 @@ namespace Bit.App
             SyncIfNeeded();
             if (Current.MainPage is NavigationPage navPage && navPage.CurrentPage is LockPage lockPage)
             {
-                await lockPage.PromptFingerprintAfterResumeAsync();
+                await lockPage.PromptBiometricAfterResumeAsync();
             }
         }
 
@@ -246,7 +246,7 @@ namespace Bit.App
                 _passwordGenerationService.ClearAsync(),
                 _vaultTimeoutService.ClearAsync(),
                 _stateService.PurgeAsync());
-            _vaultTimeoutService.FingerprintLocked = true;
+            _vaultTimeoutService.BiometricLocked = true;
             _searchService.ClearIndex();
             _authService.LogOut(() =>
             {
@@ -404,21 +404,20 @@ namespace Bit.App
             }
         }
 
-        private async Task LockedAsync(bool autoPromptFingerprint)
+        private async Task LockedAsync(bool autoPromptBiometric)
         {
             await _stateService.PurgeAsync();
-            if (autoPromptFingerprint && Device.RuntimePlatform == Device.iOS)
+            if (autoPromptBiometric && Device.RuntimePlatform == Device.iOS)
             {
                 var vaultTimeout = await _storageService.GetAsync<int?>(Constants.VaultTimeoutKey);
                 if (vaultTimeout == 0)
                 {
-                    autoPromptFingerprint = false;
+                    autoPromptBiometric = false;
                 }
             }
-            else if (autoPromptFingerprint && Device.RuntimePlatform == Device.Android &&
-                _deviceActionService.UseNativeBiometric())
+            else if (autoPromptBiometric && Device.RuntimePlatform == Device.Android)
             {
-                autoPromptFingerprint = false;
+                autoPromptBiometric = false;
             }
             PreviousPageInfo lastPageBeforeLock = null;
             if (Current.MainPage is TabbedPage tabbedPage && tabbedPage.Navigation.ModalStack.Count > 0)
@@ -445,7 +444,7 @@ namespace Bit.App
                 }
             }
             await _storageService.SaveAsync(Constants.PreviousPageKey, lastPageBeforeLock);
-            var lockPage = new LockPage(Options, autoPromptFingerprint);
+            var lockPage = new LockPage(Options, autoPromptBiometric);
             Device.BeginInvokeOnMainThread(() => Current.MainPage = new NavigationPage(lockPage));
         }
     }

src/App/Pages/Accounts/LockPage.xaml

@@ -106,8 +106,8 @@
                     Margin="0, 10, 0, 0" />
             </StackLayout>
             <StackLayout Padding="10, 0">
-                <Button Text="{Binding FingerprintButtonText}" Clicked="Fingerprint_Clicked"
-                        IsVisible="{Binding FingerprintLock}"></Button>
+                <Button Text="{Binding BiometricButtonText}" Clicked="Biometric_Clicked"
+                        IsVisible="{Binding BiometricLock}"></Button>
                 <Button Text="{u:I18n LogOut}" Clicked="LogOut_Clicked"></Button>
             </StackLayout>
         </StackLayout>

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

@@ -12,17 +12,17 @@ namespace Bit.App.Pages
     {
         private readonly IStorageService _storageService;
         private readonly AppOptions _appOptions;
-        private readonly bool _autoPromptFingerprint;
+        private readonly bool _autoPromptBiometric;
         private readonly LockPageViewModel _vm;
 
         private bool _promptedAfterResume;
         private bool _appeared;
 
-        public LockPage(AppOptions appOptions = null, bool autoPromptFingerprint = true)
+        public LockPage(AppOptions appOptions = null, bool autoPromptBiometric = true)
         {
             _storageService = ServiceContainer.Resolve<IStorageService>("storageService");
             _appOptions = appOptions;
-            _autoPromptFingerprint = autoPromptFingerprint;
+            _autoPromptBiometric = autoPromptBiometric;
             InitializeComponent();
             _vm = BindingContext as LockPageViewModel;
             _vm.Page = this;
@@ -34,15 +34,15 @@ namespace Bit.App.Pages
         public Entry MasterPasswordEntry { get; set; }
         public Entry PinEntry { get; set; }
 
-        public async Task PromptFingerprintAfterResumeAsync()
+        public async Task PromptBiometricAfterResumeAsync()
         {
-            if (_vm.FingerprintLock)
+            if (_vm.BiometricLock)
             {
                 await Task.Delay(500);
                 if (!_promptedAfterResume)
                 {
                     _promptedAfterResume = true;
-                    await _vm?.PromptFingerprintAsync();
+                    await _vm?.PromptBiometricAsync();
                 }
             }
         }
@@ -55,8 +55,8 @@ namespace Bit.App.Pages
                 return;
             }
             _appeared = true;
-            await _vm.InitAsync(_autoPromptFingerprint);
-            if (!_vm.FingerprintLock)
+            await _vm.InitAsync(_autoPromptBiometric);
+            if (!_vm.BiometricLock)
             {
                 if (_vm.PinLock)
                 {
@@ -89,11 +89,11 @@ namespace Bit.App.Pages
             }
         }
 
-        private async void Fingerprint_Clicked(object sender, EventArgs e)
+        private async void Biometric_Clicked(object sender, EventArgs e)
         {
             if (DoOnce())
             {
-                await _vm.PromptFingerprintAsync();
+                await _vm.PromptBiometricAsync();
             }
         }
 

src/App/Pages/Accounts/LockPageViewModel.cs

@@ -28,8 +28,8 @@ namespace Bit.App.Pages
         private string _email;
         private bool _showPassword;
         private bool _pinLock;
-        private bool _fingerprintLock;
-        private string _fingerprintButtonText;
+        private bool _biometricLock;
+        private string _biometricButtonText;
         private string _loggedInAsText;
         private string _lockedVerifyText;
         private int _invalidPinAttempts = 0;
@@ -69,16 +69,16 @@ namespace Bit.App.Pages
             set => SetProperty(ref _pinLock, value);
         }
 
-        public bool FingerprintLock
+        public bool BiometricLock
         {
-            get => _fingerprintLock;
-            set => SetProperty(ref _fingerprintLock, value);
+            get => _biometricLock;
+            set => SetProperty(ref _biometricLock, value);
         }
 
-        public string FingerprintButtonText
+        public string BiometricButtonText
         {
-            get => _fingerprintButtonText;
-            set => SetProperty(ref _fingerprintButtonText, value);
+            get => _biometricButtonText;
+            set => SetProperty(ref _biometricButtonText, value);
         }
 
         public string LoggedInAsText
@@ -100,11 +100,11 @@ namespace Bit.App.Pages
         public string Pin { get; set; }
         public Action UnlockedAction { get; set; }
 
-        public async Task InitAsync(bool autoPromptFingerprint)
+        public async Task InitAsync(bool autoPromptBiometric)
         {
             _pinSet = await _vaultTimeoutService.IsPinLockSetAsync();
             PinLock = (_pinSet.Item1 && _vaultTimeoutService.PinProtectedKey != null) || _pinSet.Item2;
-            FingerprintLock = await _vaultTimeoutService.IsFingerprintLockSetAsync();
+            BiometricLock = await _vaultTimeoutService.IsBiometricLockSetAsync();
             _email = await _userService.GetEmailAsync();
             var webVault = _environmentService.GetWebVaultUrl();
             if (string.IsNullOrWhiteSpace(webVault))
@@ -124,27 +124,21 @@ namespace Bit.App.Pages
                 LockedVerifyText = AppResources.VaultLockedMasterPassword;
             }
 
-            if (FingerprintLock)
+            if (BiometricLock)
             {
-                var supportsFace = await _deviceActionService.SupportsFaceBiometricAsync();
-                if (Device.RuntimePlatform == Device.iOS && supportsFace)
+                BiometricButtonText = AppResources.UseBiometricsToUnlock;
+                if (Device.RuntimePlatform == Device.iOS)
                 {
-                    FingerprintButtonText = AppResources.UseFaceIDToUnlock;
+                    var supportsFace = await _deviceActionService.SupportsFaceBiometricAsync();
+                    BiometricButtonText = supportsFace ? AppResources.UseFaceIDToUnlock :
+                        AppResources.UseFingerprintToUnlock;
                 }
-                else if (Device.RuntimePlatform == Device.Android && _deviceActionService.UseNativeBiometric())
-                {
-                    FingerprintButtonText = AppResources.UseBiometricsToUnlock;
-                }
-                else
-                {
-                    FingerprintButtonText = AppResources.UseFingerprintToUnlock;
-                }
-                if (autoPromptFingerprint)
+                if (autoPromptBiometric)
                 {
                     var tasks = Task.Run(async () =>
                     {
                         await Task.Delay(500);
-                        Device.BeginInvokeOnMainThread(async () => await PromptFingerprintAsync());
+                        Device.BeginInvokeOnMainThread(async () => await PromptBiometricAsync());
                     });
                 }
             }
@@ -271,9 +265,9 @@ namespace Bit.App.Pages
             entry.Focus();
         }
 
-        public async Task PromptFingerprintAsync()
+        public async Task PromptBiometricAsync()
         {
-            if (!FingerprintLock)
+            if (!BiometricLock)
             {
                 return;
             }
@@ -290,7 +284,7 @@ namespace Bit.App.Pages
                     page.MasterPasswordEntry.Focus();
                 }
             });
-            _vaultTimeoutService.FingerprintLocked = !success;
+            _vaultTimeoutService.BiometricLocked = !success;
             if (success)
             {
                 await DoContinueAsync();
@@ -309,7 +303,7 @@ namespace Bit.App.Pages
 
         private async Task DoContinueAsync()
         {
-            _vaultTimeoutService.FingerprintLocked = false;
+            _vaultTimeoutService.BiometricLocked = false;
             var disableFavicon = await _storageService.GetAsync<bool?>(Constants.DisableFaviconKey);
             await _stateService.SaveAsync(Constants.DisableFaviconKey, disableFavicon.GetValueOrDefault());
             _messagingService.Send("unlocked");

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

@@ -143,19 +143,15 @@ namespace Bit.App.Pages
             }
             else
             {
-                var fingerprintName = AppResources.Fingerprint;
+                var biometricName = AppResources.Biometrics;
                 if (Device.RuntimePlatform == Device.iOS)
                 {
                     var supportsFace = await _deviceActionService.SupportsFaceBiometricAsync();
-                    fingerprintName = supportsFace ? AppResources.FaceID : AppResources.TouchID;
+                    biometricName = supportsFace ? AppResources.FaceID : AppResources.TouchID;
                 }
-                else if (Device.RuntimePlatform == Device.Android && _deviceActionService.UseNativeBiometric())
+                if (item.Name == string.Format(AppResources.UnlockWith, biometricName))
                 {
-                    fingerprintName = AppResources.Biometrics;
-                }
-                if (item.Name == string.Format(AppResources.UnlockWith, fingerprintName))
-                {
-                    await _vm.UpdateFingerprintAsync();
+                    await _vm.UpdateBiometricAsync();
                 }
             }
         }

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

@@ -23,9 +23,9 @@ namespace Bit.App.Pages
         private readonly IStorageService _storageService;
         private readonly ISyncService _syncService;
 
-        private bool _supportsFingerprint;
+        private bool _supportsBiometric;
         private bool _pin;
-        private bool _fingerprint;
+        private bool _biometric;
         private string _lastSyncDate;
         private string _vaultTimeoutDisplayValue;
         private string _vaultTimeoutActionDisplayValue;
@@ -69,7 +69,7 @@ namespace Bit.App.Pages
 
         public async Task InitAsync()
         {
-            _supportsFingerprint = await _platformUtilsService.SupportsBiometricAsync();
+            _supportsBiometric = await _platformUtilsService.SupportsBiometricAsync();
             var lastSync = await _syncService.GetLastSyncAsync();
             if (lastSync != null)
             {
@@ -83,7 +83,7 @@ namespace Bit.App.Pages
             _vaultTimeoutActionDisplayValue = _vaultTimeoutActions.FirstOrDefault(o => o.Value == action).Key;
             var pinSet = await _vaultTimeoutService.IsPinLockSetAsync();
             _pin = pinSet.Item1 || pinSet.Item2;
-            _fingerprint = await _vaultTimeoutService.IsFingerprintLockSetAsync();
+            _biometric = await _vaultTimeoutService.IsBiometricLockSetAsync();
             BuildList();
         }
 
@@ -288,31 +288,31 @@ namespace Bit.App.Pages
             BuildList();
         }
 
-        public async Task UpdateFingerprintAsync()
+        public async Task UpdateBiometricAsync()
         {
-            var current = _fingerprint;
-            if (_fingerprint)
+            var current = _biometric;
+            if (_biometric)
             {
-                _fingerprint = false;
+                _biometric = false;
             }
             else if (await _platformUtilsService.SupportsBiometricAsync())
             {
-                _fingerprint = await _platformUtilsService.AuthenticateBiometricAsync(null,
+                _biometric = await _platformUtilsService.AuthenticateBiometricAsync(null,
                     _deviceActionService.DeviceType == Core.Enums.DeviceType.Android ? "." : null);
             }
-            if (_fingerprint == current)
+            if (_biometric == current)
             {
                 return;
             }
-            if (_fingerprint)
+            if (_biometric)
             {
-                await _storageService.SaveAsync(Constants.FingerprintUnlockKey, true);
+                await _storageService.SaveAsync(Constants.BiometricUnlockKey, true);
             }
             else
             {
-                await _storageService.RemoveAsync(Constants.FingerprintUnlockKey);
+                await _storageService.RemoveAsync(Constants.BiometricUnlockKey);
             }
-            _vaultTimeoutService.FingerprintLocked = false;
+            _vaultTimeoutService.BiometricLocked = false;
             await _cryptoService.ToggleKeyAsync();
             BuildList();
         }
@@ -371,22 +371,18 @@ namespace Bit.App.Pages
                 new SettingsPageListItem { Name = AppResources.LockNow },
                 new SettingsPageListItem { Name = AppResources.TwoStepLogin }
             };
-            if (_supportsFingerprint || _fingerprint)
+            if (_supportsBiometric || _biometric)
             {
-                var fingerprintName = AppResources.Fingerprint;
+                var biometricName = AppResources.Biometrics;
                 if (Device.RuntimePlatform == Device.iOS)
                 {
-                    fingerprintName = _deviceActionService.SupportsFaceBiometric() ? AppResources.FaceID :
+                    biometricName = _deviceActionService.SupportsFaceBiometric() ? AppResources.FaceID :
                         AppResources.TouchID;
                 }
-                else if (Device.RuntimePlatform == Device.Android && _deviceActionService.UseNativeBiometric())
-                {
-                    fingerprintName = AppResources.Biometrics;
-                }
                 var item = new SettingsPageListItem
                 {
-                    Name = string.Format(AppResources.UnlockWith, fingerprintName),
-                    SubLabel = _fingerprint ? AppResources.Enabled : AppResources.Disabled
+                    Name = string.Format(AppResources.UnlockWith, biometricName),
+                    SubLabel = _biometric ? AppResources.Enabled : AppResources.Disabled
                 };
                 securityItems.Insert(2, item);
             }

src/App/Pages/Vault/AddEditPage.xaml

@@ -112,9 +112,11 @@
                             StyleClass="box-value"
                             Grid.Row="1"
                             Grid.Column="0"
+                            Grid.ColumnSpan="{Binding PasswordFieldColSpan}"
                             IsPassword="{Binding ShowPassword, Converter={StaticResource inverseBool}}"
                             IsSpellCheckEnabled="False"
-                            IsTextPredictionEnabled="False" />
+                            IsTextPredictionEnabled="False"
+                            IsEnabled="{Binding Cipher.ViewPassword}"/>
                         <controls:FaButton 
                             StyleClass="box-row-button, box-row-button-platform"
                             Text="&#xf058;"
@@ -123,7 +125,8 @@
                             Grid.Column="1"
                             Grid.RowSpan="2"
                             AutomationProperties.IsInAccessibleTree="True"
-                            AutomationProperties.Name="{u:I18n CheckPassword}" />
+                            AutomationProperties.Name="{u:I18n CheckPassword}"
+                            IsVisible="{Binding Cipher.ViewPassword}" />
                         <controls:FaButton 
                             StyleClass="box-row-button, box-row-button-platform"
                             Text="{Binding ShowPasswordIcon}"
@@ -132,7 +135,8 @@
                             Grid.Column="2"
                             Grid.RowSpan="2"
                             AutomationProperties.IsInAccessibleTree="True"
-                            AutomationProperties.Name="{u:I18n ToggleVisibility}" />
+                            AutomationProperties.Name="{u:I18n ToggleVisibility}"
+                            IsVisible="{Binding Cipher.ViewPassword}" />
                         <controls:FaButton 
                             StyleClass="box-row-button, box-row-button-platform"
                             Text="&#xf021;"
@@ -141,7 +145,8 @@
                             Grid.Column="3"
                             Grid.RowSpan="2"
                             AutomationProperties.IsInAccessibleTree="True"
-                            AutomationProperties.Name="{u:I18n GeneratePassword}" />
+                            AutomationProperties.Name="{u:I18n GeneratePassword}"
+                            IsVisible="{Binding Cipher.ViewPassword}" />
                     </Grid>
 
                     <Grid StyleClass="box-row, box-row-input">
@@ -163,9 +168,12 @@
                             Text="{Binding Cipher.Login.Totp}"
                             IsSpellCheckEnabled="False"
                             IsTextPredictionEnabled="False"
+                            IsPassword="{Binding Cipher.ViewPassword, Converter={StaticResource inverseBool}}"
+                            IsEnabled="{Binding Cipher.ViewPassword}"
                             StyleClass="box-value"
                             Grid.Row="1"
-                            Grid.Column="0" />
+                            Grid.Column="0"
+                            Grid.ColumnSpan="{Binding TotpColumnSpan}" />
                         <controls:FaButton 
                             StyleClass="box-row-button, box-row-button-platform"
                             Text="&#xf030;"
@@ -173,6 +181,7 @@
                             Grid.Row="0"
                             Grid.Column="1"
                             Grid.RowSpan="2"
+                            IsVisible="{Binding Cipher.ViewPassword}"
                             AutomationProperties.IsInAccessibleTree="True"
                             AutomationProperties.Name="{u:I18n ScanQrTitle}" />
                     </Grid>
@@ -562,6 +571,7 @@
                                         Grid.Column="0"
                                         IsVisible="{Binding IsHiddenType}"
                                         IsPassword="{Binding ShowHiddenValue, Converter={StaticResource inverseBool}}"
+                                        IsEnabled="{Binding ShowViewHidden}"
                                         IsSpellCheckEnabled="False"
                                         IsTextPredictionEnabled="False">
                                         <Entry.Keyboard>
@@ -582,7 +592,7 @@
                                         StyleClass="box-row-button, box-row-button-platform"
                                         Text="{Binding ShowHiddenValueIcon}"
                                         Command="{Binding ToggleHiddenValueCommand}"
-                                        IsVisible="{Binding IsHiddenType}"
+                                        IsVisible="{Binding ShowViewHidden}"
                                         Grid.Row="0"
                                         Grid.Column="1"
                                         Grid.RowSpan="2"

src/App/Pages/Vault/AddEditPageViewModel.cs

@@ -274,6 +274,8 @@ namespace Bit.App.Pages
         public bool ShowAttachments => Cipher.HasAttachments;
         public string ShowPasswordIcon => ShowPassword ? "" : "";
         public string ShowCardCodeIcon => ShowCardCode ? "" : "";
+        public int PasswordFieldColSpan => Cipher.ViewPassword ? 1 : 4;
+        public int TotpColumnSpan => Cipher.ViewPassword ? 1 : 2;
 
         public void Init()
         {
@@ -631,7 +633,8 @@ namespace Bit.App.Pages
                 Fields.Add(new AddEditPageFieldViewModel(Cipher, new FieldView
                 {
                     Type = type,
-                    Name = string.IsNullOrWhiteSpace(name) ? null : name
+                    Name = string.IsNullOrWhiteSpace(name) ? null : name,
+                    NewField = true,
                 }));
             }
         }
@@ -818,6 +821,7 @@ namespace Bit.App.Pages
         public bool IsTextType => _field.Type == FieldType.Text;
         public bool IsBooleanType => _field.Type == FieldType.Boolean;
         public bool IsHiddenType => _field.Type == FieldType.Hidden;
+        public bool ShowViewHidden => IsHiddenType && (_cipher.ViewPassword || _field.NewField);
 
         public void ToggleHiddenValue()
         {

src/App/Pages/Vault/ViewPage.xaml

@@ -134,7 +134,8 @@
                                     Grid.Column="1"
                                     Grid.RowSpan="2"
                                     AutomationProperties.IsInAccessibleTree="True"
-                                    AutomationProperties.Name="{u:I18n CheckPassword}" />
+                                    AutomationProperties.Name="{u:I18n CheckPassword}"
+                                    IsVisible="{Binding Cipher.ViewPassword}" />
                                 <controls:FaButton 
                                     StyleClass="box-row-button, box-row-button-platform"
                                     Text="{Binding ShowPasswordIcon}"
@@ -143,7 +144,8 @@
                                     Grid.Column="2"
                                     Grid.RowSpan="2"
                                     AutomationProperties.IsInAccessibleTree="True"
-                                    AutomationProperties.Name="{u:I18n ToggleVisibility}" />
+                                    AutomationProperties.Name="{u:I18n ToggleVisibility}"
+                                    IsVisible="{Binding Cipher.ViewPassword}" />
                                 <controls:FaButton 
                                     StyleClass="box-row-button, box-row-button-platform"
                                     Text="&#xf0ea;"
@@ -153,7 +155,8 @@
                                     Grid.Column="3"
                                     Grid.RowSpan="2"
                                     AutomationProperties.IsInAccessibleTree="True"
-                                    AutomationProperties.Name="{u:I18n CopyPassword}" />
+                                    AutomationProperties.Name="{u:I18n CopyPassword}"
+                                    IsVisible="{Binding Cipher.ViewPassword}" />
                             </Grid>
                             <BoxView StyleClass="box-row-separator"
                                      IsVisible="{Binding Cipher.Login.Password, Converter={StaticResource stringHasValue}}" />
@@ -570,7 +573,7 @@
                                                 StyleClass="box-row-button, box-row-button-platform"
                                                 Text="{Binding ShowHiddenValueIcon}"
                                                 Command="{Binding ToggleHiddenValueCommand}"
-                                                IsVisible="{Binding IsHiddenType}"
+                                                IsVisible="{Binding ShowViewHidden}"
                                                 Grid.Row="0"
                                                 Grid.Column="1"
                                                 Grid.RowSpan="2"

src/App/Pages/Vault/ViewPageViewModel.cs

@@ -684,8 +684,9 @@ namespace Bit.App.Pages
         public bool IsTextType => _field.Type == Core.Enums.FieldType.Text;
         public bool IsBooleanType => _field.Type == Core.Enums.FieldType.Boolean;
         public bool IsHiddenType => _field.Type == Core.Enums.FieldType.Hidden;
+        public bool ShowViewHidden => IsHiddenType && _cipher.ViewPassword;
         public bool ShowCopyButton => _field.Type != Core.Enums.FieldType.Boolean &&
-            !string.IsNullOrWhiteSpace(_field.Value);
+            !string.IsNullOrWhiteSpace(_field.Value) && !(IsHiddenType && !_cipher.ViewPassword);
 
         public void ToggleHiddenValue()
         {

src/App/Resources/AppResources.Designer.cs

@@ -9,7 +9,6 @@
 
 namespace Bit.App.Resources {
     using System;
-    using System.Reflection;
     
     
     [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "4.0.0.0")]

src/App/Resources/AppResources.af.resx

@@ -1564,7 +1564,7 @@
     <value>Your login session has expired.</value>
   </data>
   <data name="BiometricsDirection" xml:space="preserve">
-    <value>Use biometrics to verify.</value>
+    <value>Biometric Verification</value>
   </data>
   <data name="Biometrics" xml:space="preserve">
     <value>Biometrics</value>

src/App/Resources/AppResources.be.resx

@@ -519,28 +519,28 @@
     <value>Заблакіраваць</value>
   </data>
   <data name="FifteenMinutes" xml:space="preserve">
-    <value>15 minutes</value>
+    <value>15 хвілін</value>
   </data>
   <data name="OneHour" xml:space="preserve">
-    <value>1 hour</value>
+    <value>1 гадзіна</value>
   </data>
   <data name="OneMinute" xml:space="preserve">
     <value>1 хвіліна</value>
   </data>
   <data name="FourHours" xml:space="preserve">
-    <value>4 hours</value>
+    <value>4 гадзіны</value>
   </data>
   <data name="Immediately" xml:space="preserve">
-    <value>Immediately</value>
+    <value>Адразу</value>
   </data>
   <data name="VaultTimeout" xml:space="preserve">
-    <value>Vault Timeout</value>
+    <value>Таймаўт сховішча</value>
   </data>
   <data name="VaultTimeoutAction" xml:space="preserve">
-    <value>Vault Timeout Action</value>
+    <value>Дзеянне пры таймаўце</value>
   </data>
   <data name="VaultTimeoutLogOutConfirmation" xml:space="preserve">
-    <value>Logging out will remove all access to your vault and requires online authentication after the timeout period. Are you sure you want to use this setting?</value>
+    <value>Выхад з сістэмы выдаліць доступ да сховішча і патрабуе анлайн-аутэнтыфікацію па заканчэнні перыяду чакання. Вы сапраўды жадаеце ўключыць гэтую наладу?</value>
   </data>
   <data name="LoggingIn" xml:space="preserve">
     <value>Уваход...</value>
@@ -1440,7 +1440,7 @@
     <value>Разблакіраваць</value>
   </data>
   <data name="ThirtyMinutes" xml:space="preserve">
-    <value>30 minutes</value>
+    <value>30 хвілін</value>
   </data>
   <data name="SetPINDescription" xml:space="preserve">
     <value>Задайце PIN-код для разблакіроўкі Bitwarden. Налады PIN-кода будуць скінуты, калі вы калі-небудзь цалкам выйдзеце з праграмы.</value>
@@ -1536,7 +1536,7 @@
     <value>Апавяшчэнне аб захаванні аўтаматычна прапануе вам захаваць новыя элементы ў сховішчы пасля іх дадання.</value>
   </data>
   <data name="OnRestart" xml:space="preserve">
-    <value>On App Restart</value>
+    <value>Пры перазапуску</value>
   </data>
   <data name="AutofillServiceNotEnabled" xml:space="preserve">
     <value>Аўтазапаўненне спрашчае бяспечны доступ да вашага сховішча Bitwarden з другіх вэб-сайтаў і праграм. Здаецца, вы не уключылі службу аўтазапаўнення Bitwarden. Гэта можна зрабіць у наладах.</value>

src/App/Resources/AppResources.bg.resx

@@ -519,28 +519,28 @@
     <value>Заключване</value>
   </data>
   <data name="FifteenMinutes" xml:space="preserve">
-    <value>15 minutes</value>
+    <value>15 минути</value>
   </data>
   <data name="OneHour" xml:space="preserve">
-    <value>1 hour</value>
+    <value>1 час</value>
   </data>
   <data name="OneMinute" xml:space="preserve">
     <value>1 минута</value>
   </data>
   <data name="FourHours" xml:space="preserve">
-    <value>4 hours</value>
+    <value>4 часа</value>
   </data>
   <data name="Immediately" xml:space="preserve">
-    <value>Immediately</value>
+    <value>Незабавно</value>
   </data>
   <data name="VaultTimeout" xml:space="preserve">
-    <value>Vault Timeout</value>
+    <value>Време за достъп</value>
   </data>
   <data name="VaultTimeoutAction" xml:space="preserve">
-    <value>Vault Timeout Action</value>
+    <value>Действие при изтичане на времето</value>
   </data>
   <data name="VaultTimeoutLogOutConfirmation" xml:space="preserve">
-    <value>Logging out will remove all access to your vault and requires online authentication after the timeout period. Are you sure you want to use this setting?</value>
+    <value>Излизането от трезора изцяло спира достъпа до него след изтичане на времето. Ще ви се наложи отново да се идентифицирате, за да го достъпите. Сигурни ли сте, че искате това действие?</value>
   </data>
   <data name="LoggingIn" xml:space="preserve">
     <value>Вписване…</value>
@@ -1440,7 +1440,7 @@
     <value>Отключване</value>
   </data>
   <data name="ThirtyMinutes" xml:space="preserve">
-    <value>30 minutes</value>
+    <value>30 минути</value>
   </data>
   <data name="SetPINDescription" xml:space="preserve">
     <value>Задайте ПИН за отключване на Битуорден. Настройките за ПИН се изчистват при всяко пълно излизане от програмата.</value>
@@ -1536,7 +1536,7 @@
     <value>Дали да бъдете автоматично подканени да запазите в трезора данни за вписване, които въвеждате за първи път.</value>
   </data>
   <data name="OnRestart" xml:space="preserve">
-    <value>On App Restart</value>
+    <value>При рестартиране на приложението</value>
   </data>
   <data name="AutofillServiceNotEnabled" xml:space="preserve">
     <value>Автоматичното дописване позволява сигурен достъп до трезора от сайтове и приложения. Изглежда не сте включили тази възможност в Битуорден, можете да го направите от екрана за настройките.</value>

src/App/Resources/AppResources.da.resx

@@ -1564,7 +1564,7 @@
     <value>Din login-session er udløbet.</value>
   </data>
   <data name="BiometricsDirection" xml:space="preserve">
-    <value>Benyt biometri til godkendelse.</value>
+    <value>Biometrisk godkendelse</value>
   </data>
   <data name="Biometrics" xml:space="preserve">
     <value>Biometri</value>

src/App/Resources/AppResources.de.resx

@@ -762,13 +762,13 @@
     <value>Die einfachste Möglichkeit, neue Anmeldedaten zu Ihrem Tresor hinzuzufügen, ist der automatische Fülldienst von Bitwarden. Erfahren Sie mehr über den automatischen Fülldienst von Bitwarden, indem Sie zu dem "Einstellungen"-Bildschirm navigieren.</value>
   </data>
   <data name="Autofill" xml:space="preserve">
-    <value>Auto-Ausfüllen</value>
+    <value>Automatisch Einfügen</value>
   </data>
   <data name="AutofillOrView" xml:space="preserve">
     <value>Möchtest du diese Zugangsdaten automatisch einfügen oder ansehen?</value>
   </data>
   <data name="BitwardenAutofillServiceMatchConfirm" xml:space="preserve">
-    <value>Bist du sicher, dass du die Zugangsdaten einfügen möchten? Sie stimmen nicht komplett mit "{0}" überein.</value>
+    <value>Bist du sicher, dass du diesen Eintrag automatisch einfügen möchtest? Er stimmt nicht komplett mit "{0}" überein.</value>
   </data>
   <data name="MatchingItems" xml:space="preserve">
     <value>Passende Einträge</value>
@@ -780,7 +780,7 @@
     <value>Durchsuchen</value>
   </data>
   <data name="BitwardenAutofillServiceSearch" xml:space="preserve">
-    <value>Du suchst nach einem Auto-Fill Objekt für "{0}".</value>
+    <value>Du suchst nach einem Eintrag zum automatischen Einfügen für "{0}".</value>
   </data>
   <data name="ShareVault" xml:space="preserve">
     <value>Ihren Tresor teilen</value>
@@ -1322,10 +1322,10 @@
     <comment>A loading message when doing an exposed password check.</comment>
   </data>
   <data name="CheckPassword" xml:space="preserve">
-    <value>Überprüfen Sie, ob das Passwort entblößt wurde.</value>
+    <value>Überprüfen Sie, ob das Passwort kompromittiert wurde.</value>
   </data>
   <data name="PasswordExposed" xml:space="preserve">
-    <value>Dieses Passwort wurde {0}-mal in Datenlecks entblößt. Sie sollten es ändern.</value>
+    <value>Dieses Passwort wurde {0}-mal in Datenlecks gefunden. Sie sollten es ändern.</value>
   </data>
   <data name="PasswordSafe" xml:space="preserve">
     <value>Dieses Passwort wurde in keinem bekannten Datenleck gefunden. Seine Verwendung sollte sicher sein.</value>
@@ -1505,7 +1505,7 @@
     <comment>Referring to restarting the application.</comment>
   </data>
   <data name="Restarting" xml:space="preserve">
-    <value>Neustarten...</value>
+    <value>Wird neugestartet...</value>
   </data>
   <data name="CopyNotes" xml:space="preserve">
     <value>Notizen kopieren</value>
@@ -1567,7 +1567,7 @@
     <value>Biometrische Daten zur Verifizierung nutzen.</value>
   </data>
   <data name="Biometrics" xml:space="preserve">
-    <value>Biometrie</value>
+    <value>Biometrie-Verfahren</value>
   </data>
   <data name="UseBiometricsToUnlock" xml:space="preserve">
     <value>Biometrie zum Entsperren verwenden</value>
@@ -1603,7 +1603,7 @@
     <value>Dieser Export enthält Ihre Tresor-Daten in einem unverschlüsseltem Format. Sie sollten die Datei daher nicht über unsichere Kanäle (z.B. E-Mail) versenden oder speichern. Löschen Sie die Datei sofort nach ihrer Verwendung.</value>
   </data>
   <data name="Warning" xml:space="preserve">
-    <value>Achtung</value>
+    <value>Warnung</value>
   </data>
   <data name="ExportVaultFailure" xml:space="preserve">
     <value>Beim Exportieren Ihres Tresors ist ein Problem aufgetreten. Wenn das Problem weiterhin besteht, müssen Sie aus dem Web-Tresor exportieren.</value>
@@ -1635,7 +1635,7 @@
     <value>Keine Passwortfelder erkannt</value>
   </data>
   <data name="SoftDeleting" xml:space="preserve">
-    <value>Lege in den Papierkorb…</value>
+    <value>Wird in den Papierkorb verschoben…</value>
     <comment>Message shown when interacting with the server</comment>
   </data>
   <data name="ItemSoftDeleted" xml:space="preserve">
@@ -1647,7 +1647,7 @@
     <comment>Restores an entity (verb).</comment>
   </data>
   <data name="Restoring" xml:space="preserve">
-    <value>Stelle wieder her…</value>
+    <value>Wird wiederhergestellt...</value>
     <comment>Message shown when interacting with the server</comment>
   </data>
   <data name="ItemRestored" xml:space="preserve">

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

@@ -534,10 +534,10 @@
     <value>Immediately</value>
   </data>
   <data name="VaultTimeout" xml:space="preserve">
-    <value>Vault Timeout</value>
+    <value>Vault timeout</value>
   </data>
   <data name="VaultTimeoutAction" xml:space="preserve">
-    <value>Vault Timeout Action</value>
+    <value>Vault timeout action</value>
   </data>
   <data name="VaultTimeoutLogOutConfirmation" xml:space="preserve">
     <value>Logging out will remove all access to your vault and requires online authentication after the timeout period. Are you sure you want to use this setting?</value>
@@ -1536,7 +1536,7 @@
     <value>The "save prompt" automatically prompts you to save new items to your vault whenever you enter them for the first time.</value>
   </data>
   <data name="OnRestart" xml:space="preserve">
-    <value>On App Restart</value>
+    <value>On app restart</value>
   </data>
   <data name="AutofillServiceNotEnabled" xml:space="preserve">
     <value>Auto-fill makes it easy to securely access your Bitwarden vault from other websites and apps. It looks like you have not enabled an auto-fill service for Bitwarden. Enable auto-fill for Bitwarden from the "Settings" screen.</value>

src/App/Resources/AppResources.es.resx

@@ -519,28 +519,28 @@
     <value>Bloquear</value>
   </data>
   <data name="FifteenMinutes" xml:space="preserve">
-    <value>15 minutes</value>
+    <value>15 minutos</value>
   </data>
   <data name="OneHour" xml:space="preserve">
-    <value>1 hour</value>
+    <value>1 hora</value>
   </data>
   <data name="OneMinute" xml:space="preserve">
     <value>1 minuto</value>
   </data>
   <data name="FourHours" xml:space="preserve">
-    <value>4 hours</value>
+    <value>4 horas</value>
   </data>
   <data name="Immediately" xml:space="preserve">
-    <value>Immediately</value>
+    <value>Inmediatamente</value>
   </data>
   <data name="VaultTimeout" xml:space="preserve">
-    <value>Vault Timeout</value>
+    <value>Tiempo de espera de la bóveda</value>
   </data>
   <data name="VaultTimeoutAction" xml:space="preserve">
-    <value>Vault Timeout Action</value>
+    <value>Acción de tiempo de espera de la bóveda</value>
   </data>
   <data name="VaultTimeoutLogOutConfirmation" xml:space="preserve">
-    <value>Logging out will remove all access to your vault and requires online authentication after the timeout period. Are you sure you want to use this setting?</value>
+    <value>Cerrar sesión eliminará todo el acceso a su bóveda y requiere autenticación en línea después del período de espera. ¿Estás seguro de que quieres usar esta configuración?</value>
   </data>
   <data name="LoggingIn" xml:space="preserve">
     <value>Iniciando sesión...</value>
@@ -1440,7 +1440,7 @@
     <value>Desbloquear</value>
   </data>
   <data name="ThirtyMinutes" xml:space="preserve">
-    <value>30 minutes</value>
+    <value>30 minutos</value>
   </data>
   <data name="SetPINDescription" xml:space="preserve">
     <value>Establece tu código PIN para desbloquear Bitwarden. Tus ajustes de PIN se reiniciarán si alguna vez cierras tu sesión completamente de la aplicación.</value>
@@ -1536,7 +1536,7 @@
     <value>La "Notificación para añadir entradas" pregunta automáticamente si quieres salvar nuevas entradas en tu caja fuerte cuando te identificas en un sitio web por primera vez.</value>
   </data>
   <data name="OnRestart" xml:space="preserve">
-    <value>On App Restart</value>
+    <value>Al reiniciar la aplicación</value>
   </data>
   <data name="AutofillServiceNotEnabled" xml:space="preserve">
     <value>El autocompletado facilita el acceso seguro a la caja fuerte de Bitwarden desde otros sitios web y aplicaciones. Parece que no has habilitado un servicio de autocompletado para Bitwarden. Habilita el autocompletado para Bitwarden desde la pantalla "Ajustes".</value>

src/App/Resources/AppResources.fa.resx

@@ -507,7 +507,7 @@
     <value>شما میتوانید موارد را بصورت فله ای در گاوصندوق وب bitwarden.com وارد کنید. آیا مایل به دیدن وبسایت هستید؟</value>
   </data>
   <data name="ImportItemsDescription" xml:space="preserve">
-    <value>موارد مهم خود را سریعاً از دیگر برنامه های مدیریت رمز عبور وارد کنید.</value>
+    <value>موارد مهم خود را سریعاً از دیگر برنامه های مدیریت کلمه عبور وارد کنید.</value>
   </data>
   <data name="LastSync" xml:space="preserve">
     <value>آخرین همگام‌سازی:</value>
@@ -556,16 +556,16 @@
     <value>تایید کلمه عبور صحیح نیست.</value>
   </data>
   <data name="MasterPasswordDescription" xml:space="preserve">
-    <value>گذرواژه اصلی رمز عبوری است که شما برای دسترسی به گاوصندوق خود استفاده میکنید. بیاد داشتن گذرواژه اصلی بسیار اهمیت دارد. اگر فراموشش کنید هیچ راهی برای بازگردانی آن وجود ندارد.</value>
+    <value>کلمه عبور اصلی کلمه عبوری است که شما برای دسترسی به گاوصندوق خود استفاده میکنید. بیاد داشتن کلمه عبور اصلی بسیار اهمیت دارد. اگر فراموشش کنید هیچ راهی برای بازگردانی آن وجود ندارد.</value>
   </data>
   <data name="MasterPasswordHint" xml:space="preserve">
-    <value>راهنمای گذرواژه اصلی (اختیاری)</value>
+    <value>راهنمای کلمه عبور اصلی (اختیاری)</value>
   </data>
   <data name="MasterPasswordHintDescription" xml:space="preserve">
-    <value>راهنمای گذرواژه اصلی می تواند در صورت فراموشی آن را بیاد بیارید.</value>
+    <value>راهنمای کلمه عبور اصلی می تواند در صورت فراموشی آن را بیاد بیارید.</value>
   </data>
   <data name="MasterPasswordLengthValMessage" xml:space="preserve">
-    <value>طول گذرواژه اصلی باید حداقل ۸ کاراکتر باشد.</value>
+    <value>طول کلمه عبور اصلی باید حداقل ۸ کاراکتر باشد.</value>
   </data>
   <data name="MinNumbers" xml:space="preserve">
     <value>حداقل اعداد</value>
@@ -597,14 +597,14 @@
     <value>هیج علاقه مندی برای این وب سایت در گاوصندوقتان موجود نیست. برای افزودن ضربه بزنید.</value>
   </data>
   <data name="NoUsernamePasswordConfigured" xml:space="preserve">
-    <value>این ورود هیچ نام کاربری و رمز عبور پیکربندی شده ای ندارد.</value>
+    <value>این ورود هیچ نام کاربری و کلمه عبور پیکربندی شده ای ندارد.</value>
   </data>
   <data name="OkGotIt" xml:space="preserve">
     <value>باشه، فهمیدم!</value>
     <comment>Confirmation, like "Ok, I understand it"</comment>
   </data>
   <data name="OptionDefaults" xml:space="preserve">
-    <value>گزینه های پیش فرض از ابزار تولید رمز عبور Bitwarden تنظیم شد.</value>
+    <value>گزینه های پیش فرض از ابزار تولید کلمه عبور Bitwarden تنظیم شد.</value>
   </data>
   <data name="Options" xml:space="preserve">
     <value>گزینه‌ها</value>
@@ -622,10 +622,10 @@
     <value>راهنمای کلمه عبور</value>
   </data>
   <data name="PasswordHintAlert" xml:space="preserve">
-    <value>ما یک رایانامه همراه با راهنمای گذرواژه اصلی برایتان ارسال کردیم.</value>
+    <value>ما یک رایانامه همراه با راهنمای کلمه عبور اصلی برایتان ارسال کردیم.</value>
   </data>
   <data name="PasswordOverrideAlert" xml:space="preserve">
-    <value>آیا از بازنویسی بر روی رمز عبور فعلی مطمئن هستید؟</value>
+    <value>آیا از بازنویسی بر روی کلمه عبور فعلی مطمئن هستید؟</value>
   </data>
   <data name="PushNotificationAlert" xml:space="preserve">
     <value>Bitwarden گاوصندوق شما را بصورت خودکار از طریق نشان دادن اطلاعیه ها به هنگام سازی میکند. برای بهترین تجربه کاربری ممکن، لطفاً زمانی که از شما پرسیده شد "مجاز" را سریعاً انتخاب کنید تا نمایش اعلانیه ها فعال شود.</value>
@@ -638,10 +638,10 @@
     <value>لطفاً با یک بررسی خوب به ما کمک کنید!</value>
   </data>
   <data name="RegeneratePassword" xml:space="preserve">
-    <value>تولید رمز عبور</value>
+    <value>تولید کلمه عبور</value>
   </data>
   <data name="RetypeMasterPassword" xml:space="preserve">
-    <value>تایپ دوباره گذرواژه اصلی</value>
+    <value>تایپ دوباره کلمه عبور اصلی</value>
   </data>
   <data name="SearchVault" xml:space="preserve">
     <value>جستجوی گاوصندوق</value>
@@ -1269,7 +1269,7 @@
     <value>پیشهاز ما این است که اگر از اپ های پرکردن خودکار دیگری استفاده میکنید آنها را غیرفعال کنید اگر برنامه ای برای استفاده از آنها ندارید.</value>
   </data>
   <data name="BitwardenAutofillDescription" xml:space="preserve">
-    <value>دسترسی به گاوصندوقتان بصورت مستقیم از طرق کیبوردتان برای سریعتر پرکردن خودکار رمزهای عبور.</value>
+    <value>دسترسی به گاوصندوقتان بصورت مستقیم از طرق کیبوردتان برای سریعتر پرکردن خودکار کلمه های عبور.</value>
   </data>
   <data name="AutofillTurnOn" xml:space="preserve">
     <value>برای فعال کردن پر کردن خودکار کلمه عبور بر روی دستگاهتان، این دستورالعمل ها را دنبال کنید:</value>
@@ -1293,7 +1293,7 @@
     <value>پرکردن خودکار کلمه عبور</value>
   </data>
   <data name="BitwardenAutofillAlert2" xml:space="preserve">
-    <value>ساده ترین روش برای افزودن اطلاعات ورود به گاوصندوق از طریق افزونه پرکردن خودکار رمز عبور Bitwarden است. برای اطلاع بیشتر از چگونگی استفاده از پرکردن خودکار رمز عبور Bitwarden مرورکردن صفحه "تنظیمات" است.</value>
+    <value>ساده ترین روش برای افزودن اطلاعات ورود به گاوصندوق از طریق افزونه پرکردن خودکار رمز عبور Bitwarden است. برای اطلاع بیشتر از چگونگی استفاده از پرکردن خودکار کلمه عبور Bitwarden مرورکردن صفحه "تنظیمات" است.</value>
   </data>
   <data name="InvalidEmail" xml:space="preserve">
     <value>نشانی رایانامه نامعتبر است.</value>
@@ -1318,17 +1318,17 @@
     <comment>Plural form of a URI</comment>
   </data>
   <data name="CheckingPassword" xml:space="preserve">
-    <value>درحال بررسی گذرواژه…</value>
+    <value>درحال بررسی کلمه عبور…</value>
     <comment>A loading message when doing an exposed password check.</comment>
   </data>
   <data name="CheckPassword" xml:space="preserve">
-    <value>بررسی کنید که آیا رمز عبور افشا شده است.</value>
+    <value>بررسی کنید که آیا کلمه عبور افشا شده است.</value>
   </data>
   <data name="PasswordExposed" xml:space="preserve">
-    <value>این رمز عبور در رخنه داده ها {0} بار افشا شده است. باید تغییرش دهید.</value>
+    <value>این کلمه عبور در رخنه داده ها {0} بار افشا شده است. باید تغییرش دهید.</value>
   </data>
   <data name="PasswordSafe" xml:space="preserve">
-    <value>این رمز عبور در هیچ رخنه داده ای شناخته نشده است. باید برای امنیت از آن استفاده کنید.</value>
+    <value>این کلمه عبور در هیچ رخنه داده ای شناخته نشده است. باید برای امنیت از آن استفاده کنید.</value>
   </data>
   <data name="IdentityName" xml:space="preserve">
     <value>نام شناسایی</value>
@@ -1450,10 +1450,10 @@
     <comment>ex: Logged in as user@example.com on bitwarden.com.</comment>
   </data>
   <data name="VaultLockedMasterPassword" xml:space="preserve">
-    <value>گاوصندوق شما فقل شد. برای ادامه گذرواژه اصلی را وارد کنید.</value>
+    <value>گاوصندوق شما فقل شد. برای ادامه کلمه عبور اصلی را وارد کنید.</value>
   </data>
   <data name="VaultLockedPIN" xml:space="preserve">
-    <value>گاوصندوق شما قفل شده است. برای ادامه کد پین خود را تایید کنید.</value>
+    <value>گاوصندوق شما قفل شده است. برای ادامه کد پین خود را تأیید کنید.</value>
   </data>
   <data name="Dark" xml:space="preserve">
     <value>تیره</value>
@@ -1597,7 +1597,7 @@
     <value>فرمت پرونده</value>
   </data>
   <data name="ExportVaultMasterPasswordDescription" xml:space="preserve">
-    <value>گذرواژه اصلی اصلی خود را برای خروجی گرفتن از گاوصندوقتان وارد کنید.</value>
+    <value>کلمه عبور اصلی اصلی خود را برای خروجی گرفتن از گاوصندوقتان وارد کنید.</value>
   </data>
   <data name="ExportVaultWarning" xml:space="preserve">
     <value>این خروجی شامل داده‌های گاوصندوق در یک قالب رمزنگاری نشده است. شما نباید آن را از طریق یک راه ارتباطی ناامن (مثل ایمیل) ذخیره یا ارسال کنید. به محض اینکه استفاده‌تان از آن تمام شد، آن را حذف کنید.</value>

src/App/Resources/AppResources.fi.resx

@@ -519,28 +519,28 @@
     <value>Lukitse</value>
   </data>
   <data name="FifteenMinutes" xml:space="preserve">
-    <value>15 minutes</value>
+    <value>15 minuuttia</value>
   </data>
   <data name="OneHour" xml:space="preserve">
-    <value>1 hour</value>
+    <value>1 tunti</value>
   </data>
   <data name="OneMinute" xml:space="preserve">
     <value>1 minuutti</value>
   </data>
   <data name="FourHours" xml:space="preserve">
-    <value>4 hours</value>
+    <value>4 tuntia</value>
   </data>
   <data name="Immediately" xml:space="preserve">
-    <value>Immediately</value>
+    <value>Välittömästi</value>
   </data>
   <data name="VaultTimeout" xml:space="preserve">
-    <value>Vault Timeout</value>
+    <value>Holvin aikakatkaisu</value>
   </data>
   <data name="VaultTimeoutAction" xml:space="preserve">
-    <value>Vault Timeout Action</value>
+    <value>Holvin aikakatkaisutoiminto</value>
   </data>
   <data name="VaultTimeoutLogOutConfirmation" xml:space="preserve">
-    <value>Logging out will remove all access to your vault and requires online authentication after the timeout period. Are you sure you want to use this setting?</value>
+    <value>Uloskirjautuminen poistaa kaiken pääsyn holviisi ja vaatii online-todennuksen aikakatkaisuajan jälkeen. Haluatko varmasti käyttää tätä asetusta?</value>
   </data>
   <data name="LoggingIn" xml:space="preserve">
     <value>Kirjaudutaan sisään…</value>
@@ -1440,7 +1440,7 @@
     <value>Avaa</value>
   </data>
   <data name="ThirtyMinutes" xml:space="preserve">
-    <value>30 minutes</value>
+    <value>30 minuuttia</value>
   </data>
   <data name="SetPINDescription" xml:space="preserve">
     <value>Aseta PIN-koodi Bitwardenin avaamista varten. PIN-asetukset nollautuvat, jos kirjaudut täysin ulos sovelluksesta.</value>
@@ -1536,7 +1536,7 @@
     <value>Tallennuskehote kysyy, haluatko tallentaa kirjautumistiedot holviisi, kun kirjaudut sivustoille ensimmäistä kertaa.</value>
   </data>
   <data name="OnRestart" xml:space="preserve">
-    <value>On App Restart</value>
+    <value>Sovellusta uudelleenkäynnistettäessä</value>
   </data>
   <data name="AutofillServiceNotEnabled" xml:space="preserve">
     <value>Automaattinen täyttö tekee Bitwarden-holviiisi pääsystä muista ohjelmista ja sivustoista helppoa. Et näytä kytkeneen automaattista täyttöä päälle. Voit tehdä sen Asetukset-näytöstä.</value>

src/App/Resources/AppResources.fr.resx

@@ -1564,7 +1564,7 @@
     <value>Votre session a expiré.</value>
   </data>
   <data name="BiometricsDirection" xml:space="preserve">
-    <value>Utilisez une empreinte biométrique pour vous authentifier.</value>
+    <value>Utiliser une empreinte biométrique pour vérifier.</value>
   </data>
   <data name="Biometrics" xml:space="preserve">
     <value>Empreintes biométriques</value>

src/App/Resources/AppResources.he.resx

@@ -519,28 +519,28 @@
     <value>נעל</value>
   </data>
   <data name="FifteenMinutes" xml:space="preserve">
-    <value>15 minutes</value>
+    <value>15 דקות</value>
   </data>
   <data name="OneHour" xml:space="preserve">
-    <value>1 hour</value>
+    <value>1 שעה</value>
   </data>
   <data name="OneMinute" xml:space="preserve">
     <value>דקה אחת</value>
   </data>
   <data name="FourHours" xml:space="preserve">
-    <value>4 hours</value>
+    <value>4 שעות</value>
   </data>
   <data name="Immediately" xml:space="preserve">
-    <value>Immediately</value>
+    <value>מיד</value>
   </data>
   <data name="VaultTimeout" xml:space="preserve">
-    <value>Vault Timeout</value>
+    <value>משך זמן מירבי עבור חיבור לכספת</value>
   </data>
   <data name="VaultTimeoutAction" xml:space="preserve">
-    <value>Vault Timeout Action</value>
+    <value>פעולה לביצוע בכספת בתום זמן החיבור</value>
   </data>
   <data name="VaultTimeoutLogOutConfirmation" xml:space="preserve">
-    <value>Logging out will remove all access to your vault and requires online authentication after the timeout period. Are you sure you want to use this setting?</value>
+    <value>יציאה תגרום להסרת כל גישה שיש לך לכספת ודורשת אימות אונליין לאחר משך זמן מסויים. האם אתה בטוח שברצונך להשתמש באפשרות זו?</value>
   </data>
   <data name="LoggingIn" xml:space="preserve">
     <value>מתחבר...</value>
@@ -1139,7 +1139,7 @@ Bitwarden בעזרת פתיחת חלון "הגדרות".</value>
     <value>אין פריטים בתיקיה זו.</value>
   </data>
   <data name="NoItemsTrash" xml:space="preserve">
-    <value>There are no items in the trash.</value>
+    <value>אין פריטים בסל המחזור.</value>
   </data>
   <data name="AutofillAccessibilityService" xml:space="preserve">
     <value>שירות נגישות עבור ההשלמה האוטומטית</value>
@@ -1441,7 +1441,7 @@ Bitwarden בעזרת פתיחת חלון "הגדרות".</value>
     <value>בטל נעילה</value>
   </data>
   <data name="ThirtyMinutes" xml:space="preserve">
-    <value>30 minutes</value>
+    <value>30 דקות</value>
   </data>
   <data name="SetPINDescription" xml:space="preserve">
     <value>קבע קוד PIN לביטול נעילת Bitwarden. הגדרות הPIN יאופסו אם תבצע יציאה מהתוכנה.</value>
@@ -1537,7 +1537,7 @@ Bitwarden בעזרת פתיחת חלון "הגדרות".</value>
     <value>החלון "שמור" מופיע כשאתה מזין פרטי כניסה בפעם הראשונה.</value>
   </data>
   <data name="OnRestart" xml:space="preserve">
-    <value>On App Restart</value>
+    <value>באתחול האפליקציה</value>
   </data>
   <data name="AutofillServiceNotEnabled" xml:space="preserve">
     <value>השלמה אוטומטית הופכת את תהליך הכניסה לאתרים לקל ומאובטח בעת גישה לאתרים ואפליקציות. נראה שלא הפעלת את שירות ההשלמה האוטומטית עבור Bitwarden. אנא הפעל את השירות דרך חלון "הגדרות".</value>
@@ -1636,43 +1636,43 @@ Bitwarden בעזרת פתיחת חלון "הגדרות".</value>
     <value>לא זוהו תיבות לכתיבת סיסמאות</value>
   </data>
   <data name="SoftDeleting" xml:space="preserve">
-    <value>Sending to trash...</value>
+    <value>שולח לסל המחזור...</value>
     <comment>Message shown when interacting with the server</comment>
   </data>
   <data name="ItemSoftDeleted" xml:space="preserve">
-    <value>Item has been sent to trash.</value>
+    <value>הפריט הועבר לסל המחזור.</value>
     <comment>Confirmation message after successfully soft-deleting a login</comment>
   </data>
   <data name="Restore" xml:space="preserve">
-    <value>Restore</value>
+    <value>שחזור</value>
     <comment>Restores an entity (verb).</comment>
   </data>
   <data name="Restoring" xml:space="preserve">
-    <value>Restoring...</value>
+    <value>משחזר...</value>
     <comment>Message shown when interacting with the server</comment>
   </data>
   <data name="ItemRestored" xml:space="preserve">
-    <value>Item has been restored.</value>
+    <value>הפריט שוחזר.</value>
     <comment>Confirmation message after successfully restoring a soft-deleted item</comment>
   </data>
   <data name="Trash" xml:space="preserve">
-    <value>Trash</value>
+    <value>סל המחזור</value>
     <comment>(noun) Location of deleted items which have not yet been permanently deleted</comment>
   </data>
   <data name="SearchTrash" xml:space="preserve">
-    <value>Search trash</value>
+    <value>חפש בסל המחזור</value>
     <comment>(action prompt) Label for the search text field when viewing the trash folder</comment>
   </data>
   <data name="DoYouReallyWantToPermanentlyDeleteCipher" xml:space="preserve">
-    <value>Do you really want to permanently delete? This cannot be undone.</value>
+    <value>האם אתה בטוח שברצונך למחוק? זוהי פעולה בלתי הפיכה.</value>
     <comment>Confirmation alert message when permanently deleteing a cipher.</comment>
   </data>
   <data name="DoYouReallyWantToRestoreCipher" xml:space="preserve">
-    <value>Do you really want to restore this item?</value>
+    <value>האם אתה בטוח שברצונך לשחזר פריט זה?</value>
     <comment>Confirmation alert message when restoring a soft-deleted cipher.</comment>
   </data>
   <data name="DoYouReallyWantToSoftDeleteCipher" xml:space="preserve">
-    <value>Do you really want to send to the trash?</value>
+    <value>האם אתה בטוח שברצונך לשלוח פריט זה לסל המחזור?</value>
     <comment>Confirmation alert message when soft-deleting a cipher.</comment>
   </data>
 </root>

src/App/Resources/AppResources.hi.resx

@@ -1565,7 +1565,7 @@
     <value>Your login session has expired.</value>
   </data>
   <data name="BiometricsDirection" xml:space="preserve">
-    <value>Use biometrics to verify.</value>
+    <value>Biometric Verification</value>
   </data>
   <data name="Biometrics" xml:space="preserve">
     <value>Biometrics</value>

src/App/Resources/AppResources.id.resx

@@ -1564,7 +1564,7 @@
     <value>Your login session has expired.</value>
   </data>
   <data name="BiometricsDirection" xml:space="preserve">
-    <value>Use biometrics to verify.</value>
+    <value>Biometric Verification</value>
   </data>
   <data name="Biometrics" xml:space="preserve">
     <value>Biometrics</value>

src/App/Resources/AppResources.ko.resx

@@ -519,28 +519,28 @@
     <value>잠금</value>
   </data>
   <data name="FifteenMinutes" xml:space="preserve">
-    <value>15 minutes</value>
+    <value>15분</value>
   </data>
   <data name="OneHour" xml:space="preserve">
-    <value>1 hour</value>
+    <value>1시간</value>
   </data>
   <data name="OneMinute" xml:space="preserve">
     <value>1분</value>
   </data>
   <data name="FourHours" xml:space="preserve">
-    <value>4 hours</value>
+    <value>4시간</value>
   </data>
   <data name="Immediately" xml:space="preserve">
-    <value>Immediately</value>
+    <value>즉시</value>
   </data>
   <data name="VaultTimeout" xml:space="preserve">
-    <value>Vault Timeout</value>
+    <value>보관함 시간 제한</value>
   </data>
   <data name="VaultTimeoutAction" xml:space="preserve">
-    <value>Vault Timeout Action</value>
+    <value>보관함 시간 제한 초과시 동작</value>
   </data>
   <data name="VaultTimeoutLogOutConfirmation" xml:space="preserve">
-    <value>Logging out will remove all access to your vault and requires online authentication after the timeout period. Are you sure you want to use this setting?</value>
+    <value>로그아웃하면 보관함에 대한 모든 접근이 제거되며 시간 제한을 초과하면 온라인 인증을 요구합니다. 정말로 이 설정을 사용하시겠습니까?</value>
   </data>
   <data name="LoggingIn" xml:space="preserve">
     <value>로그인 중...</value>
@@ -1440,7 +1440,7 @@
     <value>잠금 해제</value>
   </data>
   <data name="ThirtyMinutes" xml:space="preserve">
-    <value>30 minutes</value>
+    <value>30분</value>
   </data>
   <data name="SetPINDescription" xml:space="preserve">
     <value>Bitwarden 잠금해제에 사용될 PIN 코드를 설정합니다. 이 애플리케이션에서 완전히 로그아웃할 경우 PIN 설정이 초기화됩니다.</value>
@@ -1536,7 +1536,7 @@
     <value>"저장 프롬포트"를 사용하면 처음 입력할 때마다 보관함에 그 항목을 추가할 것인지 물어봅니다.</value>
   </data>
   <data name="OnRestart" xml:space="preserve">
-    <value>On App Restart</value>
+    <value>앱 재시작 시</value>
   </data>
   <data name="AutofillServiceNotEnabled" xml:space="preserve">
     <value>자동 입력은 다른 웹사이트나 앱에서 Bitwarden 보관함에 안전하게 액세스하기 쉽게 만들어줍니다. Bitwarden의 자동 입력 서비스를 활성화하지 않은 것으로 보입니다. "설정" 화면에서 Bitwarden의 자동 입력을 활성화해주세요.</value>
@@ -1643,7 +1643,7 @@
     <comment>Confirmation message after successfully soft-deleting a login</comment>
   </data>
   <data name="Restore" xml:space="preserve">
-    <value>복구</value>
+    <value>복원</value>
     <comment>Restores an entity (verb).</comment>
   </data>
   <data name="Restoring" xml:space="preserve">

src/App/Resources/AppResources.nb.resx

@@ -519,28 +519,28 @@
     <value>Lås</value>
   </data>
   <data name="FifteenMinutes" xml:space="preserve">
-    <value>15 minutes</value>
+    <value>15 minutter</value>
   </data>
   <data name="OneHour" xml:space="preserve">
-    <value>1 hour</value>
+    <value>1 time</value>
   </data>
   <data name="OneMinute" xml:space="preserve">
     <value>1 minutt</value>
   </data>
   <data name="FourHours" xml:space="preserve">
-    <value>4 hours</value>
+    <value>4 timer</value>
   </data>
   <data name="Immediately" xml:space="preserve">
-    <value>Immediately</value>
+    <value>Umiddelbart</value>
   </data>
   <data name="VaultTimeout" xml:space="preserve">
-    <value>Vault Timeout</value>
+    <value>Tidsavbrudd i hvelvet</value>
   </data>
   <data name="VaultTimeoutAction" xml:space="preserve">
-    <value>Vault Timeout Action</value>
+    <value>Handling ved pause i hvelvet</value>
   </data>
   <data name="VaultTimeoutLogOutConfirmation" xml:space="preserve">
-    <value>Logging out will remove all access to your vault and requires online authentication after the timeout period. Are you sure you want to use this setting?</value>
+    <value>Hvis du logger ut, fjerner du all tilgang til hvelvet ditt og krever online godkjenning etter tidsavbrudd. Er du sikker på at du vil bruke denne innstillingen?</value>
   </data>
   <data name="LoggingIn" xml:space="preserve">
     <value>Logger på...</value>
@@ -1440,7 +1440,7 @@
     <value>Lås opp</value>
   </data>
   <data name="ThirtyMinutes" xml:space="preserve">
-    <value>30 minutes</value>
+    <value>30 minutter</value>
   </data>
   <data name="SetPINDescription" xml:space="preserve">
     <value>Angi PIN-koden din for å låse opp Bitwarden. PIN-innstillingene tilbakestilles hvis du logger deg helt ut av programmet.</value>
@@ -1536,7 +1536,7 @@
     <value>"Lagreforespørselen" spør deg automatisk om du vil lagre nye elementer i hvelvet ditt når du skriver dem inn for første gang.</value>
   </data>
   <data name="OnRestart" xml:space="preserve">
-    <value>On App Restart</value>
+    <value>Ved omstart av appen</value>
   </data>
   <data name="AutofillServiceNotEnabled" xml:space="preserve">
     <value>Auto-utfylling gjør det lett å få sikker tilgang til Bitwarden-hvelvet ditt fra andre nettsteder og apper. Det ser ut til at du ikke har skrudd på noen auto-utfyllingstjenester for Bitwarden. Du kan skru på auto-utfylling for Bitwarden i «Innstillinger»-menyen.</value>

src/App/Resources/AppResources.nl.resx

@@ -1564,7 +1564,7 @@
     <value>Je inlogsessie is verlopen.</value>
   </data>
   <data name="BiometricsDirection" xml:space="preserve">
-    <value>Biometrie-verificatie.</value>
+    <value>Biometrische verificatie</value>
   </data>
   <data name="Biometrics" xml:space="preserve">
     <value>Biometrie</value>

src/App/Resources/AppResources.pl.resx

@@ -1564,7 +1564,7 @@
     <value>Twoja sesja wygasła.</value>
   </data>
   <data name="BiometricsDirection" xml:space="preserve">
-    <value>Użyj danych biometrycznych do weryfikacji.</value>
+    <value>Weryfikacja danych biometrycznych</value>
   </data>
   <data name="Biometrics" xml:space="preserve">
     <value>Dane biometryczne</value>

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

@@ -534,13 +534,13 @@
     <value>Imediatamente</value>
   </data>
   <data name="VaultTimeout" xml:space="preserve">
-    <value>Vault Timeout</value>
+    <value>Expiração do cofre</value>
   </data>
   <data name="VaultTimeoutAction" xml:space="preserve">
-    <value>Vault Timeout Action</value>
+    <value>Ação de expiração do cofre</value>
   </data>
   <data name="VaultTimeoutLogOutConfirmation" xml:space="preserve">
-    <value>Logging out will remove all access to your vault and requires online authentication after the timeout period. Are you sure you want to use this setting?</value>
+    <value>Terminar sessão irá remover todos os acessos ao seu cofre e requer autenticação online após o período de expiração. Tem a certeza de que pretende utilizar esta definição?</value>
   </data>
   <data name="LoggingIn" xml:space="preserve">
     <value>A iniciar sessão...</value>

src/App/Resources/AppResources.resx

@@ -1564,7 +1564,7 @@
     <value>Your login session has expired.</value>
   </data>
   <data name="BiometricsDirection" xml:space="preserve">
-    <value>Use biometrics to verify.</value>
+    <value>Biometric Verification</value>
   </data>
   <data name="Biometrics" xml:space="preserve">
     <value>Biometrics</value>

src/App/Resources/AppResources.ro.resx

@@ -519,28 +519,28 @@
     <value>Blocare</value>
   </data>
   <data name="FifteenMinutes" xml:space="preserve">
-    <value>15 minutes</value>
+    <value>15 minute</value>
   </data>
   <data name="OneHour" xml:space="preserve">
-    <value>1 hour</value>
+    <value>1 oră</value>
   </data>
   <data name="OneMinute" xml:space="preserve">
     <value>1 minut</value>
   </data>
   <data name="FourHours" xml:space="preserve">
-    <value>4 hours</value>
+    <value>4 ore</value>
   </data>
   <data name="Immediately" xml:space="preserve">
-    <value>Immediately</value>
+    <value>Imediat</value>
   </data>
   <data name="VaultTimeout" xml:space="preserve">
-    <value>Vault Timeout</value>
+    <value>Timp Ieșire Seif</value>
   </data>
   <data name="VaultTimeoutAction" xml:space="preserve">
-    <value>Vault Timeout Action</value>
+    <value>Acțiune la Ieșire Seif</value>
   </data>
   <data name="VaultTimeoutLogOutConfirmation" xml:space="preserve">
-    <value>Logging out will remove all access to your vault and requires online authentication after the timeout period. Are you sure you want to use this setting?</value>
+    <value>Deconectarea va elimina accesul la seiful dvs. și necesită autentificare online după perioada de expirare. Sunteți sigur că doriți să utilizați această setare?</value>
   </data>
   <data name="LoggingIn" xml:space="preserve">
     <value>Autentificare...</value>
@@ -594,7 +594,7 @@
     <value>Nu sunt articole în seiful dvs.</value>
   </data>
   <data name="NoItemsTap" xml:space="preserve">
-    <value>Nu sunt date de conectare în seif pentru acest sait. Atingeți pentru a adăuga un articol.</value>
+    <value>Niciun articol în seif pentru acest site/aplicație. Tapați ca să adăugați una.</value>
   </data>
   <data name="NoUsernamePasswordConfigured" xml:space="preserve">
     <value>Această autentificare nu are un nume de utilizator sau parolă configurate.</value>
@@ -644,7 +644,7 @@
     <value>Reintroduceţi parola principală</value>
   </data>
   <data name="SearchVault" xml:space="preserve">
-    <value>Căutare în seif</value>
+    <value>Căutaţi în seif</value>
   </data>
   <data name="Security" xml:space="preserve">
     <value>Securitate</value>
@@ -735,7 +735,7 @@
     <comment>This is used for the autofill service. ex. "There are no items in your vault for twitter.com".</comment>
   </data>
   <data name="BitwardenAutofillServiceOverlay" xml:space="preserve">
-    <value>When you select an input field and see a Bitwarden auto-fill overlay, you can tap it to launch the auto-fill service.</value>
+    <value>Când selectați un câmp de intrare și vedeți o propunere de auto-completare, tapați ca să lansați serviciu de auto-completare.</value>
   </data>
   <data name="BitwardenAutofillServiceNotificationContent" xml:space="preserve">
     <value>Atingeți această notificare pentru a completa automat o autentificare din seiful dvs.</value>
@@ -759,7 +759,7 @@
     <value>Stare</value>
   </data>
   <data name="BitwardenAutofillServiceAlert2" xml:space="preserve">
-    <value>Cea mai ușoară modalitate de a adăuga noi autentificări în seif este din Serviciul de completare automată Bitwarden. Aflați mai multe despre utilizarea Serviciului de completare automată Bitwarden accesând ecranul "Setări".</value>
+    <value>Cea mai ușoară modalitate de a adăuga noi logări în seif este cu Serviciul de auto-completare Bitwarden. Aflați mai multe despre folosirea acestui serviciu Bitwarden din ecranul "Setări".</value>
   </data>
   <data name="Autofill" xml:space="preserve">
     <value>Completare automată</value>
@@ -1138,7 +1138,7 @@
     <value>Nu există elemente în acest dosar.</value>
   </data>
   <data name="NoItemsTrash" xml:space="preserve">
-    <value>There are no items in the trash.</value>
+    <value>Nu există articole în coșul de gunoi.</value>
   </data>
   <data name="AutofillAccessibilityService" xml:space="preserve">
     <value>Serviciul de accesibilitate pentru completare automată</value>
@@ -1237,16 +1237,16 @@
     <comment>An entity of multiple related people (ex. a team or business organization).</comment>
   </data>
   <data name="HoldYubikeyNearTop" xml:space="preserve">
-    <value>Țineţi YubiKey-ul dumneavoastră în partea de sus a dispozitivului.</value>
+    <value>Țineți YubiKey-ul dvs. deasupra aparatului.</value>
   </data>
   <data name="TryAgain" xml:space="preserve">
     <value>Încercaţi din nou</value>
   </data>
   <data name="YubiKeyInstructionIos" xml:space="preserve">
-    <value>Pentru a continua, ţineţi NEO-YubiKey-ul dumneavoastră către partea din spate a dispozitivului.</value>
+    <value>Pentru a continua, țineți-vă YubiKey NEO pe spatele aparatului.</value>
   </data>
   <data name="BitwardenAutofillAccessibilityServiceDescription2" xml:space="preserve">
-    <value>Serviciul de accesibilitate poate fi de ajutor atunci când unele aplicații nu acceptă serviciul standard de completare automată.</value>
+    <value>Serviciul de accesibilitate poate fi de ajutor când aplicațiile nu acceptă serviciul standard de auto-completare.</value>
   </data>
   <data name="DatePasswordUpdated" xml:space="preserve">
     <value>Parolă actualizată</value>
@@ -1263,7 +1263,7 @@
     <value>Trebuie să te loghezi în aplicația Bitwarden înainte să folosești Auto Completarea.</value>
   </data>
   <data name="AutofillSetup" xml:space="preserve">
-    <value>Your logins are now easily accessable right from your keyboard while logging into apps and websites.</value>
+    <value>Logările dvs. sunt acum ușor accesibile direct de pe tastatură atunci când vă conectați la aplicații și site-uri web.</value>
   </data>
   <data name="AutofillSetup2" xml:space="preserve">
     <value>Recomandăm dezactivarea celorlalte aplicații care folosesc AutoFill din setări dacă nu intenționați să le utilizați.</value>
@@ -1296,7 +1296,7 @@
     <value>Cea mai ușoară modalitate de a adăuga noi autentificări în seif este din extensia aplicaţiei Bitwarden. Aflați mai multe despre utilizarea extensiei aplicaţiei Bitwarden accesând ecranul "Setări".</value>
   </data>
   <data name="InvalidEmail" xml:space="preserve">
-    <value>Adresă de email greșită.</value>
+    <value>Adresă de e-mail greșită.</value>
   </data>
   <data name="Cards" xml:space="preserve">
     <value>Carduri</value>
@@ -1305,13 +1305,13 @@
     <value>Identități</value>
   </data>
   <data name="Logins" xml:space="preserve">
-    <value>Autentificări</value>
+    <value>Logări</value>
   </data>
   <data name="SecureNotes" xml:space="preserve">
-    <value>Notițe securizate</value>
+    <value>Note Securizate</value>
   </data>
   <data name="AllItems" xml:space="preserve">
-    <value>Toate elementele</value>
+    <value>Toate Elementele</value>
   </data>
   <data name="URIs" xml:space="preserve">
     <value>URI-uri</value>
@@ -1322,13 +1322,13 @@
     <comment>A loading message when doing an exposed password check.</comment>
   </data>
   <data name="CheckPassword" xml:space="preserve">
-    <value>Verificare dacă parola a fost dezvăluită.</value>
+    <value>Verificați dacă parola este compromisă.</value>
   </data>
   <data name="PasswordExposed" xml:space="preserve">
-    <value>Această parolă a fost dezvăluită de {0} ori într-o breșă de date. Ar trebui să o schimbați.</value>
+    <value>Această parolă a fost compromisă de {0} ori într-o breșă de date. Ar trebui să o schimbați.</value>
   </data>
   <data name="PasswordSafe" xml:space="preserve">
-    <value>Aceasta parola nu a fost găsită în nicio breșă de date cunoscută. Ar trebui să fie sigură pentru a fi utilizată.</value>
+    <value>Parola nu a fost găsită în nicio scurgere de date cunoscută. Este sigur de utilizat.</value>
   </data>
   <data name="IdentityName" xml:space="preserve">
     <value>Numele Identității</value>
@@ -1343,10 +1343,10 @@
     <value>Tipuri</value>
   </data>
   <data name="NoPasswordsToList" xml:space="preserve">
-    <value>Nicio parolă.</value>
+    <value>Nicio parolă de afișat.</value>
   </data>
   <data name="NoItemsToList" xml:space="preserve">
-    <value>Nu există niciun articol de afișat.</value>
+    <value>Niciun articol de afișat.</value>
   </data>
   <data name="SearchCollection" xml:space="preserve">
     <value>Căutare colecție</value>
@@ -1355,7 +1355,7 @@
     <value>Căutare dosar</value>
   </data>
   <data name="SearchType" xml:space="preserve">
-    <value>Tipul de căutare</value>
+    <value>Tip de căutare</value>
   </data>
   <data name="Type" xml:space="preserve">
     <value>Tip</value>
@@ -1379,19 +1379,19 @@
     <value>Nu există colecții în listă.</value>
   </data>
   <data name="ItemShared" xml:space="preserve">
-    <value>Articolul a fost distribuit.</value>
+    <value>Articolul a fost partajat.</value>
   </data>
   <data name="SelectOneCollection" xml:space="preserve">
     <value>Este nevoie să alegeți măcar o colecție.</value>
   </data>
   <data name="Share" xml:space="preserve">
-    <value>Distribuire</value>
+    <value>Partajați</value>
   </data>
   <data name="ShareItem" xml:space="preserve">
-    <value>Distribuie element</value>
+    <value>Partajați element</value>
   </data>
   <data name="NoOrgsToList" xml:space="preserve">
-    <value>Nu există organizații care să fie afișate.</value>
+    <value>Nicio organizație de afișat.</value>
   </data>
   <data name="ShareDesc" xml:space="preserve">
     <value>Alegeți o organizație căreia doriți să îi distribuiți acest element. Distribuirea transferă proprietatea asupra obiectului către organizație. Nu veți mai fi proprietarul direct al acestui element odată ce a fost distribuit.</value>
@@ -1440,7 +1440,7 @@
     <value>Deblocare</value>
   </data>
   <data name="ThirtyMinutes" xml:space="preserve">
-    <value>30 minutes</value>
+    <value>30 de minute</value>
   </data>
   <data name="SetPINDescription" xml:space="preserve">
     <value>Setaţi codul PIN de deblocare Bitwarden. Setările codului PIN vor fi resetate dacă vă deconectaţi vreodată din aplicație.</value>
@@ -1517,7 +1517,7 @@
     <value>Sunteți sigur că doriți să ieșiți?</value>
   </data>
   <data name="PINRequireMasterPasswordRestart" xml:space="preserve">
-    <value>You you want to require unlocking with your master password when the application is restarted?</value>
+    <value>Doriți să solicitați deblocarea cu parola principală atunci când aplicația este repornită?</value>
   </data>
   <data name="Black" xml:space="preserve">
     <value>Neagră</value>
@@ -1527,7 +1527,7 @@
     <value>URI-uri în lista neagră</value>
   </data>
   <data name="BlacklistedUrisDescription" xml:space="preserve">
-    <value>URIs that are blacklisted will not offer auto-fill. The list of apps should be comma separated. Ex: "https://twitter.com, androidapp://com.twitter.android".</value>
+    <value>URI-urile de pe lista neagră nu vor oferi auto-completarea. Lista trebuie separată cu virgule. Ex: "https://twitter.com, androidapp: //com.twitter.android".</value>
   </data>
   <data name="DisableSavePrompt" xml:space="preserve">
     <value>Dezactivați solicitarea de salvare</value>
@@ -1536,10 +1536,10 @@
     <value>"Notificarea de salvare" solicită automat salvarea de noi elemente în seiful dvs. de fiecare dată când le introduceți pentru prima dată.</value>
   </data>
   <data name="OnRestart" xml:space="preserve">
-    <value>On App Restart</value>
+    <value>La repornirea aplicației</value>
   </data>
   <data name="AutofillServiceNotEnabled" xml:space="preserve">
-    <value>Completarea automată simplifică accesarea securizată a seifului Bitwarden de pe alte site-uri web și aplicații. Se pare că nu ați activat un serviciu de completare automată pentru Bitwarden. Activați completarea automată pentru Bitwarden din ecranul „Setări”.</value>
+    <value>Auto-completarea ușurează accesul securizat al seifului Bitwarden de pe alte site-uri și aplicații. Se pare că nu ați activat serviciul de auto-completare pentru Bitwarden. Activați auto-completarea pentru Bitwarden din ecranul „Setări”.</value>
   </data>
   <data name="ThemeAppliedOnRestart" xml:space="preserve">
     <value>Modificările temei se vor aplica după repornirea aplicației.</value>
@@ -1555,123 +1555,123 @@
     <value>Descărcare</value>
   </data>
   <data name="Shared" xml:space="preserve">
-    <value>Distribuit</value>
+    <value>Partajate</value>
   </data>
   <data name="ToggleVisibility" xml:space="preserve">
-    <value>Toggle Visiblity</value>
+    <value>Comutare vizibilitate</value>
   </data>
   <data name="LoginExpired" xml:space="preserve">
     <value>Sesiunea de autentificare a expirat.</value>
   </data>
   <data name="BiometricsDirection" xml:space="preserve">
-    <value>Folosiți datele biometrice pentru a verifica.</value>
+    <value>Utilizați biometria la verificări</value>
   </data>
   <data name="Biometrics" xml:space="preserve">
-    <value>Biometrice</value>
+    <value>Biometria</value>
   </data>
   <data name="UseBiometricsToUnlock" xml:space="preserve">
-    <value>Utilizați datele biometrice pentru a debloca</value>
+    <value>Folosiți Biometria la Deblocare</value>
   </data>
   <data name="AccessibilityOverlayPermissionAlert" xml:space="preserve">
-    <value>Bitwarden needs attention - See "Auto-fill Accessibility Service" from Bitwarden Settings</value>
+    <value>Bitwarden are nevoie de atenție! Vedeți în Setările Bitwarden "Servicii Accesibilitate Auto-completare"</value>
   </data>
   <data name="BitwardenAutofillServiceOverlayPermission" xml:space="preserve">
-    <value>3. On the Android App Settings screen for Bitwarden, go to the "Display over other apps" options (under Advanced) and tap the toggle to enable overlay support.</value>
+    <value>3. În ecranul Android de Setări pentru Bitwarden accesați "Opțiuni", tapați comutatorul "Afișați pete alte aplicații" (sub Avansat) pentru a activa suportul de suprapunere.</value>
   </data>
   <data name="OverlayPermission" xml:space="preserve">
-    <value>Permission</value>
+    <value>Permisiune</value>
   </data>
   <data name="BitwardenAutofillServiceOpenOverlayPermissionSettings" xml:space="preserve">
-    <value>Open Overlay Permission Settings</value>
+    <value>Deschideți Setările Permisiune de Suprapunere</value>
   </data>
   <data name="BitwardenAutofillServiceStep3" xml:space="preserve">
-    <value>3. On the Android App Settings screen for Bitwarden, select "Display over other apps" (under "Advanced") and switch on the toggle to allow the overlay.</value>
+    <value>3. În ecranul Android de Setări pentru Bitwarden accesați "Opțiuni", tapați comutatorul "Afișați pete alte aplicații" (sub "Avansat") pentru a activa suportul de suprapunere.</value>
   </data>
   <data name="Denied" xml:space="preserve">
-    <value>Denied</value>
+    <value>Interzis</value>
   </data>
   <data name="Granted" xml:space="preserve">
-    <value>Granted</value>
+    <value>Permis</value>
   </data>
   <data name="FileFormat" xml:space="preserve">
-    <value>File Format</value>
+    <value>Format fișier</value>
   </data>
   <data name="ExportVaultMasterPasswordDescription" xml:space="preserve">
-    <value>Enter your master password to export your vault data.</value>
+    <value>Introdu parola principală pentru a exporta datele seifului.</value>
   </data>
   <data name="ExportVaultWarning" xml:space="preserve">
-    <value>This export contains your vault data in an unencrypted format. You should not store or send the exported file over unsecure channels (such as email). Delete it immediately after you are done using it.</value>
+    <value>Acest export conține datele dvs. în format necriptat. Nu trebuie să le stocați sau să le trimiteți pe canale nesigure (cum ar fi e-mailuri). Ștergeți-le imediat după ce ați terminat cu utilizarea lor.</value>
   </data>
   <data name="Warning" xml:space="preserve">
-    <value>Warning</value>
+    <value>Avertisment</value>
   </data>
   <data name="ExportVaultFailure" xml:space="preserve">
-    <value>There was a problem exporting your vault.  If the problem persists, you'll need to export from the web vault.</value>
+    <value>A apărut o problemă la exportul seifului dvs. Dacă problema persistă, va trebui să exportați din seiful web.</value>
   </data>
   <data name="ExportVaultSuccess" xml:space="preserve">
-    <value>Vault exported successfully</value>
+    <value>Seiful exportat cu succes</value>
   </data>
   <data name="Clone" xml:space="preserve">
-    <value>Clone</value>
+    <value>Clon</value>
     <comment>Clone an entity (verb).</comment>
   </data>
   <data name="PasswordGeneratorPolicyInEffect" xml:space="preserve">
-    <value>One or more organization policies are affecting your generator settings</value>
+    <value>Una sau mai multe politici organizaționale afectează setările generatorului</value>
   </data>
   <data name="Open" xml:space="preserve">
-    <value>Open</value>
+    <value>Deschide</value>
     <comment>Button text for an open operation (verb).</comment>
   </data>
   <data name="UnableToSaveAttachment" xml:space="preserve">
-    <value>There was a problem saving this attachment. If the problem persists, you can save it from the web vault.</value>
+    <value>A apărut o problemă la salvarea acestui atașament. Dacă problema persistă, o puteți salva din seiful web.</value>
   </data>
   <data name="SaveAttachmentSuccess" xml:space="preserve">
-    <value>Attachment saved successfully</value>
+    <value>Atașamente salvate cu succes</value>
   </data>
   <data name="AutofillTileAccessibilityRequired" xml:space="preserve">
-    <value>Please enable "Auto-fill Accessibility Service" from Bitwarden Settings to use the Auto-fill tile.</value>
+    <value>Activați "Serviciul Accesibilitate Auto-completare" în setările Bitwarden ca să utilizați placa de auto-completare.</value>
   </data>
   <data name="AutofillTileUriNotFound" xml:space="preserve">
-    <value>No password fields detected</value>
+    <value>Câmpul parolă nu a fost detectat</value>
   </data>
   <data name="SoftDeleting" xml:space="preserve">
-    <value>Sending to trash...</value>
+    <value>Se trimite la gunoi...</value>
     <comment>Message shown when interacting with the server</comment>
   </data>
   <data name="ItemSoftDeleted" xml:space="preserve">
-    <value>Item has been sent to trash.</value>
+    <value>Elementul a fost trimis la gunoi.</value>
     <comment>Confirmation message after successfully soft-deleting a login</comment>
   </data>
   <data name="Restore" xml:space="preserve">
-    <value>Restore</value>
+    <value>Restaurați</value>
     <comment>Restores an entity (verb).</comment>
   </data>
   <data name="Restoring" xml:space="preserve">
-    <value>Restoring...</value>
+    <value>Se restaurează...</value>
     <comment>Message shown when interacting with the server</comment>
   </data>
   <data name="ItemRestored" xml:space="preserve">
-    <value>Item has been restored.</value>
+    <value>Articolul a fost restaurat</value>
     <comment>Confirmation message after successfully restoring a soft-deleted item</comment>
   </data>
   <data name="Trash" xml:space="preserve">
-    <value>Trash</value>
+    <value>Gunoi</value>
     <comment>(noun) Location of deleted items which have not yet been permanently deleted</comment>
   </data>
   <data name="SearchTrash" xml:space="preserve">
-    <value>Search trash</value>
+    <value>Caută în coșul de gunoi</value>
     <comment>(action prompt) Label for the search text field when viewing the trash folder</comment>
   </data>
   <data name="DoYouReallyWantToPermanentlyDeleteCipher" xml:space="preserve">
-    <value>Do you really want to permanently delete? This cannot be undone.</value>
+    <value>Doriți cu adevărat să ștergeți definitiv? Acest lucru nu poate fi anulat.</value>
     <comment>Confirmation alert message when permanently deleteing a cipher.</comment>
   </data>
   <data name="DoYouReallyWantToRestoreCipher" xml:space="preserve">
-    <value>Do you really want to restore this item?</value>
+    <value>Doriți cu adevărat să restaurați acest articol?</value>
     <comment>Confirmation alert message when restoring a soft-deleted cipher.</comment>
   </data>
   <data name="DoYouReallyWantToSoftDeleteCipher" xml:space="preserve">
-    <value>Do you really want to send to the trash?</value>
+    <value>Chiar vreți să trimiteți la coșul de gunoi?</value>
     <comment>Confirmation alert message when soft-deleting a cipher.</comment>
   </data>
 </root>

src/App/Resources/AppResources.sk.resx

@@ -519,28 +519,28 @@
     <value>Zámok</value>
   </data>
   <data name="FifteenMinutes" xml:space="preserve">
-    <value>15 minutes</value>
+    <value>15 minút</value>
   </data>
   <data name="OneHour" xml:space="preserve">
-    <value>1 hour</value>
+    <value>1 hodina</value>
   </data>
   <data name="OneMinute" xml:space="preserve">
     <value>1 minúta</value>
   </data>
   <data name="FourHours" xml:space="preserve">
-    <value>4 hours</value>
+    <value>4 hodiny</value>
   </data>
   <data name="Immediately" xml:space="preserve">
-    <value>Immediately</value>
+    <value>Okamžite</value>
   </data>
   <data name="VaultTimeout" xml:space="preserve">
-    <value>Vault Timeout</value>
+    <value>Časový limit pre trezor</value>
   </data>
   <data name="VaultTimeoutAction" xml:space="preserve">
-    <value>Vault Timeout Action</value>
+    <value>Akcia pri vypršaní času pre trezor</value>
   </data>
   <data name="VaultTimeoutLogOutConfirmation" xml:space="preserve">
-    <value>Logging out will remove all access to your vault and requires online authentication after the timeout period. Are you sure you want to use this setting?</value>
+    <value>Odhlásenie bude vyžadovať online prihlásenie po vypršaní časového limitu. Naozaj chcete použiť toto nastavenie?</value>
   </data>
   <data name="LoggingIn" xml:space="preserve">
     <value>Prihlasovanie...</value>
@@ -1138,7 +1138,7 @@
     <value>V tomto priečinku sa nenachádzajú žiadne položky.</value>
   </data>
   <data name="NoItemsTrash" xml:space="preserve">
-    <value>There are no items in the trash.</value>
+    <value>V koši nie sú žiadne položky</value>
   </data>
   <data name="AutofillAccessibilityService" xml:space="preserve">
     <value>Služba automatického vypĺňania pre zjednodušený prístup</value>
@@ -1440,7 +1440,7 @@
     <value>Odomknúť</value>
   </data>
   <data name="ThirtyMinutes" xml:space="preserve">
-    <value>30 minutes</value>
+    <value>30 minút</value>
   </data>
   <data name="SetPINDescription" xml:space="preserve">
     <value>Nastaviť kód PIN na odomknutie Bitwarden. Nastavenie PIN sa vynuluje, ak úplne odhlásite z aplikácie.</value>
@@ -1536,7 +1536,7 @@
     <value>"Notifikácia Pridať prihlasovacie údaje" vás automaticky upozorní na uloženie nových údajov do vášho trezoru vždy, keď sa s nimi prihlasujete po prvý krát.</value>
   </data>
   <data name="OnRestart" xml:space="preserve">
-    <value>On App Restart</value>
+    <value>Po reštarte aplikácie</value>
   </data>
   <data name="AutofillServiceNotEnabled" xml:space="preserve">
     <value>Automatické dopĺňanie umožňuje jednoducho pristupovať k vašemu trezoru z iných stránok a plaikácii. Vyzerá že ste službu automatického dopĺňania pomocou Bitwarden nezapli. Zapnúť ju môžete na obrazove "Nastavenia".</value>
@@ -1629,49 +1629,49 @@
     <value>Príloha úspešne uložená</value>
   </data>
   <data name="AutofillTileAccessibilityRequired" xml:space="preserve">
-    <value>Please enable "Auto-fill Accessibility Service" from Bitwarden Settings to use the Auto-fill tile.</value>
+    <value>Zapnite službu dostupnosti pre automatické vypĺňanie v nastaveniach Bitwardenu aby ste mohli používať dlaždicu pre automatické dopĺňanie.</value>
   </data>
   <data name="AutofillTileUriNotFound" xml:space="preserve">
-    <value>No password fields detected</value>
+    <value>Nenájdené žiadne políčka na heslo</value>
   </data>
   <data name="SoftDeleting" xml:space="preserve">
-    <value>Sending to trash...</value>
+    <value>Posielanie do koša...</value>
     <comment>Message shown when interacting with the server</comment>
   </data>
   <data name="ItemSoftDeleted" xml:space="preserve">
-    <value>Item has been sent to trash.</value>
+    <value>Položka bola poslaná do koša.</value>
     <comment>Confirmation message after successfully soft-deleting a login</comment>
   </data>
   <data name="Restore" xml:space="preserve">
-    <value>Restore</value>
+    <value>Obnoviť</value>
     <comment>Restores an entity (verb).</comment>
   </data>
   <data name="Restoring" xml:space="preserve">
-    <value>Restoring...</value>
+    <value>Obnovovanie...</value>
     <comment>Message shown when interacting with the server</comment>
   </data>
   <data name="ItemRestored" xml:space="preserve">
-    <value>Item has been restored.</value>
+    <value>Položka bola obnovená.</value>
     <comment>Confirmation message after successfully restoring a soft-deleted item</comment>
   </data>
   <data name="Trash" xml:space="preserve">
-    <value>Trash</value>
+    <value>Kôš</value>
     <comment>(noun) Location of deleted items which have not yet been permanently deleted</comment>
   </data>
   <data name="SearchTrash" xml:space="preserve">
-    <value>Search trash</value>
+    <value>Hľadať v koši</value>
     <comment>(action prompt) Label for the search text field when viewing the trash folder</comment>
   </data>
   <data name="DoYouReallyWantToPermanentlyDeleteCipher" xml:space="preserve">
-    <value>Do you really want to permanently delete? This cannot be undone.</value>
+    <value>Naozaj to chcete navždy odstrániť? Nedá sa to vrátiť späť.</value>
     <comment>Confirmation alert message when permanently deleteing a cipher.</comment>
   </data>
   <data name="DoYouReallyWantToRestoreCipher" xml:space="preserve">
-    <value>Do you really want to restore this item?</value>
+    <value>Naozaj chcete obnoviť túto položku?</value>
     <comment>Confirmation alert message when restoring a soft-deleted cipher.</comment>
   </data>
   <data name="DoYouReallyWantToSoftDeleteCipher" xml:space="preserve">
-    <value>Do you really want to send to the trash?</value>
+    <value>Naozaj to chcete poslať do koša?</value>
     <comment>Confirmation alert message when soft-deleting a cipher.</comment>
   </data>
 </root>

src/App/Resources/AppResources.th.resx

@@ -1564,7 +1564,7 @@
     <value>Your login session has expired.</value>
   </data>
   <data name="BiometricsDirection" xml:space="preserve">
-    <value>Use biometrics to verify.</value>
+    <value>Biometric Verification</value>
   </data>
   <data name="Biometrics" xml:space="preserve">
     <value>Biometrics</value>

src/App/Resources/AppResources.uk.resx

@@ -232,7 +232,7 @@
     <value>Теку оновлено.</value>
   </data>
   <data name="GoToWebsite" xml:space="preserve">
-    <value>Перейти на веб-сайт</value>
+    <value>Перейти на вебсайт</value>
     <comment>The button text that allows user to launch the website to their web browser.</comment>
   </data>
   <data name="HelpAndFeedback" xml:space="preserve">
@@ -269,7 +269,7 @@
     <comment>Title for login page. (noun)</comment>
   </data>
   <data name="LogOut" xml:space="preserve">
-    <value>Вихід</value>
+    <value>Вийти</value>
     <comment>The log out button text (verb).</comment>
   </data>
   <data name="LogoutConfirmation" xml:space="preserve">
@@ -375,13 +375,13 @@
     <value>Переглянути</value>
   </data>
   <data name="VisitOurWebsite" xml:space="preserve">
-    <value>Відвідайте наш веб-сайт</value>
+    <value>Відвідайте наш вебсайт</value>
   </data>
   <data name="VisitOurWebsiteDescription" xml:space="preserve">
-    <value>Відвідайте наш веб-сайт, щоб прочитати новини, написати нам, або дізнатися більше про те, як ми використовуємо Bitwarden.</value>
+    <value>Відвідайте наш вебсайт, щоб отримати допомогу, дізнатися про новини, написати нам, або дізнатися більше про те, як використовувати Bitwarden.</value>
   </data>
   <data name="Website" xml:space="preserve">
-    <value>Веб-сайт</value>
+    <value>Вебсайт</value>
     <comment>Label for a website.</comment>
   </data>
   <data name="Yes" xml:space="preserve">
@@ -400,7 +400,7 @@
     <value>Розширення</value>
   </data>
   <data name="AutofillAccessibilityDescription" xml:space="preserve">
-    <value>Використовуйте службу автозаповнення Bitwarden, щоб автоматично вводити паролі в програмах та на веб-сайтах.</value>
+    <value>Використовуйте службу автозаповнення Bitwarden, щоб автоматично вводити паролі в програмах та на вебсайтах.</value>
   </data>
   <data name="AutofillService" xml:space="preserve">
     <value>Служба автозаповнення</value>
@@ -427,13 +427,13 @@
     <value>Змінити адресу е-пошти</value>
   </data>
   <data name="ChangeEmailConfirmation" xml:space="preserve">
-    <value>Ви можете змінити адресу е-пошти в сховищі на bitwarden.com. Хочете перейти на веб-сайт зараз?</value>
+    <value>Ви можете змінити адресу е-пошти в сховищі на bitwarden.com. Хочете перейти на вебсайт зараз?</value>
   </data>
   <data name="ChangeMasterPassword" xml:space="preserve">
     <value>Змінити головний пароль</value>
   </data>
   <data name="ChangePasswordConfirmation" xml:space="preserve">
-    <value>Ви можете змінити головний пароль в сховищі на bitwarden.com. Хочете перейти на веб-сайт зараз?</value>
+    <value>Ви можете змінити головний пароль в сховищі на bitwarden.com. Хочете перейти на вебсайт зараз?</value>
   </data>
   <data name="Close" xml:space="preserve">
     <value>Закрити</value>
@@ -504,7 +504,7 @@
     <value>Імпорт записів</value>
   </data>
   <data name="ImportItemsConfirmation" xml:space="preserve">
-    <value>Ви можете робити масовий імпорт записів зі сховища на bitwarden.com. Хочете перейти на веб-сайт зараз?</value>
+    <value>Ви можете робити масовий імпорт записів зі сховища на bitwarden.com. Хочете перейти на вебсайт зараз?</value>
   </data>
   <data name="ImportItemsDescription" xml:space="preserve">
     <value>Швидкий імпорт ваших записів з інших програм керування паролями.</value>
@@ -516,7 +516,7 @@
     <value>Довжина</value>
   </data>
   <data name="Lock" xml:space="preserve">
-    <value>Заблокувати</value>
+    <value>Блокувати</value>
   </data>
   <data name="FifteenMinutes" xml:space="preserve">
     <value>15 хвилин</value>
@@ -594,7 +594,7 @@
     <value>У вашому сховищі немає записів.</value>
   </data>
   <data name="NoItemsTap" xml:space="preserve">
-    <value>У вашому сховищі немає записів для цього веб-сайту/програми. Торкніться, щоб додати.</value>
+    <value>У вашому сховищі немає записів для цього вебсайту/програми. Торкніться, щоб додати.</value>
   </data>
   <data name="NoUsernamePasswordConfigured" xml:space="preserve">
     <value>Цей запис не має імені користувача або пароля.</value>
@@ -689,7 +689,7 @@
     <value>Двоетапна перевірка</value>
   </data>
   <data name="TwoStepLoginConfirmation" xml:space="preserve">
-    <value>Двоетапна перевірка робить ваш обліковий запис більш захищеним, вимагаючи підтвердження входу з використанням іншого пристрою, наприклад, за допомогою коду безпеки, програми авторизації, SMS, телефонного виклику, або е-пошти. Ви можете увімкнути двоетапну перевірку в сховищі на bitwarden.com. Хочете перейти на веб-сайт зараз?</value>
+    <value>Двоетапна перевірка робить ваш обліковий запис більш захищеним, вимагаючи підтвердження входу з використанням іншого пристрою, наприклад, за допомогою коду безпеки, програми авторизації, SMS, телефонного виклику, або е-пошти. Ви можете увімкнути двоетапну перевірку в сховищі на bitwarden.com. Хочете перейти на вебсайт зараз?</value>
   </data>
   <data name="UnlockWith" xml:space="preserve">
     <value>Розблокування з {0}</value>
@@ -708,7 +708,7 @@
     <value>Перегляд запису</value>
   </data>
   <data name="WebVault" xml:space="preserve">
-    <value>Веб-сховище Bitwarden</value>
+    <value>Веб сховище Bitwarden</value>
   </data>
   <data name="Lost2FAApp" xml:space="preserve">
     <value>Втратили доступ до програми перевірки?</value>
@@ -964,7 +964,7 @@
     <value>URL-адреса сервера</value>
   </data>
   <data name="WebVaultUrl" xml:space="preserve">
-    <value>URL-адреса сервера веб-сховища</value>
+    <value>URL-адреса сервера веб сховища</value>
   </data>
   <data name="BitwardenAutofillServiceNotificationContentOld" xml:space="preserve">
     <value>Торкніться цього сповіщення для перегляду записів з вашого сховища.</value>
@@ -1111,10 +1111,10 @@
     <value>Термін дії</value>
   </data>
   <data name="DisableWebsiteIcons" xml:space="preserve">
-    <value>Вимкнути піктограми веб-сайтів</value>
+    <value>Вимкнути піктограми вебсайтів</value>
   </data>
   <data name="DisableWebsiteIconsDescription" xml:space="preserve">
-    <value>Впізнавані піктограми веб-сайтів додаються біля кожного запису вашого сховища.</value>
+    <value>Впізнавані піктограми вебсайтів додаються біля кожного запису вашого сховища.</value>
   </data>
   <data name="IconsUrl" xml:space="preserve">
     <value>URL-адреса сервера піктограм</value>
@@ -1263,7 +1263,7 @@
     <value>Ви повинні увійти в основну програму Bitwarden, щоб використовувати автозаповнення.</value>
   </data>
   <data name="AutofillSetup" xml:space="preserve">
-    <value>Тепер ви можете легко отримувати доступ до своїх записів з клавіатури під час входу в програмах і на веб-сайтах.</value>
+    <value>Тепер ви можете легко отримувати доступ до своїх записів з клавіатури під час входу в програмах і на вебсайтах.</value>
   </data>
   <data name="AutofillSetup2" xml:space="preserve">
     <value>Ми радимо вимкнути будь-які інші програми з функцією автозаповнення в Параметрах, якщо ви не плануєте ними користуватися.</value>
@@ -1425,7 +1425,7 @@
     <comment>A 'fingerprint phrase' is a unique word phrase (similar to a passphrase) that a user can use to authenticate their public key with another user, for the purposes of sharing.</comment>
   </data>
   <data name="ShareVaultConfirmation" xml:space="preserve">
-    <value>Bitwarden дозволяє вам надавати доступ до свого сховища іншим за допомогою облікового запису організації. Чи не бажаєте перейти на веб-сайт bitwarden.com, щоб дізнатися більше?</value>
+    <value>Bitwarden дозволяє вам надавати доступ до свого сховища іншим за допомогою облікового запису організації. Чи не бажаєте перейти на вебсайт bitwarden.com, щоб дізнатися більше?</value>
   </data>
   <data name="ExportVault" xml:space="preserve">
     <value>Експорт сховища</value>
@@ -1539,7 +1539,7 @@
     <value>При перезапуску програми</value>
   </data>
   <data name="AutofillServiceNotEnabled" xml:space="preserve">
-    <value>Автозаповнення дозволяє безпечно отримувати доступ до вашого сховища Bitwarden з інших веб-сайтів та програм. Схоже, що ви не активували функцію автозаповнення Bitwarden. Увімкніть автозаповнення на екрані налаштувань.</value>
+    <value>Автозаповнення дозволяє безпечно отримувати доступ до вашого сховища Bitwarden з інших вебсайтів та програм. Схоже, що ви не активували функцію автозаповнення Bitwarden. Увімкніть автозаповнення на екрані налаштувань.</value>
   </data>
   <data name="ThemeAppliedOnRestart" xml:space="preserve">
     <value>Зміни теми застосуються після перезапуску додатка.</value>
@@ -1606,7 +1606,7 @@
     <value>Попередження</value>
   </data>
   <data name="ExportVaultFailure" xml:space="preserve">
-    <value>Сталася помилка під час експорту вашого сховища. Якщо проблема не зникне, вам необхідно буде експортувати з веб-сховища.</value>
+    <value>Сталася помилка під час експорту вашого сховища. Якщо проблема не зникне, вам необхідно буде експортувати з веб сховища.</value>
   </data>
   <data name="ExportVaultSuccess" xml:space="preserve">
     <value>Сховище успішно експортовано</value>
@@ -1623,7 +1623,7 @@
     <comment>Button text for an open operation (verb).</comment>
   </data>
   <data name="UnableToSaveAttachment" xml:space="preserve">
-    <value>Виникла проблема зі збереженням цього вкладення. Якщо проблема не зникне, ви можете зберегти її з веб-сховища.</value>
+    <value>Виникла проблема зі збереженням цього вкладення. Якщо проблема не зникне, ви можете зберегти її з веб сховища.</value>
   </data>
   <data name="SaveAttachmentSuccess" xml:space="preserve">
     <value>Вкладення успішно збережено</value>

src/App/Resources/AppResources.vi.resx

@@ -412,7 +412,7 @@
     <value>Phần mở rộng Bitwarden</value>
   </data>
   <data name="BitwardenAppExtensionAlert2" xml:space="preserve">
-    <value>The easiest way to add new logins to your vault is from the Bitwarden App Extension. Learn more about using the Bitwarden App Extension by navigating to the "Settings" screen.</value>
+    <value>Cách dễ nhất để thêm đăng nhập mới vào kho của bạn là từ Phần mở rộng Bitwarden. Tìm hiểu thêm về cách sử dụng Phần mở rộng Bitwarden bằng cách điều hướng đến màn hình "Cài đặt".</value>
   </data>
   <data name="BitwardenAppExtensionDescription" xml:space="preserve">
     <value>Sử dụng Bitwarden trong Safari và các ứng dụng khác để tự động điền thông tin đăng nhập của bạn.</value>
@@ -519,28 +519,28 @@
     <value>Khóa</value>
   </data>
   <data name="FifteenMinutes" xml:space="preserve">
-    <value>15 minutes</value>
+    <value>15 phút</value>
   </data>
   <data name="OneHour" xml:space="preserve">
-    <value>1 hour</value>
+    <value>1 giờ</value>
   </data>
   <data name="OneMinute" xml:space="preserve">
-    <value>1 minute</value>
+    <value>1 phút</value>
   </data>
   <data name="FourHours" xml:space="preserve">
-    <value>4 hours</value>
+    <value>4 giờ</value>
   </data>
   <data name="Immediately" xml:space="preserve">
-    <value>Immediately</value>
+    <value>Tức thì</value>
   </data>
   <data name="VaultTimeout" xml:space="preserve">
-    <value>Vault Timeout</value>
+    <value>Thời Gian Chờ Của Kho</value>
   </data>
   <data name="VaultTimeoutAction" xml:space="preserve">
-    <value>Vault Timeout Action</value>
+    <value>Hành Động Khi Hết Thời Gian Chờ</value>
   </data>
   <data name="VaultTimeoutLogOutConfirmation" xml:space="preserve">
-    <value>Logging out will remove all access to your vault and requires online authentication after the timeout period. Are you sure you want to use this setting?</value>
+    <value>Đăng xuất sẽ xóa tất các truy cập vào kho của bạn và yêu cầu xác thực trực tuyến sau khi khoảng thời gian chờ hết. Bạn có chắc bạn muốn dùng cài đặt này?</value>
   </data>
   <data name="LoggingIn" xml:space="preserve">
     <value>Đang đăng nhập...</value>
@@ -735,7 +735,7 @@
     <comment>This is used for the autofill service. ex. "There are no items in your vault for twitter.com".</comment>
   </data>
   <data name="BitwardenAutofillServiceOverlay" xml:space="preserve">
-    <value>When you select an input field and see a Bitwarden auto-fill overlay, you can tap it to launch the auto-fill service.</value>
+    <value>Khi bạn chọn một trường nhập liệu và thấy thông báo tự động điền của Bitwarden, bạn có thể chạp vào nó để mở tự động điền tiêu chuẩn.</value>
   </data>
   <data name="BitwardenAutofillServiceNotificationContent" xml:space="preserve">
     <value>Chạm vào thông báo này để tự động điền thông tin đăng nhập từ kho của bạn.</value>
@@ -759,7 +759,7 @@
     <value>Trạng thái</value>
   </data>
   <data name="BitwardenAutofillServiceAlert2" xml:space="preserve">
-    <value>The easiest way to add new logins to your vault is from the Bitwarden Auto-fill Service. Learn more about using the Bitwarden Auto-fill Service by navigating to the "Settings" screen.</value>
+    <value>Cách dễ nhất để thêm một đăng nhập mới vào kho của bạn là bằng dịch vụ Tự động điền của Bitwarden. Tìm hiểu thêm về cách sử dụng dịch vụ Tự động điền của Bitwarden trong trang 'Cài đặt'.</value>
   </data>
   <data name="Autofill" xml:space="preserve">
     <value>Tự động điền</value>
@@ -1138,7 +1138,7 @@
     <value>Không có mục nào trong thư mục này.</value>
   </data>
   <data name="NoItemsTrash" xml:space="preserve">
-    <value>There are no items in the trash.</value>
+    <value>Không có khoản mục nào trong thùng rác!</value>
   </data>
   <data name="AutofillAccessibilityService" xml:space="preserve">
     <value>Tự động điền bằng trợ năng</value>
@@ -1249,429 +1249,429 @@
     <value>Bạn có thể cần dùng dịch vụ trợ năng vì một số ứng dụng không hỗ trợ dịch vụ tự động điền của Android.</value>
   </data>
   <data name="DatePasswordUpdated" xml:space="preserve">
-    <value>Password Updated</value>
+    <value>Mật khẩu đã được cập nhật</value>
     <comment>ex. Date this password was updated</comment>
   </data>
   <data name="DateUpdated" xml:space="preserve">
-    <value>Updated</value>
+    <value>Đã được cập nhật</value>
     <comment>ex. Date this item was updated</comment>
   </data>
   <data name="AutofillActivated" xml:space="preserve">
-    <value>AutoFill Activated!</value>
+    <value>Tự động điền đã được kích hoạt!</value>
   </data>
   <data name="MustLogInMainAppAutofill" xml:space="preserve">
-    <value>You must log into the main Bitwarden app before you can use AutoFill.</value>
+    <value>Bạn phải đăng nhập vào ứng dụng Bitwarden trước khi sử dụng Tự động điền.</value>
   </data>
   <data name="AutofillSetup" xml:space="preserve">
     <value>Your logins are now easily accessable right from your keyboard while logging into apps and websites.</value>
   </data>
   <data name="AutofillSetup2" xml:space="preserve">
-    <value>We recommend disabling any other AutoFill apps under Settings if you do not plan to use them.</value>
+    <value>Chúng tôi khuyên nên vô hiệu hóa các ứng dụng tự động điền khác trong Cài đặt nếu bạn không có ý định sử dụng chúng.</value>
   </data>
   <data name="BitwardenAutofillDescription" xml:space="preserve">
-    <value>Access your vault directly from your keyboard to quickly autofill passwords.</value>
+    <value>Truy cập kho của bạn trực tiếp từ bàn phím để có thể nhanh chóng tự động điền mật khẩu.</value>
   </data>
   <data name="AutofillTurnOn" xml:space="preserve">
-    <value>To enable password autofill on your device, follow these instructions:</value>
+    <value>Để mở chức năng tự động điền mật khẩu trên thiết bị của bạn, xin làm theo hướng dẫn dưới đây:</value>
   </data>
   <data name="AutofillTurnOn1" xml:space="preserve">
-    <value>1. Go to the iOS "Settings" app</value>
+    <value>1. Truy cập vào ứng dụng "Cài đặt" của iOS</value>
   </data>
   <data name="AutofillTurnOn2" xml:space="preserve">
-    <value>2. Tap "Passwords &amp; Accounts"</value>
+    <value>2. Chọn "Mật khẩu &amp; Tài khoản"</value>
   </data>
   <data name="AutofillTurnOn3" xml:space="preserve">
-    <value>3. Tap "AutoFill Passwords"</value>
+    <value>3. Chọn "Tự động điền mật khẩu"</value>
   </data>
   <data name="AutofillTurnOn4" xml:space="preserve">
-    <value>4. Turn on AutoFill</value>
+    <value>4. Mở Tự động điền mật khẩu</value>
   </data>
   <data name="AutofillTurnOn5" xml:space="preserve">
-    <value>5. Select "Bitwarden"</value>
+    <value>5. Chọn "Bitwarden"</value>
   </data>
   <data name="PasswordAutofill" xml:space="preserve">
-    <value>Password AutoFill</value>
+    <value>Tự động điền mật khẩu</value>
   </data>
   <data name="BitwardenAutofillAlert2" xml:space="preserve">
-    <value>The easiest way to add new logins to your vault is by using the Bitwarden Password AutoFill extension. Learn more about using the Bitwarden Password AutoFill extension by navigating to the "Settings" screen.</value>
+    <value>Cách dễ nhất để thêm đăng nhập mới vào kho của bạn là bằng cách sử dụng tiện ích mở rộng Tự động điền mật khẩu của Bitwarden. Tìm hiểu thêm về cách sử dụng tiện ích mở rộng Tự động điền mật khẩu của Bitwarden bằng cách điều hướng đến màn hình "Cài đặt".</value>
   </data>
   <data name="InvalidEmail" xml:space="preserve">
-    <value>Invalid email address.</value>
+    <value>Địa chỉ email không hợp lệ.</value>
   </data>
   <data name="Cards" xml:space="preserve">
-    <value>Cards</value>
+    <value>Thẻ</value>
   </data>
   <data name="Identities" xml:space="preserve">
-    <value>Identities</value>
+    <value>Danh tính</value>
   </data>
   <data name="Logins" xml:space="preserve">
-    <value>Logins</value>
+    <value>Đăng nhập</value>
   </data>
   <data name="SecureNotes" xml:space="preserve">
-    <value>Secure Notes</value>
+    <value>Ghi chú bảo mật</value>
   </data>
   <data name="AllItems" xml:space="preserve">
-    <value>All Items</value>
+    <value>Tất cả các mục</value>
   </data>
   <data name="URIs" xml:space="preserve">
-    <value>URIs</value>
+    <value>Đường dẫn</value>
     <comment>Plural form of a URI</comment>
   </data>
   <data name="CheckingPassword" xml:space="preserve">
-    <value>Checking password...</value>
+    <value>Đang kiểm tra mật khẩu...</value>
     <comment>A loading message when doing an exposed password check.</comment>
   </data>
   <data name="CheckPassword" xml:space="preserve">
-    <value>Check if password has been exposed.</value>
+    <value>Kiểm tra xem mật khẩu có bị lộ không.</value>
   </data>
   <data name="PasswordExposed" xml:space="preserve">
-    <value>This password has been exposed {0} time(s) in data breaches. You should change it.</value>
+    <value>Mật khẩu này đã bị lộ {0} lần trong các lần rò rĩ dữ liệu. Bạn nên thay đổi nó.</value>
   </data>
   <data name="PasswordSafe" xml:space="preserve">
-    <value>This password was not found in any known data breaches. It should be safe to use.</value>
+    <value>Mật khẩu này không được tìm thấy trong bất kỳ các lần rò rĩ dữ liệu nào nào được biết đến. Nó an toàn để sử dụng.</value>
   </data>
   <data name="IdentityName" xml:space="preserve">
-    <value>Identity Name</value>
+    <value>Tên đầy đủ</value>
   </data>
   <data name="Value" xml:space="preserve">
-    <value>Value</value>
+    <value>Giá trị</value>
   </data>
   <data name="PasswordHistory" xml:space="preserve">
-    <value>Password History</value>
+    <value>Lịch sử Mật khẩu</value>
   </data>
   <data name="Types" xml:space="preserve">
-    <value>Types</value>
+    <value>Các loại</value>
   </data>
   <data name="NoPasswordsToList" xml:space="preserve">
-    <value>No passwords to list.</value>
+    <value>Không có mật khẩu nào để liệt kê.</value>
   </data>
   <data name="NoItemsToList" xml:space="preserve">
-    <value>There are no items to list.</value>
+    <value>Không có mục nào để liệt kê.</value>
   </data>
   <data name="SearchCollection" xml:space="preserve">
-    <value>Search collection</value>
+    <value>Tìm kiếm bộ sưu tập</value>
   </data>
   <data name="SearchFolder" xml:space="preserve">
-    <value>Search folder</value>
+    <value>Tìm kiếm thư mục</value>
   </data>
   <data name="SearchType" xml:space="preserve">
-    <value>Search type</value>
+    <value>Tìm theo loại</value>
   </data>
   <data name="Type" xml:space="preserve">
-    <value>Type</value>
+    <value>Loại</value>
   </data>
   <data name="MoveDown" xml:space="preserve">
-    <value>Move Down</value>
+    <value>Chuyển xuống</value>
   </data>
   <data name="MoveUp" xml:space="preserve">
-    <value>Move Up</value>
+    <value>Chuyển lên</value>
   </data>
   <data name="Miscellaneous" xml:space="preserve">
-    <value>Miscellaneous</value>
+    <value>Khác</value>
   </data>
   <data name="Ownership" xml:space="preserve">
-    <value>Ownership</value>
+    <value>Quyền sở hữu</value>
   </data>
   <data name="WhoOwnsThisItem" xml:space="preserve">
-    <value>Who owns this item?</value>
+    <value>Ai sở hữu mục này?</value>
   </data>
   <data name="NoCollectionsToList" xml:space="preserve">
-    <value>There are no collections to list.</value>
+    <value>Không có bộ sưu tập nào để liệt kê.</value>
   </data>
   <data name="ItemShared" xml:space="preserve">
-    <value>Item has been shared.</value>
+    <value>Mục đã được chia sẻ.</value>
   </data>
   <data name="SelectOneCollection" xml:space="preserve">
-    <value>You must select at least one collection.</value>
+    <value>Bạn phải chọn ít nhất một bộ sưu tập.</value>
   </data>
   <data name="Share" xml:space="preserve">
-    <value>Share</value>
+    <value>Chia sẻ</value>
   </data>
   <data name="ShareItem" xml:space="preserve">
-    <value>Share Item</value>
+    <value>Chia sẻ mục này</value>
   </data>
   <data name="NoOrgsToList" xml:space="preserve">
-    <value>No organizations to list.</value>
+    <value>Không có tổ chức để liệt kê.</value>
   </data>
   <data name="ShareDesc" xml:space="preserve">
-    <value>Choose an organization that you wish to share this item with. Sharing transfers ownership of the item to the organization. You will no longer be the direct owner of this item once it has been shared.</value>
+    <value>Chọn một tổ chức mà bạn muốn chia sẻ mục này. Việc chia sẻ sẽ chuyển quyền sở hữu của mục sang tổ chức. Bạn sẽ không còn là chủ sở hữu trực tiếp của mục này một khi nó đã được chia sẻ.</value>
   </data>
   <data name="NumberOfWords" xml:space="preserve">
-    <value>Number of Words</value>
+    <value>Số lượng chữ</value>
   </data>
   <data name="Passphrase" xml:space="preserve">
-    <value>Passphrase</value>
+    <value>Cụm từ mật khẩu</value>
   </data>
   <data name="WordSeparator" xml:space="preserve">
-    <value>Word Separator</value>
+    <value>Dấu tách từ</value>
   </data>
   <data name="Clear" xml:space="preserve">
-    <value>Clear</value>
+    <value>Xoá</value>
     <comment>To clear something out. example: To clear browser history.</comment>
   </data>
   <data name="Generator" xml:space="preserve">
-    <value>Generator</value>
+    <value>Tạo mật khẩu</value>
     <comment>Short for "Password Generator"</comment>
   </data>
   <data name="NoFoldersToList" xml:space="preserve">
-    <value>There are no folders to list.</value>
+    <value>Không có thư mục để liệt kê.</value>
   </data>
   <data name="FingerprintPhrase" xml:space="preserve">
-    <value>Fingerprint Phrase</value>
+    <value>Cụm từ mật khẩu</value>
     <comment>A 'fingerprint phrase' is a unique word phrase (similar to a passphrase) that a user can use to authenticate their public key with another user, for the purposes of sharing.</comment>
   </data>
   <data name="YourAccountsFingerprint" xml:space="preserve">
-    <value>Your account's fingerprint phrase</value>
+    <value>Cụm từ mật khẩu của tài khoản của bạn</value>
     <comment>A 'fingerprint phrase' is a unique word phrase (similar to a passphrase) that a user can use to authenticate their public key with another user, for the purposes of sharing.</comment>
   </data>
   <data name="ShareVaultConfirmation" xml:space="preserve">
-    <value>Bitwarden allows you to share your vault with others by using an organization account. Would you like to visit the bitwarden.com website to learn more?</value>
+    <value>Bitwarden cho phép bạn chia sẻ kho mật khẩu của mình với người khác bằng cách sử dụng tài khoản tổ chức. Bạn có muốn truy cập trang web bitwarden.com để tìm hiểu thêm không?</value>
   </data>
   <data name="ExportVault" xml:space="preserve">
-    <value>Export Vault</value>
+    <value>Trích xuất kho</value>
   </data>
   <data name="LockNow" xml:space="preserve">
-    <value>Lock Now</value>
+    <value>Khóa ngay</value>
   </data>
   <data name="PIN" xml:space="preserve">
-    <value>PIN</value>
+    <value>Mã PIN</value>
   </data>
   <data name="Unlock" xml:space="preserve">
-    <value>Unlock</value>
+    <value>Mở khóa</value>
   </data>
   <data name="ThirtyMinutes" xml:space="preserve">
-    <value>30 minutes</value>
+    <value>30 phút</value>
   </data>
   <data name="SetPINDescription" xml:space="preserve">
-    <value>Set your PIN code for unlocking Bitwarden. Your PIN settings will be reset if you ever fully log out of the application.</value>
+    <value>Đặt mã PIN của bạn để mở khóa Bitwarden. Cài đặt mã PIN của bạn sẽ bị xóa nếu bạn hoàn toàn đăng xuất khỏi ứng dụng.</value>
   </data>
   <data name="LoggedInAsOn" xml:space="preserve">
-    <value>Logged in as {0} on {1}.</value>
+    <value>Đã đăng nhập là {0} trên {1}</value>
     <comment>ex: Logged in as user@example.com on bitwarden.com.</comment>
   </data>
   <data name="VaultLockedMasterPassword" xml:space="preserve">
-    <value>Your vault is locked. Verify your master password to continue.</value>
+    <value>Kho của bạn đã bị khóa. Xác minh mật khẩu chính của bạn để mở.</value>
   </data>
   <data name="VaultLockedPIN" xml:space="preserve">
-    <value>Your vault is locked. Verify your PIN code to continue.</value>
+    <value>Kho của bạn đã bị khóa. Xác minh mã PIN của bạn để mở.</value>
   </data>
   <data name="Dark" xml:space="preserve">
-    <value>Dark</value>
+    <value>Tối</value>
     <comment>A dark color</comment>
   </data>
   <data name="Light" xml:space="preserve">
-    <value>Light</value>
+    <value>Sáng</value>
     <comment>A light color</comment>
   </data>
   <data name="FiveMinutes" xml:space="preserve">
-    <value>5 minutes</value>
+    <value>5 phút</value>
   </data>
   <data name="TenSeconds" xml:space="preserve">
-    <value>10 seconds</value>
+    <value>10 giây</value>
   </data>
   <data name="ThirtySeconds" xml:space="preserve">
-    <value>30 seconds</value>
+    <value>30 giây</value>
   </data>
   <data name="TwentySeconds" xml:space="preserve">
-    <value>20 seconds</value>
+    <value>20 giây</value>
   </data>
   <data name="TwoMinutes" xml:space="preserve">
-    <value>2 minutes</value>
+    <value>2 phút</value>
   </data>
   <data name="ClearClipboard" xml:space="preserve">
-    <value>Clear Clipboard</value>
+    <value>Xóa bộ nhớ tạm</value>
     <comment>Clipboard is the operating system thing where you copy/paste data to on your device.</comment>
   </data>
   <data name="ClearClipboardDescription" xml:space="preserve">
-    <value>Automatically clear copied values from your clipboard.</value>
+    <value>Tự động xóa các giá trị đã sao chép khỏi bộ nhớ tạm.</value>
     <comment>Clipboard is the operating system thing where you copy/paste data to on your device.</comment>
   </data>
   <data name="DefaultUriMatchDetection" xml:space="preserve">
-    <value>Default URI Match Detection</value>
+    <value>Phương thức kiểm tra URI mặc định</value>
     <comment>Default URI match detection for auto-fill.</comment>
   </data>
   <data name="DefaultUriMatchDetectionDescription" xml:space="preserve">
-    <value>Choose the default way that URI match detection is handled for logins when performing actions such as auto-fill.</value>
+    <value>Chọn phương thức mặc định để kiểm tra so sánh URI cho các đăng nhập khi xử lí các hành động như là tự động điền.</value>
   </data>
   <data name="Theme" xml:space="preserve">
-    <value>Theme</value>
+    <value>Giao diện</value>
     <comment>Color theme</comment>
   </data>
   <data name="ThemeDescription" xml:space="preserve">
-    <value>Change the application's color theme.</value>
+    <value>Thay đổi màu giao diện của ứng dụng.</value>
   </data>
   <data name="RestartIsRequired" xml:space="preserve">
-    <value>Restart is required.</value>
+    <value>Cần khởi động lại.</value>
     <comment>Referring to restarting the application.</comment>
   </data>
   <data name="Restarting" xml:space="preserve">
-    <value>Restarting...</value>
+    <value>Đang khởi động lại...</value>
   </data>
   <data name="CopyNotes" xml:space="preserve">
-    <value>Copy Notes</value>
+    <value>Sao chép ghi chú</value>
   </data>
   <data name="Exit" xml:space="preserve">
-    <value>Exit</value>
+    <value>Thoát</value>
   </data>
   <data name="ExitConfirmation" xml:space="preserve">
-    <value>Are you sure you want to exit Bitwarden?</value>
+    <value>Bạn có chắc muốn thoát Bitwarden?</value>
   </data>
   <data name="PINRequireMasterPasswordRestart" xml:space="preserve">
     <value>You you want to require unlocking with your master password when the application is restarted?</value>
   </data>
   <data name="Black" xml:space="preserve">
-    <value>Black</value>
+    <value>Đen</value>
     <comment>The color black</comment>
   </data>
   <data name="BlacklistedUris" xml:space="preserve">
-    <value>Blacklisted URIs</value>
+    <value>Các URI bị cho vào danh sách đen</value>
   </data>
   <data name="BlacklistedUrisDescription" xml:space="preserve">
     <value>URIs that are blacklisted will not offer auto-fill. The list of apps should be comma separated. Ex: "https://twitter.com, androidapp://com.twitter.android".</value>
   </data>
   <data name="DisableSavePrompt" xml:space="preserve">
-    <value>Disable Save Prompt</value>
+    <value>Vô hiệu hóa Thông báo Thêm Mục</value>
   </data>
   <data name="DisableSavePromptDescription" xml:space="preserve">
-    <value>The "Save Prompt" automatically prompts you to save new items to your vault whenever you enter them for the first time.</value>
+    <value>"Thông Báo Thêm Mục" sẽ nhắc bạn thêm mục mới vào kho mỗi khi bạn nhập lần đầu tiên.</value>
   </data>
   <data name="OnRestart" xml:space="preserve">
-    <value>On App Restart</value>
+    <value>Khi khởi động lại ứng dụng</value>
   </data>
   <data name="AutofillServiceNotEnabled" xml:space="preserve">
-    <value>Auto-fill makes it easy to securely access your Bitwarden vault from other websites and apps. It looks like you have not enabled an auto-fill service for Bitwarden. Enable auto-fill for Bitwarden from the "Settings" screen.</value>
+    <value>Tự động điền giúp dễ dàng an toàn truy cập kho Bitwarden của bạn từ các trang web khác và các ứng dụng. Có vẻ như không mở chức năng tự động điền cho Bitwarden. Mở chức năng tự động điền cho Bitwarden ở màn hình "Cài đặt".</value>
   </data>
   <data name="ThemeAppliedOnRestart" xml:space="preserve">
-    <value>Your theme changes will apply when the app is restarted.</value>
+    <value>Thay đổi về giao diện của bạn sẽ được áp dụng khi ứng dụng khởi động lại.</value>
   </data>
   <data name="Capitalize" xml:space="preserve">
-    <value>Capitalize</value>
+    <value>Viết hoa</value>
     <comment>ex. Uppercase the first character of a word.</comment>
   </data>
   <data name="IncludeNumber" xml:space="preserve">
-    <value>Include Number</value>
+    <value>Bao gồm cả số</value>
   </data>
   <data name="Download" xml:space="preserve">
-    <value>Download</value>
+    <value>Tải xuống</value>
   </data>
   <data name="Shared" xml:space="preserve">
-    <value>Shared</value>
+    <value>Đã chia sẻ</value>
   </data>
   <data name="ToggleVisibility" xml:space="preserve">
     <value>Toggle Visiblity</value>
   </data>
   <data name="LoginExpired" xml:space="preserve">
-    <value>Your login session has expired.</value>
+    <value>Phiên đăng nhập của bạn đã hết hạn.</value>
   </data>
   <data name="BiometricsDirection" xml:space="preserve">
-    <value>Use biometrics to verify.</value>
+    <value>Sử dụng phương thức sinh trắc học để xác nhận.</value>
   </data>
   <data name="Biometrics" xml:space="preserve">
-    <value>Biometrics</value>
+    <value>Phương thức sinh trắc học</value>
   </data>
   <data name="UseBiometricsToUnlock" xml:space="preserve">
-    <value>Use Biometrics To Unlock</value>
+    <value>Sử dụng phương thức sinh trắc học để mở khóa</value>
   </data>
   <data name="AccessibilityOverlayPermissionAlert" xml:space="preserve">
-    <value>Bitwarden needs attention - See "Auto-fill Accessibility Service" from Bitwarden Settings</value>
+    <value>Bitwarden cần sự chú ý - Kiểm tra "Tự động điền bằng trợ năng" trong Cài đặt của Bitwarden</value>
   </data>
   <data name="BitwardenAutofillServiceOverlayPermission" xml:space="preserve">
-    <value>3. On the Android App Settings screen for Bitwarden, go to the "Display over other apps" options (under Advanced) and tap the toggle to enable overlay support.</value>
+    <value>3. Ở màn hình Cài đặt Ứng dụng Android cho Bitwarden, chọn "Hiển thị lên trên các ứng dụng khác" (dưới mục "Nâng cao") và chạm vào tùy chọn bật/tắt để cho phép hiển thị đè.</value>
   </data>
   <data name="OverlayPermission" xml:space="preserve">
-    <value>Permission</value>
+    <value>Phân quyền</value>
   </data>
   <data name="BitwardenAutofillServiceOpenOverlayPermissionSettings" xml:space="preserve">
-    <value>Open Overlay Permission Settings</value>
+    <value>Mở màn hình cài đặt phân quyền</value>
   </data>
   <data name="BitwardenAutofillServiceStep3" xml:space="preserve">
-    <value>3. On the Android App Settings screen for Bitwarden, select "Display over other apps" (under "Advanced") and switch on the toggle to allow the overlay.</value>
+    <value>3. Ở màn hình Cài đặt Ứng dụng Android cho Bitwarden, chọn "Hiển thị lên trên các ứng dụng khác" (dưới mục "Nâng cao") và gạt tùy chọn bật/tắt để cho phép hiển thị đè.</value>
   </data>
   <data name="Denied" xml:space="preserve">
-    <value>Denied</value>
+    <value>Đã từ chối</value>
   </data>
   <data name="Granted" xml:space="preserve">
-    <value>Granted</value>
+    <value>Đã chấp thuận</value>
   </data>
   <data name="FileFormat" xml:space="preserve">
-    <value>File Format</value>
+    <value>Định dạng tập tin</value>
   </data>
   <data name="ExportVaultMasterPasswordDescription" xml:space="preserve">
-    <value>Enter your master password to export your vault data.</value>
+    <value>Nhập mật khẩu chính để trích xuất kho của bạn.</value>
   </data>
   <data name="ExportVaultWarning" xml:space="preserve">
-    <value>This export contains your vault data in an unencrypted format. You should not store or send the exported file over unsecure channels (such as email). Delete it immediately after you are done using it.</value>
+    <value>Bản trích xuất này chứ dữ liệu kho của bạn dưới một định dạng không được mã hóa. Bạn không nên lưu trữ hay gửi tập tin trích xuất thông qua phương thức không an toàn (như email). Xóa nó ngay lập tức khi bạn đã sử dụng xong.</value>
   </data>
   <data name="Warning" xml:space="preserve">
-    <value>Warning</value>
+    <value>Cảnh báo</value>
   </data>
   <data name="ExportVaultFailure" xml:space="preserve">
-    <value>There was a problem exporting your vault.  If the problem persists, you'll need to export from the web vault.</value>
+    <value>Có vấn đề trong việc trích xuất kho của bạn. Nếu vấn đề vẫn tiếp tục, bạn sẽ phải trích xuất từ kho nền web.</value>
   </data>
   <data name="ExportVaultSuccess" xml:space="preserve">
-    <value>Vault exported successfully</value>
+    <value>Trích xuất kho thành công</value>
   </data>
   <data name="Clone" xml:space="preserve">
-    <value>Clone</value>
+    <value>Tạo bản sao</value>
     <comment>Clone an entity (verb).</comment>
   </data>
   <data name="PasswordGeneratorPolicyInEffect" xml:space="preserve">
-    <value>One or more organization policies are affecting your generator settings</value>
+    <value>Có một hoặc vài chính sách của tổ chức đang làm ảnh hưởng đến cài đặt tạo mật khẩu của bạn</value>
   </data>
   <data name="Open" xml:space="preserve">
-    <value>Open</value>
+    <value>Mở</value>
     <comment>Button text for an open operation (verb).</comment>
   </data>
   <data name="UnableToSaveAttachment" xml:space="preserve">
-    <value>There was a problem saving this attachment. If the problem persists, you can save it from the web vault.</value>
+    <value>Có vấn đề khi lưu tập đính kèm này. If vấn đề này vẫn tiếp tục, bạn có thể lưu nó từ kho nền web.</value>
   </data>
   <data name="SaveAttachmentSuccess" xml:space="preserve">
-    <value>Attachment saved successfully</value>
+    <value>Tập tin đính kèm được lưu thành công</value>
   </data>
   <data name="AutofillTileAccessibilityRequired" xml:space="preserve">
-    <value>Please enable "Auto-fill Accessibility Service" from Bitwarden Settings to use the Auto-fill tile.</value>
+    <value>Hãy mở "Tự động điền bằng trợ năng" từ Cài đặt của Bitwarden để sử dụng chức năng tự động điền.</value>
   </data>
   <data name="AutofillTileUriNotFound" xml:space="preserve">
-    <value>No password fields detected</value>
+    <value>Không tìm thấy trường mật khẩu nào</value>
   </data>
   <data name="SoftDeleting" xml:space="preserve">
-    <value>Sending to trash...</value>
+    <value>Đang gửi vào thùng rác...</value>
     <comment>Message shown when interacting with the server</comment>
   </data>
   <data name="ItemSoftDeleted" xml:space="preserve">
-    <value>Item has been sent to trash.</value>
+    <value>Mục đã được đưa vào thùng rác.</value>
     <comment>Confirmation message after successfully soft-deleting a login</comment>
   </data>
   <data name="Restore" xml:space="preserve">
-    <value>Restore</value>
+    <value>Khôi phục</value>
     <comment>Restores an entity (verb).</comment>
   </data>
   <data name="Restoring" xml:space="preserve">
-    <value>Restoring...</value>
+    <value>Đang khôi phục...</value>
     <comment>Message shown when interacting with the server</comment>
   </data>
   <data name="ItemRestored" xml:space="preserve">
-    <value>Item has been restored.</value>
+    <value>Mục đã được khôi phục.</value>
     <comment>Confirmation message after successfully restoring a soft-deleted item</comment>
   </data>
   <data name="Trash" xml:space="preserve">
-    <value>Trash</value>
+    <value>Thùng rác</value>
     <comment>(noun) Location of deleted items which have not yet been permanently deleted</comment>
   </data>
   <data name="SearchTrash" xml:space="preserve">
-    <value>Search trash</value>
+    <value>Tìm kiếm thùng rác</value>
     <comment>(action prompt) Label for the search text field when viewing the trash folder</comment>
   </data>
   <data name="DoYouReallyWantToPermanentlyDeleteCipher" xml:space="preserve">
-    <value>Do you really want to permanently delete? This cannot be undone.</value>
+    <value>Bạn có chắc chắn muốn xóa hoàn toàn nó không? Thao tác này không thể được khôi phục.</value>
     <comment>Confirmation alert message when permanently deleteing a cipher.</comment>
   </data>
   <data name="DoYouReallyWantToRestoreCipher" xml:space="preserve">
-    <value>Do you really want to restore this item?</value>
+    <value>Bạn có thực sự muốn khôi phục mục này?</value>
     <comment>Confirmation alert message when restoring a soft-deleted cipher.</comment>
   </data>
   <data name="DoYouReallyWantToSoftDeleteCipher" xml:space="preserve">
-    <value>Do you really want to send to the trash?</value>
+    <value>Bạn có thực sự muốn đưa vào thùng rác?</value>
     <comment>Confirmation alert message when soft-deleting a cipher.</comment>
   </data>
 </root>

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

@@ -519,28 +519,28 @@
     <value>鎖定</value>
   </data>
   <data name="FifteenMinutes" xml:space="preserve">
-    <value>15 minutes</value>
+    <value>15 分鐘</value>
   </data>
   <data name="OneHour" xml:space="preserve">
-    <value>1 hour</value>
+    <value>1 小時</value>
   </data>
   <data name="OneMinute" xml:space="preserve">
     <value>1 分鐘</value>
   </data>
   <data name="FourHours" xml:space="preserve">
-    <value>4 hours</value>
+    <value>4 小時</value>
   </data>
   <data name="Immediately" xml:space="preserve">
-    <value>Immediately</value>
+    <value>即時</value>
   </data>
   <data name="VaultTimeout" xml:space="preserve">
-    <value>Vault Timeout</value>
+    <value>密碼庫超時</value>
   </data>
   <data name="VaultTimeoutAction" xml:space="preserve">
-    <value>Vault Timeout Action</value>
+    <value>密碼庫超時動作</value>
   </data>
   <data name="VaultTimeoutLogOutConfirmation" xml:space="preserve">
-    <value>Logging out will remove all access to your vault and requires online authentication after the timeout period. Are you sure you want to use this setting?</value>
+    <value>選擇登出將會在密碼庫超時後移除所有密碼庫存取權，重新認證時需要連接網路。決定選擇登出嗎？</value>
   </data>
   <data name="LoggingIn" xml:space="preserve">
     <value>正在登入...</value>
@@ -1440,7 +1440,7 @@
     <value>解鎖</value>
   </data>
   <data name="ThirtyMinutes" xml:space="preserve">
-    <value>30 minutes</value>
+    <value>30 分鐘</value>
   </data>
   <data name="SetPINDescription" xml:space="preserve">
     <value>設定您用來解鎖 Bitwarden 的 PIN 碼。您的 PIN 設定將在您完全結束本應用程式時被重設。</value>
@@ -1536,7 +1536,7 @@
     <value>當您首次輸入時，「儲存提示」會自動提示您將新項目儲存進密碼庫。</value>
   </data>
   <data name="OnRestart" xml:space="preserve">
-    <value>On App Restart</value>
+    <value>於程式重新啟動時</value>
   </data>
   <data name="AutofillServiceNotEnabled" xml:space="preserve">
     <value>「自動填入」使其他網站及 App 能更簡單地安全存取您的 Bitwarden 密碼庫。看起來您尚未啟用 Bitwarden 的自動填入服務。請在「設定」畫面啟用 Bitwarden 的自動填入。</value>

src/App/Services/MobilePlatformUtilsService.cs

@@ -199,43 +199,47 @@ namespace Bit.App.Services
 
         public async Task<bool> SupportsBiometricAsync()
         {
-            return await _deviceActionService.BiometricAvailableAsync();
+            try
+            {
+                return await CrossFingerprint.Current.IsAvailableAsync();
+            }
+            catch
+            {
+                return false;
+            }
         }
 
         public async Task<bool> AuthenticateBiometricAsync(string text = null, string fallbackText = null,
             Action fallback = null)
         {
-            if (_deviceActionService.UseNativeBiometric())
+            try
             {
-                return await _deviceActionService.AuthenticateBiometricAsync(text);
-            }
-            else
-            {
-                try
+                if (text == null)
                 {
-                    if (text == null)
+                    text = AppResources.BiometricsDirection;
+                    if (Device.RuntimePlatform == Device.iOS)
                     {
                         var supportsFace = await _deviceActionService.SupportsFaceBiometricAsync();
                         text = supportsFace ? AppResources.FaceIDDirection : AppResources.FingerprintDirection;
                     }
-                    var fingerprintRequest = new AuthenticationRequestConfiguration(text, text)
-                    {
-                        CancelTitle = AppResources.Cancel,
-                        FallbackTitle = fallbackText
-                    };
-                    var result = await CrossFingerprint.Current.AuthenticateAsync(fingerprintRequest);
-                    if (result.Authenticated)
-                    {
-                        return true;
-                    }
-                    else if (result.Status == FingerprintAuthenticationResultStatus.FallbackRequested)
-                    {
-                        fallback?.Invoke();
-                    }
                 }
-                catch { }
-                return false;
+                var biometricRequest = new AuthenticationRequestConfiguration(AppResources.Bitwarden, text)
+                {
+                    CancelTitle = AppResources.Cancel,
+                    FallbackTitle = fallbackText
+                };
+                var result = await CrossFingerprint.Current.AuthenticateAsync(biometricRequest);
+                if (result.Authenticated)
+                {
+                    return true;
+                }
+                if (result.Status == FingerprintAuthenticationResultStatus.FallbackRequested)
+                {
+                    fallback?.Invoke();
+                }
             }
+            catch { }
+            return false;
         }
     }
 }

src/App/Utilities/AppHelpers.cs

@@ -30,7 +30,7 @@ namespace Bit.App.Utilities
                 {
                     options.Add(AppResources.CopyUsername);
                 }
-                if (!string.IsNullOrWhiteSpace(cipher.Login.Password))
+                if (!string.IsNullOrWhiteSpace(cipher.Login.Password) && cipher.ViewPassword)
                 {
                     options.Add(AppResources.CopyPassword);
                 }

src/Core/Abstractions/IVaultTimeoutService.cs

@@ -7,13 +7,13 @@ namespace Bit.Core.Abstractions
     public interface IVaultTimeoutService
     {
         CipherString PinProtectedKey { get; set; }
-        bool FingerprintLocked { get; set; }
+        bool BiometricLocked { get; set; }
 
         Task CheckVaultTimeoutAsync();
         Task ClearAsync();
         Task<bool> IsLockedAsync();
         Task<Tuple<bool, bool>> IsPinLockSetAsync();
-        Task<bool> IsFingerprintLockSetAsync();
+        Task<bool> IsBiometricLockSetAsync();
         Task LockAsync(bool allowSoftLock = false, bool userInitiated = false);
         Task LogOutAsync();
         Task SetVaultTimeoutOptionsAsync(int? timeout, string action);

src/Core/Constants.cs

@@ -7,7 +7,7 @@
         public static string VaultTimeoutKey = "lockOption";
         public static string VaultTimeoutActionKey = "vaultTimeoutAction";
         public static string LastActiveKey = "lastActive";
-        public static string FingerprintUnlockKey = "fingerprintUnlock";
+        public static string BiometricUnlockKey = "fingerprintUnlock";
         public static string ProtectedPin = "protectedPin";
         public static string PinProtectedKey = "pinProtectedKey";
         public static string DefaultUriMatch = "defaultUriMatch";

src/Core/Models/Data/CipherData.cs

@@ -16,6 +16,7 @@ namespace Bit.Core.Models.Data
             FolderId = response.FolderId;
             UserId = userId;
             Edit = response.Edit;
+            ViewPassword = response.ViewPassword;
             OrganizationUseTotp = response.OrganizationUseTotp;
             Favorite = response.Favorite;
             RevisionDate = response.RevisionDate;
@@ -53,6 +54,7 @@ namespace Bit.Core.Models.Data
         public string FolderId { get; set; }
         public string UserId { get; set; }
         public bool Edit { get; set; }
+        public bool ViewPassword { get; set; } = true; // Fallback for old server versions
         public bool OrganizationUseTotp { get; set; }
         public bool Favorite { get; set; }
         public DateTime RevisionDate { get; set; }

src/Core/Models/Domain/Cipher.cs

@@ -26,6 +26,7 @@ namespace Bit.Core.Models.Domain
             Favorite = obj.Favorite;
             OrganizationUseTotp = obj.OrganizationUseTotp;
             Edit = obj.Edit;
+            ViewPassword = obj.ViewPassword;
             RevisionDate = obj.RevisionDate;
             CollectionIds = obj.CollectionIds != null ? new HashSet<string>(obj.CollectionIds) : null;
             LocalData = localData;
@@ -63,6 +64,7 @@ namespace Bit.Core.Models.Domain
         public bool Favorite { get; set; }
         public bool OrganizationUseTotp { get; set; }
         public bool Edit { get; set; }
+        public bool ViewPassword { get; set; }
         public DateTime RevisionDate { get; set; }
         public Dictionary<string, object> LocalData { get; set; }
         public Login Login { get; set; }

src/Core/Models/Response/CipherResponse.cs

@@ -19,6 +19,7 @@ namespace Bit.Core.Models.Response
         public SecureNoteApi SecureNote { get; set; }
         public bool Favorite { get; set; }
         public bool Edit { get; set; }
+        public bool ViewPassword { get; set; } = true; // Fallback for old server versions
         public bool OrganizationUseTotp { get; set; }
         public DateTime RevisionDate { get; set; }
         public List<AttachmentResponse> Attachments { get; set; }

src/Core/Models/View/CipherView.cs

@@ -18,6 +18,7 @@ namespace Bit.Core.Models.View
             Favorite = c.Favorite;
             OrganizationUseTotp = c.OrganizationUseTotp;
             Edit = c.Edit;
+            ViewPassword = c.ViewPassword;
             Type = c.Type;
             LocalData = c.LocalData;
             CollectionIds = c.CollectionIds;
@@ -34,6 +35,7 @@ namespace Bit.Core.Models.View
         public bool Favorite { get; set; }
         public bool OrganizationUseTotp { get; set; }
         public bool Edit { get; set; }
+        public bool ViewPassword { get; set; } = true;
         public Dictionary<string, object> LocalData { get; set; }
         public LoginView Login { get; set; }
         public IdentityView Identity { get; set; }

src/Core/Models/View/FieldView.cs

@@ -16,5 +16,6 @@ namespace Bit.Core.Models.View
         public string Value { get; set; }
         public FieldType Type { get; set; }
         public string MaskedValue => Value != null ? "••••••••" : null;
+        public bool NewField { get; set; }
     }
 }

src/Core/Models/View/LoginUriView.cs

@@ -67,6 +67,10 @@ namespace Bit.Core.Models.View
         {
             get
             {
+                if (Match == UriMatchType.RegularExpression)
+                {
+                    return null;
+                }
                 if (_hostname == null && Uri != null)
                 {
                     _hostname = CoreHelpers.GetHostname(Uri);