Merge remote-tracking branch 'origin/master' into CLOUDOPS-202_Google-Account-Migration

.github/ISSUE_TEMPLATE/config.yml

@@ -1,6 +1,6 @@
 blank_issues_enabled: false
 contact_links:
-  - name: Report mobile AUTOFILL failure
+  - name: Report mobile autofill failure
     url: https://docs.google.com/forms/d/e/1FAIpQLScMopHyN7KGJs8hW562VTzbIGL4KcFnx0wJcsW0GYE1BnPiGA/viewform
     about: We are aware of some situations where the Bitwarden mobile app will not autofill information correctly. This is something the Bitwarden team is actively working on but need your help as a community and active Bitwarden users!
   - name: Feature Requests

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

@@ -14,10 +14,6 @@
         <string>Dist: Extension 2021</string>
         <key>com.8bit.bitwarden.share-extension</key>
         <string>Dist: Share Extension 2021</string>
-        <key>com.8bit.bitwarden.watchkitapp</key>
-        <string>Dist: Bitwarden Watch App</string>
-        <key>com.8bit.bitwarden.watchkitapp.watchkitextension</key>
-        <string>Dist: Bitwarden Watch App Extension</string>
     </dict>
 </dict>
 </plist>

.github/workflows/build.yml

@@ -4,13 +4,16 @@ name: Build
 on:
   push:
     branches-ignore:
-      - "l10n_master"
-      - "gh-pages"
+      - 'l10n_master'
+      - 'gh-pages'
     paths-ignore:
-      - ".github/workflows/**"
+      - '.github/workflows/**'
   workflow_dispatch:
     inputs: {}
 
+  env:
+    BASE_PKG_NAME: com.x8bit.bitwarden
+
 jobs:
   cloc:
     name: CLOC
@@ -42,15 +45,15 @@ jobs:
         id: branch-check
         run: |
           if [[ $(git ls-remote --heads origin rc) ]]; then
-            echo "rc_branch_exists=1" >> $GITHUB_OUTPUT
+            echo "::set-output name=rc_branch_exists::1"
           else
-            echo "rc_branch_exists=0" >> $GITHUB_OUTPUT
+            echo "::set-output name=rc_branch_exists::0"
           fi
 
           if [[ $(git ls-remote --heads origin hotfix-rc) ]]; then
-            echo "hotfix_branch_exists=1" >> $GITHUB_OUTPUT
+            echo "::set-output name=hotfix_branch_exists::1"
           else
-            echo "hotfix_branch_exists=0" >> $GITHUB_OUTPUT
+            echo "::set-output name=hotfix_branch_exists::0"
           fi
         shell: bash
 
@@ -62,16 +65,16 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        variant: ["prod", "qa"]
+        variant: ['prod', 'qa']
     steps:
       - name: Setup NuGet
-        uses: nuget/setup-nuget@b2bc17b761a1d88cab755a776c7922eb26eefbfa # v1.0.6
+        uses: nuget/setup-nuget@b2bc17b761a1d88cab755a776c7922eb26eefbfa  # v1.0.6
         with:
           nuget-version: 5.9.0
 
       - name: Set up MSBuild
         uses: microsoft/setup-msbuild@ab534842b4bdf384b8aaf93765dc6f721d9f5fab
-
+          
       - name: Work Around for broken Windows 2022 Runner Image
         run: |
           Set-Location "C:\Program Files (x86)\Microsoft Visual Studio\Installer\"
@@ -148,17 +151,7 @@ jobs:
         shell: pwsh
 
       - name: Run Core tests
-        run: dotnet test test/Core.Test/Core.Test.csproj --logger "trx;LogFileName=test-results.trx" || true
-        shell: pwsh
-
-      - name: Report test results
-        uses: dorny/test-reporter@c9b3d0e2bd2a4e96aaf424dbaa31c46b42318226
-        if: always()
-        with:
-          name: Test Results
-          path: "**/test-results.trx"
-          reporter: dotnet-trx
-          fail-on-error: true
+        run: dotnet test test/Core.Test/Core.Test.csproj
 
       - name: Build Play Store publisher
         if: ${{ matrix.variant == 'prod' }}
@@ -184,11 +177,11 @@ jobs:
           UPLOAD_KEYSTORE_PASSWORD: ${{ secrets.UPLOAD_KEYSTORE_PASSWORD }}
         run: |
           $androidPath = $($env:GITHUB_WORKSPACE + "/src/Android/Android.csproj");
-          $packageName = "com.x8bit.bitwarden";
-
+          $packageName = "";
+          
           if ("${{ matrix.variant }}" -ne "prod") 
           {
-            $packageName = "com.x8bit.bitwarden.${{ matrix.variant }}";
+            $packageName = "${{ env.BASE_PKG_NAME }}.${{ matrix.variant }}";
           }
           Write-Output "########################################"
           Write-Output "##### Sign Google Play Bundle Release Configuration"
@@ -229,24 +222,24 @@ jobs:
         if: ${{ matrix.variant == 'prod' }}
         uses: actions/upload-artifact@6673cd052c4cd6fcf4b4e6e60ea986c889389535
         with:
-          name: com.x8bit.bitwarden.aab
-          path: ./com.x8bit.bitwarden.aab
+          name: ${{ env.BASE_PKG_NAME }}.aab
+          path: ./${{ env.BASE_PKG_NAME }}.aab
           if-no-files-found: error
 
       - name: Upload Prod .apk artifact
         if: ${{ matrix.variant == 'prod' }}
         uses: actions/upload-artifact@6673cd052c4cd6fcf4b4e6e60ea986c889389535
         with:
-          name: com.x8bit.bitwarden.apk
-          path: ./com.x8bit.bitwarden.apk
+          name: ${{ env.BASE_PKG_NAME }}.apk
+          path: ./${{ env.BASE_PKG_NAME }}.apk
           if-no-files-found: error
 
       - name: Upload Other .apk artifact
         if: ${{ matrix.variant != 'prod' }}
         uses: actions/upload-artifact@6673cd052c4cd6fcf4b4e6e60ea986c889389535
         with:
-          name: com.x8bit.bitwarden.${{ matrix.variant }}.apk
-          path: ./com.x8bit.bitwarden.${{ matrix.variant }}.apk
+          name: ${{ env.BASE_PKG_NAME }}.${{ matrix.variant }}.apk
+          path: ./${{ env.BASE_PKG_NAME }}.${{ matrix.variant }}.apk
           if-no-files-found: error
 
       - name: Deploy to Play Store
@@ -258,10 +251,10 @@ jobs:
         run: |
           PUBLISHER_PATH="$GITHUB_WORKSPACE/store/google/Publisher/bin/Release/netcoreapp3.1/Publisher.dll"
           CREDS_PATH="$HOME/secrets/play_creds.json"
-          AAB_PATH="$GITHUB_WORKSPACE/com.x8bit.bitwarden.aab"
+          AAB_PATH="$GITHUB_WORKSPACE/${{env:BASE_PKG_NAME}}.aab"
           TRACK="internal"
 
-          dotnet $PUBLISHER_PATH $CREDS_PATH $AAB_PATH $TRACK
+          dotnet $PUBLISHER_PATH $CREDS_PATH $AAB_PATH $TRACK ${{env:BASE_PKG_NAME}}
         shell: bash
 
 
@@ -270,7 +263,7 @@ jobs:
     runs-on: windows-2022
     steps:
       - name: Setup NuGet
-        uses: nuget/setup-nuget@b2bc17b761a1d88cab755a776c7922eb26eefbfa # v1.0.6
+        uses: nuget/setup-nuget@b2bc17b761a1d88cab755a776c7922eb26eefbfa  # v1.0.6
         with:
           nuget-version: 5.9.0
 
@@ -434,8 +427,8 @@ jobs:
           Write-Output "##### Copy FDroid apk to project root"
           Write-Output "########################################"
 
-          $signedApkPath = $($env:GITHUB_WORKSPACE + "/src/Android/bin/FDroid/com.x8bit.bitwarden-Signed.apk");
-          $signedApkDestPath = $($env:GITHUB_WORKSPACE + "/com.x8bit.bitwarden-fdroid.apk");
+          $signedApkPath = $($env:GITHUB_WORKSPACE + "/src/Android/bin/FDroid/$env:BASE_PKG_NAME-Signed.apk");
+          $signedApkDestPath = $($env:GITHUB_WORKSPACE + "/$env:BASE_PKG_NAME-fdroid.apk");
 
           Copy-Item $signedApkPath $signedApkDestPath
         shell: pwsh
@@ -443,18 +436,18 @@ jobs:
       - name: Upload F-Droid .apk artifact
         uses: actions/upload-artifact@6673cd052c4cd6fcf4b4e6e60ea986c889389535
         with:
-          name: com.x8bit.bitwarden-fdroid.apk
-          path: ./com.x8bit.bitwarden-fdroid.apk
+          name: ${{ env.BASE_PKG_NAME }}.apk
+          path: ./${{ env.BASE_PKG_NAME }}.apk
           if-no-files-found: error
 
 
   ios:
     name: Apple iOS
-    runs-on: macos-12
+    runs-on: macos-11
     needs: setup
     steps:
       - name: Setup NuGet
-        uses: nuget/setup-nuget@b2bc17b761a1d88cab755a776c7922eb26eefbfa # v1.0.6
+        uses: nuget/setup-nuget@b2bc17b761a1d88cab755a776c7922eb26eefbfa  # v1.0.6
         with:
           nuget-version: 5.9.0
 
@@ -485,7 +478,7 @@ jobs:
           do
             VALUE=$(az keyvault secret show --vault-name $KEYVAULT --name $i --query value --output tsv)
             echo "::add-mask::$VALUE"
-            echo "$i=$VALUE" >> $GITHUB_OUTPUT
+            echo "::set-output name=$i::$VALUE"
           done
 
       - name: Decrypt secrets
@@ -507,14 +500,6 @@ jobs:
           gpg --quiet --batch --yes --decrypt --passphrase="$DECRYPT_FILE_PASSWORD" \
             --output $HOME/secrets/dist_share_extension.mobileprovision \
             ./.github/secrets/dist_share_extension.mobileprovision.gpg
-          gpg --quiet --batch --yes --decrypt --passphrase="$DECRYPT_FILE_PASSWORD" \
-            --output $HOME/secrets/dist_watch_app.mobileprovision \
-            ./.github/secrets/dist_watch_app.mobileprovision.gpg
-          gpg --quiet --batch --yes --decrypt --passphrase="$DECRYPT_FILE_PASSWORD" \
-            --output $HOME/secrets/dist_watch_app_extension.mobileprovision \
-            ./.github/secrets/dist_watch_app_extension.mobileprovision.gpg
-          gpg --quiet --batch --yes --decrypt --passphrase="$DECRYPT_FILE_PASSWORD" \
-            --output ./src/watchOS/bitwarden/GoogleService-Info.plist ./.github/secrets/GoogleService-Info.plist.gpg
         shell: bash
 
       - name: Increment version
@@ -529,9 +514,6 @@ jobs:
           perl -0777 -pi.bak -e 's/<key>CFBundleVersion<\/key>\s*<string>1<\/string>/<key>CFBundleVersion<\/key>\n\t<string>'"$BUILD_NUMBER"'<\/string>/' ./src/iOS.Extension/Info.plist
           perl -0777 -pi.bak -e 's/<key>CFBundleVersion<\/key>\s*<string>1<\/string>/<key>CFBundleVersion<\/key>\n\t<string>'"$BUILD_NUMBER"'<\/string>/' ./src/iOS.Autofill/Info.plist
           perl -0777 -pi.bak -e 's/<key>CFBundleVersion<\/key>\s*<string>1<\/string>/<key>CFBundleVersion<\/key>\n\t<string>'"$BUILD_NUMBER"'<\/string>/' ./src/iOS.ShareExtension/Info.plist
-          cd src/watchOS/bitwarden
-          agvtool new-version -all  $BUILD_NUMBER
-          cd ../../..
         shell: bash
 
       - name: Update Entitlements
@@ -566,8 +548,6 @@ jobs:
           BITWARDEN_PROFILE_PATH=$HOME/secrets/dist_bitwarden.mobileprovision
           EXTENSION_PROFILE_PATH=$HOME/secrets/dist_extension.mobileprovision
           SHARE_EXTENSION_PROFILE_PATH=$HOME/secrets/dist_share_extension.mobileprovision
-          WATCH_APP_PROFILE_PATH=$HOME/secrets/dist_watch_app.mobileprovision
-          WATCH_APP_EXTENSION_PROFILE_PATH=$HOME/secrets/dist_watch_app_extension.mobileprovision
           PROFILES_DIR_PATH=$HOME/Library/MobileDevice/Provisioning\ Profiles
 
           mkdir -p "$PROFILES_DIR_PATH"
@@ -583,25 +563,6 @@ jobs:
 
           SHARE_EXTENSION_UUID=$(grep UUID -A1 -a $SHARE_EXTENSION_PROFILE_PATH | grep -io "[-A-F0-9]\{36\}")
           cp $SHARE_EXTENSION_PROFILE_PATH "$PROFILES_DIR_PATH/$SHARE_EXTENSION_UUID.mobileprovision"
-
-          WATCH_APP_UUID=$(grep UUID -A1 -a $WATCH_APP_PROFILE_PATH | grep -io "[-A-F0-9]\{36\}")
-          cp $WATCH_APP_PROFILE_PATH "$PROFILES_DIR_PATH/$WATCH_APP_UUID.mobileprovision"
-
-          WATCH_APP_EXTENSION_UUID=$(grep UUID -A1 -a $WATCH_APP_EXTENSION_PROFILE_PATH | grep -io "[-A-F0-9]\{36\}")
-          cp $WATCH_APP_EXTENSION_PROFILE_PATH "$PROFILES_DIR_PATH/$WATCH_APP_EXTENSION_UUID.mobileprovision"
-        shell: bash
-
-      - name: Bulid WatchApp
-        run: |
-          echo "########################################"
-          echo "##### Build WatchApp with Release Configuration"
-          echo "########################################"
-
-          xcodebuild archive -workspace ./src/watchOS/bitwarden/bitwarden.xcodeproj/project.xcworkspace -configuration Release -scheme bitwarden\ WatchKit\ App -archivePath ./src/watchOS/bitwarden
-
-          echo "########################################"
-          echo "##### Done"
-          echo "########################################"
         shell: bash
 
       - name: Restore packages
@@ -639,12 +600,7 @@ jobs:
           ARCHIVE_DSYMS_PATH="$HOME/Library/Developer/Xcode/Archives/*/*.xcarchive/dSYMs"
           EXPORT_PATH="./bitwarden-export"
 
-          WATCH_ARCHIVE_DSYMS_PATH="./src/watchOS/bitwarden.xcarchive/dSYMs/"
-          WATCH_DSYMS_EXPORT_PATH="$EXPORT_PATH/Watch_dSYMs"
-
-          cp -r -v $ARCHIVE_DSYMS_PATH $EXPORT_PATH
-          mkdir $WATCH_DSYMS_EXPORT_PATH
-          cp -r -v $WATCH_ARCHIVE_DSYMS_PATH $WATCH_DSYMS_EXPORT_PATH
+          cp -r $ARCHIVE_DSYMS_PATH $EXPORT_PATH
         shell: bash
 
       - name: Upload App Store .ipa & dSYMs artifacts
@@ -667,39 +623,23 @@ jobs:
 
       - name: Upload dSYMs to App Center
         if: |
-          (github.ref == 'refs/heads/master'
-            && needs.setup.outputs.rc_branch_exists == 0
-            && needs.setup.outputs.hotfix_branch_exists == 0)
-          || (github.ref == 'refs/heads/rc' && needs.setup.outputs.hotfix_branch_exists == 0)
-          || github.ref == 'refs/heads/hotfix-rc'
+            (github.ref == 'refs/heads/master'
+              && needs.setup.outputs.rc_branch_exists == 0
+              && needs.setup.outputs.hotfix_branch_exists == 0)
+            || (github.ref == 'refs/heads/rc' && needs.setup.outputs.hotfix_branch_exists == 0)
+            || github.ref == 'refs/heads/hotfix-rc'
         env:
           APPCENTER_IOS_TOKEN: ${{ steps.retrieve-secrets.outputs.appcenter-ios-token }}
         run: appcenter crashes upload-symbols -a bitwarden/bitwarden -s "./bitwarden-export/dSYMs" --token $APPCENTER_IOS_TOKEN
         shell: bash
 
-      - name: Upload Watch dSYMs to Firebase Crashlytics
-        if: |
-          (github.ref == 'refs/heads/master'
-            && needs.setup.outputs.rc_branch_exists == 0
-            && needs.setup.outputs.hotfix_branch_exists == 0)
-          || (github.ref == 'refs/heads/rc' && needs.setup.outputs.hotfix_branch_exists == 0)
-          || github.ref == 'refs/heads/hotfix-rc'
-        run: |
-
-          echo "########################################"
-          echo "##### Uploading Watch dSYMs to Firebase"
-          echo "########################################"
-
-          find "$HOME/Library/Developer/XCode/DerivedData" -name "upload-symbols" -exec chmod +x {} \; -exec {} -gsp "./src/watchOS/bitwarden/GoogleService-Info.plist" -p ios "./bitwarden-export/Watch_dSYMs" \;
-        shell: bash
-
       - name: Deploy to App Store
         if: |
-          (github.ref == 'refs/heads/master'
-            && needs.setup.outputs.rc_branch_exists == 0
-            && needs.setup.outputs.hotfix_branch_exists == 0)
-          || (github.ref == 'refs/heads/rc' && needs.setup.outputs.hotfix_branch_exists == 0)
-          || github.ref == 'refs/heads/hotfix-rc'
+            (github.ref == 'refs/heads/master'
+              && needs.setup.outputs.rc_branch_exists == 0
+              && needs.setup.outputs.hotfix_branch_exists == 0)
+            || (github.ref == 'refs/heads/rc' && needs.setup.outputs.hotfix_branch_exists == 0)
+            || github.ref == 'refs/heads/hotfix-rc'
         env:
           APPLE_ID_USERNAME: ${{ secrets.APPLE_ID_USERNAME }}
           APPLE_ID_PASSWORD: ${{ secrets.APPLE_ID_PASSWORD }}
@@ -739,7 +679,7 @@ jobs:
           do
             VALUE=$(az keyvault secret show --vault-name $KEYVAULT --name $i --query value --output tsv)
             echo "::add-mask::$VALUE"
-            echo "$i=$VALUE" >> $GITHUB_OUTPUT
+            echo "::set-output name=$i::$VALUE"
           done
 
       - name: Upload Sources
@@ -767,9 +707,9 @@ jobs:
     steps:
       - name: Check if any job failed
         if: |
-          (github.ref == 'refs/heads/master')
-          || (github.ref == 'refs/heads/rc')
-          || (github.ref == 'refs/heads/hotfix-rc')
+            (github.ref == 'refs/heads/master')
+            || (github.ref == 'refs/heads/rc')
+            || (github.ref == 'refs/heads/hotfix-rc')
         env:
           CLOC_STATUS: ${{ needs.cloc.result }}
           ANDROID_STATUS: ${{ needs.android.result }}
@@ -807,7 +747,7 @@ jobs:
           do
             VALUE=$(az keyvault secret show --vault-name $KEYVAULT --name $i --query value --output tsv)
             echo "::add-mask::$VALUE"
-            echo "$i=$VALUE" >> $GITHUB_OUTPUT
+            echo "::set-output name=$i::$VALUE"
           done
 
       - name: Notify Slack on failure

.github/workflows/enforce-labels.yml

@@ -12,5 +12,5 @@ jobs:
       - name: Enforce Label
         uses: yogevbd/enforce-label-action@8d1e1709b1011e6d90400a0e6cf7c0b77aa5efeb
         with:
-          BANNED_LABELS: "hold,needs-qa"
-          BANNED_LABELS_DESCRIPTION: "PRs with the hold or needs-qa labels cannot be merged"
+          BANNED_LABELS: "hold"
+          BANNED_LABELS_DESCRIPTION: "PRs on hold cannot be merged"

.github/workflows/release.yml

@@ -20,6 +20,9 @@ on:
         default: true
         type: boolean
 
+  env:
+    BASE_PKG_NAME: com.x8bit.bitwarden
+
 jobs:
   release:
     name: Create Release
@@ -52,7 +55,7 @@ jobs:
         id: branch
         run: |
           BRANCH_NAME=$(basename ${{ github.ref }})
-          echo "branch-name=$BRANCH_NAME" >> $GITHUB_OUTPUT
+          echo "::set-output name=branch-name::$BRANCH_NAME"
 
       - name: Create GitHub deployment
         if: ${{ github.event.inputs.release_type != 'Dry Run' }}
@@ -89,9 +92,9 @@ jobs:
         if: ${{ github.event.inputs.release_type != 'Dry Run' }}
         uses: ncipollo/release-action@40bb172bd05f266cf9ba4ff965cb61e9ee5f6d01  # v1.9.0
         with:
-          artifacts: "./com.x8bit.bitwarden.aab/com.x8bit.bitwarden.aab,
-                      ./com.x8bit.bitwarden.apk/com.x8bit.bitwarden.apk,
-                      ./com.x8bit.bitwarden-fdroid.apk/com.x8bit.bitwarden-fdroid.apk,
+          artifacts: "./${{ BASE_PKG_NAME }}.aab/${{ BASE_PKG_NAME }}.aab,
+                      ./${{ BASE_PKG_NAME }}.apk/${{ BASE_PKG_NAME }}.apk,
+                      ./${{ BASE_PKG_NAME }}-fdroid.apk/${{ BASE_PKG_NAME }}-fdroid.apk,
                       ./Bitwarden iOS.zip"
           commit: ${{ github.sha }}
           tag: v${{ steps.version.outputs.version }}
@@ -133,7 +136,7 @@ jobs:
           workflow: build.yml
           workflow_conclusion: success
           branch: ${{ needs.release.outputs.branch-name }}
-          name: com.x8bit.bitwarden-fdroid.apk
+          name: ${{ BASE_PKG_NAME }}-fdroid.apk
 
       - name: Dry Run - Download F-Droid .apk artifact
         if: ${{ github.event.inputs.release_type == 'Dry Run' }}
@@ -142,7 +145,7 @@ jobs:
           workflow: build.yml
           workflow_conclusion: success
           branch: master
-          name: com.x8bit.bitwarden-fdroid.apk
+          name: ${{ BASE_PKG_NAME }}-fdroid.apk
 
       - name: Set up Node
         uses: actions/setup-node@1f8c6b94b26d0feae1e387ca63ccbdc44d27b561  # v2.5.1
@@ -198,7 +201,7 @@ jobs:
           echo "keystorepass=\"$FDROID_STORE_KEYSTORE_PASSWORD\"" >>config.py
           echo "local_copy_dir=\"$TEMP_DIR\"" >>config.py
           mkdir -p repo
-          mv $GITHUB_WORKSPACE/com.x8bit.bitwarden-fdroid.apk ./repo/
+          mv $GITHUB_WORKSPACE/${{ BASE_PKG_NAME }}-fdroid.apk ./repo/
           fdroid update
           fdroid server update
           cd ..

.github/workflows/version-auto-bump.yml

@@ -21,15 +21,15 @@ jobs:
         env:
           RELEASE_TAG: ${{ github.ref }}
         run: |
-          CURR_MAJOR=$(echo $RELEASE_TAG | sed -r 's/refs\/tags\/v([0-9]{4}\.[0-9]{1,2})\.([0-9]{1,2})/\1/')
-          CURR_PATCH=$(echo $RELEASE_TAG | sed -r 's/refs\/tags\/v([0-9]{4}\.[0-9]{1,2})\.([0-9]{1,2})/\2/')
+          CURR_MAJOR=$(echo $RELEASE_TAG | sed -r 's/v([0-9]{4}\.[0-9]{1,2})\.([0-9]{1,2})/\1/')
+          CURR_PATCH=$(echo $RELEASE_TAG | sed -r 's/v([0-9]{4}\.[0-9]{1,2})\.([0-9]{1,2})/\2/')
           echo "Current Major: $CURR_MAJOR"
           echo "Current Patch: $CURR_PATCH"
 
           NEW_PATCH=$((CURR_PATCH+1))
           NEW_VER=$CURR_MAJOR.$NEW_PATCH
           echo "New Version: $NEW_VER"
-          echo "new-version=$NEW_VER" >> $GITHUB_OUTPUT
+          echo "::set-output name=new-version::$NEW_VER"
 
   trigger_version_bump:
     name: "Trigger version bump workflow"

.github/workflows/version-bump.yml

@@ -37,7 +37,8 @@ jobs:
           git_commit_gpgsign: true
 
       - name: Create Version Branch
-        run: git switch -c version_bump_${{ github.event.inputs.version_number }}
+        run: |
+          git switch -c version_bump_${{ github.event.inputs.version_number }}
 
       - name: Bump Version - Android XML
         uses: bitwarden/gh-actions/version-bump@03ad9a873c39cdc95dd8d77dbbda67f84db43945
@@ -78,15 +79,16 @@ jobs:
         id: version-changed
         run: |
           if [ -n "$(git status --porcelain)" ]; then
-            echo "changes_to_commit=TRUE" >> $GITHUB_OUTPUT
+            echo "::set-output name=changes_to_commit::TRUE"
           else
-            echo "changes_to_commit=FALSE" >> $GITHUB_OUTPUT
+            echo "::set-output name=changes_to_commit::FALSE"
             echo "No changes to commit!";
           fi
 
       - name: Commit files
         if: ${{ steps.version-changed.outputs.changes_to_commit == 'TRUE' }}
-        run: git commit -m "Bumped version to ${{ github.event.inputs.version_number }}" -a
+        run: |
+          git commit -m "Bumped version to ${{ github.event.inputs.version_number }}" -a
 
       - name: Push changes
         if: ${{ steps.version-changed.outputs.changes_to_commit == 'TRUE' }}

.gitignore

@@ -210,128 +210,3 @@ project.lock.json
 .DS_Store
 src/App/Css
 tools
-
-# Created by https://www.toptal.com/developers/gitignore/api/swift,objective-c
-# Edit at https://www.toptal.com/developers/gitignore?templates=swift,objective-c
-
-### Objective-C ###
-# Xcode
-#
-# gitignore contributors: remember to update Global/Xcode.gitignore, Objective-C.gitignore & Swift.gitignore
-
-## User settings
-xcuserdata/
-
-## compatibility with Xcode 8 and earlier (ignoring not required starting Xcode 9)
-*.xcscmblueprint
-*.xccheckout
-
-## compatibility with Xcode 3 and earlier (ignoring not required starting Xcode 4)
-build/
-DerivedData/
-*.moved-aside
-*.pbxuser
-!default.pbxuser
-*.mode1v3
-!default.mode1v3
-*.mode2v3
-!default.mode2v3
-*.perspectivev3
-!default.perspectivev3
-
-## Obj-C/Swift specific
-*.hmap
-
-## App packaging
-*.ipa
-*.dSYM.zip
-*.dSYM
-
-# CocoaPods
-# We recommend against adding the Pods directory to your .gitignore. However
-# you should judge for yourself, the pros and cons are mentioned at:
-# https://guides.cocoapods.org/using/using-cocoapods.html#should-i-check-the-pods-directory-into-source-control
-# Pods/
-# Add this line if you want to avoid checking in source code from the Xcode workspace
-# *.xcworkspace
-
-# Carthage
-# Add this line if you want to avoid checking in source code from Carthage dependencies.
-# Carthage/Checkouts
-
-Carthage/Build/
-
-# fastlane
-# It is recommended to not store the screenshots in the git repo.
-# Instead, use fastlane to re-generate the screenshots whenever they are needed.
-# For more information about the recommended setup visit:
-# https://docs.fastlane.tools/best-practices/source-control/#source-control
-
-fastlane/report.xml
-fastlane/Preview.html
-fastlane/screenshots/**/*.png
-fastlane/test_output
-
-# Code Injection
-# After new code Injection tools there's a generated folder /iOSInjectionProject
-# https://github.com/johnno1962/injectionforxcode
-
-iOSInjectionProject/
-
-### Objective-C Patch ###
-
-### Swift ###
-# Xcode
-# gitignore contributors: remember to update Global/Xcode.gitignore, Objective-C.gitignore & Swift.gitignore
-
-
-
-
-
-
-## Playgrounds
-timeline.xctimeline
-playground.xcworkspace
-
-# Swift Package Manager
-# Add this line if you want to avoid checking in source code from Swift Package Manager dependencies.
-# Packages/
-# Package.pins
-# Package.resolved
-# *.xcodeproj
-# Xcode automatically generates this directory with a .xcworkspacedata file and xcuserdata
-# hence it is not needed unless you have added a package configuration file to your project
-# .swiftpm
-
-.build/
-
-# CocoaPods
-# We recommend against adding the Pods directory to your .gitignore. However
-# you should judge for yourself, the pros and cons are mentioned at:
-# https://guides.cocoapods.org/using/using-cocoapods.html#should-i-check-the-pods-directory-into-source-control
-# Pods/
-# Add this line if you want to avoid checking in source code from the Xcode workspace
-# *.xcworkspace
-
-# Carthage
-# Add this line if you want to avoid checking in source code from Carthage dependencies.
-# Carthage/Checkouts
-
-
-# Accio dependency management
-Dependencies/
-.accio/
-
-# fastlane
-# It is recommended to not store the screenshots in the git repo.
-# Instead, use fastlane to re-generate the screenshots whenever they are needed.
-# For more information about the recommended setup visit:
-# https://docs.fastlane.tools/best-practices/source-control/#source-control
-
-
-# Code Injection
-# After new code Injection tools there's a generated folder /iOSInjectionProject
-# https://github.com/johnno1962/injectionforxcode
-
-
-# End of https://www.toptal.com/developers/gitignore/api/swift,objective-c

README.md

@@ -12,7 +12,7 @@ The Bitwarden mobile application is written in C# with Xamarin Android, Xamarin
 
 # Build/Run
 
-Please refer to the [Mobile section](https://contributing.bitwarden.com/getting-started/clients/mobile/) of the [Contributing Documentation](https://contributing.bitwarden.com/) for build instructions, recommended tooling, code style tips, and lots of other great information to get you started.
+Please refer to the [Mobile section](https://contributing.bitwarden.com/mobile/) of the [Contributing Documentation](https://contributing.bitwarden.com/) for build instructions, recommended tooling, code style tips, and lots of other great information to get you started.
 
 # We're Hiring!
 

build.cake

@@ -132,7 +132,6 @@ Task("UpdateAndroidCodeFiles")
             Path.Combine(_slnPath, "src", "Android", "Receivers", "PackageReplacedReceiver.cs"),
             Path.Combine(_slnPath, "src", "Android", "Receivers", "RestrictionsChangedReceiver.cs"),
             Path.Combine(_slnPath, "src", "Android", "Services", "DeviceActionService.cs"),
-            Path.Combine(_slnPath, "src", "Android", "Services", "FileService.cs"),
             Path.Combine(_slnPath, "src", "Android", "Tiles", "AutofillTileService.cs"),
             Path.Combine(_slnPath, "src", "Android", "Tiles", "GeneratorTileService.cs"),
             Path.Combine(_slnPath, "src", "Android", "Tiles", "MyVaultTileService.cs"),

src/Android/Accessibility/AccessibilityHelpers.cs

@@ -33,7 +33,6 @@ namespace Bit.Droid.Accessibility
             //   - Resources/xml/autofillservice.xml
             new Browser("alook.browser", "search_fragment_input_view"),
             new Browser("alook.browser.google", "search_fragment_input_view"),
-            new Browser("app.vanadium.browser", "url_bar"),
             new Browser("com.amazon.cloud9", "url"),
             new Browser("com.android.browser", "url"),
             new Browser("com.android.chrome", "url_bar"),
@@ -67,7 +66,6 @@ namespace Bit.Droid.Accessibility
             new Browser("com.mmbox.xbrowser", "search_box"),
             new Browser("com.mycompany.app.soulbrowser", "edit_text"),
             new Browser("com.naver.whale", "url_bar"),
-            new Browser("com.neeva.app", "full_url_text_view"),
             new Browser("com.opera.browser", "url_field"),
             new Browser("com.opera.browser.beta", "url_field"),
             new Browser("com.opera.gx", "addressbarEdit"),
@@ -76,7 +74,6 @@ namespace Bit.Droid.Accessibility
             new Browser("com.opera.touch", "addressbarEdit"),
             new Browser("com.qflair.browserq", "url"),
             new Browser("com.qwant.liberty", "mozac_browser_toolbar_url_view,url_bar_title"), // 2nd = Legacy (before v4)
-            new Browser("com.rainsee.create", "search_box"),
             new Browser("com.sec.android.app.sbrowser", "location_bar_edit_text"),
             new Browser("com.sec.android.app.sbrowser.beta", "location_bar_edit_text"),
             new Browser("com.stoutner.privacybrowser.free", "url_edittext"),
@@ -86,9 +83,6 @@ namespace Bit.Droid.Accessibility
             new Browser("com.vivaldi.browser.sopranos", "url_bar"),
             new Browser("com.yandex.browser", "bro_omnibar_address_title_text,bro_omnibox_collapsed_title",
                 (s) => s.Split(new char[]{' ', ' '}).FirstOrDefault()), // 0 = Regular Space, 1 = No-break space (00A0)
-            new Browser("com.yjllq.internet", "search_box"),
-            new Browser("com.yjllq.kito", "search_box"),
-            new Browser("com.yujian.ResideMenuDemo", "search_box"),
             new Browser("com.z28j.feel", "g2"),
             new Browser("idm.internet.download.manager", "search"),
             new Browser("idm.internet.download.manager.adm.lite", "search"),
@@ -96,7 +90,6 @@ namespace Bit.Droid.Accessibility
             new Browser("io.github.forkmaintainers.iceraven", "mozac_browser_toolbar_url_view"),
             new Browser("mark.via", "am,an"),
             new Browser("mark.via.gp", "as"),
-            new Browser("net.dezor.browser", "url_bar"),
             new Browser("net.slions.fulguris.full.download", "search"),
             new Browser("net.slions.fulguris.full.download.debug", "search"),
             new Browser("net.slions.fulguris.full.playstore", "search"),
@@ -136,7 +129,6 @@ namespace Bit.Droid.Accessibility
             new Browser("com.htc.sense.browser", "title"),
             new Browser("com.jerky.browser2", "enterUrl"),
             new Browser("com.ksmobile.cb", "address_bar_edit_text"),
-            new Browser("com.lemurbrowser.exts","url_bar"),
             new Browser("com.linkbubble.playstore", "url_text"),
             new Browser("com.mx.browser", "address_editor_with_progress"),
             new Browser("com.mx.browser.tablet", "address_editor_with_progress"),

src/Android/Android.csproj

@@ -15,7 +15,7 @@
     <AndroidManifest>Properties\AndroidManifest.xml</AndroidManifest>
     <MonoAndroidResourcePrefix>Resources</MonoAndroidResourcePrefix>
     <MonoAndroidAssetsPrefix>Assets</MonoAndroidAssetsPrefix>
-    <TargetFrameworkVersion>v13.0</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v12.1</TargetFrameworkVersion>
     <AndroidHttpClientHandlerType>Xamarin.Android.Net.AndroidClientHandler</AndroidHttpClientHandlerType>
     <NuGetPackageImportStamp>
     </NuGetPackageImportStamp>
@@ -77,12 +77,12 @@
     <PackageReference Include="Portable.BouncyCastle">
       <Version>1.9.0</Version>
     </PackageReference>
-    <PackageReference Include="Xamarin.AndroidX.AppCompat" Version="1.5.1.1" />
-    <PackageReference Include="Xamarin.AndroidX.AutoFill" Version="1.1.0.14" />
-    <PackageReference Include="Xamarin.AndroidX.CardView" Version="1.0.0.17" />
-    <PackageReference Include="Xamarin.AndroidX.Core" Version="1.9.0.1" />
-    <PackageReference Include="Xamarin.AndroidX.Legacy.Support.V4" Version="1.0.0.15" />
-    <PackageReference Include="Xamarin.AndroidX.MediaRouter" Version="1.3.1.1" />
+    <PackageReference Include="Xamarin.AndroidX.AppCompat" Version="1.5.1" />
+    <PackageReference Include="Xamarin.AndroidX.AutoFill" Version="1.1.0.13" />
+    <PackageReference Include="Xamarin.AndroidX.CardView" Version="1.0.0.16" />
+    <PackageReference Include="Xamarin.AndroidX.Core" Version="1.9.0" />
+    <PackageReference Include="Xamarin.AndroidX.Legacy.Support.V4" Version="1.0.0.14" />
+    <PackageReference Include="Xamarin.AndroidX.MediaRouter" Version="1.3.1" />
     <PackageReference Include="Xamarin.Essentials">
       <Version>1.7.3</Version>
     </PackageReference>
@@ -103,10 +103,8 @@
     <Compile Include="Accessibility\Browser.cs" />
     <Compile Include="Accessibility\NodeList.cs" />
     <Compile Include="Accessibility\KnownUsernameField.cs" />
-    <Compile Include="Autofill\AutofillConstants.cs" />
     <Compile Include="Autofill\AutofillHelpers.cs" />
     <Compile Include="Autofill\AutofillService.cs" />
-    <Compile Include="Autofill\AutofillExternalSelectionActivity.cs" />
     <Compile Include="Autofill\Field.cs" />
     <Compile Include="Autofill\FieldCollection.cs" />
     <Compile Include="Autofill\FilledItem.cs" />
@@ -159,7 +157,6 @@
     <Compile Include="Services\AutofillHandler.cs" />
     <Compile Include="Constants.cs" />
     <Compile Include="Effects\RemoveFontPaddingEffect.cs" />
-    <Compile Include="Services\WatchDeviceService.cs" />
   </ItemGroup>
   <ItemGroup>
     <AndroidAsset Include="Assets\bwi-font.ttf" />

src/Android/Autofill/AutofillConstants.cs

@@ -1,10 +0,0 @@
-namespace Bit.Droid.Autofill
-{
-    public class AutofillConstants
-    {
-        public const string AutofillFramework = "autofillFramework";
-        public const string AutofillFrameworkFillType = "autofillFrameworkFillType";
-        public const string AutofillFrameworkUri = "autofillFrameworkUri";
-        public const string AutofillFrameworkCipherId = "autofillFrameworkCipherId";
-    }
-}

src/Android/Autofill/AutofillExternalSelectionActivity.cs

@@ -1,42 +0,0 @@
-using System.Threading.Tasks;
-using Android.App;
-using Android.Content.PM;
-using Android.OS;
-using Bit.Core.Abstractions;
-using Bit.Core.Utilities;
-using Bit.Droid.Utilities;
-
-namespace Bit.Droid.Autofill
-{
-    [Activity(
-        NoHistory = true,
-        LaunchMode = LaunchMode.SingleTop)]
-    public class AutofillExternalSelectionActivity : Xamarin.Forms.Platform.Android.FormsAppCompatActivity
-    {
-        protected override void OnCreate(Bundle bundle)
-        {
-            Intent?.Validate();
-            base.OnCreate(bundle);
-
-            var cipherId = Intent?.GetStringExtra(AutofillConstants.AutofillFrameworkCipherId);
-            if (string.IsNullOrEmpty(cipherId))
-            {
-                SetResult(Result.Canceled);
-                Finish();
-                return;
-            }
-
-            GetCipherAndPerformAutofillAsync(cipherId).FireAndForget();
-        }
-
-        private async Task GetCipherAndPerformAutofillAsync(string cipherId)
-        {
-            var cipherService = ServiceContainer.Resolve<ICipherService>();
-            var cipher = await cipherService.GetAsync(cipherId);
-            var decCipher = await cipher.DecryptAsync();
-
-            var autofillHandler = ServiceContainer.Resolve<IAutofillHandler>();
-            autofillHandler.Autofill(decCipher);
-        }
-    }
-}

src/Android/Autofill/AutofillHelpers.cs

@@ -54,7 +54,6 @@ namespace Bit.Droid.Autofill
         {
             "alook.browser",
             "alook.browser.google",
-            "app.vanadium.browser",
             "com.amazon.cloud9",
             "com.android.browser",
             "com.android.chrome",
@@ -79,7 +78,6 @@ namespace Bit.Droid.Autofill
             "com.jamal2367.styx",
             "com.kiwibrowser.browser",
             "com.kiwibrowser.browser.dev",
-            "com.lemurbrowser.exts",
             "com.microsoft.emmx",
             "com.microsoft.emmx.beta",
             "com.microsoft.emmx.canary",
@@ -88,7 +86,6 @@ namespace Bit.Droid.Autofill
             "com.mmbox.xbrowser",
             "com.mycompany.app.soulbrowser",
             "com.naver.whale",
-            "com.neeva.app",
             "com.opera.browser",
             "com.opera.browser.beta",
             "com.opera.gx",
@@ -97,7 +94,6 @@ namespace Bit.Droid.Autofill
             "com.opera.touch",
             "com.qflair.browserq",
             "com.qwant.liberty",
-            "com.rainsee.create",
             "com.sec.android.app.sbrowser",
             "com.sec.android.app.sbrowser.beta",
             "com.stoutner.privacybrowser.free",
@@ -106,9 +102,6 @@ namespace Bit.Droid.Autofill
             "com.vivaldi.browser.snapshot",
             "com.vivaldi.browser.sopranos",
             "com.yandex.browser",
-            "com.yjllq.internet",
-            "com.yjllq.kito",
-            "com.yujian.ResideMenuDemo",
             "com.z28j.feel",
             "idm.internet.download.manager",
             "idm.internet.download.manager.adm.lite",
@@ -116,7 +109,6 @@ namespace Bit.Droid.Autofill
             "io.github.forkmaintainers.iceraven",
             "mark.via",
             "mark.via.gp",
-            "net.dezor.browser",
             "net.slions.fulguris.full.download",
             "net.slions.fulguris.full.download.debug",            
             "net.slions.fulguris.full.playstore",
@@ -215,7 +207,7 @@ namespace Bit.Droid.Autofill
                         }
                     }
                     var dataset = BuildDataset(parser.ApplicationContext, parser.FieldCollection, items[i], 
-                        true, inlinePresentationSpec);
+                        inlinePresentationSpec);
                     if (dataset != null)
                     {
                         responseBuilder.AddDataset(dataset);
@@ -229,7 +221,7 @@ namespace Bit.Droid.Autofill
         }
 
         public static Dataset BuildDataset(Context context, FieldCollection fields, FilledItem filledItem,
-            bool includeAuthIntent, InlinePresentationSpec inlinePresentationSpec = null)
+            InlinePresentationSpec inlinePresentationSpec = null)
         {
             var overlayPresentation = BuildOverlayPresentation(
                 filledItem.Name,
@@ -250,15 +242,6 @@ namespace Bit.Droid.Autofill
             {
                 datasetBuilder.SetInlinePresentation(inlinePresentation);
             }
-            if (includeAuthIntent)
-            {
-                var intent = new Intent(context, typeof(AutofillExternalSelectionActivity));
-                intent.PutExtra(AutofillConstants.AutofillFramework, true);
-                intent.PutExtra(AutofillConstants.AutofillFrameworkCipherId, filledItem.Id);
-                var pendingIntent = PendingIntent.GetActivity(context, ++_pendingIntentId, intent,
-                AndroidHelpers.AddPendingIntentMutabilityFlag(PendingIntentFlags.CancelCurrent, true));
-                datasetBuilder.SetAuthentication(pendingIntent?.IntentSender);
-            }
             if (filledItem.ApplyToFields(fields, datasetBuilder))
             {
                 return datasetBuilder.Build();
@@ -270,26 +253,25 @@ namespace Bit.Droid.Autofill
             IList<InlinePresentationSpec> inlinePresentationSpecs = null)
         {
             var intent = new Intent(context, typeof(MainActivity));
-            intent.PutExtra(AutofillConstants.AutofillFramework, true);
+            intent.PutExtra("autofillFramework", true);
             if (fields.FillableForLogin)
             {
-                intent.PutExtra(AutofillConstants.AutofillFrameworkFillType, (int)CipherType.Login);
+                intent.PutExtra("autofillFrameworkFillType", (int)CipherType.Login);
             }
             else if (fields.FillableForCard)
             {
-                intent.PutExtra(AutofillConstants.AutofillFrameworkFillType, (int)CipherType.Card);
+                intent.PutExtra("autofillFrameworkFillType", (int)CipherType.Card);
             }
             else if (fields.FillableForIdentity)
             {
-                intent.PutExtra(AutofillConstants.AutofillFrameworkFillType, (int)CipherType.Identity);
+                intent.PutExtra("autofillFrameworkFillType", (int)CipherType.Identity);
             }
             else
             {
                 return null;
             }
-            intent.PutExtra(AutofillConstants.AutofillFrameworkUri, uri);
-            var pendingIntent = PendingIntent.GetActivity(context, ++_pendingIntentId, intent,
-                AndroidHelpers.AddPendingIntentMutabilityFlag(PendingIntentFlags.CancelCurrent, true));
+            intent.PutExtra("autofillFrameworkUri", uri);
+            var pendingIntent = PendingIntent.GetActivity(context, ++_pendingIntentId, intent, AndroidHelpers.AddPendingIntentMutabilityFlag(PendingIntentFlags.CancelCurrent, true));
 
             var overlayPresentation = BuildOverlayPresentation(
                 AppResources.AutofillWithBitwarden,

src/Android/Autofill/FilledItem.cs

@@ -23,7 +23,6 @@ namespace Bit.Droid.Autofill
 
         public FilledItem(CipherView cipher)
         {
-            Id = cipher.Id;
             Name = cipher.Name;
             Type = cipher.Type;
             Subtitle = cipher.SubTitle;
@@ -56,7 +55,6 @@ namespace Bit.Droid.Autofill
             }
         }
 
-        public string Id { get; set; }
         public string Name { get; set; }
         public string Subtitle { get; set; } = string.Empty;
         public int Icon { get; set; } = Resource.Drawable.login;

src/Android/MainActivity.cs

@@ -18,7 +18,6 @@ using Bit.Core;
 using Bit.Core.Abstractions;
 using Bit.Core.Enums;
 using Bit.Core.Utilities;
-using Bit.Droid.Autofill;
 using Bit.Droid.Receivers;
 using Bit.Droid.Utilities;
 using Newtonsoft.Json;
@@ -323,13 +322,13 @@ namespace Bit.Droid
         {
             var options = new AppOptions
             {
-                Uri = Intent.GetStringExtra("uri") ?? Intent.GetStringExtra(AutofillConstants.AutofillFrameworkUri),
+                Uri = Intent.GetStringExtra("uri") ?? Intent.GetStringExtra("autofillFrameworkUri"),
                 MyVaultTile = Intent.GetBooleanExtra("myVaultTile", false),
                 GeneratorTile = Intent.GetBooleanExtra("generatorTile", false),
-                FromAutofillFramework = Intent.GetBooleanExtra(AutofillConstants.AutofillFramework, false),
+                FromAutofillFramework = Intent.GetBooleanExtra("autofillFramework", false),
                 CreateSend = GetCreateSendRequest(Intent)
             };
-            var fillType = Intent.GetIntExtra(AutofillConstants.AutofillFrameworkFillType, 0);
+            var fillType = Intent.GetIntExtra("autofillFrameworkFillType", 0);
             if (fillType > 0)
             {
                 options.FillType = (CipherType)fillType;

src/Android/MainApplication.cs

@@ -45,16 +45,9 @@ namespace Bit.Droid
             if (ServiceContainer.RegisteredServices.Count == 0)
             {
                 RegisterLocalServices();
-
                 var deviceActionService = ServiceContainer.Resolve<IDeviceActionService>("deviceActionService");
                 ServiceContainer.Init(deviceActionService.DeviceUserAgent, Core.Constants.ClearCiphersCacheKey,
                     Core.Constants.AndroidAllClearCipherCacheKeys);
-
-                ServiceContainer.Register<IWatchDeviceService>(new WatchDeviceService(ServiceContainer.Resolve<ICipherService>(),
-                    ServiceContainer.Resolve<IEnvironmentService>(),
-                    ServiceContainer.Resolve<IStateService>(),
-                    ServiceContainer.Resolve<IVaultTimeoutService>()));
-
                 InitializeAppSetup();
 
                 // TODO: Update when https://github.com/bitwarden/mobile/pull/1662 gets merged
@@ -80,9 +73,8 @@ namespace Bit.Droid
                     ServiceContainer.Resolve<IPlatformUtilsService>("platformUtilsService"),
                     ServiceContainer.Resolve<IAuthService>("authService"),
                     ServiceContainer.Resolve<ILogger>("logger"),
-                    ServiceContainer.Resolve<IMessagingService>("messagingService"),
-                    ServiceContainer.Resolve<IWatchDeviceService>());
-                ServiceContainer.Register<IAccountsManager>("accountsManager", accountsManager);
+                    ServiceContainer.Resolve<IMessagingService>("messagingService"));
+                    ServiceContainer.Register<IAccountsManager>("accountsManager", accountsManager);
             }
 #if !FDROID
             if (Build.VERSION.SdkInt <= BuildVersionCodes.Kitkat)
@@ -149,10 +141,9 @@ namespace Bit.Droid
             var clipboardService = new ClipboardService(stateService);
             var deviceActionService = new DeviceActionService(stateService, messagingService);
             var fileService = new FileService(stateService, broadcasterService);
+            var autofillHandler = new AutofillHandler(stateService, messagingService, clipboardService, new LazyResolve<IEventService>());
             var platformUtilsService = new MobilePlatformUtilsService(deviceActionService, clipboardService,
                 messagingService, broadcasterService);
-            var autofillHandler = new AutofillHandler(stateService, messagingService, clipboardService,
-                platformUtilsService, new LazyResolve<IEventService>());
             var biometricService = new BiometricService();
             var cryptoFunctionService = new PclCryptoFunctionService(cryptoPrimitiveService);
             var cryptoService = new CryptoService(stateService, cryptoFunctionService);

src/Android/Properties/AndroidManifest.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android" xmlns:tools="http://schemas.android.com/tools" android:versionCode="1" android:versionName="2023.1.1" android:installLocation="internalOnly" package="com.x8bit.bitwarden">
-	<uses-sdk android:minSdkVersion="21" android:targetSdkVersion="33" />
+<manifest xmlns:android="http://schemas.android.com/apk/res/android" xmlns:tools="http://schemas.android.com/tools" android:versionCode="1" android:versionName="2022.10.1" android:installLocation="internalOnly" package="com.x8bit.bitwarden">
+	<uses-sdk android:minSdkVersion="21" android:targetSdkVersion="32" />
 	<uses-permission android:name="android.permission.INTERNET" />
 	<uses-permission android:name="android.permission.NFC" />
 	<uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
@@ -40,16 +40,10 @@
 			</intent-filter>
 		</activity>
 	</application>
-	<!-- Support for Xamarin.Essentials.Browser.OpenAsync  (for Android > 11) -->
-	<!-- Related docs: https://learn.microsoft.com/en-us/xamarin/essentials/open-browser?tabs=android -->
+	<!-- Package visibility (for Android 11+) -->
 	<queries>
 		<intent>
-			<action android:name="android.intent.action.VIEW" />
-			<data android:scheme="http"/>
-		</intent>
-		<intent>
-			<action android:name="android.intent.action.VIEW" />
-			<data android:scheme="https"/>
+			<action android:name="*" />
 		</intent>
 	</queries>
 </manifest>

src/Android/Receivers/ClearClipboardAlarmReceiver.cs

@@ -1,5 +1,4 @@
 using Android.Content;
-using Android.OS;
 
 namespace Bit.Droid.Receivers
 {
@@ -9,17 +8,7 @@ namespace Bit.Droid.Receivers
         public override void OnReceive(Context context, Intent intent)
         {
             var clipboardManager = context.GetSystemService(Context.ClipboardService) as ClipboardManager;
-            if (clipboardManager == null)
-            {
-                return;
-            }
-            // ClearPrimaryClip is supported down to API 28 with mixed results, so we're requiring 33+ instead
-            if ((int)Build.VERSION.SdkInt < 33)
-            {
-                clipboardManager.PrimaryClip = ClipData.NewPlainText("bitwarden", " ");
-                return;
-            }
-            clipboardManager.ClearPrimaryClip();
+            clipboardManager.PrimaryClip = ClipData.NewPlainText("bitwarden", " ");
         }
     }
 }

src/Android/Renderers/CustomSwitchRenderer.cs

@@ -44,7 +44,6 @@ namespace Bit.Droid.Renderers
             }
             if (Control != null)
             {
-                Control.SetHintTextColor(ThemeHelpers.MutedColor);
                 var t = ResourcesCompat.GetDrawable(Resources, Resource.Drawable.switch_thumb, null);
                 if (t is GradientDrawable thumb)
                 {

src/Android/Resources/xml/autofillservice.xml

@@ -17,9 +17,6 @@
   <compatibility-package
     android:name="alook.browser.google"
     android:maxLongVersionCode="10000000000"/>
-  <compatibility-package
-    android:name="app.vanadium.browser"
-    android:maxLongVersionCode="10000000000"/>
   <compatibility-package
     android:name="com.amazon.cloud9"
     android:maxLongVersionCode="10000000000"/>
@@ -92,9 +89,6 @@
   <compatibility-package
     android:name="com.kiwibrowser.browser.dev"
     android:maxLongVersionCode="10000000000"/>
-  <compatibility-package
-    android:name="com.lemurbrowser.exts"
-    android:maxLongVersionCode="10000000000"/>
   <compatibility-package
     android:name="com.microsoft.emmx"
     android:maxLongVersionCode="10000000000"/>
@@ -119,9 +113,6 @@
   <compatibility-package
     android:name="com.naver.whale"
     android:maxLongVersionCode="10000000000"/>
-  <compatibility-package
-    android:name="com.neeva.app"
-    android:maxLongVersionCode="10000000000"/>
   <compatibility-package
     android:name="com.opera.browser"
     android:maxLongVersionCode="10000000000"/>
@@ -146,9 +137,6 @@
   <compatibility-package
     android:name="com.qwant.liberty"
     android:maxLongVersionCode="10000000000"/>
-  <compatibility-package
-    android:name="com.rainsee.create"
-    android:maxLongVersionCode="10000000000"/>
   <compatibility-package
     android:name="com.sec.android.app.sbrowser"
     android:maxLongVersionCode="10000000000"/>
@@ -173,15 +161,6 @@
   <compatibility-package
     android:name="com.yandex.browser"
     android:maxLongVersionCode="10000000000"/>
-  <compatibility-package
-    android:name="com.yjllq.internet"
-    android:maxLongVersionCode="10000000000"/>
-  <compatibility-package
-    android:name="com.yjllq.kito"
-    android:maxLongVersionCode="10000000000"/>
-  <compatibility-package
-    android:name="com.yujian.ResideMenuDemo"
-    android:maxLongVersionCode="10000000000"/>
   <compatibility-package
     android:name="com.z28j.feel"
     android:maxLongVersionCode="10000000000"/>
@@ -203,9 +182,6 @@
   <compatibility-package
     android:name="mark.via.gp"
     android:maxLongVersionCode="10000000000"/>
-  <compatibility-package
-    android:name="net.dezor.browser"
-    android:maxLongVersionCode="10000000000"/>
   <compatibility-package
     android:name="net.slions.fulguris.full.download"
     android:maxLongVersionCode="10000000000"/>

src/Android/Services/AutofillHandler.cs

@@ -6,7 +6,6 @@ using Android.Content;
 using Android.OS;
 using Android.Provider;
 using Android.Views.Autofill;
-using Bit.App.Resources;
 using Bit.Core.Abstractions;
 using Bit.Core.Enums;
 using Bit.Core.Models.View;
@@ -21,19 +20,16 @@ namespace Bit.Droid.Services
         private readonly IStateService _stateService;
         private readonly IMessagingService _messagingService;
         private readonly IClipboardService _clipboardService;
-        private readonly IPlatformUtilsService _platformUtilsService;
         private readonly LazyResolve<IEventService> _eventService;
 
         public AutofillHandler(IStateService stateService,
             IMessagingService messagingService,
             IClipboardService clipboardService,
-            IPlatformUtilsService platformUtilsService,
             LazyResolve<IEventService> eventService)
         {
             _stateService = stateService;
             _messagingService = messagingService;
             _clipboardService = clipboardService;
-            _platformUtilsService = platformUtilsService;
             _eventService = eventService;
         }
 
@@ -77,12 +73,12 @@ namespace Bit.Droid.Services
 
         public void Autofill(CipherView cipher)
         {
-            var activity = CrossCurrentActivity.Current.Activity as Xamarin.Forms.Platform.Android.FormsAppCompatActivity;
+            var activity = (MainActivity)CrossCurrentActivity.Current.Activity;
             if (activity == null)
             {
                 return;
             }
-            if (activity.Intent?.GetBooleanExtra(AutofillConstants.AutofillFramework, false) ?? false)
+            if (activity.Intent?.GetBooleanExtra("autofillFramework", false) ?? false)
             {
                 if (cipher == null)
                 {
@@ -107,7 +103,7 @@ namespace Bit.Droid.Services
                     return;
                 }
                 var task = CopyTotpAsync(cipher);
-                var dataset = AutofillHelpers.BuildDataset(activity, parser.FieldCollection, new FilledItem(cipher), false);
+                var dataset = AutofillHelpers.BuildDataset(activity, parser.FieldCollection, new FilledItem(cipher));
                 var replyIntent = new Intent();
                 replyIntent.PutExtra(AutofillManager.ExtraAuthenticationResult, dataset);
                 activity.SetResult(Result.Ok, replyIntent);
@@ -206,7 +202,6 @@ namespace Bit.Droid.Services
                     if (totp != null)
                     {
                         await _clipboardService.CopyTextAsync(totp);
-                        _platformUtilsService.ShowToastForCopiedValue(AppResources.VerificationCodeTotp);
                     }
                 }
             }

src/Android/Services/ClipboardService.cs

@@ -6,6 +6,7 @@ using Android.OS;
 using Bit.Core.Abstractions;
 using Bit.Droid.Receivers;
 using Bit.Droid.Utilities;
+using Plugin.CurrentActivity;
 using Xamarin.Essentials;
 
 namespace Bit.Droid.Services
@@ -20,9 +21,9 @@ namespace Bit.Droid.Services
             _stateService = stateService;
 
             _clearClipboardPendingIntent = new Lazy<PendingIntent>(() =>
-                PendingIntent.GetBroadcast(Application.Context,
+                PendingIntent.GetBroadcast(CrossCurrentActivity.Current.Activity,
                                            0,
-                                           new Intent(Application.Context, typeof(ClearClipboardAlarmReceiver)),
+                                           new Intent(CrossCurrentActivity.Current.Activity, typeof(ClearClipboardAlarmReceiver)),
                                            AndroidHelpers.AddPendingIntentMutabilityFlag(PendingIntentFlags.UpdateCurrent, false)));
         }
 
@@ -44,7 +45,7 @@ namespace Bit.Droid.Services
             }
             catch (Java.Lang.SecurityException ex) when (ex.Message.Contains("does not belong to"))
             {
-                // #1962 Just ignore, the content is copied either way but there is some app interfering in the process
+                // #1962 Just ignore, the content is copied either way but there is some app interfiering in the process
                 // that the OS catches and just throws this exception.
             }
         }
@@ -57,7 +58,9 @@ namespace Bit.Droid.Services
 
         private void CopyToClipboard(string text, bool isSensitive = true)
         {
-            var clipboardManager = Application.Context.GetSystemService(Context.ClipboardService) as ClipboardManager;
+            var activity = (MainActivity)CrossCurrentActivity.Current.Activity;
+            var clipboardManager = activity.GetSystemService(
+                Context.ClipboardService) as Android.Content.ClipboardManager;
             var clipData = ClipData.NewPlainText("bitwarden", text);
             if (isSensitive)
             {
@@ -84,7 +87,7 @@ namespace Bit.Droid.Services
                 return;
             }
             var triggerMs = Java.Lang.JavaSystem.CurrentTimeMillis() + clearMs;
-            var alarmManager = Application.Context.GetSystemService(Context.AlarmService) as AlarmManager;
+            var alarmManager = CrossCurrentActivity.Current.Activity.GetSystemService(Context.AlarmService) as AlarmManager;
             alarmManager.Set(AlarmType.Rtc, triggerMs, _clearClipboardPendingIntent.Value);
         }
     }

src/Android/Services/DeviceActionService.cs

@@ -18,7 +18,6 @@ using Bit.Core.Enums;
 using Bit.Core.Utilities;
 using Bit.Droid.Utilities;
 using Plugin.CurrentActivity;
-using static Bit.App.Pages.SettingsPageViewModel;
 
 namespace Bit.Droid.Services
 {
@@ -70,17 +69,14 @@ namespace Bit.Droid.Services
 
         public bool LaunchApp(string appName)
         {
-            if ((int)Build.VERSION.SdkInt < 33)
-            {
-                // API 33 required to avoid using wildcard app visibility or dangerous permissions
-                // https://developer.android.com/reference/android/content/pm/PackageManager#getLaunchIntentSenderForPackage(java.lang.String)
-                return false;
-            }
             var activity = CrossCurrentActivity.Current.Activity;
             appName = appName.Replace("androidapp://", string.Empty);
-            var launchIntentSender = activity?.PackageManager?.GetLaunchIntentSenderForPackage(appName);
-            launchIntentSender?.SendIntent(activity, Result.Ok, null, null, null);
-            return launchIntentSender != null;
+            var launchIntent = activity.PackageManager.GetLaunchIntentForPackage(appName);
+            if (launchIntent != null)
+            {
+                activity.StartActivity(launchIntent);
+            }
+            return launchIntent != null;
         }
 
         public async Task ShowLoadingAsync(string text)

src/Android/Services/LocalizeService.cs

@@ -1,5 +1,4 @@
 using System;
-using System.Diagnostics;
 using System.Globalization;
 using Bit.App.Abstractions;
 using Bit.App.Models;
@@ -26,13 +25,13 @@ namespace Bit.Droid.Services
                 try
                 {
                     var fallback = ToDotnetFallbackLanguage(new PlatformCulture(netLanguage));
-                    Debug.WriteLine(netLanguage + " failed, trying " + fallback + " (" + e1.Message + ")");
+                    Console.WriteLine(netLanguage + " failed, trying " + fallback + " (" + e1.Message + ")");
                     ci = new CultureInfo(fallback);
                 }
                 catch (CultureNotFoundException e2)
                 {
                     // iOS language not valid .NET culture, falling back to English
-                    Debug.WriteLine(netLanguage + " couldn't be set, using 'en' (" + e2.Message + ")");
+                    Console.WriteLine(netLanguage + " couldn't be set, using 'en' (" + e2.Message + ")");
                     ci = new CultureInfo("en");
                 }
             }
@@ -41,7 +40,7 @@ namespace Bit.Droid.Services
 
         private string AndroidToDotnetLanguage(string androidLanguage)
         {
-            Debug.WriteLine("Android Language:" + androidLanguage);
+            Console.WriteLine("Android Language:" + androidLanguage);
             var netLanguage = androidLanguage;
             if (androidLanguage.StartsWith("zh"))
             {
@@ -80,13 +79,13 @@ namespace Bit.Droid.Services
                         // ONLY use cultures that have been tested and known to work
                 }
             }
-            Debug.WriteLine(".NET Language/Locale:" + netLanguage);
+            Console.WriteLine(".NET Language/Locale:" + netLanguage);
             return netLanguage;
         }
 
         private string ToDotnetFallbackLanguage(PlatformCulture platCulture)
         {
-            Debug.WriteLine(".NET Fallback Language:" + platCulture.LanguageCode);
+            Console.WriteLine(".NET Fallback Language:" + platCulture.LanguageCode);
             var netLanguage = platCulture.LanguageCode; // use the first part of the identifier (two chars, usually);
             switch (platCulture.LanguageCode)
             {
@@ -96,7 +95,7 @@ namespace Bit.Droid.Services
                     // add more application-specific cases here (if required)
                     // ONLY use cultures that have been tested and known to work
             }
-            Debug.WriteLine(".NET Fallback Language/Locale:" + netLanguage + " (application-specific)");
+            Console.WriteLine(".NET Fallback Language/Locale:" + netLanguage + " (application-specific)");
             return netLanguage;
         }
 

src/Android/Services/WatchDeviceService.cs

@@ -1,29 +0,0 @@
-using System;
-using System.Threading.Tasks;
-using Bit.App.Services;
-using Bit.Core.Abstractions;
-using Bit.Core.Models;
-
-namespace Bit.Droid.Services
-{
-    public class WatchDeviceService : BaseWatchDeviceService
-    {
-        public WatchDeviceService(ICipherService cipherService,
-            IEnvironmentService environmentService,
-            IStateService stateService,
-            IVaultTimeoutService vaultTimeoutService)
-            : base(cipherService, environmentService, stateService, vaultTimeoutService)
-        {
-        }
-
-        protected override bool IsSupported => false;
-
-        public override bool IsConnected => false;
-
-        protected override bool CanSendData => false;
-
-        protected override Task SendDataToWatchAsync(WatchDTO watchDto) => throw new NotImplementedException();
-
-        protected override void ConnectToWatch() => throw new NotImplementedException();
-    }
-}

src/Android/Utilities/ThemeHelpers.cs

@@ -62,7 +62,7 @@ namespace Bit.Droid.Utilities
                 theme = ThemeManager.Dark;
             }
 
-            if (theme == ThemeManager.Dark || theme == ThemeManager.Black || theme == ThemeManager.Nord || theme == ThemeManager.SolarizedDark)
+            if (theme == ThemeManager.Dark || theme == ThemeManager.Black || theme == ThemeManager.Nord)
             {
                 LightTheme = false;
             }

src/App/Abstractions/IDeviceActionService.cs

@@ -1,6 +1,5 @@
 using System.Threading.Tasks;
 using Bit.Core.Enums;
-using Bit.Core.Models;
 
 namespace Bit.App.Abstractions
 {

src/App/App.csproj

@@ -143,7 +143,6 @@
     <Folder Include="Utilities\AccountManagement\" />
     <Folder Include="Controls\DateTime\" />
     <Folder Include="Controls\IconLabelButton\" />
-    <Folder Include="Controls\PasswordStrengthProgressBar\" />
   </ItemGroup>
 
   <ItemGroup>
@@ -436,6 +435,5 @@
     <None Remove="Utilities\AccountManagement\" />
     <None Remove="Controls\DateTime\" />
     <None Remove="Controls\IconLabelButton\" />
-    <None Remove="Controls\PasswordStrengthProgressBar\" />
   </ItemGroup>
 </Project>

src/App/Controls/AccountViewCell/AccountViewCellViewModel.cs

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

src/App/Controls/AvatarImageSource.cs

@@ -13,7 +13,6 @@ namespace Bit.App.Controls
     {
         private readonly string _text;
         private readonly string _id;
-        private readonly string _color;
 
         public override bool Equals(object obj)
         {
@@ -24,7 +23,7 @@ namespace Bit.App.Controls
 
             if (obj is AvatarImageSource avatar)
             {
-                return avatar._id == _id && avatar._text == _text && avatar._color == _color;
+                return avatar._id == _id && avatar._text == _text;
             }
 
             return base.Equals(obj);
@@ -32,7 +31,7 @@ namespace Bit.App.Controls
 
         public override int GetHashCode() => _id?.GetHashCode() ?? _text?.GetHashCode() ?? -1;
 
-        public AvatarImageSource(string userId = null, string name = null, string email = null, string color = null)
+        public AvatarImageSource(string userId = null, string name = null, string email = null)
         {
             _id = userId;
             _text = name;
@@ -40,7 +39,6 @@ namespace Bit.App.Controls
             {
                 _text = email;
             }
-            _color = color;
         }
 
         public override Func<CancellationToken, Task<Stream>> Stream => GetStreamAsync;
@@ -73,7 +71,7 @@ namespace Bit.App.Controls
                 chars = upperCaseText = _text.ToUpper();
             }
 
-            var bgColor = _color ?? CoreHelpers.StringToColor(_id ?? upperCaseText, "#33ffffff");
+            var bgColor = CoreHelpers.StringToColor(_id ?? upperCaseText, "#33ffffff");
             var textColor = CoreHelpers.TextColorFromBgColor(bgColor);
             var size = 50;
 

src/App/Controls/AvatarImageSourcePool.cs

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

src/App/Controls/CircularProgressbarView.cs

@@ -21,13 +21,13 @@ namespace Bit.App.Controls
             nameof(StrokeWidth), typeof(float), typeof(CircularProgressbarView), 3f);
 
         public static readonly BindableProperty ProgressColorProperty = BindableProperty.Create(
-            nameof(ProgressColor), typeof(Color), typeof(CircularProgressbarView), Color.FromHex("175DDC"));
+            nameof(ProgressColor), typeof(Color), typeof(CircularProgressbarView), Color.Default);
 
         public static readonly BindableProperty EndingProgressColorProperty = BindableProperty.Create(
-            nameof(EndingProgressColor), typeof(Color), typeof(CircularProgressbarView), Color.FromHex("dd4b39"));
+            nameof(EndingProgressColor), typeof(Color), typeof(CircularProgressbarView), Color.Default);
 
         public static readonly BindableProperty BackgroundProgressColorProperty = BindableProperty.Create(
-            nameof(BackgroundProgressColor), typeof(Color), typeof(CircularProgressbarView), Color.White);
+            nameof(BackgroundProgressColor), typeof(Color), typeof(CircularProgressbarView), Color.Default);
 
         public double Progress
         {

src/App/Controls/ExtendedSlider.cs

@@ -5,7 +5,7 @@ namespace Bit.App.Controls
     public class ExtendedSlider : Slider
     {
         public static readonly BindableProperty ThumbBorderColorProperty = BindableProperty.Create(
-            nameof(ThumbBorderColor), typeof(Color), typeof(ExtendedSlider), Color.FromHex("b5b5b5"));
+            nameof(ThumbBorderColor), typeof(Color), typeof(ExtendedSlider), Color.Default);
 
         public Color ThumbBorderColor
         {

src/App/Controls/ExtendedStepper.cs

@@ -5,10 +5,10 @@ namespace Bit.App.Controls
     public class ExtendedStepper : Stepper
     {
         public static readonly BindableProperty StepperBackgroundColorProperty = BindableProperty.Create(
-            nameof(StepperBackgroundColor), typeof(Color), typeof(ExtendedStepper), Color.White);
+            nameof(StepperBackgroundColor), typeof(Color), typeof(ExtendedStepper), Color.Default);
 
         public static readonly BindableProperty StepperForegroundColorProperty = BindableProperty.Create(
-            nameof(StepperForegroundColor), typeof(Color), typeof(ExtendedStepper), Color.Black);
+            nameof(StepperForegroundColor), typeof(Color), typeof(ExtendedStepper), Color.Default);
 
         public Color StepperBackgroundColor
         {

src/App/Controls/PasswordStrengthProgressBar/IPasswordStrengthable.cs

@@ -1,11 +0,0 @@
-using System.Collections.Generic;
-
-namespace Bit.App.Controls
-{
-    public interface IPasswordStrengthable
-    {
-        string Password { get; }
-        List<string> UserInputs { get; }
-    }
-}
-

src/App/Controls/PasswordStrengthProgressBar/PasswordStrengthCategory.cs

@@ -1,17 +0,0 @@
-using Bit.Core.Attributes;
-
-namespace Bit.App.Controls
-{
-    public enum PasswordStrengthLevel
-    {
-        [LocalizableEnum("Weak")]
-        VeryWeak,
-        [LocalizableEnum("Weak")]
-        Weak,
-        [LocalizableEnum("Good")]
-        Good,
-        [LocalizableEnum("Strong")]
-        Strong
-    }
-}
-

src/App/Controls/PasswordStrengthProgressBar/PasswordStrengthProgressBar.xaml

@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<StackLayout
-    xmlns="http://xamarin.com/schemas/2014/forms"
-    xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
-    xmlns:controls="clr-namespace:Bit.App.Controls"
-    xmlns:u="clr-namespace:Bit.App.Utilities"
-    x:DataType="controls:PasswordStrengthViewModel"
-    x:Class="Bit.App.Controls.PasswordStrengthProgressBar"
-    StyleClass="box">
-    
-    <StackLayout.Resources>
-        <ResourceDictionary>
-            <u:LocalizableEnumConverter x:Key="localizableEnum" />
-        </ResourceDictionary>
-    </StackLayout.Resources>
-
-    <ProgressBar
-        x:Name="_progressBar"
-        u:ProgressBarExtensions.AnimatedProgress="{Binding PasswordStrength}"
-        ScaleY="2" />
-
-    <Label
-        x:Name="_progressLabel"
-        Text="{Binding PasswordStrengthLevel, Converter={StaticResource localizableEnum}, TargetNullValue=' ' }"
-        StyleClass="box-footer-label" />
-
-</StackLayout>
-

src/App/Controls/PasswordStrengthProgressBar/PasswordStrengthProgressBar.xaml.cs

@@ -1,107 +0,0 @@
-using System;
-using Xamarin.Forms;
-
-namespace Bit.App.Controls
-{
-    public partial class PasswordStrengthProgressBar : StackLayout
-    {
-        public static readonly BindableProperty PasswordStrengthLevelProperty = BindableProperty.Create(
-            nameof(PasswordStrengthLevel),
-            typeof(PasswordStrengthLevel),
-            typeof(PasswordStrengthProgressBar),
-            propertyChanged: OnControlPropertyChanged);
-
-        public static readonly BindableProperty VeryWeakColorProperty = BindableProperty.Create(
-            nameof(VeryWeakColor),
-            typeof(Color),
-            typeof(PasswordStrengthProgressBar),
-            propertyChanged: OnControlPropertyChanged);
-
-        public static readonly BindableProperty WeakColorProperty = BindableProperty.Create(
-            nameof(WeakColor),
-            typeof(Color),
-            typeof(PasswordStrengthProgressBar),
-            propertyChanged: OnControlPropertyChanged);
-
-        public static readonly BindableProperty GoodColorProperty = BindableProperty.Create(
-            nameof(GoodColor),
-            typeof(Color),
-            typeof(PasswordStrengthProgressBar),
-            propertyChanged: OnControlPropertyChanged);
-
-        public static readonly BindableProperty StrongColorProperty = BindableProperty.Create(
-            nameof(StrongColor),
-            typeof(Color),
-            typeof(PasswordStrengthProgressBar),
-            propertyChanged: OnControlPropertyChanged);
-
-        public PasswordStrengthLevel? PasswordStrengthLevel
-        {
-            get { return (PasswordStrengthLevel?)GetValue(PasswordStrengthLevelProperty); }
-            set { SetValue(PasswordStrengthLevelProperty, value); }
-        }
-
-        public Color VeryWeakColor
-        {
-            get { return (Color)GetValue(VeryWeakColorProperty); }
-            set { SetValue(VeryWeakColorProperty, value); }
-        }
-
-        public Color WeakColor
-        {
-            get { return (Color)GetValue(WeakColorProperty); }
-            set { SetValue(WeakColorProperty, value); }
-        }
-
-        public Color GoodColor
-        {
-            get { return (Color)GetValue(GoodColorProperty); }
-            set { SetValue(GoodColorProperty, value); }
-        }
-
-        public Color StrongColor
-        {
-            get { return (Color)GetValue(StrongColorProperty); }
-            set { SetValue(StrongColorProperty, value); }
-        }
-
-        public PasswordStrengthProgressBar()
-        {
-            InitializeComponent();
-            SetBinding(PasswordStrengthProgressBar.PasswordStrengthLevelProperty, new Binding() { Path = nameof(PasswordStrengthViewModel.PasswordStrengthLevel) });
-        }
-
-        private static void OnControlPropertyChanged(BindableObject bindable, object oldValue, object newValue)
-        {
-            (bindable as PasswordStrengthProgressBar)?.UpdateColors();
-        }
-
-        public void UpdateColors()
-        {
-            if (_progressBar == null || _progressLabel == null)
-            {
-                return;
-            }
-            _progressBar.ProgressColor = GetColorForStrength();
-            _progressLabel.TextColor = _progressBar.ProgressColor;
-        }
-
-        private Color GetColorForStrength()
-        {
-            switch (PasswordStrengthLevel)
-            {
-                case Controls.PasswordStrengthLevel.VeryWeak:
-                    return VeryWeakColor;
-                case Controls.PasswordStrengthLevel.Weak:
-                    return WeakColor;
-                case Controls.PasswordStrengthLevel.Good:
-                    return GoodColor;
-                case Controls.PasswordStrengthLevel.Strong:
-                    return StrongColor;
-                default:
-                    return Color.Transparent;
-            }
-        }
-    }
-}
-

src/App/Controls/PasswordStrengthProgressBar/PasswordStrengthViewModel.cs

@@ -1,67 +0,0 @@
-using System.Collections.Generic;
-using Bit.Core.Abstractions;
-using Bit.Core.Utilities;
-using Xamarin.Forms;
-
-namespace Bit.App.Controls
-{
-    public class PasswordStrengthViewModel : ExtendedViewModel
-    {
-        private readonly IPasswordGenerationService _passwordGenerationService;
-        private readonly IPasswordStrengthable _passwordStrengthable;
-        private double _passwordStrength;
-        private Color _passwordColor;
-        private PasswordStrengthLevel? _passwordStrengthLevel;
-
-        public PasswordStrengthViewModel(IPasswordStrengthable passwordStrengthable)
-        {
-            _passwordGenerationService = ServiceContainer.Resolve<IPasswordGenerationService>();
-            _passwordStrengthable = passwordStrengthable;
-        }
-
-        public double PasswordStrength
-        {
-            get => _passwordStrength;
-            set => SetProperty(ref _passwordStrength, value);
-        }
-
-        public PasswordStrengthLevel? PasswordStrengthLevel
-        {
-            get => _passwordStrengthLevel;
-            set => SetProperty(ref _passwordStrengthLevel, value);
-        }
-
-        public List<string> GetPasswordStrengthUserInput(string email) => _passwordGenerationService.GetPasswordStrengthUserInput(email);
-
-        public void CalculatePasswordStrength()
-        {
-            if (string.IsNullOrEmpty(_passwordStrengthable.Password))
-            {
-                PasswordStrength = 0;
-                PasswordStrengthLevel = null;
-                return;
-            }
-
-            var passwordStrength = _passwordGenerationService.PasswordStrength(_passwordStrengthable.Password, _passwordStrengthable.UserInputs);
-            // The passwordStrength.Score is 0..4, convertion was made to be used as a progress directly by the control 0..1 
-            PasswordStrength = (passwordStrength.Score + 1f) / 5f;
-            if (PasswordStrength <= 0.4f)
-            {
-                PasswordStrengthLevel = Controls.PasswordStrengthLevel.VeryWeak;
-            }
-            else if (PasswordStrength <= 0.6f)
-            {
-                PasswordStrengthLevel = Controls.PasswordStrengthLevel.Weak;
-            }
-            else if (PasswordStrength <= 0.8f)
-            {
-                PasswordStrengthLevel = Controls.PasswordStrengthLevel.Good;
-            }
-            else
-            {
-                PasswordStrengthLevel = Controls.PasswordStrengthLevel.Strong;
-            }
-        }
-    }
-}
-

src/App/Pages/Accounts/BaseChangePasswordViewModel.cs

@@ -4,8 +4,6 @@ using System.Text.RegularExpressions;
 using System.Threading.Tasks;
 using Bit.App.Abstractions;
 using Bit.App.Resources;
-using Bit.App.Utilities;
-using Bit.Core;
 using Bit.Core.Abstractions;
 using Bit.Core.Models.Domain;
 using Bit.Core.Utilities;
@@ -149,8 +147,8 @@ namespace Bit.App.Pages
             }
             if (IsPolicyInEffect)
             {
-                var userInputs = _passwordGenerationService.GetPasswordStrengthUserInput(await _stateService.GetEmailAsync());
-                var passwordStrength = _passwordGenerationService.PasswordStrength(MasterPassword, userInputs);
+                var userInput = await GetPasswordStrengthUserInput();
+                var passwordStrength = _passwordGenerationService.PasswordStrength(MasterPassword, userInput);
                 if (!await _policyService.EvaluateMasterPassword(passwordStrength.Score, MasterPassword, Policy))
                 {
                     await _platformUtilsService.ShowDialogAsync(AppResources.MasterPasswordPolicyValidationMessage,
@@ -160,7 +158,7 @@ namespace Bit.App.Pages
             }
             else
             {
-                if (MasterPassword.Length < Constants.MasterPasswordMinimumChars)
+                if (MasterPassword.Length < 8)
                 {
                     await _platformUtilsService.ShowDialogAsync(AppResources.MasterPasswordLengthValMessage,
                         AppResources.MasterPasswordPolicyValidationTitle, AppResources.Ok);
@@ -176,5 +174,19 @@ namespace Bit.App.Pages
 
             return true;
         }
+
+        private async Task<List<string>> GetPasswordStrengthUserInput()
+        {
+            var email = await _stateService.GetEmailAsync();
+            List<string> userInput = null;
+            var atPosition = email.IndexOf('@');
+            if (atPosition > -1)
+            {
+                var rx = new Regex("/[^A-Za-z0-9]/", RegexOptions.Compiled);
+                var data = rx.Split(email.Substring(0, atPosition).Trim().ToLower());
+                userInput = new List<string>(data);
+            }
+            return userInput;
+        }
     }
 }

src/App/Pages/Accounts/HomePage.xaml

@@ -51,9 +51,7 @@
                         x:Name="_email"
                         Text="{Binding Email}"
                         Keyboard="Email"
-                        StyleClass="box-value"
-                        ReturnType="Go"
-                        ReturnCommand="{Binding ContinueCommand}">
+                        StyleClass="box-value">
                         <VisualStateManager.VisualStateGroups>
                             <VisualStateGroup x:Name="CommonStates">
                                 <VisualState x:Name="Disabled">

src/App/Pages/Accounts/LockPageViewModel.cs

@@ -28,7 +28,6 @@ namespace Bit.App.Pages
         private readonly IBiometricService _biometricService;
         private readonly IKeyConnectorService _keyConnectorService;
         private readonly ILogger _logger;
-        private readonly IWatchDeviceService _watchDeviceService;
         private readonly WeakEventManager<int?> _secretEntryFocusWeakEventManager = new WeakEventManager<int?>();
 
         private string _email;
@@ -57,7 +56,6 @@ namespace Bit.App.Pages
             _biometricService = ServiceContainer.Resolve<IBiometricService>("biometricService");
             _keyConnectorService = ServiceContainer.Resolve<IKeyConnectorService>("keyConnectorService");
             _logger = ServiceContainer.Resolve<ILogger>("logger");
-            _watchDeviceService = ServiceContainer.Resolve<IWatchDeviceService>();
 
             PageTitle = AppResources.VerifyMasterPassword;
             TogglePasswordCommand = new Command(TogglePassword);
@@ -389,7 +387,6 @@ namespace Bit.App.Pages
         private async Task DoContinueAsync()
         {
             await _stateService.SetBiometricLockedAsync(false);
-            _watchDeviceService.SyncDataToWatchAsync().FireAndForget();
             _messagingService.Send("unlocked");
             UnlockedAction?.Invoke();
         }

src/App/Pages/Accounts/LoginPageViewModel.cs

@@ -305,5 +305,15 @@ namespace Bit.App.Pages
                 _logger.Exception(e);
             }
         }
+
+        private void HandleException(Exception ex)
+        {
+            Xamarin.Essentials.MainThread.InvokeOnMainThreadAsync(async () =>
+            {
+                await _deviceActionService.HideLoadingAsync();
+                await _platformUtilsService.ShowDialogAsync(AppResources.GenericErrorMessage);
+            }).FireAndForget();
+            _logger.Exception(ex);
+        }
     }
 }

src/App/Pages/Accounts/LoginPasswordlessViewModel.cs

@@ -148,6 +148,16 @@ namespace Bit.App.Pages
 
             return string.Format(AppResources.XMinutesAgo, DateTime.UtcNow.Minute - requestDate.Value.ToUniversalTime().Minute);
         }
+
+        private void HandleException(Exception ex)
+        {
+            Xamarin.Essentials.MainThread.InvokeOnMainThreadAsync(async () =>
+            {
+                await _deviceActionService.HideLoadingAsync();
+                await _platformUtilsService.ShowDialogAsync(AppResources.GenericErrorMessage);
+            }).FireAndForget();
+            _logger.Exception(ex);
+        }
     }
 
     public class LoginPasswordlessDetails

src/App/Pages/Accounts/RegisterPage.xaml

@@ -25,7 +25,7 @@
     </ContentPage.ToolbarItems>
 
     <ScrollView>
-        <StackLayout Spacing="10">
+        <StackLayout Spacing="20">
             <StackLayout StyleClass="box">
                 <StackLayout StyleClass="box-row">
                     <Label
@@ -72,19 +72,8 @@
                         AutomationProperties.HelpText="{Binding PasswordVisibilityAccessibilityText}"/>
                 </Grid>
                 <Label
-                    StyleClass="box-sub-label"
-                    Margin="0,0,0,10">
-                        <Label.FormattedText>
-                            <FormattedString>
-                                <Span Text="{u:I18n Important}" TextColor="{DynamicResource InfoColor}"/>
-                                <Span Text=": " TextColor="{DynamicResource InfoColor}"/>
-                                <Span Text="{Binding MasterPasswordMininumCharactersDescription}" TextColor="{DynamicResource MutedColor}"/>
-                            </FormattedString>
-                        </Label.FormattedText>
-                </Label>
-                <controls:PasswordStrengthProgressBar
-                    BindingContext="{Binding PasswordStrengthViewModel}"
-                    Margin="0,0"/>
+                    Text="{u:I18n MasterPasswordDescription}"
+                    StyleClass="box-footer-label" />
             </StackLayout>
             <StackLayout StyleClass="box">
                 <Grid StyleClass="box-row">
@@ -137,17 +126,6 @@
                     StyleClass="box-footer-label" />
             </StackLayout>
             <StackLayout StyleClass="box">
-                <StackLayout StyleClass="box-row, box-row-switch">
-                    <Switch
-                        IsToggled="{Binding CheckExposedMasterPassword}"
-                        StyleClass="box-value"
-                        HorizontalOptions="Start"
-                        Margin="0, 0, 10, 0"/>
-                    <Label
-                        Text="{u:I18n CheckKnownDataBreachesForThisPassword}"
-                        StyleClass="box-footer-label"
-                        VerticalOptions="Center"/>
-                </StackLayout>
                 <StackLayout StyleClass="box-row, box-row-switch"
                             IsVisible="{Binding ShowTerms}">
                     <Switch

src/App/Pages/Accounts/RegisterPageViewModel.cs

@@ -1,36 +1,28 @@
 using System;
-using System.Collections.Generic;
 using System.Threading.Tasks;
 using System.Windows.Input;
 using Bit.App.Abstractions;
-using Bit.App.Controls;
 using Bit.App.Resources;
-using Bit.App.Utilities;
 using Bit.Core;
 using Bit.Core.Abstractions;
 using Bit.Core.Enums;
 using Bit.Core.Exceptions;
 using Bit.Core.Models.Request;
-using Bit.Core.Services;
 using Bit.Core.Utilities;
 using Xamarin.Forms;
 
 namespace Bit.App.Pages
 {
-    public class RegisterPageViewModel : CaptchaProtectedViewModel, IPasswordStrengthable
+    public class RegisterPageViewModel : CaptchaProtectedViewModel
     {
         private readonly IDeviceActionService _deviceActionService;
         private readonly II18nService _i18nService;
         private readonly IEnvironmentService _environmentService;
-        private readonly IAuditService _auditService;
         private readonly IApiService _apiService;
         private readonly ICryptoService _cryptoService;
         private readonly IPlatformUtilsService _platformUtilsService;
-        private string _email;
-        private string _masterPassword;
         private bool _showPassword;
         private bool _acceptPolicies;
-        private bool _checkExposedMasterPassword;
 
         public RegisterPageViewModel()
         {
@@ -40,14 +32,12 @@ namespace Bit.App.Pages
             _platformUtilsService = ServiceContainer.Resolve<IPlatformUtilsService>("platformUtilsService");
             _i18nService = ServiceContainer.Resolve<II18nService>("i18nService");
             _environmentService = ServiceContainer.Resolve<IEnvironmentService>("environmentService");
-            _auditService = ServiceContainer.Resolve<IAuditService>();
 
             PageTitle = AppResources.CreateAccount;
             TogglePasswordCommand = new Command(TogglePassword);
             ToggleConfirmPasswordCommand = new Command(ToggleConfirmPassword);
             SubmitCommand = new Command(async () => await SubmitAsync());
             ShowTerms = !_platformUtilsService.IsSelfHost();
-            PasswordStrengthViewModel = new PasswordStrengthViewModel(this);
         }
 
         public ICommand PoliciesClickCommand => new Command<string>((url) =>
@@ -71,34 +61,6 @@ namespace Bit.App.Pages
             get => _acceptPolicies;
             set => SetProperty(ref _acceptPolicies, value);
         }
-
-        public bool CheckExposedMasterPassword
-        {
-            get => _checkExposedMasterPassword;
-            set => SetProperty(ref _checkExposedMasterPassword, value);
-        }
-
-        public string MasterPassword
-        {
-            get => _masterPassword;
-            set
-            {
-                SetProperty(ref _masterPassword, value);
-                PasswordStrengthViewModel.CalculatePasswordStrength();
-            }
-        }
-
-        public string Email
-        {
-            get => _email;
-            set => SetProperty(ref _email, value);
-        }
-
-        public string Password => MasterPassword;
-        public List<string> UserInputs => PasswordStrengthViewModel.GetPasswordStrengthUserInput(Email);
-        public string MasterPasswordMininumCharactersDescription => string.Format(AppResources.YourMasterPasswordCannotBeRecoveredIfYouForgetItXCharactersMinimum,
-                                                                            Constants.MasterPasswordMinimumChars);
-        public PasswordStrengthViewModel PasswordStrengthViewModel { get; }
         public bool ShowTerms { get; set; }
         public Command SubmitCommand { get; }
         public Command TogglePasswordCommand { get; }
@@ -106,10 +68,13 @@ namespace Bit.App.Pages
         public string ShowPasswordIcon => ShowPassword ? BitwardenIcons.EyeSlash : BitwardenIcons.Eye;
         public string PasswordVisibilityAccessibilityText => ShowPassword ? AppResources.PasswordIsVisibleTapToHide : AppResources.PasswordIsNotVisibleTapToShow;
         public string Name { get; set; }
+        public string Email { get; set; }
+        public string MasterPassword { get; set; }
         public string ConfirmMasterPassword { get; set; }
         public string Hint { get; set; }
         public Action RegistrationSuccess { get; set; }
         public Action CloseAction { get; set; }
+
         protected override II18nService i18nService => _i18nService;
         protected override IEnvironmentService environmentService => _environmentService;
         protected override IDeviceActionService deviceActionService => _deviceActionService;
@@ -145,7 +110,7 @@ namespace Bit.App.Pages
                     AppResources.Ok);
                 return;
             }
-            if (MasterPassword.Length < Constants.MasterPasswordMinimumChars)
+            if (MasterPassword.Length < 8)
             {
                 await _platformUtilsService.ShowDialogAsync(AppResources.MasterPasswordLengthValMessage,
                     AppResources.AnErrorHasOccurred, AppResources.Ok);
@@ -163,10 +128,8 @@ namespace Bit.App.Pages
                     AppResources.AnErrorHasOccurred, AppResources.Ok);
                 return;
             }
-            if (await IsPasswordWeakOrExposed())
-            {
-                return;
-            }
+
+            // TODO: Password strength check?
 
             if (showLoading)
             {
@@ -176,7 +139,8 @@ namespace Bit.App.Pages
             Name = string.IsNullOrWhiteSpace(Name) ? null : Name;
             Email = Email.Trim().ToLower();
             var kdf = KdfType.PBKDF2_SHA256;
-            var key = await _cryptoService.MakeKeyAsync(MasterPassword, Email, kdf, Constants.KdfIterations);
+            var kdfIterations = 100_000;
+            var key = await _cryptoService.MakeKeyAsync(MasterPassword, Email, kdf, kdfIterations);
             var encKey = await _cryptoService.MakeEncKeyAsync(key);
             var hashedPassword = await _cryptoService.HashPasswordAsync(MasterPassword, key);
             var keys = await _cryptoService.MakeKeyPairAsync(encKey.Item1);
@@ -188,7 +152,7 @@ namespace Bit.App.Pages
                 MasterPasswordHint = Hint,
                 Key = encKey.Item2.EncryptedString,
                 Kdf = kdf,
-                KdfIterations = Constants.KdfIterations,
+                KdfIterations = kdfIterations,
                 Keys = new KeysRequest
                 {
                     PublicKey = keys.Item1,
@@ -196,7 +160,6 @@ namespace Bit.App.Pages
                 },
                 CaptchaResponse = _captchaToken,
             };
-
             // TODO: org invite?
 
             try
@@ -245,43 +208,5 @@ namespace Bit.App.Pages
             entry.Focus();
             entry.CursorPosition = String.IsNullOrEmpty(ConfirmMasterPassword) ? 0 : ConfirmMasterPassword.Length;
         }
-
-        private async Task<bool> IsPasswordWeakOrExposed()
-        {
-            try
-            {
-                var title = string.Empty;
-                var message = string.Empty;
-                var exposedPassword = CheckExposedMasterPassword ? await _auditService.PasswordLeakedAsync(MasterPassword) > 0 : false;
-                var weakPassword = PasswordStrengthViewModel.PasswordStrengthLevel <= PasswordStrengthLevel.Weak;
-
-                if (exposedPassword && weakPassword)
-                {
-                    title = AppResources.WeakAndExposedMasterPassword;
-                    message = AppResources.WeakPasswordIdentifiedAndFoundInADataBreachAlertDescription;
-                }
-                else if (exposedPassword)
-                {
-                    title = AppResources.ExposedMasterPassword;
-                    message = AppResources.PasswordFoundInADataBreachAlertDescription;
-                }
-                else if (weakPassword)
-                {
-                    title = AppResources.WeakMasterPassword;
-                    message = AppResources.WeakPasswordIdentifiedUseAStrongPasswordToProtectYourAccount;
-                }
-
-                if (exposedPassword || weakPassword)
-                {
-                    return !await _platformUtilsService.ShowDialogAsync(message, title, AppResources.Yes, AppResources.No);
-                }
-            }
-            catch (Exception ex)
-            {
-                HandleException(ex);
-            }
-
-            return false;
-        }
     }
 }

src/App/Pages/Accounts/SetPasswordPage.xaml

@@ -47,7 +47,7 @@
                            Margin="0, 12, 0, 0"
                            HasShadow="False"
                            BackgroundColor="Transparent"
-                           BorderColor="{DynamicResource PrimaryColor}">
+                           BorderColor="Accent">
                         <Label
                             Text="{u:I18n ResetPasswordAutoEnrollInviteWarning}"
                             StyleClass="text-muted, text-sm, text-bold"
@@ -69,7 +69,7 @@
                            Margin="0, 12, 0, 0"
                            HasShadow="False"
                            BackgroundColor="Transparent"
-                           BorderColor="{DynamicResource PrimaryColor}">
+                           BorderColor="Accent">
                         <Label
                             Text="{Binding PolicySummary}"
                             StyleClass="text-muted, text-sm, text-bold"

src/App/Pages/Accounts/SetPasswordPageViewModel.cs

@@ -5,7 +5,6 @@ using System.Text.RegularExpressions;
 using System.Threading.Tasks;
 using Bit.App.Abstractions;
 using Bit.App.Resources;
-using Bit.App.Utilities;
 using Bit.Core;
 using Bit.Core.Abstractions;
 using Bit.Core.Enums;
@@ -138,8 +137,8 @@ namespace Bit.App.Pages
             }
             if (IsPolicyInEffect)
             {
-                var userInputs = _passwordGenerationService.GetPasswordStrengthUserInput(await _stateService.GetEmailAsync());
-                var passwordStrength = _passwordGenerationService.PasswordStrength(MasterPassword, userInputs);
+                var userInput = await GetPasswordStrengthUserInput();
+                var passwordStrength = _passwordGenerationService.PasswordStrength(MasterPassword, userInput);
                 if (!await _policyService.EvaluateMasterPassword(passwordStrength.Score, MasterPassword, Policy))
                 {
                     await Page.DisplayAlert(AppResources.MasterPasswordPolicyValidationTitle,
@@ -149,7 +148,7 @@ namespace Bit.App.Pages
             }
             else
             {
-                if (MasterPassword.Length < Constants.MasterPasswordMinimumChars)
+                if (MasterPassword.Length < 8)
                 {
                     await Page.DisplayAlert(AppResources.MasterPasswordPolicyValidationTitle,
                         AppResources.MasterPasswordLengthValMessage, AppResources.Ok);
@@ -164,8 +163,9 @@ namespace Bit.App.Pages
             }
 
             var kdf = KdfType.PBKDF2_SHA256;
+            var kdfIterations = 100000;
             var email = await _stateService.GetEmailAsync();
-            var key = await _cryptoService.MakeKeyAsync(MasterPassword, email, kdf, Constants.KdfIterations);
+            var key = await _cryptoService.MakeKeyAsync(MasterPassword, email, kdf, kdfIterations);
             var masterPasswordHash = await _cryptoService.HashPasswordAsync(MasterPassword, key, HashPurpose.ServerAuthorization);
             var localMasterPasswordHash = await _cryptoService.HashPasswordAsync(MasterPassword, key, HashPurpose.LocalAuthorization);
 
@@ -187,7 +187,7 @@ namespace Bit.App.Pages
                 Key = encKey.Item2.EncryptedString,
                 MasterPasswordHint = Hint,
                 Kdf = kdf,
-                KdfIterations = Constants.KdfIterations,
+                KdfIterations = kdfIterations,
                 OrgIdentifier = OrgIdentifier,
                 Keys = new KeysRequest
                 {
@@ -202,7 +202,7 @@ namespace Bit.App.Pages
                 // Set Password and relevant information
                 await _apiService.SetPasswordAsync(request);
                 await _stateService.SetKdfTypeAsync(kdf);
-                await _stateService.SetKdfIterationsAsync(Constants.KdfIterations);
+                await _stateService.SetKdfIterationsAsync(kdfIterations);
                 await _cryptoService.SetKeyAsync(key);
                 await _cryptoService.SetKeyHashAsync(localMasterPasswordHash);
                 await _cryptoService.SetEncKeyAsync(encKey.Item2.EncryptedString);

src/App/Pages/Accounts/UpdateTempPasswordPage.xaml

@@ -44,7 +44,7 @@
                            Margin="0"
                            HasShadow="False"
                            BackgroundColor="Transparent"
-                           BorderColor="{DynamicResource PrimaryColor}">
+                           BorderColor="Accent">
                         <Label
                             Text="{u:I18n UpdateMasterPasswordWarning}"
                             StyleClass="text-muted, text-sm, text-bold"
@@ -67,7 +67,7 @@
                            Margin="0"
                            HasShadow="False"
                            BackgroundColor="Transparent"
-                           BorderColor="{DynamicResource PrimaryColor}">
+                           BorderColor="Accent">
                         <Label
                             Text="{Binding PolicySummary}"
                             StyleClass="text-muted, text-sm, text-bold"

src/App/Pages/BaseContentPage.cs

@@ -129,8 +129,8 @@ namespace Bit.App.Pages
         {
             if (useCurrentActiveAccount)
             {
-                var user = await _stateService.GetActiveUserCustomDataAsync(a => (a?.Profile?.UserId, a?.Profile?.Name, a?.Profile?.Email, a?.Profile?.AvatarColor));
-                return new AvatarImageSource(user.UserId, user.Name, user.Email, user.AvatarColor);
+                return new AvatarImageSource(await _stateService.GetActiveUserIdAsync(),
+                    await _stateService.GetNameAsync(), await _stateService.GetEmailAsync());
             }
             return new AvatarImageSource();
         }

src/App/Pages/BaseViewModel.cs

@@ -1,10 +1,4 @@
-using System;
-using Bit.App.Abstractions;
-using Bit.App.Controls;
-using Bit.App.Resources;
-using Bit.Core.Abstractions;
-using Bit.Core.Exceptions;
-using Bit.Core.Services;
+using Bit.App.Controls;
 using Bit.Core.Utilities;
 using Xamarin.Forms;
 
@@ -14,9 +8,6 @@ namespace Bit.App.Pages
     {
         private string _pageTitle = string.Empty;
         private AvatarImageSource _avatar;
-        private LazyResolve<IDeviceActionService> _deviceActionService = new LazyResolve<IDeviceActionService>();
-        private LazyResolve<IPlatformUtilsService> _platformUtilsService = new LazyResolve<IPlatformUtilsService>();
-        private LazyResolve<ILogger> _logger = new LazyResolve<ILogger>();
 
         public string PageTitle
         {
@@ -31,21 +22,5 @@ namespace Bit.App.Pages
         }
 
         public ContentPage Page { get; set; }
-
-        protected void HandleException(Exception ex, string message = null)
-        {
-            if (ex is ApiException apiException && apiException.Error != null)
-            {
-                message = apiException.Error.GetSingleMessage();
-            }
-
-            Xamarin.Essentials.MainThread.InvokeOnMainThreadAsync(async () =>
-            {
-                await _deviceActionService.Value.HideLoadingAsync();
-                await _platformUtilsService.Value.ShowDialogAsync(message ?? AppResources.GenericErrorMessage);
-            }).FireAndForget();
-            _logger.Value.Exception(ex);
-        }
-
     }
 }

src/App/Pages/Generator/GeneratorPage.xaml

@@ -66,7 +66,7 @@
                             Margin="0"
                             HasShadow="False"
                             BackgroundColor="Transparent"
-                            BorderColor="{DynamicResource PrimaryColor}">
+                            BorderColor="Accent">
                         <Label
                             Text="{u:I18n PasswordGeneratorPolicyInEffect}"
                             StyleClass="text-muted, text-sm, text-bold"
@@ -462,7 +462,7 @@
                                 StyleClass="box-value"
                                 HorizontalOptions="End"
                                 AutomationProperties.IsInAccessibleTree="True"
-                                AutomationProperties.Name="{u:I18n LowercaseAtoZ}"/>
+                                AutomationProperties.Name="{u:I18n LowercaseAtoZ}" />
                         </StackLayout>
                         <BoxView StyleClass="box-row-separator" />
                         <StackLayout StyleClass="box-row, box-row-switch">

src/App/Pages/Send/SendAddEditPage.xaml

@@ -67,7 +67,7 @@
                             Margin="0, 12, 0, 0"
                             HasShadow="False"
                             BackgroundColor="Transparent"
-                            BorderColor="{DynamicResource PrimaryColor}">
+                            BorderColor="Accent">
                             <Label
                                 Text="{u:I18n SendDisabledWarning}"
                                 StyleClass="text-muted, text-sm, text-bold"
@@ -79,7 +79,7 @@
                             Margin="0, 12, 0, 0"
                             HasShadow="False"
                             BackgroundColor="Transparent"
-                            BorderColor="{DynamicResource PrimaryColor}">
+                            BorderColor="Accent">
                             <Label
                                 Text="{u:I18n SendOptionsPolicyInEffect}"
                                 StyleClass="text-muted, text-sm, text-bold"

src/App/Pages/Send/SendAddOnlyPage.xaml

@@ -48,7 +48,7 @@
                     Margin="0, 12, 0, 0"
                     HasShadow="False"
                     BackgroundColor="Transparent"
-                    BorderColor="{DynamicResource PrimaryColor}">
+                    BorderColor="Accent">
                     <Label
                         Text="{u:I18n SendDisabledWarning}"
                         StyleClass="text-muted, text-sm, text-bold"
@@ -60,7 +60,7 @@
                     Margin="0, 12, 0, 0"
                     HasShadow="False"
                     BackgroundColor="Transparent"
-                    BorderColor="{DynamicResource PrimaryColor}">
+                    BorderColor="Accent">
                     <Label
                         Text="{u:I18n SendOptionsPolicyInEffect}"
                         StyleClass="text-muted, text-sm, text-bold"

src/App/Pages/Send/SendGroupingsPage/SendGroupingsPage.xaml

@@ -108,7 +108,7 @@
                         Margin="0, 12, 0, 6"
                         HasShadow="False"
                         BackgroundColor="Transparent"
-                        BorderColor="{DynamicResource PrimaryColor}">
+                        BorderColor="Accent">
                         <Label
                             Text="{u:I18n SendDisabledWarning}"
                             StyleClass="text-muted, text-sm, text-bold"

src/App/Pages/Settings/ExportVaultPage.xaml

@@ -34,7 +34,7 @@
                 Margin="0, 12, 0, 0"
                 HasShadow="False"
                 BackgroundColor="Transparent"
-                BorderColor="{DynamicResource PrimaryColor}">
+                BorderColor="Accent">
                 <Label
                     Text="{u:I18n DisablePersonalVaultExportPolicyInEffect}"
                     StyleClass="text-muted, text-sm, text-bold"

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

@@ -26,7 +26,7 @@
                         Padding="10"
                         HasShadow="False"
                         BackgroundColor="Transparent"
-                        BorderColor="{DynamicResource PrimaryColor}">
+                        BorderColor="Accent">
                         <Label
                             Text="{Binding Name, Mode=OneWay}"
                             StyleClass="text-muted, text-sm, text-bold"
@@ -57,7 +57,7 @@
                         Padding="10"
                         HasShadow="False"
                         BackgroundColor="Transparent"
-                        BorderColor="{DynamicResource PrimaryColor}">
+                        BorderColor="Accent">
                         <Label
                             Text="{Binding Name, Mode=OneWay}"
                             StyleClass="text-muted, text-sm, text-bold"

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

@@ -7,10 +7,7 @@ using Bit.App.Pages.Accounts;
 using Bit.App.Resources;
 using Bit.Core.Abstractions;
 using Bit.Core.Enums;
-using Bit.Core.Models;
 using Bit.Core.Models.Domain;
-using Bit.Core.Models.View;
-using Bit.Core.Services;
 using Bit.Core.Utilities;
 using Xamarin.CommunityToolkit.ObjectModel;
 using Xamarin.Forms;
@@ -35,7 +32,6 @@ namespace Bit.App.Pages
         private readonly IClipboardService _clipboardService;
         private readonly ILogger _loggerService;
         private readonly IPushNotificationService _pushNotificationService;
-        private readonly IWatchDeviceService _watchDeviceService;
         private const int CustomVaultTimeoutValue = -100;
 
         private bool _supportsBiometric;
@@ -48,7 +44,6 @@ namespace Bit.App.Pages
         private bool _showChangeMasterPassword;
         private bool _reportLoggingEnabled;
         private bool _approvePasswordlessLoginRequests;
-        private bool _shouldConnectToWatch;
 
         private List<KeyValuePair<string, int?>> _vaultTimeouts =
             new List<KeyValuePair<string, int?>>
@@ -92,7 +87,6 @@ namespace Bit.App.Pages
             _clipboardService = ServiceContainer.Resolve<IClipboardService>("clipboardService");
             _loggerService = ServiceContainer.Resolve<ILogger>("logger");
             _pushNotificationService = ServiceContainer.Resolve<IPushNotificationService>();
-            _watchDeviceService = ServiceContainer.Resolve<IWatchDeviceService>();
 
             GroupedItems = new ObservableRangeCollection<ISettingsPageListItem>();
             PageTitle = AppResources.Settings;
@@ -144,9 +138,6 @@ namespace Bit.App.Pages
                 !await _keyConnectorService.GetUsesKeyConnector();
             _reportLoggingEnabled = await _loggerService.IsEnabled();
             _approvePasswordlessLoginRequests = await _stateService.GetApprovePasswordlessLoginsAsync();
-
-            _shouldConnectToWatch = await _stateService.GetShouldConnectToWatchAsync();
-
             BuildList();
         }
 
@@ -610,26 +601,19 @@ namespace Bit.App.Pages
                     ExecuteAsync = () => SetScreenCaptureAllowedAsync()
                 });
             }
-            var accountItems = new List<SettingsPageListItem>();
-            if (Device.RuntimePlatform == Device.iOS)
+            var accountItems = new List<SettingsPageListItem>
             {
-                accountItems.Add(new SettingsPageListItem
+                new SettingsPageListItem
                 {
-                    Name = AppResources.ConnectToWatch,
-                    SubLabel = _shouldConnectToWatch ? AppResources.On : AppResources.Off,
-                    ExecuteAsync = () => ToggleWatchConnectionAsync()
-                });
-            }
-            accountItems.Add(new SettingsPageListItem
-            {
-                Name = AppResources.FingerprintPhrase,
-                ExecuteAsync = () => FingerprintAsync()
-            });
-            accountItems.Add(new SettingsPageListItem
-            {
-                Name = AppResources.LogOut,
-                ExecuteAsync = () => LogOutAsync()
-            });
+                    Name = AppResources.FingerprintPhrase,
+                    ExecuteAsync = () => FingerprintAsync()
+                },
+                new SettingsPageListItem
+                {
+                    Name = AppResources.LogOut,
+                    ExecuteAsync = () => LogOutAsync()
+                }
+            };
             if (_showChangeMasterPassword)
             {
                 accountItems.Insert(0, new SettingsPageListItem
@@ -807,13 +791,5 @@ namespace Bit.App.Pages
                 await Page.DisplayAlert(AppResources.AnErrorHasOccurred, AppResources.GenericErrorMessage, AppResources.Ok);
             }
         }
-
-        private async Task ToggleWatchConnectionAsync()
-        {
-            _shouldConnectToWatch = !_shouldConnectToWatch;
-
-            await _watchDeviceService.SetShouldConnectToWatchAsync(_shouldConnectToWatch);
-            BuildList();
-        }
     }
 }

src/App/Pages/Vault/CipherAddEditPage.xaml

@@ -96,7 +96,7 @@
                            Margin="0"
                            HasShadow="False"
                            BackgroundColor="Transparent"
-                           BorderColor="{DynamicResource PrimaryColor}">
+                           BorderColor="Accent">
                         <Label
                             Text="{u:I18n PersonalOwnershipPolicyInEffect}"
                             StyleClass="text-muted, text-sm, text-bold"

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

@@ -263,6 +263,12 @@ namespace Bit.App.Pages
         {
             if (DoOnce())
             {
+                var cameraPermission = await PermissionManager.CheckAndRequestPermissionAsync(new Permissions.Camera());
+                if (cameraPermission != PermissionStatus.Granted)
+                {
+                    return;
+                }
+
                 var page = new ScanPage(key =>
                 {
                     Device.BeginInvokeOnMainThread(async () =>
@@ -271,7 +277,6 @@ namespace Bit.App.Pages
                         await _vm.UpdateTotpKeyAsync(key);
                     });
                 });
-
                 await Navigation.PushModalAsync(new Xamarin.Forms.NavigationPage(page));
             }
         }

src/App/Pages/Vault/CipherAddEditPageViewModel.cs

@@ -29,7 +29,6 @@ namespace Bit.App.Pages
         private readonly ICustomFieldItemFactory _customFieldItemFactory;
         private readonly IClipboardService _clipboardService;
         private readonly IAutofillHandler _autofillHandler;
-        private readonly IWatchDeviceService _watchDeviceService;
 
         private bool _showNotesSeparator;
         private bool _showPassword;
@@ -81,7 +80,6 @@ namespace Bit.App.Pages
             _customFieldItemFactory = ServiceContainer.Resolve<ICustomFieldItemFactory>("customFieldItemFactory");
             _clipboardService = ServiceContainer.Resolve<IClipboardService>("clipboardService");
             _autofillHandler = ServiceContainer.Resolve<IAutofillHandler>();
-            _watchDeviceService = ServiceContainer.Resolve<IWatchDeviceService>();
 
             GeneratePasswordCommand = new Command(GeneratePassword);
             TogglePasswordCommand = new Command(TogglePassword);
@@ -139,7 +137,6 @@ namespace Bit.App.Pages
                 new KeyValuePair<string, string>(AppResources.Mr, AppResources.Mr),
                 new KeyValuePair<string, string>(AppResources.Mrs, AppResources.Mrs),
                 new KeyValuePair<string, string>(AppResources.Ms, AppResources.Ms),
-                new KeyValuePair<string, string>(AppResources.Mx, AppResources.Mx),
                 new KeyValuePair<string, string>(AppResources.Dr, AppResources.Dr),
             };
             FolderOptions = new List<KeyValuePair<string, string>>();
@@ -510,8 +507,6 @@ namespace Bit.App.Pages
                     EditMode && !CloneMode ? AppResources.ItemUpdated : AppResources.NewItemCreated);
                 _messagingService.Send(EditMode && !CloneMode ? "editedCipher" : "addedCipher", Cipher.Id);
 
-                _watchDeviceService.SyncDataToWatchAsync().FireAndForget();
-
                 if (Page is CipherAddEditPage page && page.FromAutofillFramework)
                 {
                     // Close and go back to app

src/App/Pages/Vault/CipherDetailsPageViewModel.cs

@@ -31,7 +31,6 @@ namespace Bit.App.Pages
         private readonly ILocalizeService _localizeService;
         private readonly ICustomFieldItemFactory _customFieldItemFactory;
         private readonly IClipboardService _clipboardService;
-        private readonly IWatchDeviceService _watchDeviceService;
 
         private List<ICustomFieldItemViewModel> _fields;
         private bool _canAccessPremium;
@@ -63,7 +62,6 @@ namespace Bit.App.Pages
             _localizeService = ServiceContainer.Resolve<ILocalizeService>("localizeService");
             _customFieldItemFactory = ServiceContainer.Resolve<ICustomFieldItemFactory>("customFieldItemFactory");
             _clipboardService = ServiceContainer.Resolve<IClipboardService>("clipboardService");
-            _watchDeviceService = ServiceContainer.Resolve<IWatchDeviceService>();
 
             CopyCommand = new AsyncCommand<string>((id) => CopyAsync(id, null), onException: ex => _logger.Exception(ex), allowsMultipleExecutions: false);
             CopyUriCommand = new AsyncCommand<LoginUriView>(uriView => CopyAsync("LoginUri", uriView.Uri), onException: ex => _logger.Exception(ex), allowsMultipleExecutions: false);
@@ -373,9 +371,6 @@ namespace Bit.App.Pages
                     await _cipherService.SoftDeleteWithServerAsync(Cipher.Id);
                 }
                 await _deviceActionService.HideLoadingAsync();
-
-                _watchDeviceService.SyncDataToWatchAsync().FireAndForget();
-
                 _platformUtilsService.ShowToast("success", null,
                     Cipher.IsDeleted ? AppResources.ItemDeleted : AppResources.ItemSoftDeleted);
                 _messagingService.Send(Cipher.IsDeleted ? "deletedCipher" : "softDeletedCipher", Cipher);

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

@@ -108,10 +108,6 @@ namespace Bit.App.Pages
                     else if (message.Command == "syncCompleted")
                     {
                         await Task.Delay(500);
-                        if (_vm.MainPage)
-                        {
-                            _vm.AvatarImageSource = await GetAvatarImageSourceAsync();
-                        }
                         Device.BeginInvokeOnMainThread(() =>
                         {
                             IsBusy = false;

src/App/Pages/Vault/ScanPage.xaml

@@ -34,13 +34,16 @@
             <RowDefinition Height="*" />
             <RowDefinition Height="*" />
         </Grid.RowDefinitions>
-        <ContentView 
-            x:Name="_scannerContainer"
+        <zxing:ZXingScannerView
+            x:Name="_zxing"
+            HorizontalOptions="FillAndExpand"
+            VerticalOptions="FillAndExpand"
             AutomationId="zxingScannerView"
             IsVisible="{Binding ShowScanner}"
             Grid.Column="0"
             Grid.Row="0"
-            Grid.RowSpan="3"/>
+            Grid.RowSpan="3"
+            OnScanResult="OnScanResult"/>
         <StackLayout
             VerticalOptions="Center"
             HorizontalOptions="FillAndExpand"

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

@@ -8,10 +8,8 @@ using Bit.Core.Abstractions;
 using Bit.Core.Utilities;
 using SkiaSharp;
 using SkiaSharp.Views.Forms;
-using Xamarin.CommunityToolkit.ObjectModel;
 using Xamarin.Essentials;
 using Xamarin.Forms;
-using ZXing.Net.Mobile.Forms;
 
 namespace Bit.App.Pages
 {
@@ -28,15 +26,20 @@ namespace Bit.App.Pages
         private bool _pageIsActive;
         private bool _qrcodeFound;
         private float _scale;
-        private ZXingScannerView _zxing;
+
         private readonly LazyResolve<ILogger> _logger = new LazyResolve<ILogger>("logger");
 
         public ScanPage(Action<string> callback)
         {
-            InitializeComponent();
             _callback = callback;
-            ViewModel.InitScannerCommand = new Command(() => InitScanner());
-
+            InitializeComponent();
+            _zxing.Options = new ZXing.Mobile.MobileBarcodeScanningOptions
+            {
+                UseNativeScanning = true,
+                PossibleFormats = new List<ZXing.BarcodeFormat> { ZXing.BarcodeFormat.QR_CODE },
+                AutoRotate = false,
+                TryInverted = true
+            };
             if (Device.RuntimePlatform == Device.Android)
             {
                 ToolbarItems.RemoveAt(0);
@@ -52,53 +55,6 @@ namespace Bit.App.Pages
         protected override void OnAppearing()
         {
             base.OnAppearing();
-            StartScanner();
-        }
-
-        protected override void OnDisappearing()
-        {
-            StopScanner().FireAndForget();
-            base.OnDisappearing();
-        }
-
-        // Fix known bug with DelayBetweenAnalyzingFrames & DelayBetweenContinuousScans: https://github.com/Redth/ZXing.Net.Mobile/issues/721
-        private void InitScanner()
-        {
-            try
-            {
-                if (!ViewModel.HasCameraPermission || !ViewModel.ShowScanner || _zxing != null)
-                {
-                    return;
-                }
-
-                _zxing = new ZXingScannerView();
-                _zxing.Options = new ZXing.Mobile.MobileBarcodeScanningOptions
-                {
-                    UseNativeScanning = true,
-                    PossibleFormats = new List<ZXing.BarcodeFormat> { ZXing.BarcodeFormat.QR_CODE },
-                    AutoRotate = false,
-                    TryInverted = true,
-                    DelayBetweenAnalyzingFrames = 5,
-                    DelayBetweenContinuousScans = 5
-                };
-                _scannerContainer.Content = _zxing;
-                StartScanner();
-            }
-            catch (Exception ex)
-            {
-                _logger.Value.Exception(ex);
-            }
-        }
-
-        private void StartScanner()
-        {
-            if (_zxing == null)
-            {
-                return;
-            }
-
-            _zxing.OnScanResult -= OnScanResult;
-            _zxing.OnScanResult += OnScanResult;
             _zxing.IsScanning = true;
 
             // Fix for Autofocus, now it's done every 2 seconds so that the user does't have to do it
@@ -142,21 +98,16 @@ namespace Bit.App.Pages
             AnimationLoopAsync();
         }
 
-        private async Task StopScanner()
+        protected override async void OnDisappearing()
         {
-            if (_zxing == null)
-            {
-                return;
-            }
-
             _autofocusCts?.Cancel();
             if (_continuousAutofocusTask != null)
             {
                 await _continuousAutofocusTask;
             }
             _zxing.IsScanning = false;
-            _zxing.OnScanResult -= OnScanResult;
             _pageIsActive = false;
+            base.OnDisappearing();
         }
 
         private async void OnScanResult(ZXing.Result result)

src/App/Pages/Vault/ScanPageViewModel.cs

@@ -1,14 +1,6 @@
-using System;
-using System.Threading.Tasks;
-using System.Windows.Input;
-using Bit.App.Abstractions;
-using Bit.App.Resources;
+using Bit.App.Resources;
 using Bit.App.Utilities;
 using Bit.Core.Abstractions;
-using Bit.Core.Services;
-using Bit.Core.Utilities;
-using Xamarin.CommunityToolkit.ObjectModel;
-using Xamarin.Essentials;
 using Xamarin.Forms;
 
 namespace Bit.App.Pages
@@ -17,46 +9,13 @@ namespace Bit.App.Pages
     {
         private bool _showScanner = true;
         private string _totpAuthenticationKey;
-        private IPlatformUtilsService _platformUtilsService;
-        private IDeviceActionService _deviceActionService;
-        private ILogger _logger;
 
         public ScanPageViewModel()
         {
-            ToggleScanModeCommand = new AsyncCommand(ToggleScanMode, onException: HandleException);
-            _platformUtilsService = ServiceContainer.Resolve<IPlatformUtilsService>("platformUtilsService");
-            _deviceActionService = ServiceContainer.Resolve<IDeviceActionService>("deviceActionService");
-            _logger = ServiceContainer.Resolve<ILogger>();
-            InitAsync().FireAndForget();
+            ToggleScanModeCommand = new Command(() => ShowScanner = !ShowScanner);
         }
 
-        public async Task InitAsync()
-        {
-            try
-            {
-                await Device.InvokeOnMainThreadAsync(async () =>
-                {
-                    var hasCameraPermission = await PermissionManager.CheckAndRequestPermissionAsync(new Permissions.Camera());
-                    HasCameraPermission = hasCameraPermission == PermissionStatus.Granted;
-                    ShowScanner = hasCameraPermission == PermissionStatus.Granted;
-                });
-
-                if (!HasCameraPermission)
-                {
-                    return;
-                }
-                InitScannerCommand.Execute(null);
-            }
-            catch (System.Exception ex)
-            {
-                HandleException(ex);
-            }
-        }
-
-        public ICommand ToggleScanModeCommand { get; set; }
-        public ICommand InitScannerCommand { get; set; }
-
-        public bool HasCameraPermission { get; set; }
+        public Command ToggleScanModeCommand { get; set; }
         public string ScanQrPageTitle => ShowScanner ? AppResources.ScanQrTitle : AppResources.AuthenticatorKeyScanner;
         public string CameraInstructionTop => ShowScanner ? AppResources.PointYourCameraAtTheQRCode : AppResources.OnceTheKeyIsSuccessfullyEntered;
         public string TotpAuthenticationKey
@@ -80,23 +39,6 @@ namespace Bit.App.Pages
                 });
         }
 
-        private async Task ToggleScanMode()
-        {
-            var cameraPermission = await PermissionManager.CheckAndRequestPermissionAsync(new Permissions.Camera());
-            HasCameraPermission = cameraPermission == PermissionStatus.Granted;
-            if (!HasCameraPermission)
-            {
-                var openAppSettingsResult = await _platformUtilsService.ShowDialogAsync(AppResources.EnableCamerPermissionToUseTheScanner, title: string.Empty, confirmText: AppResources.Settings, cancelText: AppResources.NoThanks);
-                if (openAppSettingsResult)
-                {
-                    _deviceActionService.OpenAppSettings();
-                }
-                return;
-            }
-            ShowScanner = !ShowScanner;
-            InitScannerCommand.Execute(null);
-        }
-
         public FormattedString ToggleScanModeLabel
         {
             get
@@ -115,15 +57,5 @@ namespace Bit.App.Pages
                 return fs;
             }
         }
-
-        private void HandleException(Exception ex)
-        {
-            Xamarin.Essentials.MainThread.InvokeOnMainThreadAsync(async () =>
-            {
-                await _deviceActionService.HideLoadingAsync();
-                await _platformUtilsService.ShowDialogAsync(AppResources.GenericErrorMessage);
-            }).FireAndForget();
-            _logger.Exception(ex);
-        }
     }
 }

src/App/Resources/AppResources.Designer.cs

@@ -1372,15 +1372,6 @@ namespace Bit.App.Resources {
             }
         }
         
-        /// <summary>
-        ///   Looks up a localized string similar to Check known data breaches for this password.
-        /// </summary>
-        public static string CheckKnownDataBreachesForThisPassword {
-            get {
-                return ResourceManager.GetString("CheckKnownDataBreachesForThisPassword", resourceCulture);
-            }
-        }
-        
         /// <summary>
         ///   Looks up a localized string similar to Check if password has been exposed..
         /// </summary>
@@ -1507,15 +1498,6 @@ namespace Bit.App.Resources {
             }
         }
         
-        /// <summary>
-        ///   Looks up a localized string similar to Connect to Watch.
-        /// </summary>
-        public static string ConnectToWatch {
-            get {
-                return ResourceManager.GetString("ConnectToWatch", resourceCulture);
-            }
-        }
-        
         /// <summary>
         ///   Looks up a localized string similar to Continue.
         /// </summary>
@@ -2146,15 +2128,6 @@ namespace Bit.App.Resources {
             }
         }
         
-        /// <summary>
-        ///   Looks up a localized string similar to Enable camera permission to use the scanner.
-        /// </summary>
-        public static string EnableCamerPermissionToUseTheScanner {
-            get {
-                return ResourceManager.GetString("EnableCamerPermissionToUseTheScanner", resourceCulture);
-            }
-        }
-        
         /// <summary>
         ///   Looks up a localized string similar to Enabled.
         /// </summary>
@@ -2425,15 +2398,6 @@ namespace Bit.App.Resources {
             }
         }
         
-        /// <summary>
-        ///   Looks up a localized string similar to Exposed Master Password.
-        /// </summary>
-        public static string ExposedMasterPassword {
-            get {
-                return ResourceManager.GetString("ExposedMasterPassword", resourceCulture);
-            }
-        }
-        
         /// <summary>
         ///   Looks up a localized string similar to Extension activated!.
         /// </summary>
@@ -2956,15 +2920,6 @@ namespace Bit.App.Resources {
             }
         }
         
-        /// <summary>
-        ///   Looks up a localized string similar to Good.
-        /// </summary>
-        public static string Good {
-            get {
-                return ResourceManager.GetString("Good", resourceCulture);
-            }
-        }
-        
         /// <summary>
         ///   Looks up a localized string similar to Go to my vault.
         /// </summary>
@@ -3100,15 +3055,6 @@ namespace Bit.App.Resources {
             }
         }
         
-        /// <summary>
-        ///   Looks up a localized string similar to Important.
-        /// </summary>
-        public static string Important {
-            get {
-                return ResourceManager.GetString("Important", resourceCulture);
-            }
-        }
-        
         /// <summary>
         ///   Looks up a localized string similar to Import items.
         /// </summary>
@@ -3598,7 +3544,7 @@ namespace Bit.App.Resources {
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Enterprise single sign-on.
+        ///   Looks up a localized string similar to Enterprise Single Sign-On.
         /// </summary>
         public static string LogInSso {
             get {
@@ -3643,7 +3589,7 @@ namespace Bit.App.Resources {
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Log in with master password.
+        ///   Looks up a localized string similar to Log In with master password.
         /// </summary>
         public static string LogInWithMasterPassword {
             get {
@@ -3983,18 +3929,7 @@ namespace Bit.App.Resources {
                 return ResourceManager.GetString("Ms", resourceCulture);
             }
         }
-
-        /// <summary>
-        ///   Looks up a localized string similar to Mx.
-        /// </summary>
-        public static string Mx
-        {
-            get
-            {
-                return ResourceManager.GetString("Mx", resourceCulture);
-            }
-        }
-
+        
         /// <summary>
         ///   Looks up a localized string similar to You must log into the main Bitwarden app before you can use the extension..
         /// </summary>
@@ -4617,15 +4552,6 @@ namespace Bit.App.Resources {
             }
         }
         
-        /// <summary>
-        ///   Looks up a localized string similar to Password found in a data breach. Use a unique password to protect your account. Are you sure you want to use an exposed password?.
-        /// </summary>
-        public static string PasswordFoundInADataBreachAlertDescription {
-            get {
-                return ResourceManager.GetString("PasswordFoundInADataBreachAlertDescription", resourceCulture);
-            }
-        }
-        
         /// <summary>
         ///   Looks up a localized string similar to Password generated.
         /// </summary>
@@ -5311,6 +5237,15 @@ namespace Bit.App.Resources {
             }
         }
         
+        /// <summary>
+        ///   Looks up a localized string similar to .
+        /// </summary>
+        public static string SelectAddTotpToStoreTheKeySafely {
+            get {
+                return ResourceManager.GetString("SelectAddTotpToStoreTheKeySafely", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   Looks up a localized string similar to You must select at least one collection..
         /// </summary>
@@ -5725,15 +5660,6 @@ namespace Bit.App.Resources {
             }
         }
         
-        /// <summary>
-        ///   Looks up a localized string similar to Strong.
-        /// </summary>
-        public static string Strong {
-            get {
-                return ResourceManager.GetString("Strong", resourceCulture);
-            }
-        }
-        
         /// <summary>
         ///   Looks up a localized string similar to Submit.
         /// </summary>
@@ -6715,51 +6641,6 @@ namespace Bit.App.Resources {
             }
         }
         
-        /// <summary>
-        ///   Looks up a localized string similar to Weak.
-        /// </summary>
-        public static string Weak {
-            get {
-                return ResourceManager.GetString("Weak", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Weak and Exposed Master Password.
-        /// </summary>
-        public static string WeakAndExposedMasterPassword {
-            get {
-                return ResourceManager.GetString("WeakAndExposedMasterPassword", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Weak Master Password.
-        /// </summary>
-        public static string WeakMasterPassword {
-            get {
-                return ResourceManager.GetString("WeakMasterPassword", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Weak password identified and found in a data breach. Use a strong and unique password to protect your account. Are you sure you want to use this password?.
-        /// </summary>
-        public static string WeakPasswordIdentifiedAndFoundInADataBreachAlertDescription {
-            get {
-                return ResourceManager.GetString("WeakPasswordIdentifiedAndFoundInADataBreachAlertDescription", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Weak password identified. Use a strong password to protect your account. Are you sure you want to use a weak password?.
-        /// </summary>
-        public static string WeakPasswordIdentifiedUseAStrongPasswordToProtectYourAccount {
-            get {
-                return ResourceManager.GetString("WeakPasswordIdentifiedUseAStrongPasswordToProtectYourAccount", resourceCulture);
-            }
-        }
-        
         /// <summary>
         ///   Looks up a localized string similar to Website.
         /// </summary>
@@ -6877,15 +6758,6 @@ namespace Bit.App.Resources {
             }
         }
         
-        /// <summary>
-        ///   Looks up a localized string similar to Your master password cannot be recovered if you forget it! {0} characters minimum..
-        /// </summary>
-        public static string YourMasterPasswordCannotBeRecoveredIfYouForgetItXCharactersMinimum {
-            get {
-                return ResourceManager.GetString("YourMasterPasswordCannotBeRecoveredIfYouForgetItXCharactersMinimum", resourceCulture);
-            }
-        }
-        
         /// <summary>
         ///   Looks up a localized string similar to To continue, hold your YubiKey NEO against the back of the device or insert your YubiKey into your device&apos;s USB port, then touch its button..
         /// </summary>

src/App/Resources/AppResources.af.resx

@@ -376,7 +376,7 @@
   </data>
   <data name="ValueHasBeenCopied" xml:space="preserve">
     <value>{0} is gekopieer.</value>
-    <comment>Confirmation message after successfully copying a value to the clipboard.</comment>
+    <comment>Confirmation message after suceessfully copying a value to the clipboard.</comment>
   </data>
   <data name="VerifyFingerprint" xml:space="preserve">
     <value>Bevestig vingerafdruk</value>
@@ -1576,7 +1576,7 @@ Skandering gebeur outomaties.</value>
     <comment>'Nord' is the name of a specific color scheme. It should not be translated.</comment>
   </data>
   <data name="SolarizedDark" xml:space="preserve">
-    <value>'Solarized' Donker</value>
+    <value>Solarized Dark</value>
     <comment>'Solarized Dark' is the name of a specific color scheme. It should not be translated.</comment>
   </data>
   <data name="AutofillBlockedUris" xml:space="preserve">
@@ -2299,6 +2299,9 @@ Skandering gebeur outomaties.</value>
     <value>Sodra u die sleutel reg ingevoer het,
 kies u Voeg TOTP toe om die sleutel veilig te bewaar</value>
   </data>
+  <data name="SelectAddTotpToStoreTheKeySafely" xml:space="preserve">
+    <value></value>
+  </data>
   <data name="NeverLockWarning" xml:space="preserve">
     <value>Deur u vergrendelopsies na “Nooit” te stel, is u kluis beskikbaar aan enigeen met toegang tot u toestel. Indien u hierdie opsie gebruik moet u seker maak dat u u toestel voldoende beskerm.</value>
   </data>
@@ -2449,9 +2452,6 @@ kies u Voeg TOTP toe om die sleutel veilig te bewaar</value>
   <data name="Random" xml:space="preserve">
     <value>Lukraak</value>
   </data>
-  <data name="ConnectToWatch" xml:space="preserve">
-    <value>Koppel aan horlosie</value>
-  </data>
   <data name="AccessibilityServiceDisclosure" xml:space="preserve">
     <value>Toeganklikheidsdiensopenbaarmaking</value>
   </data>
@@ -2468,50 +2468,47 @@ kies u Voeg TOTP toe om die sleutel veilig te bewaar</value>
     <value>Aantekenversoek het reeds verstryk.</value>
   </data>
   <data name="LoginAttemptFromXDoYouWantToSwitchToThisAccount" xml:space="preserve">
-    <value>Teken Aan probeerslag van:
+    <value>Login attempt from:
 {0}
-Wil u na die rekening omskakel?</value>
+Do you want to switch to this account?</value>
   </data>
   <data name="NewAroundHere" xml:space="preserve">
-    <value>Nuut hier?</value>
+    <value>New around here?</value>
   </data>
   <data name="GetMasterPasswordwordHint" xml:space="preserve">
-    <value>Kry hoofwagwoord wenk</value>
+    <value>Get master password hint</value>
   </data>
   <data name="LoggingInAsX" xml:space="preserve">
-    <value>Teken in as {0}</value>
+    <value>Logging in as {0}</value>
   </data>
   <data name="NotYou" xml:space="preserve">
-    <value>Nie jy nie?</value>
+    <value>Not you?</value>
   </data>
   <data name="LogInWithMasterPassword" xml:space="preserve">
-    <value>Teken aan met hoofwagwoord</value>
+    <value>Log in with master password</value>
   </data>
   <data name="LogInWithAnotherDevice" xml:space="preserve">
-    <value>Teken Aan met 'n ander toestel</value>
+    <value>Log In with another device</value>
   </data>
   <data name="LogInInitiated" xml:space="preserve">
-    <value>Aanmelding begin</value>
+    <value>Log in initiated</value>
   </data>
   <data name="ANotificationHasBeenSentToYourDevice" xml:space="preserve">
-    <value>'n Kennisgewing was gestuur na u toestel.</value>
+    <value>A notification has been sent to your device.</value>
   </data>
   <data name="PleaseMakeSureYourVaultIsUnlockedAndTheFingerprintPhraseMatchesOnTheOtherDevice" xml:space="preserve">
-    <value>Asseblief maak seker jou kluis is oopgesluit en die vingerafdruk frase stem ooreen op die ander toestel.</value>
+    <value>Please make sure your vault is unlocked and the Fingerprint phrase matches on the other device.</value>
   </data>
   <data name="ResendNotification" xml:space="preserve">
-    <value>Stuur kennisgewing weer</value>
+    <value>Resend notification</value>
   </data>
   <data name="NeedAnotherOption" xml:space="preserve">
-    <value>Is daar nog 'n opsie nodig?</value>
+    <value>Need another option?</value>
   </data>
   <data name="ViewAllLoginOptions" xml:space="preserve">
-    <value>Wys alle aanmeldings opsies</value>
+    <value>View all log in options</value>
   </data>
   <data name="ThisRequestIsNoLongerValid" xml:space="preserve">
-    <value>Hierdie versoek is nie langer gelding nie</value>
-  </data>
-  <data name="EnableCamerPermissionToUseTheScanner" xml:space="preserve">
-    <value>Laat die kamera versoek toe om die skandeerder te gebruik</value>
+    <value>This request is no longer valid</value>
   </data>
 </root>

src/App/Resources/AppResources.ar.resx

@@ -118,17 +118,17 @@
     <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
   <data name="About" xml:space="preserve">
-    <value>عن التطبيق</value>
+    <value>حول</value>
   </data>
   <data name="Add" xml:space="preserve">
-    <value>أضِف</value>
+    <value>إضافة</value>
     <comment>Add/create a new entity (verb).</comment>
   </data>
   <data name="AddFolder" xml:space="preserve">
-    <value>مجلد مضاف</value>
+    <value>إضافة مجلد</value>
   </data>
   <data name="AddItem" xml:space="preserve">
-    <value>تمت إضافة العنصر</value>
+    <value>إضافة عنصر</value>
     <comment>The title for the add item page.</comment>
   </data>
   <data name="AnErrorHasOccurred" xml:space="preserve">
@@ -323,14 +323,14 @@
     <comment>Label for a password.</comment>
   </data>
   <data name="Save" xml:space="preserve">
-    <value>حفظ</value>
+    <value>تسجيل</value>
     <comment>Button text for a save operation (verb).</comment>
   </data>
   <data name="Move" xml:space="preserve">
     <value>نقل</value>
   </data>
   <data name="Saving" xml:space="preserve">
-    <value>حفظ...</value>
+    <value>تسجيل ...</value>
     <comment>Message shown when interacting with the server</comment>
   </data>
   <data name="Settings" xml:space="preserve">
@@ -376,7 +376,7 @@
   </data>
   <data name="ValueHasBeenCopied" xml:space="preserve">
     <value>{0} تم نسخه</value>
-    <comment>Confirmation message after successfully copying a value to the clipboard.</comment>
+    <comment>Confirmation message after suceessfully copying a value to the clipboard.</comment>
   </data>
   <data name="VerifyFingerprint" xml:space="preserve">
     <value>التحقق من بصمة الإصبع</value>
@@ -2300,6 +2300,9 @@
     <value>بمجرد إدخال المفتاح بنجاح،
 حدد إضافة TOTP لتخزين المفتاح بأمان</value>
   </data>
+  <data name="SelectAddTotpToStoreTheKeySafely" xml:space="preserve">
+    <value></value>
+  </data>
   <data name="NeverLockWarning" xml:space="preserve">
     <value>تعيين خيارات قفل الخاص بك إلى "مطلقا" يبقي خزنتك متاحةً لأي شخص لديه حق الوصول إلى جهازك. إذا كنت تستخدم هذا الخيار، يجب أن تتأكد من الحفاظ على حماية جهازك بشكل صحيح.</value>
   </data>
@@ -2450,9 +2453,6 @@
   <data name="Random" xml:space="preserve">
     <value>عشوائي</value>
   </data>
-  <data name="ConnectToWatch" xml:space="preserve">
-    <value>متّصل بالسّاعة</value>
-  </data>
   <data name="AccessibilityServiceDisclosure" xml:space="preserve">
     <value>كشف خدمة إمكانية الوصول</value>
   </data>
@@ -2492,27 +2492,24 @@
     <value>تسجيل الدخول باستخدام جهاز آخر</value>
   </data>
   <data name="LogInInitiated" xml:space="preserve">
-    <value>بدء تسجيل الدخول</value>
+    <value>Log in initiated</value>
   </data>
   <data name="ANotificationHasBeenSentToYourDevice" xml:space="preserve">
-    <value>تم إرسال إشعار إلى جهازك.</value>
+    <value>A notification has been sent to your device.</value>
   </data>
   <data name="PleaseMakeSureYourVaultIsUnlockedAndTheFingerprintPhraseMatchesOnTheOtherDevice" xml:space="preserve">
-    <value>الرجاء التأكد من أن الخزنة الخاصة بك غير مقفلة وأن عبارة بصمة الإصبع تتطابق على الجهاز الآخر.</value>
+    <value>Please make sure your vault is unlocked and the Fingerprint phrase matches on the other device.</value>
   </data>
   <data name="ResendNotification" xml:space="preserve">
-    <value>إعادة إرسال الإشعار</value>
+    <value>Resend notification</value>
   </data>
   <data name="NeedAnotherOption" xml:space="preserve">
-    <value>هل تحتاج إلى خيار آخر؟</value>
+    <value>Need another option?</value>
   </data>
   <data name="ViewAllLoginOptions" xml:space="preserve">
-    <value>عرض جميع خيارات تسجيل الدخول</value>
+    <value>View all log in options</value>
   </data>
   <data name="ThisRequestIsNoLongerValid" xml:space="preserve">
-    <value>هذا الطلب لم يعد صالحًا</value>
-  </data>
-  <data name="EnableCamerPermissionToUseTheScanner" xml:space="preserve">
-    <value>تمكين إذن الكاميرا لاستخدام الماسح الضوئي</value>
+    <value>This request is no longer valid</value>
   </data>
 </root>

src/App/Resources/AppResources.az.resx

@@ -376,7 +376,7 @@
   </data>
   <data name="ValueHasBeenCopied" xml:space="preserve">
     <value>{0} kopyalandı.</value>
-    <comment>Confirmation message after successfully copying a value to the clipboard.</comment>
+    <comment>Confirmation message after suceessfully copying a value to the clipboard.</comment>
   </data>
   <data name="VerifyFingerprint" xml:space="preserve">
     <value>Barmaq izini təsdiqlə</value>
@@ -2137,7 +2137,7 @@ Skan prosesi avtomatik baş tutacaq.</value>
     <value>Bu təşkilat, sizi "parol sıfırlama"da avtomatik olaraq qeydiyyata alan müəssisə siyasətinə sahibdir. Qeydiyyat, təşkilat administratorlarına ana parolunuzu dəyişdirmə icazəsi verəcək.</value>
   </data>
   <data name="VaultTimeoutPolicyInEffect" xml:space="preserve">
-    <value>Your organization policies are affecting your vault timeout. Maximum allowed vault timeout is {0} hour(s) and {1} minute(s)</value>
+    <value>Təşkilatınızın siyasətləri, anbarınızın vaxt bitişinə təsir edir. Anbar vaxt bitişi üçün icazə verilən maksimum vaxt $HOURS$ saat $MINUTES$ dəqiqədir</value>
   </data>
   <data name="VaultTimeoutToLarge" xml:space="preserve">
     <value>Anbar vaxt bitişi, təşkilatınız tərəfindən tənzimlənən məhdudiyyətləri aşır.</value>
@@ -2298,6 +2298,9 @@ Skan prosesi avtomatik baş tutacaq.</value>
   <data name="OnceTheKeyIsSuccessfullyEntered" xml:space="preserve">
     <value>Açar uğurla daxil edildikdən sonra, açarı güvənli şəkildə saxlamaq üçün "TOTP əlavə et"i seçin</value>
   </data>
+  <data name="SelectAddTotpToStoreTheKeySafely" xml:space="preserve">
+    <value></value>
+  </data>
   <data name="NeverLockWarning" xml:space="preserve">
     <value>Kilid seçimlərini "Heç vaxt" olaraq tənzimləmək, anbarınızı cihazınıza müraciəti olan hər kəsə əlçatan edir. Bu seçimi istifadə etsəniz, cihazınızı düzgün qoruduğunuza əmin olmalısınız.</value>
   </data>
@@ -2448,9 +2451,6 @@ Skan prosesi avtomatik baş tutacaq.</value>
   <data name="Random" xml:space="preserve">
     <value>Təsadüfi</value>
   </data>
-  <data name="ConnectToWatch" xml:space="preserve">
-    <value>"Watch"a bağlan</value>
-  </data>
   <data name="AccessibilityServiceDisclosure" xml:space="preserve">
     <value>Əlçatımlılıq Xidməti açıqlaması</value>
   </data>
@@ -2510,7 +2510,4 @@ Bu hesaba keçmək istəyirsiniz?</value>
   <data name="ThisRequestIsNoLongerValid" xml:space="preserve">
     <value>Bu tələb artıq yararsızdır</value>
   </data>
-  <data name="EnableCamerPermissionToUseTheScanner" xml:space="preserve">
-    <value>Skaneri istifadə etmək üçün kamera icazəsini fəallaşdırın</value>
-  </data>
 </root>

src/App/Resources/AppResources.be.resx

@@ -376,7 +376,7 @@
   </data>
   <data name="ValueHasBeenCopied" xml:space="preserve">
     <value>{0} скапіяваны</value>
-    <comment>Confirmation message after successfully copying a value to the clipboard.</comment>
+    <comment>Confirmation message after suceessfully copying a value to the clipboard.</comment>
   </data>
   <data name="VerifyFingerprint" xml:space="preserve">
     <value>Праверка адбітка пальца</value>
@@ -1575,7 +1575,7 @@
     <comment>'Nord' is the name of a specific color scheme. It should not be translated.</comment>
   </data>
   <data name="SolarizedDark" xml:space="preserve">
-    <value>Solarized Dark</value>
+    <value>Цёмная Solarized</value>
     <comment>'Solarized Dark' is the name of a specific color scheme. It should not be translated.</comment>
   </data>
   <data name="AutofillBlockedUris" xml:space="preserve">
@@ -2299,6 +2299,9 @@
     <value>Пасля таго, як ваш ключ паспяхова ўведзены,
 выберыце "Дадаць TOTP" для надзейнага захавання ключа</value>
   </data>
+  <data name="SelectAddTotpToStoreTheKeySafely" xml:space="preserve">
+    <value></value>
+  </data>
   <data name="NeverLockWarning" xml:space="preserve">
     <value>Прызначыўшы параметр блакіравання "Ніколі", ваша сховішча будзе даступна кожнаму, хто мае доступ да вашай прылады. Калі вы выкарыстоўваеце гэты параметр, вы павінны быць упэўнены ў тым, што ваша прылада надзейна абаронена.</value>
   </data>
@@ -2449,9 +2452,6 @@
   <data name="Random" xml:space="preserve">
     <value>Выпадкова</value>
   </data>
-  <data name="ConnectToWatch" xml:space="preserve">
-    <value>Падлучыцца да гадзінніка</value>
-  </data>
   <data name="AccessibilityServiceDisclosure" xml:space="preserve">
     <value>Апісанне службы спецыяльных магчымасцей</value>
   </data>
@@ -2511,7 +2511,4 @@
   <data name="ThisRequestIsNoLongerValid" xml:space="preserve">
     <value>Гэты запыт больш не дзейнічае</value>
   </data>
-  <data name="EnableCamerPermissionToUseTheScanner" xml:space="preserve">
-    <value>Каб выкарыстоўваць сканер дайце дазвол на выкарыстанне камеры</value>
-  </data>
 </root>

src/App/Resources/AppResources.bg.resx

@@ -300,7 +300,7 @@
     <comment>The title for the vault page.</comment>
   </data>
   <data name="Authenticator" xml:space="preserve">
-    <value>Удостоверител</value>
+    <value>Authenticator</value>
     <comment>Authenticator TOTP feature</comment>
   </data>
   <data name="Name" xml:space="preserve">
@@ -376,7 +376,7 @@
   </data>
   <data name="ValueHasBeenCopied" xml:space="preserve">
     <value>{0} беше копирано.</value>
-    <comment>Confirmation message after successfully copying a value to the clipboard.</comment>
+    <comment>Confirmation message after suceessfully copying a value to the clipboard.</comment>
   </data>
   <data name="VerifyFingerprint" xml:space="preserve">
     <value>Потвърждаване на пръстовия отпечатък</value>
@@ -2080,7 +2080,7 @@
     <value>Това действие е защитено. За да продължите, въведете отново главната си парола, за да потвърдите самоличността си.</value>
   </data>
   <data name="CaptchaRequired" xml:space="preserve">
-    <value>Адресът за hCaptcha е задължителен</value>
+    <value>Captcha required</value>
   </data>
   <data name="CaptchaFailed" xml:space="preserve">
     <value>
@@ -2267,7 +2267,7 @@
     <value>Всички</value>
   </data>
   <data name="Totp" xml:space="preserve">
-    <value>Кода за потвърждаване</value>
+    <value>TOTP</value>
   </data>
   <data name="VerificationCodes" xml:space="preserve">
     <value>Кодове за потвърждаване</value>
@@ -2291,15 +2291,18 @@
     <value>Ръчно въвеждане на кода</value>
   </data>
   <data name="AddTotp" xml:space="preserve">
-    <value>Копиране на кода за потвърждаване</value>
+    <value>Add TOTP</value>
   </data>
   <data name="SetupTotp" xml:space="preserve">
-    <value>Копиране на кода за потвърждаване</value>
+    <value>Set up TOTP</value>
   </data>
   <data name="OnceTheKeyIsSuccessfullyEntered" xml:space="preserve">
     <value>Once the key is successfully entered,
 select Add TOTP to store the key safely</value>
   </data>
+  <data name="SelectAddTotpToStoreTheKeySafely" xml:space="preserve">
+    <value></value>
+  </data>
   <data name="NeverLockWarning" xml:space="preserve">
     <value>Ако изберете „Никога“ като настройка за заключването, трезорът Ви ще бъде достъпен за всеки, който има досег с устройството. Ако използвате тази настройка, трябва да се уверите, че устройството Ви е удачно защитено.</value>
   </data>
@@ -2334,7 +2337,7 @@ select Add TOTP to store the key safely</value>
     <value>Време</value>
   </data>
   <data name="Near" xml:space="preserve">
-    <value>Близо</value>
+    <value>Near</value>
   </data>
   <data name="ConfirmLogIn" xml:space="preserve">
     <value>Потвърждаване на вписването</value>
@@ -2385,13 +2388,13 @@ select Add TOTP to store the key safely</value>
     <value>Тип потребителско име</value>
   </data>
   <data name="PlusAddressedEmail" xml:space="preserve">
-    <value>Адрес на е-поща с плюс</value>
+    <value>Plus addressed email</value>
   </data>
   <data name="CatchAllEmail" xml:space="preserve">
-    <value>Хващаща всичко е-поща</value>
+    <value>Catch-all email</value>
   </data>
   <data name="ForwardedEmailAlias" xml:space="preserve">
-    <value>Псевдоним на препратена е-поща</value>
+    <value>Forwarded email alias</value>
   </data>
   <data name="RandomWord" xml:space="preserve">
     <value>Произволна дума</value>
@@ -2430,7 +2433,7 @@ select Add TOTP to store the key safely</value>
     <value>Генериране на потр. име</value>
   </data>
   <data name="EmailType" xml:space="preserve">
-    <value>Вид е-поща</value>
+    <value>Email Type</value>
   </data>
   <data name="WebsiteRequired" xml:space="preserve">
     <value>Уеб сайт (задължително)</value>
@@ -2442,17 +2445,14 @@ select Add TOTP to store the key safely</value>
     <value>Използвайте възможностите за под-адресиране на е-поща на своя доставчик</value>
   </data>
   <data name="CatchAllEmailDescription" xml:space="preserve">
-    <value>Използвайте конфигурираната входяща кутия за събиране на всичко.</value>
+    <value>Use your domain's configured catch-all inbox.</value>
   </data>
   <data name="ForwardedEmailDescription" xml:space="preserve">
-    <value>Създайте псевдоним на е-поща с външна услуга за препращане.</value>
+    <value>Generate an email alias with an external forwarding service.</value>
   </data>
   <data name="Random" xml:space="preserve">
     <value>Произволно</value>
   </data>
-  <data name="ConnectToWatch" xml:space="preserve">
-    <value>Свързване към часовник</value>
-  </data>
   <data name="AccessibilityServiceDisclosure" xml:space="preserve">
     <value>Използване на услугата за достъпност</value>
   </data>
@@ -2512,7 +2512,4 @@ select Add TOTP to store the key safely</value>
   <data name="ThisRequestIsNoLongerValid" xml:space="preserve">
     <value>Тази зявка вече не е приложима</value>
   </data>
-  <data name="EnableCamerPermissionToUseTheScanner" xml:space="preserve">
-    <value>Разрешете достъпа до камерата, за да използвате скенера</value>
-  </data>
 </root>

src/App/Resources/AppResources.bn.resx

@@ -376,7 +376,7 @@
   </data>
   <data name="ValueHasBeenCopied" xml:space="preserve">
     <value>{0} copied</value>
-    <comment>Confirmation message after successfully copying a value to the clipboard.</comment>
+    <comment>Confirmation message after suceessfully copying a value to the clipboard.</comment>
   </data>
   <data name="VerifyFingerprint" xml:space="preserve">
     <value>Verify fingerprint</value>
@@ -2300,6 +2300,9 @@ Scanning will happen automatically.</value>
     <value>Once the key is successfully entered,
 select Add TOTP to store the key safely</value>
   </data>
+  <data name="SelectAddTotpToStoreTheKeySafely" xml:space="preserve">
+    <value></value>
+  </data>
   <data name="NeverLockWarning" xml:space="preserve">
     <value>Setting your lock options to “Never” keeps your vault available to anyone with access to your device. If you use this option, you should ensure that you keep your device properly protected.</value>
   </data>
@@ -2450,9 +2453,6 @@ select Add TOTP to store the key safely</value>
   <data name="Random" xml:space="preserve">
     <value>Random</value>
   </data>
-  <data name="ConnectToWatch" xml:space="preserve">
-    <value>Connect to Watch</value>
-  </data>
   <data name="AccessibilityServiceDisclosure" xml:space="preserve">
     <value>Accessibility Service Disclosure</value>
   </data>
@@ -2512,7 +2512,4 @@ Do you want to switch to this account?</value>
   <data name="ThisRequestIsNoLongerValid" xml:space="preserve">
     <value>This request is no longer valid</value>
   </data>
-  <data name="EnableCamerPermissionToUseTheScanner" xml:space="preserve">
-    <value>Enable camera permission to use the scanner</value>
-  </data>
 </root>

src/App/Resources/AppResources.bs.resx

@@ -376,7 +376,7 @@
   </data>
   <data name="ValueHasBeenCopied" xml:space="preserve">
     <value>{0} kopirano.</value>
-    <comment>Confirmation message after successfully copying a value to the clipboard.</comment>
+    <comment>Confirmation message after suceessfully copying a value to the clipboard.</comment>
   </data>
   <data name="VerifyFingerprint" xml:space="preserve">
     <value>Potvrdi otisak prsta</value>
@@ -1412,7 +1412,7 @@ Scanning will happen automatically.</value>
     <value>Nema kolekcija za prikazati.</value>
   </data>
   <data name="MovedItemToOrg" xml:space="preserve">
-    <value>{0} moved to {1}.</value>
+    <value>premješteno u</value>
     <comment>ex: Item moved to Organization.</comment>
   </data>
   <data name="ItemShared" xml:space="preserve">
@@ -2299,6 +2299,9 @@ Scanning will happen automatically.</value>
     <value>Once the key is successfully entered,
 select Add TOTP to store the key safely</value>
   </data>
+  <data name="SelectAddTotpToStoreTheKeySafely" xml:space="preserve">
+    <value></value>
+  </data>
   <data name="NeverLockWarning" xml:space="preserve">
     <value>Setting your lock options to “Never” keeps your vault available to anyone with access to your device. If you use this option, you should ensure that you keep your device properly protected.</value>
   </data>
@@ -2449,9 +2452,6 @@ select Add TOTP to store the key safely</value>
   <data name="Random" xml:space="preserve">
     <value>Random</value>
   </data>
-  <data name="ConnectToWatch" xml:space="preserve">
-    <value>Connect to Watch</value>
-  </data>
   <data name="AccessibilityServiceDisclosure" xml:space="preserve">
     <value>Accessibility Service Disclosure</value>
   </data>
@@ -2511,7 +2511,4 @@ Do you want to switch to this account?</value>
   <data name="ThisRequestIsNoLongerValid" xml:space="preserve">
     <value>This request is no longer valid</value>
   </data>
-  <data name="EnableCamerPermissionToUseTheScanner" xml:space="preserve">
-    <value>Enable camera permission to use the scanner</value>
-  </data>
 </root>

src/App/Resources/AppResources.ca.resx

@@ -376,7 +376,7 @@
   </data>
   <data name="ValueHasBeenCopied" xml:space="preserve">
     <value>S'ha copiat '{0}'.</value>
-    <comment>Confirmation message after successfully copying a value to the clipboard.</comment>
+    <comment>Confirmation message after suceessfully copying a value to the clipboard.</comment>
   </data>
   <data name="VerifyFingerprint" xml:space="preserve">
     <value>Verifica empremta digital</value>
@@ -556,7 +556,7 @@
     <value>Temps d'espera de la caixa forta</value>
   </data>
   <data name="VaultTimeoutAction" xml:space="preserve">
-    <value>Acció quan acabe el temps d'espera de la caixa forta</value>
+    <value>Acció del temps d'espera de la caixa forta</value>
   </data>
   <data name="VaultTimeoutLogOutConfirmation" xml:space="preserve">
     <value>En tancar la sessió s'eliminarà tot l'accés a la vostra caixa forta i es requerirà una autenticació en línia després del període de temps d'espera. Esteu segur que voleu utilitzar aquesta configuració?</value>
@@ -769,16 +769,16 @@
     <value>2. Activeu el commutador i premeu d'acord per acceptar.</value>
   </data>
   <data name="Disabled" xml:space="preserve">
-    <value>No</value>
+    <value>Deshabilitat</value>
   </data>
   <data name="Enabled" xml:space="preserve">
-    <value>Sí</value>
+    <value>Habilitat</value>
   </data>
   <data name="Off" xml:space="preserve">
-    <value>No</value>
+    <value>Desactivat</value>
   </data>
   <data name="On" xml:space="preserve">
-    <value>Sí</value>
+    <value>Activat</value>
   </data>
   <data name="Status" xml:space="preserve">
     <value>Estat</value>
@@ -1620,13 +1620,13 @@ L'escaneig es farà automàticament.</value>
     <value>La vostra sessió ha caducat.</value>
   </data>
   <data name="BiometricsDirection" xml:space="preserve">
-    <value>Desbloqueja amb biometria</value>
+    <value>Utilitzeu dades biomètriques per verificar</value>
   </data>
   <data name="Biometrics" xml:space="preserve">
     <value>Dades biomètriques</value>
   </data>
   <data name="UseBiometricsToUnlock" xml:space="preserve">
-    <value>Desbloqueja amb biometria</value>
+    <value>Utilitzeu dades biomètriques per desbloquejar</value>
   </data>
   <data name="AccessibilityOverlayPermissionAlert" xml:space="preserve">
     <value>Bitwarden necessita atenció: vegeu "Servei d'accessibilitat d'emplenament automàtic" de la configuració de Bitwarden</value>
@@ -1828,7 +1828,7 @@ L'escaneig es farà automàticament.</value>
     <value>Serveis d'emplenament automàtic</value>
   </data>
   <data name="InlineAutofill" xml:space="preserve">
-    <value>Utilitza l'emplenament automàtic integrat</value>
+    <value>Utilitza l'emplenament automàtic en línia</value>
   </data>
   <data name="InlineAutofillDescription" xml:space="preserve">
     <value>Utilitzeu l'emplenament automàtic en línia si l'IME (teclat) seleccionat l'admet. Si la vostra configuració no és compatible (o aquesta opció està desactivada), s'utilitzarà la superposició d'emplenament automàtic per defecte.</value>
@@ -2299,6 +2299,9 @@ L'escaneig es farà automàticament.</value>
     <value>Una vegada introduïda la clau correctament,
 seleccioneu Afegeix TOTP per emmagatzemar la clau de manera segura</value>
   </data>
+  <data name="SelectAddTotpToStoreTheKeySafely" xml:space="preserve">
+    <value></value>
+  </data>
   <data name="NeverLockWarning" xml:space="preserve">
     <value>Si configureu les opcions de bloqueig a "Mai", la vostra caixa forta està disponible per a qualsevol persona amb accés al vostre dispositiu. Si utilitzeu aquesta opció, hauríeu d'assegurar-vos de mantenir el vostre dispositiu correctament protegit.</value>
   </data>
@@ -2449,9 +2452,6 @@ seleccioneu Afegeix TOTP per emmagatzemar la clau de manera segura</value>
   <data name="Random" xml:space="preserve">
     <value>Aleatori</value>
   </data>
-  <data name="ConnectToWatch" xml:space="preserve">
-    <value>Connecta't a Watch</value>
-  </data>
   <data name="AccessibilityServiceDisclosure" xml:space="preserve">
     <value>Divulgació del servei d'accessibilitat</value>
   </data>
@@ -2511,7 +2511,4 @@ Voleu canviar a aquest compte?</value>
   <data name="ThisRequestIsNoLongerValid" xml:space="preserve">
     <value>Aquesta sol·licitud ja no és vàlida</value>
   </data>
-  <data name="EnableCamerPermissionToUseTheScanner" xml:space="preserve">
-    <value>Habilita el permís de la càmera per utilitzar l'escàner</value>
-  </data>
 </root>

src/App/Resources/AppResources.cs.resx

@@ -376,7 +376,7 @@
   </data>
   <data name="ValueHasBeenCopied" xml:space="preserve">
     <value>{0} bylo zkopírováno.</value>
-    <comment>Confirmation message after successfully copying a value to the clipboard.</comment>
+    <comment>Confirmation message after suceessfully copying a value to the clipboard.</comment>
   </data>
   <data name="VerifyFingerprint" xml:space="preserve">
     <value>Ověření otisku prstu</value>
@@ -2299,6 +2299,9 @@ Načtení proběhne automaticky.</value>
     <value>Once the key is successfully entered,
 select Add TOTP to store the key safely</value>
   </data>
+  <data name="SelectAddTotpToStoreTheKeySafely" xml:space="preserve">
+    <value></value>
+  </data>
   <data name="NeverLockWarning" xml:space="preserve">
     <value>Nastavení zámku na „Nikdy“ ponechá váš trezor k dispozici komukoliv s přístupem k vašemu zařízení. Používáte-li tuto možnost, měli byste zajistit, aby vaše zařízení bylo náležitě chráněno.</value>
   </data>
@@ -2449,9 +2452,6 @@ select Add TOTP to store the key safely</value>
   <data name="Random" xml:space="preserve">
     <value>Náhodně</value>
   </data>
-  <data name="ConnectToWatch" xml:space="preserve">
-    <value>Connect to Watch</value>
-  </data>
   <data name="AccessibilityServiceDisclosure" xml:space="preserve">
     <value>Accessibility Service Disclosure</value>
   </data>
@@ -2511,7 +2511,4 @@ Chcete se přepnout na tento účet?</value>
   <data name="ThisRequestIsNoLongerValid" xml:space="preserve">
     <value>Tento požadavek již není platný</value>
   </data>
-  <data name="EnableCamerPermissionToUseTheScanner" xml:space="preserve">
-    <value>Enable camera permission to use the scanner</value>
-  </data>
 </root>

src/App/Resources/AppResources.da.resx

@@ -376,7 +376,7 @@
   </data>
   <data name="ValueHasBeenCopied" xml:space="preserve">
     <value>{0} kopieret</value>
-    <comment>Confirmation message after successfully copying a value to the clipboard.</comment>
+    <comment>Confirmation message after suceessfully copying a value to the clipboard.</comment>
   </data>
   <data name="VerifyFingerprint" xml:space="preserve">
     <value>Verificér fingeraftryk</value>
@@ -1762,7 +1762,7 @@ Skanning vil ske automatisk.</value>
     <value>Synkronisering af boks med træk nedad-gestus.</value>
   </data>
   <data name="LogInSso" xml:space="preserve">
-    <value>Virksomheds Single Sign-On</value>
+    <value>Virksomheds Single Sign On</value>
   </data>
   <data name="LogInSsoSummary" xml:space="preserve">
     <value>Log hurtigt ind vha. din organisations single sign-on portal. Angiv din organisations identifikator for at begynde.</value>
@@ -2299,6 +2299,9 @@ Skanning vil ske automatisk.</value>
     <value>Når nøglen er angivet,
 vælg Tilføj TOTP for at gemme nøglen sikkert</value>
   </data>
+  <data name="SelectAddTotpToStoreTheKeySafely" xml:space="preserve">
+    <value></value>
+  </data>
   <data name="NeverLockWarning" xml:space="preserve">
     <value>Sættes låseindstillingen til “Aldrig”, er din boks tilgængelig for alle med adgang til enheden. Bruges denne mulighed, så vær sikker på, at din enhed er ordentligt beskyttet.</value>
   </data>
@@ -2449,9 +2452,6 @@ vælg Tilføj TOTP for at gemme nøglen sikkert</value>
   <data name="Random" xml:space="preserve">
     <value>Tilfældig</value>
   </data>
-  <data name="ConnectToWatch" xml:space="preserve">
-    <value>Opret forbindelse til Watch</value>
-  </data>
   <data name="AccessibilityServiceDisclosure" xml:space="preserve">
     <value>Oplysninger om tilgængelighedstjeneste</value>
   </data>
@@ -2511,7 +2511,4 @@ Vil du skifte til denne konto?</value>
   <data name="ThisRequestIsNoLongerValid" xml:space="preserve">
     <value>Anmodningen er ikke længere gyldig</value>
   </data>
-  <data name="EnableCamerPermissionToUseTheScanner" xml:space="preserve">
-    <value>Tildel kameratilladelse for brug af skanneren</value>
-  </data>
 </root>

src/App/Resources/AppResources.de.resx

@@ -376,7 +376,7 @@
   </data>
   <data name="ValueHasBeenCopied" xml:space="preserve">
     <value>{0} wurde kopiert</value>
-    <comment>Confirmation message after successfully copying a value to the clipboard.</comment>
+    <comment>Confirmation message after suceessfully copying a value to the clipboard.</comment>
   </data>
   <data name="VerifyFingerprint" xml:space="preserve">
     <value>Fingerabdruck überprüfen</value>
@@ -2298,6 +2298,9 @@ Das Scannen erfolgt automatisch.</value>
   <data name="OnceTheKeyIsSuccessfullyEntered" xml:space="preserve">
     <value>Sobald der Schlüssel erfolgreich eingegeben wurde, wähle TOTP hinzufügen, um den Schlüssel sicher abzuspeichern</value>
   </data>
+  <data name="SelectAddTotpToStoreTheKeySafely" xml:space="preserve">
+    <value></value>
+  </data>
   <data name="NeverLockWarning" xml:space="preserve">
     <value>Wenn du deine Sperroptionen auf „Nie“ einstellst, bleibt dein Tresor für jeden zugänglich, der Zugriff auf dein Gerät hat. Wenn du diese Option verwendest, solltest du sicherstellen, dass du dein Gerät angemessen schützt.</value>
   </data>
@@ -2448,9 +2451,6 @@ Das Scannen erfolgt automatisch.</value>
   <data name="Random" xml:space="preserve">
     <value>Zufällig</value>
   </data>
-  <data name="ConnectToWatch" xml:space="preserve">
-    <value>Mit Uhr verbinden</value>
-  </data>
   <data name="AccessibilityServiceDisclosure" xml:space="preserve">
     <value>Bedienungshilfen Offenlegung</value>
   </data>
@@ -2510,7 +2510,4 @@ Möchtest du zu diesem Konto wechseln?</value>
   <data name="ThisRequestIsNoLongerValid" xml:space="preserve">
     <value>Diese Anfrage ist nicht mehr gültig</value>
   </data>
-  <data name="EnableCamerPermissionToUseTheScanner" xml:space="preserve">
-    <value>Kamerazugriff aktivieren, um den Scanner zu verwenden</value>
-  </data>
 </root>

src/App/Resources/AppResources.el.resx

@@ -377,7 +377,7 @@
   </data>
   <data name="ValueHasBeenCopied" xml:space="preserve">
     <value>{0} έχει αντιγραφεί.</value>
-    <comment>Confirmation message after successfully copying a value to the clipboard.</comment>
+    <comment>Confirmation message after suceessfully copying a value to the clipboard.</comment>
   </data>
   <data name="VerifyFingerprint" xml:space="preserve">
     <value>Επαλήθευση Δακτυλικού Αποτυπώματος</value>
@@ -2299,6 +2299,9 @@
     <value>Μόλις το κλειδί εισαχθεί με επιτυχία,
 επιλέξτε Προσθήκη TOTP για να αποθηκεύσετε το κλειδί με ασφάλεια</value>
   </data>
+  <data name="SelectAddTotpToStoreTheKeySafely" xml:space="preserve">
+    <value></value>
+  </data>
   <data name="NeverLockWarning" xml:space="preserve">
     <value>Ρυθμίζοντας τις επιλογές κλειδώματος σε “Ποτέ” κρατά τη κρύπτη σας διαθέσιμη σε οποιονδήποτε με πρόσβαση στη συσκευή σας. Εάν χρησιμοποιείτε αυτήν την επιλογή, θα πρέπει να διασφαλίσετε ότι διατηρείτε τη συσκευή σας σωστά προστατευμένη.</value>
   </data>
@@ -2449,9 +2452,6 @@
   <data name="Random" xml:space="preserve">
     <value>Τυχαίο</value>
   </data>
-  <data name="ConnectToWatch" xml:space="preserve">
-    <value>Σύνδεση με το ρολόι</value>
-  </data>
   <data name="AccessibilityServiceDisclosure" xml:space="preserve">
     <value>Γνωστοποίηση Υπηρεσίας Προσβασιμότητας</value>
   </data>
@@ -2511,7 +2511,4 @@ Do you want to switch to this account?</value>
   <data name="ThisRequestIsNoLongerValid" xml:space="preserve">
     <value>This request is no longer valid</value>
   </data>
-  <data name="EnableCamerPermissionToUseTheScanner" xml:space="preserve">
-    <value>Enable camera permission to use the scanner</value>
-  </data>
 </root>

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

@@ -376,7 +376,7 @@
   </data>
   <data name="ValueHasBeenCopied" xml:space="preserve">
     <value>{0} copied</value>
-    <comment>Confirmation message after successfully copying a value to the clipboard.</comment>
+    <comment>Confirmation message after suceessfully copying a value to the clipboard.</comment>
   </data>
   <data name="VerifyFingerprint" xml:space="preserve">
     <value>Verify fingerprint</value>
@@ -471,19 +471,19 @@
     <value>Edit item</value>
   </data>
   <data name="EnableAutomaticSyncing" xml:space="preserve">
-    <value>Allow automatic syncing</value>
+    <value>Enable automatic syncing</value>
   </data>
   <data name="EnterEmailForHint" xml:space="preserve">
     <value>Enter your account email address to receive your master password hint.</value>
   </data>
   <data name="ExntesionReenable" xml:space="preserve">
-    <value>Reactivate app extension</value>
+    <value>Re-enable app extension</value>
   </data>
   <data name="ExtensionAlmostDone" xml:space="preserve">
     <value>Almost done!</value>
   </data>
   <data name="ExtensionEnable" xml:space="preserve">
-    <value>Activate app extension</value>
+    <value>Enable app extension</value>
   </data>
   <data name="ExtensionInSafari" xml:space="preserve">
     <value>In Safari, find Bitwarden using the share icon (hint: scroll to the right on the bottom row of the menu).</value>
@@ -604,7 +604,7 @@
     <value>Never</value>
   </data>
   <data name="NewItemCreated" xml:space="preserve">
-    <value>Item added</value>
+    <value>New item created.</value>
   </data>
   <data name="NoFavorites" xml:space="preserve">
     <value>There are no favourites in your vault.</value>
@@ -632,7 +632,7 @@
     <value>Other</value>
   </data>
   <data name="PasswordGenerated" xml:space="preserve">
-    <value>Password generated</value>
+    <value>Password generated.</value>
   </data>
   <data name="PasswordGenerator" xml:space="preserve">
     <value>Password generator</value>
@@ -647,7 +647,7 @@
     <value>Are you sure you want to overwrite the current password?</value>
   </data>
   <data name="PushNotificationAlert" xml:space="preserve">
-    <value>Bitwarden keeps your vault automatically synced by using push notifications. For the best possible experience, please select "Allow" on the following prompt when asked to allow push notifications.</value>
+    <value>Bitwarden keeps your vault automatically synced by using push notifications. For the best possible experience, please select "Allow" on the following prompt when asked to enable push notifications.</value>
     <comment>Push notifications for apple products</comment>
   </data>
   <data name="RateTheApp" xml:space="preserve">
@@ -663,7 +663,7 @@
     <value>Re-type master password</value>
   </data>
   <data name="SearchVault" xml:space="preserve">
-    <value>Search vault</value>
+    <value>Search Vault</value>
   </data>
   <data name="Security" xml:space="preserve">
     <value>Security</value>
@@ -681,7 +681,7 @@
     <value>Item information</value>
   </data>
   <data name="ItemUpdated" xml:space="preserve">
-    <value>Item saved</value>
+    <value>Item updated.</value>
   </data>
   <data name="Submitting" xml:space="preserve">
     <value>Submitting...</value>
@@ -692,10 +692,10 @@
     <comment>Message shown when interacting with the server</comment>
   </data>
   <data name="SyncingComplete" xml:space="preserve">
-    <value>Syncing complete</value>
+    <value>Syncing complete.</value>
   </data>
   <data name="SyncingFailed" xml:space="preserve">
-    <value>Syncing failed</value>
+    <value>Syncing failed.</value>
   </data>
   <data name="SyncVaultNow" xml:space="preserve">
     <value>Sync vault now</value>
@@ -708,7 +708,7 @@
     <value>Two-step login</value>
   </data>
   <data name="TwoStepLoginConfirmation" xml:space="preserve">
-    <value>Two-step login makes your account more secure by requiring you to verify your login with another device such as a security key, authenticator app, SMS, phone call, or email. Two-step login can be set up on the bitwarden.com web vault. Do you want to visit the website now?</value>
+    <value>Two-step login makes your account more secure by requiring you to verify your login with another device such as a security key, authenticator app, SMS, phone call, or email. Two-step login can be enabled on the bitwarden.com web vault. Do you want to visit the website now?</value>
   </data>
   <data name="UnlockWith" xml:space="preserve">
     <value>Unlock with {0}</value>
@@ -831,7 +831,7 @@
     <comment>For 2FA whenever there are no available providers on this device.</comment>
   </data>
   <data name="NoTwoStepAvailable" xml:space="preserve">
-    <value>This account has two-step login set up, however, none of the configured two-step providers are supported on this device. Please use a supported device and/or add additional providers that are better supported across devices (such as an authenticator app).</value>
+    <value>This account has two-step login enabled. However, none of the configured two-step providers are supported on this device. Please use a supported device and/or add additional providers that are better supported across devices (such as an authenticator app).</value>
   </data>
   <data name="RecoveryCodeTitle" xml:space="preserve">
     <value>Recovery code</value>
@@ -856,7 +856,7 @@
     <comment>For 2FA</comment>
   </data>
   <data name="VerificationEmailSent" xml:space="preserve">
-    <value>Verification email sent</value>
+    <value>Verification email sent.</value>
     <comment>For 2FA</comment>
   </data>
   <data name="YubiKeyInstruction" xml:space="preserve">
@@ -1080,7 +1080,7 @@ Scanning will happen automatically.</value>
     <value>Last name</value>
   </data>
   <data name="FullName" xml:space="preserve">
-    <value>Full name</value>
+    <value>Full Name</value>
   </data>
   <data name="LicenseNumber" xml:space="preserve">
     <value>Licence number</value>
@@ -1301,7 +1301,7 @@ Scanning will happen automatically.</value>
     <value>Access your vault directly from your keyboard to quickly auto-fill passwords.</value>
   </data>
   <data name="AutofillTurnOn" xml:space="preserve">
-    <value>To set up password auto-fill on your device, follow these instructions:</value>
+    <value>To enable password auto-fill on your device, follow these instructions:</value>
   </data>
   <data name="AutofillTurnOn1" xml:space="preserve">
     <value>1. Go to the iOS "Settings" app</value>
@@ -1381,10 +1381,10 @@ Scanning will happen automatically.</value>
     <value>Search collection</value>
   </data>
   <data name="SearchFileSends" xml:space="preserve">
-    <value>Search file Sends</value>
+    <value>Search File Sends</value>
   </data>
   <data name="SearchTextSends" xml:space="preserve">
-    <value>Search text Sends</value>
+    <value>Search Text Sends</value>
   </data>
   <data name="SearchGroup" xml:space="preserve">
     <value>Search {0}</value>
@@ -1480,7 +1480,7 @@ Scanning will happen automatically.</value>
     <value>Unlock</value>
   </data>
   <data name="UnlockVault" xml:space="preserve">
-    <value>Unlock vault</value>
+    <value>Unlock Vault</value>
   </data>
   <data name="ThirtyMinutes" xml:space="preserve">
     <value>30 minutes</value>
@@ -1553,10 +1553,10 @@ Scanning will happen automatically.</value>
     <value>Default dark theme</value>
   </data>
   <data name="DefaultDarkThemeDescription" xml:space="preserve">
-    <value>Choose the dark theme to use when using Default (System) theme while your device's dark mode is in use.</value>
+    <value>Choose the dark theme to use when using Default (System) theme while your device's dark mode is enabled.</value>
   </data>
   <data name="CopyNotes" xml:space="preserve">
-    <value>Copy note</value>
+    <value>Copy Note</value>
   </data>
   <data name="Exit" xml:space="preserve">
     <value>Exit</value>
@@ -1595,7 +1595,7 @@ Scanning will happen automatically.</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 set up an auto-fill service for Bitwarden. Set up auto-fill for Bitwarden from the "Settings" screen.</value>
+    <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>
   </data>
   <data name="ThemeAppliedOnRestart" xml:space="preserve">
     <value>Your theme changes will apply when the app is restarted.</value>
@@ -1629,10 +1629,10 @@ Scanning will happen automatically.</value>
     <value>Use biometrics to unlock</value>
   </data>
   <data name="AccessibilityOverlayPermissionAlert" xml:space="preserve">
-    <value>Bitwarden needs attention - See "Auto-fill Accessibility Service" from Bitwarden settings</value>
+    <value>Bitwarden needs attention - See "Auto-fill Accessibility Service" from Bitwarden Settings</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 allow overlay support.</value>
+    <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>
   </data>
   <data name="OverlayPermission" xml:space="preserve">
     <value>Permission</value>
@@ -1659,7 +1659,7 @@ Scanning will happen automatically.</value>
     <value>Send a verification code to your email</value>
   </data>
   <data name="CodeSent" xml:space="preserve">
-    <value>Code sent!</value>
+    <value>Code Sent!</value>
   </data>
   <data name="ConfirmYourIdentity" xml:space="preserve">
     <value>Confirm your identity to continue.</value>
@@ -1674,7 +1674,7 @@ Scanning will happen automatically.</value>
     <value>Account encryption keys are unique to each Bitwarden user account, so you can't import an encrypted export into a different account.</value>
   </data>
   <data name="ExportVaultConfirmationTitle" xml:space="preserve">
-    <value>Confirm vault export</value>
+    <value>Confirm Vault Export</value>
     <comment>Title for the alert to confirm vault exports.</comment>
   </data>
   <data name="Warning" xml:space="preserve">
@@ -1704,7 +1704,7 @@ Scanning will happen automatically.</value>
     <value>Attachment saved successfully</value>
   </data>
   <data name="AutofillTileAccessibilityRequired" xml:space="preserve">
-    <value>Please turn on "Auto-fill Accessibility Service" from Bitwarden Settings to use the Auto-fill tile.</value>
+    <value>Please enable "Auto-fill accessibility service" from Bitwarden settings to use the auto-fill tile.</value>
   </data>
   <data name="AutofillTileUriNotFound" xml:space="preserve">
     <value>No password fields detected</value>
@@ -1726,7 +1726,7 @@ Scanning will happen automatically.</value>
     <comment>Message shown when interacting with the server</comment>
   </data>
   <data name="ItemRestored" xml:space="preserve">
-    <value>Item restored</value>
+    <value>Item has been restored.</value>
     <comment>Confirmation message after successfully restoring a soft-deleted item</comment>
   </data>
   <data name="Trash" xml:space="preserve">
@@ -1756,7 +1756,7 @@ Scanning will happen automatically.</value>
     <value>Biometric unlock for autofill disabled pending verification of master password.</value>
   </data>
   <data name="EnableSyncOnRefresh" xml:space="preserve">
-    <value>Allow sync on refresh</value>
+    <value>Enable sync on refresh</value>
   </data>
   <data name="EnableSyncOnRefreshDescription" xml:space="preserve">
     <value>Syncing vault with pull down gesture.</value>
@@ -1822,7 +1822,8 @@ Scanning will happen automatically.</value>
     <value>Privacy policy</value>
   </data>
   <data name="AccessibilityDrawOverPermissionAlert" xml:space="preserve">
-    <value>Bitwarden needs attention - Turn on "Draw-Over" in "Auto-fill Services" from Bitwarden Settings</value>
+    <value>Bitwarden needs attention - Enable "Draw-Over" in "Auto-fill Services" from Bitwarden Settings
+</value>
   </data>
   <data name="AutofillServices" xml:space="preserve">
     <value>Auto-fill services</value>
@@ -1831,37 +1832,45 @@ Scanning will happen automatically.</value>
     <value>Use inline autofill</value>
   </data>
   <data name="InlineAutofillDescription" xml:space="preserve">
-    <value>Use inline autofill if your selected IME (keyboard) supports it. If your configuration is not supported (or this option is turned off), the default Autofill overlay will be used.</value>
+    <value>Use inline autofill if your selected IME (keyboard) supports it. If your configuration is not supported (or this option is disabled), the default Autofill overlay will be used.
+</value>
   </data>
   <data name="Accessibility" xml:space="preserve">
     <value>Use accessibility</value>
   </data>
   <data name="AccessibilityDescription" xml:space="preserve">
-    <value>Use the Bitwarden Accessibility Service to auto-fill your logins across apps and the web. When set up, we'll display a popup when login fields are selected.</value>
+    <value>Use the Bitwarden Accessibility Service to auto-fill your logins across apps and the web. When enabled, we'll display a popup when login fields are selected.
+</value>
   </data>
   <data name="AccessibilityDescription2" xml:space="preserve">
-    <value>Use the Bitwarden Accessibility Service to auto-fill your logins across apps and the web. (Requires Draw-Over to be turned on as well)</value>
+    <value>Use the Bitwarden Accessibility Service to auto-fill your logins across apps and the web. (Requires Draw-Over to be enabled as well)
+</value>
   </data>
   <data name="AccessibilityDescription3" xml:space="preserve">
-    <value>Use the Bitwarden Accessibility Service to use the Autofill Quick-Action Tile, and/or show a popup using Draw-Over (if turned on).</value>
+    <value>Use the Bitwarden Accessibility Service to use the Autofill Quick-Action Tile, and/or show a popup using Draw-Over (if enabled).
+</value>
   </data>
   <data name="AccessibilityDescription4" xml:space="preserve">
-    <value>Required to use the Autofill Quick-Action Tile, or to augment the Autofill Service by using Draw-Over (if turned on).</value>
+    <value>Required to use the Autofill Quick-Action Tile, or to augment the Autofill Service by using Draw-Over (if enabled).
+</value>
   </data>
   <data name="DrawOver" xml:space="preserve">
     <value>Use draw-over</value>
   </data>
   <data name="DrawOverDescription" xml:space="preserve">
-    <value>Allows the Bitwarden Accessibility Service to display a popup when login fields are selected.</value>
+    <value>When enabled, allows the Bitwarden Accessibility Service to display a popup when login fields are selected.
+</value>
   </data>
   <data name="DrawOverDescription2" xml:space="preserve">
-    <value>If turned on, the Bitwarden Accessibility Service will display a popup when login fields are selected to assist with auto-filling your logins.</value>
+    <value>If enabled, the Bitwarden Accessibility Service will display a popup when login fields are selected to assist with auto-filling your logins.
+</value>
   </data>
   <data name="DrawOverDescription3" xml:space="preserve">
-    <value>If turned on, accessibility will show a popup to augment the Autofill Service for older apps that don't support the Android Autofill Framework.</value>
+    <value>If enabled, accessibility will show a popup to augment the Autofill Service for older apps that don't support the Android Autofill Framework.
+</value>
   </data>
   <data name="PersonalOwnershipSubmitError" xml:space="preserve">
-    <value>Due to an enterprise policy, you are restricted from saving items to your individual vault. Change the ownership option to an organisation and choose from available collections.</value>
+    <value>Due to an Enterprise Policy, you are restricted from saving items to your personal vault. Change the Ownership option to an organisation and choose from available Collections.</value>
   </data>
   <data name="PersonalOwnershipPolicyInEffect" xml:space="preserve">
     <value>An organisation policy is affecting your ownership options.</value>
@@ -1914,10 +1923,10 @@ Scanning will happen automatically.</value>
     <value>Text type is not selected, tap to select.</value>
   </data>
   <data name="DeletionDate" xml:space="preserve">
-    <value>Deletion date</value>
+    <value>Deletion Date</value>
   </data>
   <data name="DeletionTime" xml:space="preserve">
-    <value>Deletion time</value>
+    <value>Deletion Time</value>
   </data>
   <data name="DeletionDateInfo" xml:space="preserve">
     <value>The Send will be permanently deleted on the specified date and time.</value>
@@ -1927,10 +1936,10 @@ Scanning will happen automatically.</value>
     <value>Pending deletion</value>
   </data>
   <data name="ExpirationDate" xml:space="preserve">
-    <value>Expiration date</value>
+    <value>Expiration Date</value>
   </data>
   <data name="ExpirationTime" xml:space="preserve">
-    <value>Expiration time</value>
+    <value>Expiration Time</value>
   </data>
   <data name="ExpirationDateInfo" xml:space="preserve">
     <value>If set, access to this Send will expire on the specified date and time.</value>
@@ -1940,7 +1949,7 @@ Scanning will happen automatically.</value>
     <value>Expired</value>
   </data>
   <data name="MaximumAccessCount" xml:space="preserve">
-    <value>Maximum access count</value>
+    <value>Maximum Access Count</value>
   </data>
   <data name="MaximumAccessCountInfo" xml:space="preserve">
     <value>If set, users will no longer be able to access this send once the maximum access count is reached.</value>
@@ -1950,17 +1959,17 @@ Scanning will happen automatically.</value>
     <value>Max access count reached</value>
   </data>
   <data name="CurrentAccessCount" xml:space="preserve">
-    <value>Current access count</value>
+    <value>Current Access Count</value>
   </data>
   <data name="NewPassword" xml:space="preserve">
-    <value>New password</value>
+    <value>New Password</value>
   </data>
   <data name="PasswordInfo" xml:space="preserve">
     <value>Optionally require a password for users to access this Send.</value>
     <comment>'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated.</comment>
   </data>
   <data name="RemovePassword" xml:space="preserve">
-    <value>Remove password</value>
+    <value>Remove Password</value>
   </data>
   <data name="AreYouSureRemoveSendPassword" xml:space="preserve">
     <value>Are you sure you want to remove the password?</value>
@@ -1976,7 +1985,7 @@ Scanning will happen automatically.</value>
     <comment>'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated.</comment>
   </data>
   <data name="DisableSend" xml:space="preserve">
-    <value>Deactivate this Send so that no one can access it</value>
+    <value>Disable this Send so that no one can access it</value>
     <comment>'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated.</comment>
   </data>
   <data name="NoSends" xml:space="preserve">
@@ -1988,10 +1997,10 @@ Scanning will happen automatically.</value>
     <comment>'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated.</comment>
   </data>
   <data name="CopyLink" xml:space="preserve">
-    <value>Copy link</value>
+    <value>Copy Link</value>
   </data>
   <data name="ShareLink" xml:space="preserve">
-    <value>Share link</value>
+    <value>Share Link</value>
   </data>
   <data name="SendLink" xml:space="preserve">
     <value>Send link</value>
@@ -2006,7 +2015,7 @@ Scanning will happen automatically.</value>
     <comment>'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated.</comment>
   </data>
   <data name="AddSend" xml:space="preserve">
-    <value>New Send</value>
+    <value>Add Send</value>
     <comment>'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated.</comment>
   </data>
   <data name="AreYouSureDeleteSend" xml:space="preserve">
@@ -2014,15 +2023,15 @@ Scanning will happen automatically.</value>
     <comment>'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated.</comment>
   </data>
   <data name="SendDeleted" xml:space="preserve">
-    <value>Send deleted</value>
+    <value>Send has been deleted.</value>
     <comment>'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated.</comment>
   </data>
   <data name="SendUpdated" xml:space="preserve">
-    <value>Send saved</value>
+    <value>Send updated.</value>
     <comment>'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated.</comment>
   </data>
   <data name="NewSendCreated" xml:space="preserve">
-    <value>Send created</value>
+    <value>New send created.</value>
     <comment>'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated.</comment>
   </data>
   <data name="OneDay" xml:space="preserve">
@@ -2080,37 +2089,37 @@ Scanning will happen automatically.</value>
     <value>This action is protected, to continue please re-enter your master password to verify your identity.</value>
   </data>
   <data name="CaptchaRequired" xml:space="preserve">
-    <value>Captcha required</value>
+    <value>Captcha Required</value>
   </data>
   <data name="CaptchaFailed" xml:space="preserve">
-    <value>Captcha failed. Please try again.</value>
+    <value>Captcha Failed. Please try again.</value>
   </data>
   <data name="UpdatedMasterPassword" xml:space="preserve">
-    <value>Updated master password</value>
+    <value>Updated Master Password</value>
   </data>
   <data name="UpdateMasterPassword" xml:space="preserve">
-    <value>Update master password</value>
+    <value>Update Master Password</value>
   </data>
   <data name="UpdateMasterPasswordWarning" xml:space="preserve">
-    <value>Your master password was recently changed by an administrator in your organisation. In order to access the vault, you must update your master password now. Proceeding will log you out of your current session, requiring you to log back in. Active sessions on other devices may continue to remain active for up to one hour.</value>
+    <value>Your Master Password was recently changed by an administrator in your organisation. In order to access the vault, you must update your Master Password now. Proceeding will log you out of your current session, requiring you to log back in. Active sessions on other devices may continue to remain active for up to one hour.</value>
   </data>
   <data name="UpdatingPassword" xml:space="preserve">
-    <value>Updating password</value>
+    <value>Updating Password</value>
   </data>
   <data name="UpdatePasswordError" xml:space="preserve">
     <value>Currently unable to update password</value>
   </data>
   <data name="RemoveMasterPassword" xml:space="preserve">
-    <value>Remove master password</value>
+    <value>Remove Master Password</value>
   </data>
   <data name="RemoveMasterPasswordWarning" xml:space="preserve">
-    <value>{0} is using SSO with customer-managed encryption. Continuing will remove your master password from your account and require SSO to login.</value>
+    <value>{0} is using SSO with customer-managed encryption. Continuing will remove your Master Password from your account and require SSO to login.</value>
   </data>
   <data name="RemoveMasterPasswordWarning2" xml:space="preserve">
-    <value>If you do not want to remove your master password, you may leave this organisation.</value>
+    <value>If you do not want to remove your Master Password, you may leave this organisation.</value>
   </data>
   <data name="LeaveOrganization" xml:space="preserve">
-    <value>Leave organisation</value>
+    <value>Leave Organisation</value>
   </data>
   <data name="LeaveOrganizationName" xml:space="preserve">
     <value>Leave {0}?</value>
@@ -2119,7 +2128,7 @@ Scanning will happen automatically.</value>
     <value>FIDO2 WebAuthn</value>
   </data>
   <data name="Fido2Instruction" xml:space="preserve">
-    <value>To continue, have your FIDO2 WebAuthn compatible security key ready, then follow the instructions after clicking 'Authenticate WebAuthn' on the next screen.</value>
+    <value>To continue, have your FIDO2 WebAuthn enabled security key ready, then follow the instructions after clicking 'Authenticate WebAuthn' on the next screen.</value>
   </data>
   <data name="Fido2Desc" xml:space="preserve">
     <value>Authentication using FIDO2 WebAuthn, you can authenticate using an external security key.</value>
@@ -2128,7 +2137,7 @@ Scanning will happen automatically.</value>
     <value>Authenticate WebAuthn</value>
   </data>
   <data name="Fido2ReturnToApp" xml:space="preserve">
-    <value>Return to app</value>
+    <value>Return to App</value>
   </data>
   <data name="Fido2CheckBrowser" xml:space="preserve">
     <value>Please make sure your default browser supports WebAuthn and try again.</value>
@@ -2137,16 +2146,16 @@ Scanning will happen automatically.</value>
     <value>This organisation has an enterprise policy that will automatically enroll you in password reset. Enrollment will allow organisation administrators to change your master password.</value>
   </data>
   <data name="VaultTimeoutPolicyInEffect" xml:space="preserve">
-    <value>Your organisation policies are affecting your vault timeout. Maximum allowed vault timeout is {0} hour(s) and {1} minute(s)</value>
+    <value>Your organisation policies are affecting your vault timeout. Maximum allowed Vault Timeout is {0} hour(s) and {1} minute(s)</value>
   </data>
   <data name="VaultTimeoutToLarge" xml:space="preserve">
     <value>Your vault timeout exceeds the restrictions set by your organisation.</value>
   </data>
   <data name="DisablePersonalVaultExportPolicyInEffect">
-    <value>One or more organisation policies prevents your from exporting your individual vault.</value>
+    <value>One or more organisation policies prevents your from exporting your personal vault.</value>
   </data>
   <data name="AddAccount" xml:space="preserve">
-    <value>Add account</value>
+    <value>Add Account</value>
   </data>
   <data name="AccountUnlocked" xml:space="preserve">
     <value>Unlocked</value>
@@ -2155,13 +2164,13 @@ Scanning will happen automatically.</value>
     <value>Locked</value>
   </data>
   <data name="AccountLoggedOut" xml:space="preserve">
-    <value>Logged out</value>
+    <value>Logged Out</value>
   </data>
   <data name="AccountSwitchedAutomatically" xml:space="preserve">
     <value>Switched to next available account</value>
   </data>
   <data name="AccountLockedSuccessfully" xml:space="preserve">
-    <value>Account locked</value>
+    <value>Account Locked</value>
   </data>
   <data name="AccountLoggedOutSuccessfully" xml:space="preserve">
     <value>Account logged out successfully</value>
@@ -2185,13 +2194,13 @@ Scanning will happen automatically.</value>
     <value>Your account has been permanently deleted</value>
   </data>
   <data name="InvalidVerificationCode" xml:space="preserve">
-    <value>Invalid verification code</value>
+    <value>Invalid Verification Code.</value>
   </data>
   <data name="RequestOTP" xml:space="preserve">
     <value>Request one-time password</value>
   </data>
   <data name="SendCode" xml:space="preserve">
-    <value>Send code</value>
+    <value>Send Code</value>
   </data>
   <data name="Sending" xml:space="preserve">
     <value>Sending</value>
@@ -2206,7 +2215,7 @@ Scanning will happen automatically.</value>
     <value>Verifying</value>
   </data>
   <data name="ResendCode" xml:space="preserve">
-    <value>Resend code</value>
+    <value>Resend Code</value>
   </data>
   <data name="AVerificationCodeWasSentToYourEmail" xml:space="preserve">
     <value>A verification code was sent to your email</value>
@@ -2239,7 +2248,7 @@ Scanning will happen automatically.</value>
     <value>Numbers (0 to 9)</value>
   </data>
   <data name="SpecialCharacters" xml:space="preserve">
-    <value>Special characters (!@#$%^&amp;*)</value>
+    <value>Special Characters (!@#$%^&amp;*)</value>
   </data>
   <data name="TapToGoBack" xml:space="preserve">
     <value>Tap to go back</value>
@@ -2254,7 +2263,7 @@ Scanning will happen automatically.</value>
     <value>Filter items by vault</value>
   </data>
   <data name="AllVaults" xml:space="preserve">
-    <value>All vaults</value>
+    <value>All Vaults</value>
   </data>
   <data name="Vaults" xml:space="preserve">
     <value>Vaults</value>
@@ -2269,7 +2278,7 @@ Scanning will happen automatically.</value>
     <value>TOTP</value>
   </data>
   <data name="VerificationCodes" xml:space="preserve">
-    <value>Verification codes</value>
+    <value>Verification Codes</value>
   </data>
   <data name="PremiumSubscriptionRequired" xml:space="preserve">
     <value>Premium subscription required</value>
@@ -2284,10 +2293,10 @@ Scanning will happen automatically.</value>
     <value>Cannot scan QR Code? </value>
   </data>
   <data name="AuthenticatorKeyScanner" xml:space="preserve">
-    <value>Authenticator key</value>
+    <value>Authenticator Key</value>
   </data>
   <data name="EnterKeyManually" xml:space="preserve">
-    <value>Enter key manually</value>
+    <value>Enter Key Manually</value>
   </data>
   <data name="AddTotp" xml:space="preserve">
     <value>Add TOTP</value>
@@ -2299,6 +2308,9 @@ Scanning will happen automatically.</value>
     <value>Once the key is successfully entered,
 select Add TOTP to store the key safely</value>
   </data>
+  <data name="SelectAddTotpToStoreTheKeySafely" xml:space="preserve">
+    <value></value>
+  </data>
   <data name="NeverLockWarning" xml:space="preserve">
     <value>Setting your lock options to “Never” keeps your vault available to anyone with access to your device. If you use this option, you should ensure that you keep your device properly protected.</value>
   </data>
@@ -2312,7 +2324,7 @@ select Add TOTP to store the key safely</value>
     <value>Allow screen capture</value>
   </data>
   <data name="AreYouSureYouWantToEnableScreenCapture" xml:space="preserve">
-    <value>Are you sure you want to turn on screen capture?</value>
+    <value>Are you sure you want to enable Screen Capture?</value>
   </data>
   <data name="LogInRequested" xml:space="preserve">
     <value>Login requested</value>
@@ -2375,34 +2387,34 @@ select Add TOTP to store the key safely</value>
     <value>All notifications</value>
   </data>
   <data name="PasswordType" xml:space="preserve">
-    <value>Password type</value>
+    <value>Password Type</value>
   </data>
   <data name="WhatWouldYouLikeToGenerate" xml:space="preserve">
     <value>What would you like to generate?</value>
   </data>
   <data name="UsernameType" xml:space="preserve">
-    <value>Username type</value>
+    <value>Username Type</value>
   </data>
   <data name="PlusAddressedEmail" xml:space="preserve">
-    <value>Plus addressed email</value>
+    <value>Plus Addressed Email</value>
   </data>
   <data name="CatchAllEmail" xml:space="preserve">
-    <value>Catch-all email</value>
+    <value>Catch-all Email</value>
   </data>
   <data name="ForwardedEmailAlias" xml:space="preserve">
-    <value>Forwarded email alias</value>
+    <value>Forwarded Email Alias</value>
   </data>
   <data name="RandomWord" xml:space="preserve">
-    <value>Random word</value>
+    <value>Random Word</value>
   </data>
   <data name="EmailRequiredParenthesis" xml:space="preserve">
     <value>Email (required)</value>
   </data>
   <data name="DomainNameRequiredParenthesis" xml:space="preserve">
-    <value>Domain name (required)</value>
+    <value>Domain Name (required)</value>
   </data>
   <data name="APIKeyRequiredParenthesis" xml:space="preserve">
-    <value>API key (required)</value>
+    <value>API Key (required)</value>
   </data>
   <data name="Service" xml:space="preserve">
     <value>Service</value>
@@ -2420,13 +2432,13 @@ select Add TOTP to store the key safely</value>
     <comment>"SimpleLogin" is the product name and should not be translated.</comment>
   </data>
   <data name="APIAccessToken" xml:space="preserve">
-    <value>API access token</value>
+    <value>API Access Token</value>
   </data>
   <data name="AreYouSureYouWantToOverwriteTheCurrentUsername" xml:space="preserve">
     <value>Are you sure you want to overwrite the current username?</value>
   </data>
   <data name="GenerateUsername" xml:space="preserve">
-    <value>Generate username</value>
+    <value>Generate Username</value>
   </data>
   <data name="EmailType" xml:space="preserve">
     <value>Email Type</value>
@@ -2449,9 +2461,6 @@ select Add TOTP to store the key safely</value>
   <data name="Random" xml:space="preserve">
     <value>Random</value>
   </data>
-  <data name="ConnectToWatch" xml:space="preserve">
-    <value>Connect to Watch</value>
-  </data>
   <data name="AccessibilityServiceDisclosure" xml:space="preserve">
     <value>Accessibility Service Disclosure</value>
   </data>
@@ -2473,7 +2482,7 @@ select Add TOTP to store the key safely</value>
 Do you want to switch to this account?</value>
   </data>
   <data name="NewAroundHere" xml:space="preserve">
-    <value>New around here?</value>
+    <value>Are you new here?</value>
   </data>
   <data name="GetMasterPasswordwordHint" xml:space="preserve">
     <value>Get master password hint</value>
@@ -2511,7 +2520,4 @@ Do you want to switch to this account?</value>
   <data name="ThisRequestIsNoLongerValid" xml:space="preserve">
     <value>This request is no longer valid</value>
   </data>
-  <data name="EnableCamerPermissionToUseTheScanner" xml:space="preserve">
-    <value>Enable camera permission to use the scanner</value>
-  </data>
 </root>

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

@@ -376,7 +376,7 @@
   </data>
   <data name="ValueHasBeenCopied" xml:space="preserve">
     <value>{0} has been copied.</value>
-    <comment>Confirmation message after successfully copying a value to the clipboard.</comment>
+    <comment>Confirmation message after suceessfully copying a value to the clipboard.</comment>
   </data>
   <data name="VerifyFingerprint" xml:space="preserve">
     <value>Verify fingerprint</value>
@@ -808,7 +808,7 @@
     <value>You are searching for an auto-fill item for "{0}".</value>
   </data>
   <data name="LearnOrg" xml:space="preserve">
-    <value>Learn about organisations</value>
+    <value>Learn about organizations</value>
   </data>
   <data name="CannotOpenApp" xml:space="preserve">
     <value>Cannot open the app "{0}".</value>
@@ -1428,13 +1428,13 @@ Scanning will happen automatically.</value>
     <value>Share item</value>
   </data>
   <data name="MoveToOrganization" xml:space="preserve">
-    <value>Move to Organisation</value>
+    <value>Move to Organization</value>
   </data>
   <data name="NoOrgsToList" xml:space="preserve">
     <value>No organisations to list.</value>
   </data>
   <data name="MoveToOrgDesc" xml:space="preserve">
-    <value>Choose an organisation that you wish to move this item to. Moving to an organisation transfers ownership of the item to that organisation. You will no longer be the direct owner of this item once it has been moved.</value>
+    <value>Choose an organization that you wish to move this item to. Moving to an organization transfers ownership of the item to that organization. You will no longer be the direct owner of this item once it has been moved.</value>
   </data>
   <data name="NumberOfWords" xml:space="preserve">
     <value>Number of words</value>
@@ -1465,7 +1465,7 @@ Scanning will happen automatically.</value>
     <comment>A 'fingerprint phrase' is a unique word phrase (similar to a passphrase) that a user can use to authenticate their public key with another user, for the purposes of sharing.</comment>
   </data>
   <data name="LearnOrgConfirmation" xml:space="preserve">
-    <value>Bitwarden allows you to share your vault items with others by using an organisation account. Would you like to visit the bitwarden.com website to learn more?</value>
+    <value>Bitwarden allows you to share your vault items with others by using an organization account. Would you like to visit the bitwarden.com website to learn more?</value>
   </data>
   <data name="ExportVault" xml:space="preserve">
     <value>Export vault</value>
@@ -2313,6 +2313,9 @@ Scanning will happen automatically.</value>
     <value>Once the key is successfully entered,
 select Add TOTP to store the key safely</value>
   </data>
+  <data name="SelectAddTotpToStoreTheKeySafely" xml:space="preserve">
+    <value></value>
+  </data>
   <data name="NeverLockWarning" xml:space="preserve">
     <value>Setting your lock options to “Never” keeps your vault available to anyone with access to your device. If you use this option, you should ensure that you keep your device properly protected.</value>
   </data>
@@ -2463,9 +2466,6 @@ select Add TOTP to store the key safely</value>
   <data name="Random" xml:space="preserve">
     <value>Random</value>
   </data>
-  <data name="ConnectToWatch" xml:space="preserve">
-    <value>Connect to Watch</value>
-  </data>
   <data name="AccessibilityServiceDisclosure" xml:space="preserve">
     <value>Accessibility Service Disclosure</value>
   </data>
@@ -2525,7 +2525,4 @@ Do you want to switch to this account?</value>
   <data name="ThisRequestIsNoLongerValid" xml:space="preserve">
     <value>This request is no longer valid</value>
   </data>
-  <data name="EnableCamerPermissionToUseTheScanner" xml:space="preserve">
-    <value>Enable camera permission to use the scanner</value>
-  </data>
 </root>

src/App/Resources/AppResources.es.resx

@@ -376,7 +376,7 @@
   </data>
   <data name="ValueHasBeenCopied" xml:space="preserve">
     <value>{0} ha sido copiado.</value>
-    <comment>Confirmation message after successfully copying a value to the clipboard.</comment>
+    <comment>Confirmation message after suceessfully copying a value to the clipboard.</comment>
   </data>
   <data name="VerifyFingerprint" xml:space="preserve">
     <value>Verificar huella dactilar</value>
@@ -778,7 +778,7 @@
     <value>Apagado</value>
   </data>
   <data name="On" xml:space="preserve">
-    <value>Activado</value>
+    <value>Encendido</value>
   </data>
   <data name="Status" xml:space="preserve">
     <value>Estado</value>
@@ -1486,7 +1486,7 @@ El escaneo se realizará automáticamente.</value>
     <value>30 minutos</value>
   </data>
   <data name="SetPINDescription" xml:space="preserve">
-    <value>Establezca su código PIN para desbloquear Bitwarden. Sus ajustes de PIN se reiniciarán si alguna vez cierra su sesión completamente de la aplicación.</value>
+    <value>Establece su código PIN para desbloquear Bitwarden. Sus ajustes de PIN se reiniciarán si alguna vez cierra su sesión completamente de la aplicación.</value>
   </data>
   <data name="LoggedInAsOn" xml:space="preserve">
     <value>Iniciado como {0} en {1}.</value>
@@ -1553,7 +1553,7 @@ El escaneo se realizará automáticamente.</value>
     <value>Tema oscuro por defecto</value>
   </data>
   <data name="DefaultDarkThemeDescription" xml:space="preserve">
-    <value>Elija el tema oscuro para usar al estar usándose el tema por defecto (Sistema) mientras el modo oscuro de su dispositivo está activado.</value>
+    <value>Elija el tema oscuro para usar al estar usandose el tema por defecto (Sistema) mientras el modo oscuro de su dispositivo está activado.</value>
   </data>
   <data name="CopyNotes" xml:space="preserve">
     <value>Copiar notas</value>
@@ -1783,7 +1783,7 @@ El escaneo se realizará automáticamente.</value>
     <value>Una o más políticas de la organización requieren que su contraseña maestra cumpla con los siguientes requisitos:</value>
   </data>
   <data name="PolicyInEffectMinComplexity" xml:space="preserve">
-    <value>Minimum complexity score of {0}</value>
+    <value>Puntuación mínima de complejidad de $SCORE$</value>
   </data>
   <data name="PolicyInEffectMinLength" xml:space="preserve">
     <value>Longitud mínima de {0}</value>
@@ -1798,7 +1798,7 @@ El escaneo se realizará automáticamente.</value>
     <value>Contiene uno o más números</value>
   </data>
   <data name="PolicyInEffectSpecial" xml:space="preserve">
-    <value>Contain one or more of the following special characters: {0}</value>
+    <value>Contiene uno o más de los siguientes caracteres especiales $CHARS$</value>
   </data>
   <data name="MasterPasswordPolicyValidationTitle" xml:space="preserve">
     <value>Contraseña no válida</value>
@@ -2300,6 +2300,9 @@ El escaneo se realizará automáticamente.</value>
     <value>Una vez que la clave haya sido ingresada con éxito,
 seleccione Agregar TOTP para almacenar la clave de forma segura</value>
   </data>
+  <data name="SelectAddTotpToStoreTheKeySafely" xml:space="preserve">
+    <value></value>
+  </data>
   <data name="NeverLockWarning" xml:space="preserve">
     <value>Configurar las opciones de bloqueo a "Nunca" mantiene la bóveda disponible para cualquier persona con acceso a su dispositivo. Si utiliza esta opción, debe asegurarse de que mantiene su dispositivo debidamente protegido.</value>
   </data>
@@ -2358,7 +2361,7 @@ seleccione Agregar TOTP para almacenar la clave de forma segura</value>
     <value>Aprobar solicitudes de inicio de sesión</value>
   </data>
   <data name="UseThisDeviceToApproveLoginRequestsMadeFromOtherDevices" xml:space="preserve">
-    <value>Use este dispositivo para aprobar solicitudes de inicio de sesión realizadas desde otros dispositivos.</value>
+    <value>Use este dispositivo para aprovar solicitudes de incio de sesión realizadas desde otros dispositivos.</value>
   </data>
   <data name="AllowNotifications" xml:space="preserve">
     <value>Permitir notificaciones</value>
@@ -2450,9 +2453,6 @@ seleccione Agregar TOTP para almacenar la clave de forma segura</value>
   <data name="Random" xml:space="preserve">
     <value>Aleatorio</value>
   </data>
-  <data name="ConnectToWatch" xml:space="preserve">
-    <value>Conectar al reloj</value>
-  </data>
   <data name="AccessibilityServiceDisclosure" xml:space="preserve">
     <value>Revelación del servicio de accesibilidad</value>
   </data>
@@ -2512,7 +2512,4 @@ seleccione Agregar TOTP para almacenar la clave de forma segura</value>
   <data name="ThisRequestIsNoLongerValid" xml:space="preserve">
     <value>Esta solicitud ya no es válida</value>
   </data>
-  <data name="EnableCamerPermissionToUseTheScanner" xml:space="preserve">
-    <value>Habilitar el permiso de la cámara para usar el escáner</value>
-  </data>
 </root>

src/App/Resources/AppResources.et.resx

@@ -376,7 +376,7 @@
   </data>
   <data name="ValueHasBeenCopied" xml:space="preserve">
     <value>{0} on kopeeritud.</value>
-    <comment>Confirmation message after successfully copying a value to the clipboard.</comment>
+    <comment>Confirmation message after suceessfully copying a value to the clipboard.</comment>
   </data>
   <data name="VerifyFingerprint" xml:space="preserve">
     <value>Kinnita sõrmejäljega</value>
@@ -2299,6 +2299,9 @@ Skaneerimine toimub automaatselt.</value>
     <value>Pärast võtme edukat sisestamist vajuta
 "Lisa TOTP", et see võti turvaliselt talletada</value>
   </data>
+  <data name="SelectAddTotpToStoreTheKeySafely" xml:space="preserve">
+    <value></value>
+  </data>
   <data name="NeverLockWarning" xml:space="preserve">
     <value>Kõik, kes pääsevad sinu telefoni, saavad valikuga "Mitte kunagi" ka sinu hoidlat vaadata. Veendu, et seda tõesti teha soovid.</value>
   </data>
@@ -2449,9 +2452,6 @@ Skaneerimine toimub automaatselt.</value>
   <data name="Random" xml:space="preserve">
     <value>Juhuslik</value>
   </data>
-  <data name="ConnectToWatch" xml:space="preserve">
-    <value>Ühenda kellaga</value>
-  </data>
   <data name="AccessibilityServiceDisclosure" xml:space="preserve">
     <value>Accessibility Service Disclosure</value>
   </data>
@@ -2511,7 +2511,4 @@ Soovid selle konto peale lülituda?</value>
   <data name="ThisRequestIsNoLongerValid" xml:space="preserve">
     <value>See päring ei ole enam kehtiv</value>
   </data>
-  <data name="EnableCamerPermissionToUseTheScanner" xml:space="preserve">
-    <value>Kaamera kasutamiseks luba ligipääs kaamerale</value>
-  </data>
 </root>

src/App/Resources/AppResources.eu.resx

@@ -376,7 +376,7 @@
   </data>
   <data name="ValueHasBeenCopied" xml:space="preserve">
     <value>{0} kopiatu da.</value>
-    <comment>Confirmation message after successfully copying a value to the clipboard.</comment>
+    <comment>Confirmation message after suceessfully copying a value to the clipboard.</comment>
   </data>
   <data name="VerifyFingerprint" xml:space="preserve">
     <value>Egiaztatu hatz-marka</value>
@@ -2298,6 +2298,9 @@
   <data name="OnceTheKeyIsSuccessfullyEntered" xml:space="preserve">
     <value>Gakoa ondo sartzen duzunean, sakatu Gehitu TOTP-a gakoa modu seguruan gordetzeko</value>
   </data>
+  <data name="SelectAddTotpToStoreTheKeySafely" xml:space="preserve">
+    <value></value>
+  </data>
   <data name="NeverLockWarning" xml:space="preserve">
     <value>Zure blokeo aukerak "inoiz ez" bezala ezartzen badituzu, gailura sarbidea duen edonork izango du kutxa gotorra eskuragarri. Aukera hau erabiltzen baduzu, gailua behar bezala babestuta duzula ziurtatu behar duzu.</value>
   </data>
@@ -2448,9 +2451,6 @@
   <data name="Random" xml:space="preserve">
     <value>Ausazkoa</value>
   </data>
-  <data name="ConnectToWatch" xml:space="preserve">
-    <value>Connect to Watch</value>
-  </data>
   <data name="AccessibilityServiceDisclosure" xml:space="preserve">
     <value>Zabaldu irisgarritasun zerbitzua</value>
   </data>
@@ -2508,9 +2508,6 @@ Kontu honetara aldatu nahi duzu?</value>
     <value>Ikusi erregistro guztiak ezarpenetan</value>
   </data>
   <data name="ThisRequestIsNoLongerValid" xml:space="preserve">
-    <value>Eskaera jada ez da balekoa.</value>
-  </data>
-  <data name="EnableCamerPermissionToUseTheScanner" xml:space="preserve">
-    <value>Gaitu kameraren baimena eskanerra erabiltzeko</value>
+    <value>This request is no longer valid</value>
   </data>
 </root>

src/App/Resources/AppResources.fi.resx

@@ -376,7 +376,7 @@
   </data>
   <data name="ValueHasBeenCopied" xml:space="preserve">
     <value>{0} kopioitiin</value>
-    <comment>Confirmation message after successfully copying a value to the clipboard.</comment>
+    <comment>Confirmation message after suceessfully copying a value to the clipboard.</comment>
   </data>
   <data name="VerifyFingerprint" xml:space="preserve">
     <value>Vahvista sormenjälki</value>
@@ -790,7 +790,7 @@
     <value>Automaattinen täyttö</value>
   </data>
   <data name="AutofillOrView" xml:space="preserve">
-    <value>Täytetäänkö automaatisesti vai näytetäänkö tiedot?</value>
+    <value>Haluatko täyttää kohteella automaatisesti vai tarkastella sen tietoja?</value>
   </data>
   <data name="BitwardenAutofillServiceMatchConfirm" xml:space="preserve">
     <value>Haluatko varmasti täyttää automaattisesti tällä kohteella? Se ei täsmää täysin osoitteen "{0}" kanssa.</value>
@@ -2300,6 +2300,9 @@ Koodi luetaan automaattisesti.</value>
     <value>Kun koodi on syötetty oikein, tallenna avain
 turvallisesti valitsemalla "Lisää TOTP"</value>
   </data>
+  <data name="SelectAddTotpToStoreTheKeySafely" xml:space="preserve">
+    <value></value>
+  </data>
   <data name="NeverLockWarning" xml:space="preserve">
     <value>Käyttämällä lukitusasetusta "Ei koskaan"? Tallentuu holvisi salausavain laitteellesi. Jos käytät asetusta, varmista, että laite on suojattu hyvin.</value>
   </data>
@@ -2450,9 +2453,6 @@ turvallisesti valitsemalla "Lisää TOTP"</value>
   <data name="Random" xml:space="preserve">
     <value>Satunnainen</value>
   </data>
-  <data name="ConnectToWatch" xml:space="preserve">
-    <value>Yhdistä Watchiin</value>
-  </data>
   <data name="AccessibilityServiceDisclosure" xml:space="preserve">
     <value>Esteettömyyspalvelun kuvaus</value>
   </data>
@@ -2512,7 +2512,4 @@ Haluatko vaihtaa tähän tiliin?</value>
   <data name="ThisRequestIsNoLongerValid" xml:space="preserve">
     <value>Pyyntö ei ole enää voimassa.</value>
   </data>
-  <data name="EnableCamerPermissionToUseTheScanner" xml:space="preserve">
-    <value>Myönnä kameran käyttöoikeus skannerin käyttämiseksi</value>
-  </data>
 </root>

src/App/Resources/AppResources.fil.resx

@@ -376,7 +376,7 @@
   </data>
   <data name="ValueHasBeenCopied" xml:space="preserve">
     <value>{0} copied</value>
-    <comment>Confirmation message after successfully copying a value to the clipboard.</comment>
+    <comment>Confirmation message after suceessfully copying a value to the clipboard.</comment>
   </data>
   <data name="VerifyFingerprint" xml:space="preserve">
     <value>Verify fingerprint</value>
@@ -2300,6 +2300,9 @@ Scanning will happen automatically.</value>
     <value>Once the key is successfully entered,
 select Add TOTP to store the key safely</value>
   </data>
+  <data name="SelectAddTotpToStoreTheKeySafely" xml:space="preserve">
+    <value></value>
+  </data>
   <data name="NeverLockWarning" xml:space="preserve">
     <value>Setting your lock options to “Never” keeps your vault available to anyone with access to your device. If you use this option, you should ensure that you keep your device properly protected.</value>
   </data>
@@ -2450,9 +2453,6 @@ select Add TOTP to store the key safely</value>
   <data name="Random" xml:space="preserve">
     <value>Random</value>
   </data>
-  <data name="ConnectToWatch" xml:space="preserve">
-    <value>Connect to Watch</value>
-  </data>
   <data name="AccessibilityServiceDisclosure" xml:space="preserve">
     <value>Accessibility Service Disclosure</value>
   </data>
@@ -2512,7 +2512,4 @@ Do you want to switch to this account?</value>
   <data name="ThisRequestIsNoLongerValid" xml:space="preserve">
     <value>This request is no longer valid</value>
   </data>
-  <data name="EnableCamerPermissionToUseTheScanner" xml:space="preserve">
-    <value>Enable camera permission to use the scanner</value>
-  </data>
 </root>

src/App/Resources/AppResources.fr.resx

@@ -179,7 +179,7 @@
     <value>Modifier</value>
   </data>
   <data name="EditFolder" xml:space="preserve">
-    <value>Éditer le dossier</value>
+    <value>Modifier le dossier</value>
   </data>
   <data name="Email" xml:space="preserve">
     <value>E-mail</value>
@@ -209,7 +209,7 @@
     <value>Ouvrir un ticket dans notre dépôt Github.</value>
   </data>
   <data name="FingerprintDirection" xml:space="preserve">
-    <value>Utilisez votre empreinte pour vérifier.</value>
+    <value>Utilisez votre empreinte pour vous authentifier.</value>
   </data>
   <data name="Folder" xml:space="preserve">
     <value>Dossier</value>
@@ -229,7 +229,7 @@
     <value>Dossiers</value>
   </data>
   <data name="FolderUpdated" xml:space="preserve">
-    <value>Dossier sauvegardé</value>
+    <value>Dossier mis à jour.</value>
   </data>
   <data name="GoToWebsite" xml:space="preserve">
     <value>Accéder au site Web</value>
@@ -243,7 +243,7 @@
     <comment>Hide a secret value that is currently shown (password).</comment>
   </data>
   <data name="InternetConnectionRequiredMessage" xml:space="preserve">
-    <value>Veuillez vous connecter à internet avant de continuer.</value>
+    <value>Veuillez vous connecter à Internet avant de poursuivre.</value>
     <comment>Description message for the alert when internet connection is required to continue.</comment>
   </data>
   <data name="InternetConnectionRequiredTitle" xml:space="preserve">
@@ -251,7 +251,7 @@
     <comment>Title for the alert when internet connection is required to continue.</comment>
   </data>
   <data name="InvalidMasterPassword" xml:space="preserve">
-    <value>Mot de passe principal invalide. Essayez à nouveau.</value>
+    <value>Mot de passe maître invalide. Veuillez réessayer.</value>
   </data>
   <data name="InvalidPIN" xml:space="preserve">
     <value>Code PIN invalide. Veuillez réessayer.</value>
@@ -269,7 +269,7 @@
     <comment>Title for login page. (noun)</comment>
   </data>
   <data name="LogOut" xml:space="preserve">
-    <value>Se déconnecter</value>
+    <value>Déconnexion</value>
     <comment>The log out button text (verb).</comment>
   </data>
   <data name="LogoutConfirmation" xml:space="preserve">
@@ -279,7 +279,7 @@
     <value>Supprimer le compte</value>
   </data>
   <data name="RemoveAccountConfirmation" xml:space="preserve">
-    <value>Êtes-vous sûr de vouloir supprimer ce compte ?</value>
+    <value>Êtes-vous sûr de vouloir retirer ce compte ?</value>
   </data>
   <data name="AccountAlreadyAdded" xml:space="preserve">
     <value>Le compte a déjà été ajouté</value>
@@ -288,7 +288,7 @@
     <value>Souhaitez-vous y passer maintenant ?</value>
   </data>
   <data name="MasterPassword" xml:space="preserve">
-    <value>Mot de passe principal</value>
+    <value>Mot de passe maître</value>
     <comment>Label for a master password.</comment>
   </data>
   <data name="More" xml:space="preserve">
@@ -342,7 +342,7 @@
     <comment>Reveal a hidden value (password).</comment>
   </data>
   <data name="ItemDeleted" xml:space="preserve">
-    <value>Élément supprimé</value>
+    <value>L'élément a été supprimé.</value>
     <comment>Confirmation message after successfully deleting a login.</comment>
   </data>
   <data name="Submit" xml:space="preserve">
@@ -364,7 +364,7 @@
     <comment>Label for a uri/url.</comment>
   </data>
   <data name="UseFingerprintToUnlock" xml:space="preserve">
-    <value>Utiliser l'empreinte pour déverrouiller</value>
+    <value>Utiliser votre empreinte pour déverrouiller</value>
   </data>
   <data name="Username" xml:space="preserve">
     <value>Nom d'utilisateur</value>
@@ -375,14 +375,14 @@
     <comment>Validation message for when a form field is left blank and is required to be entered.</comment>
   </data>
   <data name="ValueHasBeenCopied" xml:space="preserve">
-    <value>{0} copié</value>
-    <comment>Confirmation message after successfully copying a value to the clipboard.</comment>
+    <value>{0} a été copié.</value>
+    <comment>Confirmation message after suceessfully copying a value to the clipboard.</comment>
   </data>
   <data name="VerifyFingerprint" xml:space="preserve">
-    <value>Vérifier l'empreinte digitale</value>
+    <value>S'authentifier avec l'empreinte</value>
   </data>
   <data name="VerifyMasterPassword" xml:space="preserve">
-    <value>Vérifier le mot de passe principal</value>
+    <value>S'authentifier avec le mot de passe maître</value>
   </data>
   <data name="VerifyPIN" xml:space="preserve">
     <value>S'authentifier avec un code PIN</value>
@@ -425,10 +425,10 @@
     <value>Service de remplissage automatique</value>
   </data>
   <data name="AvoidAmbiguousCharacters" xml:space="preserve">
-    <value>Éviter les caractères ambigus</value>
+    <value>Évitez les caractères ambigus</value>
   </data>
   <data name="BitwardenAppExtension" xml:space="preserve">
-    <value>Extension de l'application Bitwarden</value>
+    <value>Extension de l'application bitwarden</value>
   </data>
   <data name="BitwardenAppExtensionAlert2" xml:space="preserve">
     <value>Le meilleur moyen d'ajouter de nouveaux sites à votre coffre est d'utiliser l'extension de l'application Bitwarden. Parcourez le menu "Paramètres" pour en apprendre davantage.</value>
@@ -449,10 +449,10 @@
     <value>Vous pouvez changer votre adresse e-mail depuis le coffre web sur bitwarden.com. Voulez-vous visiter le site web maintenant ?</value>
   </data>
   <data name="ChangeMasterPassword" xml:space="preserve">
-    <value>Changer le mot de passe principal</value>
+    <value>Changer le mot de passe maître</value>
   </data>
   <data name="ChangePasswordConfirmation" xml:space="preserve">
-    <value>Vous pouvez changer votre mot de passe principal depuis le coffre web de bitwarden.com. Voulez-vous visiter le site web maintenant ?</value>
+    <value>Vous pouvez modifier votre mot de passe maître depuis le coffre web sur bitwarden.com. Souhaitez-vous visiter le site maintenant ?</value>
   </data>
   <data name="Close" xml:space="preserve">
     <value>Fermer</value>
@@ -468,13 +468,13 @@
     <comment>Message shown when interacting with the server</comment>
   </data>
   <data name="EditItem" xml:space="preserve">
-    <value>Éditer l'élément</value>
+    <value>Modifier l'Élément</value>
   </data>
   <data name="EnableAutomaticSyncing" xml:space="preserve">
     <value>Activer la synchronisation automatique</value>
   </data>
   <data name="EnterEmailForHint" xml:space="preserve">
-    <value>Saisissez l'adresse électronique de votre compte pour recevoir l'indice de votre mot de passe principal.</value>
+    <value>Saisissez l'adresse e-mail de votre compte pour recevoir l'indice de votre mot de passe maître.</value>
   </data>
   <data name="ExntesionReenable" xml:space="preserve">
     <value>Activez à nouveau l'extension de l'application</value>
@@ -511,13 +511,13 @@
     <value>Favori</value>
   </data>
   <data name="Fingerprint" xml:space="preserve">
-    <value>Empreinte digitale</value>
+    <value>Empreinte</value>
   </data>
   <data name="GeneratePassword" xml:space="preserve">
     <value>Générer un mot de passe</value>
   </data>
   <data name="GetPasswordHint" xml:space="preserve">
-    <value>Obtenez votre indice de mot de passe principal</value>
+    <value>Obtenir votre indice de mot de passe maître</value>
   </data>
   <data name="ImportItems" xml:space="preserve">
     <value>Importer des éléments</value>
@@ -556,10 +556,10 @@
     <value>Délai d'expiration du coffre</value>
   </data>
   <data name="VaultTimeoutAction" xml:space="preserve">
-    <value>Après délai d'expiration du coffre</value>
+    <value>Action lors de l'expiration du délai du coffre</value>
   </data>
   <data name="VaultTimeoutLogOutConfirmation" xml:space="preserve">
-    <value>La déconnexion supprimera tout accès à votre coffre et nécessitera une authentification en ligne après la période d'expiration. Êtes-vous sûr de vouloir utiliser ce paramètre ?</value>
+    <value>La déconnexion supprimera tous les accès à votre coffre et nécessite une authentification en ligne après la période d'expiration. Êtes-vous sûr de vouloir utiliser ce paramètre ?</value>
   </data>
   <data name="LoggingIn" xml:space="preserve">
     <value>Identification...</value>
@@ -575,23 +575,23 @@
     <value>La confirmation du mot de passe est erronée.</value>
   </data>
   <data name="MasterPasswordDescription" xml:space="preserve">
-    <value>Le mot de passe principal est le mot de passe que vous utilisez pour accéder à votre coffre. Il est très important de ne pas oublier votre mot de passe principal. Il n'existe aucun moyen de récupérer le mot de passe si vous l'oubliez.</value>
+    <value>Le mot de passe maître correspond au mot de passe utilisé pour accéder à votre coffre. Il est très important de ne pas l'oublier. Il n'existe aucun moyen de le retrouver en cas d'oubli.</value>
   </data>
   <data name="MasterPasswordHint" xml:space="preserve">
-    <value>Indice du mot de passe principal (facultatif)</value>
+    <value>Indice de mot de passe maître (facultatif)</value>
   </data>
   <data name="MasterPasswordHintDescription" xml:space="preserve">
-    <value>Un indice de mot de passe principal peut vous aider à vous souvenir de votre mot de passe si vous l'oubliez.</value>
+    <value>Un indice de mot de passe maître peut vous aider à vous rappeler de votre mot de passe en cas d'oubli.</value>
   </data>
   <data name="MasterPasswordLengthValMessage" xml:space="preserve">
-    <value>Le mot de passe principal doit comporter au moins 8 caractères.</value>
+    <value>Le mot de passe maître doit faire plus de 8 caractères.</value>
   </data>
   <data name="MinNumbers" xml:space="preserve">
-    <value>Min. de chiffres</value>
+    <value>Nombre minimum de chiffres</value>
     <comment>Minimum numeric characters for password generator settings</comment>
   </data>
   <data name="MinSpecial" xml:space="preserve">
-    <value>Min. de caractères spéciaux</value>
+    <value>Nombre minimum de caractères spéciaux</value>
     <comment>Minimum special characters for password generator settings</comment>
   </data>
   <data name="MoreSettings" xml:space="preserve">
@@ -613,7 +613,7 @@
     <value>Il n’y a aucun élément dans votre coffre.</value>
   </data>
   <data name="NoItemsTap" xml:space="preserve">
-    <value>Il n’y a aucun élément dans votre coffre pour ce site web/app. Appuyer pour en ajouter un.</value>
+    <value>Il n’y a aucun élément dans votre coffre pour ce site. Appuyer pour en ajouter un.</value>
   </data>
   <data name="NoUsernamePasswordConfigured" xml:space="preserve">
     <value>Cet identifiant n'a aucun nom d'utilisateur ou mot de passe associé.</value>
@@ -660,7 +660,7 @@
     <value>Regénérer un mot de passe</value>
   </data>
   <data name="RetypeMasterPassword" xml:space="preserve">
-    <value>Ressaisir le mot de passe principal</value>
+    <value>Saisir à nouveau le mot de passe maître</value>
   </data>
   <data name="SearchVault" xml:space="preserve">
     <value>Recherche dans le coffre</value>
@@ -681,7 +681,7 @@
     <value>Informations sur l'élément</value>
   </data>
   <data name="ItemUpdated" xml:space="preserve">
-    <value>Élément sauvegardé</value>
+    <value>Élément mis à jour.</value>
   </data>
   <data name="Submitting" xml:space="preserve">
     <value>Soumission...</value>
@@ -692,10 +692,10 @@
     <comment>Message shown when interacting with the server</comment>
   </data>
   <data name="SyncingComplete" xml:space="preserve">
-    <value>Synchronisation terminée</value>
+    <value>Synchronisation terminée.</value>
   </data>
   <data name="SyncingFailed" xml:space="preserve">
-    <value>Échec de la synchronisation</value>
+    <value>Échec de la synchronisation.</value>
   </data>
   <data name="SyncVaultNow" xml:space="preserve">
     <value>Synchroniser le coffre maintenant</value>
@@ -705,10 +705,10 @@
     <comment>What Apple calls their fingerprint reader.</comment>
   </data>
   <data name="TwoStepLogin" xml:space="preserve">
-    <value>Authentification à deux facteurs</value>
+    <value>Identification en deux étapes</value>
   </data>
   <data name="TwoStepLoginConfirmation" xml:space="preserve">
-    <value>L'authentification à deux facteurs rend votre compte plus sûr en vous demandant de vérifier votre connexion avec un autre dispositif tel qu'une clé de sécurité, une application d'authentification, un SMS, un appel téléphonique ou un courriel. L'authentification à deux facteurs peut être configurée sur le coffre web de bitwarden.com. Voulez-vous visiter le site web maintenant ?</value>
+    <value>L'authentification en deux étapes sécurise davantage votre compte en exigeant que chaque connexion soit confirmée par un autre dispositif tel qu'une clé de sécurité, une application d'authentification, un SMS, un appel téléphonique ou un courriel. Cette option peut être activée depuis le coffre web sur bitwarden.com. Voulez-vous y accéder maintenant ?</value>
   </data>
   <data name="UnlockWith" xml:space="preserve">
     <value>Déverrouiller avec {0}</value>
@@ -769,10 +769,10 @@
     <value>2. Activez l'option et appuyez sur OK pour accepter.</value>
   </data>
   <data name="Disabled" xml:space="preserve">
-    <value>Non</value>
+    <value>Désactivé</value>
   </data>
   <data name="Enabled" xml:space="preserve">
-    <value>Oui</value>
+    <value>Activé</value>
   </data>
   <data name="Off" xml:space="preserve">
     <value>Désactivé</value>
@@ -831,14 +831,14 @@
     <comment>For 2FA whenever there are no available providers on this device.</comment>
   </data>
   <data name="NoTwoStepAvailable" xml:space="preserve">
-    <value>Ce compte a une authentification à deux facteurs configurée, mais aucun des fournisseurs d'authentification à deux facteurs configurés ne sont pris en charge sur cet appareil. Veuillez utiliser un appareil pris en charge et/ou ajouter des fournisseurs supplémentaires qui sont mieux pris en charge par les appareils (comme une application d'authentification).</value>
+    <value>Ce compte utilise l'authentification à double facteurs, mais aucun des services d'authentification à double facteurs n'est supporté sur cet appareil. Veuillez utiliser un appareil compatible et/ou ajouter des services supplémentaires qui sont mieux supportés sur les appareils (comme une application d'authentification).</value>
   </data>
   <data name="RecoveryCodeTitle" xml:space="preserve">
     <value>Code de récupération</value>
     <comment>For 2FA</comment>
   </data>
   <data name="RememberMe" xml:space="preserve">
-    <value>Se souvenir de moi</value>
+    <value>Rester connecté</value>
     <comment>Remember my two-step login</comment>
   </data>
   <data name="SendVerificationCodeAgain" xml:space="preserve">
@@ -846,10 +846,10 @@
     <comment>For 2FA</comment>
   </data>
   <data name="TwoStepLoginOptions" xml:space="preserve">
-    <value>Options d'authentification à deux facteurs</value>
+    <value>Options d'identification à double facteurs</value>
   </data>
   <data name="UseAnotherTwoStepMethod" xml:space="preserve">
-    <value>Utiliser une autre méthode d'authentification à deux facteurs</value>
+    <value>Utiliser une autre méthode d'identification en deux étapes</value>
   </data>
   <data name="VerificationEmailNotSent" xml:space="preserve">
     <value>Impossible d'envoyer l'e-mail de vérification. Essayez à nouveau.</value>
@@ -922,7 +922,7 @@ La numérisation se fera automatiquement.</value>
     <value>Copier le code TOTP automatiquement</value>
   </data>
   <data name="PremiumRequired" xml:space="preserve">
-    <value>Une adhésion Premium est requise pour utiliser cette fonctionnalité.</value>
+    <value>Une adhésion premium est requise pour utiliser cette fonctionnalité.</value>
   </data>
   <data name="AttachementAdded" xml:space="preserve">
     <value>Pièce jointe ajoutée</value>
@@ -1366,7 +1366,7 @@ La numérisation se fera automatiquement.</value>
     <value>Valeur</value>
   </data>
   <data name="PasswordHistory" xml:space="preserve">
-    <value>Historique du mot de passe</value>
+    <value>Historique des mots de passe</value>
   </data>
   <data name="Types" xml:space="preserve">
     <value>Types</value>
@@ -1493,10 +1493,10 @@ La numérisation se fera automatiquement.</value>
     <comment>ex: Logged in as user@example.com on bitwarden.com.</comment>
   </data>
   <data name="VaultLockedMasterPassword" xml:space="preserve">
-    <value>Votre coffre est verrouillé. Vérifiez votre mot de passe principal pour continuer.</value>
+    <value>Votre coffre est verrouillé. Saisissez votre mot de passe maître pour continuer.</value>
   </data>
   <data name="VaultLockedPIN" xml:space="preserve">
-    <value>Votre coffre est verrouillé. Vérifiez votre code PIN pour continuer.</value>
+    <value>Votre coffre est verrouillé. Saisissez votre code PIN pour continuer.</value>
   </data>
   <data name="VaultLockedIdentity" xml:space="preserve">
     <value>Votre coffre est verrouillé. Vérifiez votre identité pour continuer.</value>
@@ -1565,7 +1565,7 @@ La numérisation se fera automatiquement.</value>
     <value>Êtes-vous sûr de vouloir quitter Bitwarden ?</value>
   </data>
   <data name="PINRequireMasterPasswordRestart" xml:space="preserve">
-    <value>Voulez-vous exiger le déverrouillage avec votre mot de passe principal lorsque l'application est redémarrée ?</value>
+    <value>Voulez-vous avoir à déverrouiller avec votre mot de passe maître lorsque l'application est redémarrée ?</value>
   </data>
   <data name="Black" xml:space="preserve">
     <value>Noir</value>
@@ -1601,7 +1601,7 @@ La numérisation se fera automatiquement.</value>
     <value>Vos modifications de thème s'appliqueront lorsque l'application sera redémarrée.</value>
   </data>
   <data name="Capitalize" xml:space="preserve">
-    <value>Mettre une majuscule</value>
+    <value>Mettre la première lettre de chaque mot en majuscule</value>
     <comment>ex. Uppercase the first character of a word.</comment>
   </data>
   <data name="IncludeNumber" xml:space="preserve">
@@ -1620,13 +1620,13 @@ La numérisation se fera automatiquement.</value>
     <value>Votre session a expiré.</value>
   </data>
   <data name="BiometricsDirection" xml:space="preserve">
-    <value>Vérification biométrique</value>
+    <value>Utiliser une empreinte biométrique pour vérifier.</value>
   </data>
   <data name="Biometrics" xml:space="preserve">
-    <value>Biométrie</value>
+    <value>Empreintes biométriques</value>
   </data>
   <data name="UseBiometricsToUnlock" xml:space="preserve">
-    <value>Utiliser la biométrie pour déverrouiller</value>
+    <value>Utiliser une empreinte biométrique pour déverrouiller</value>
   </data>
   <data name="AccessibilityOverlayPermissionAlert" xml:space="preserve">
     <value>Bitwarden requiert votre attention - Voir "Service d'accessibilité pour le remplissage automatique" dans les paramètres de Bitwarden</value>
@@ -1653,7 +1653,7 @@ La numérisation se fera automatiquement.</value>
     <value>Format de fichier</value>
   </data>
   <data name="ExportVaultMasterPasswordDescription" xml:space="preserve">
-    <value>Saisissez votre mot de passe principal pour exporter les données de votre coffre.</value>
+    <value>Saisissez votre mot de passe maître pour exporter les données de votre coffre.</value>
   </data>
   <data name="SendVerificationCodeToEmail" xml:space="preserve">
     <value>Envoyer un code de vérification à votre adresse email</value>
@@ -1750,10 +1750,10 @@ La numérisation se fera automatiquement.</value>
     <comment>Confirmation alert message when soft-deleting a cipher.</comment>
   </data>
   <data name="BiometricInvalidated" xml:space="preserve">
-    <value>Déverrouillage biométrique désactivé dans l'attente de vérification du mot de passe principal.</value>
+    <value>Le déverrouillage biométrique est désactivé en attendant la vérification du mot de passe maître.</value>
   </data>
   <data name="BiometricInvalidatedExtension" xml:space="preserve">
-    <value>Déverrouillage biométrique pour la saisie automatique désactivé dans l'attente de vérification du mot de passe principal.</value>
+    <value>Le déverrouillage biométrique pour le remplissage automatique est désactivé en attendant la vérification du mot de passe maître.</value>
   </data>
   <data name="EnableSyncOnRefresh" xml:space="preserve">
     <value>Activer la synchronisation lors de l'actualisation</value>
@@ -1771,16 +1771,16 @@ La numérisation se fera automatiquement.</value>
     <value>Identifiant de l'organisation</value>
   </data>
   <data name="LoginSsoError" xml:space="preserve">
-    <value>Actuellement impossible de se connecter avec le SSO</value>
+    <value>Impossible de se connecter avec SSO pour le moment</value>
   </data>
   <data name="SetMasterPassword" xml:space="preserve">
-    <value>Définir le mot de passe principal</value>
+    <value>Définir le mot de passe maître</value>
   </data>
   <data name="SetMasterPasswordSummary" xml:space="preserve">
-    <value>Afin de finaliser la connexion avec SSO, veuillez définir un mot de passe principal pour accéder et protéger votre coffre.</value>
+    <value>Afin de terminer la connexion avec SSO, veuillez définir un mot de passe maître pour accéder à votre coffre et le protéger.</value>
   </data>
   <data name="MasterPasswordPolicyInEffect" xml:space="preserve">
-    <value>Une ou plusieurs politiques de l'organisation exigent que votre mot de passe principal réponde aux exigences suivantes :</value>
+    <value>Une ou plusieurs politiques de l'organisation exigent que votre mot de passe maître réponde aux exigences suivantes :</value>
   </data>
   <data name="PolicyInEffectMinComplexity" xml:space="preserve">
     <value>Score de complexité minimum de {0}</value>
@@ -2018,7 +2018,7 @@ La numérisation se fera automatiquement.</value>
     <comment>'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated.</comment>
   </data>
   <data name="SendUpdated" xml:space="preserve">
-    <value>Send sauvegardé</value>
+    <value>Send mis à jour.</value>
     <comment>'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated.</comment>
   </data>
   <data name="NewSendCreated" xml:space="preserve">
@@ -2063,7 +2063,7 @@ La numérisation se fera automatiquement.</value>
     <comment>'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated.</comment>
   </data>
   <data name="SendFilePremiumRequired" xml:space="preserve">
-    <value>Les comptes gratuits sont limités au partage de texte uniquement. Une adhésion Premium est requise pour utiliser les fichiers avec Send.</value>
+    <value>Les comptes gratuits sont limités au partage de texte. Un abonnement premium est requis pour utiliser les fichiers avec Send.</value>
     <comment>'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated.</comment>
   </data>
   <data name="SendFileEmailVerificationRequired" xml:space="preserve">
@@ -2071,13 +2071,13 @@ La numérisation se fera automatiquement.</value>
     <comment>'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated.</comment>
   </data>
   <data name="PasswordPrompt" xml:space="preserve">
-    <value>Ressaisir le mot de passe principal</value>
+    <value>Ressaisie du mot de passe maître</value>
   </data>
   <data name="PasswordConfirmation" xml:space="preserve">
-    <value>Confirmation du mot de passe principal</value>
+    <value>Confirmation du mot de passe maître</value>
   </data>
   <data name="PasswordConfirmationDesc" xml:space="preserve">
-    <value>Cette action est protégée, pour continuer veuillez entrer à nouveau votre mot de passe principal pour vérifier votre identité.</value>
+    <value>Cette action est protégée. Pour continuer, veuillez ressaisir votre mot de passe maître pour vérifier votre identité.</value>
   </data>
   <data name="CaptchaRequired" xml:space="preserve">
     <value>Captcha obligatoire</value>
@@ -2086,13 +2086,13 @@ La numérisation se fera automatiquement.</value>
     <value>Le captcha a échoué. Veuillez réessayer.</value>
   </data>
   <data name="UpdatedMasterPassword" xml:space="preserve">
-    <value>Mot de passe principal mis à jour</value>
+    <value>Mot de passe maître mis à jour</value>
   </data>
   <data name="UpdateMasterPassword" xml:space="preserve">
-    <value>Mettre à jour le mot de passe principal</value>
+    <value>Mettre à jour le mot de passe maître</value>
   </data>
   <data name="UpdateMasterPasswordWarning" xml:space="preserve">
-    <value>Votre mot de passe principal a été récemment changé par un administrateur de votre organisation. Pour pouvoir accéder au coffre, vous devez mettre à jour votre mot de passe principal maintenant. En poursuivant, vous serez déconnecté de votre session actuelle et vous devrez vous reconnecter. Les sessions actives sur d'autres appareils peuvent rester actives pendant encore une heure.</value>
+    <value>Votre mot de passe maître a récemment été modifié par un administrateur de votre organisation. Pour accéder au coffre, vous devez mettre à jour votre mot de passe maître dès maintenant. Cette action va vous déconnecter et vous obligera à vous reconnecter. Les sessions actives sur d'autres appareils peuvent rester actives jusqu'à une heure.</value>
   </data>
   <data name="UpdatingPassword" xml:space="preserve">
     <value>Mise à jour du mot de passe</value>
@@ -2101,13 +2101,13 @@ La numérisation se fera automatiquement.</value>
     <value>Impossible de mettre à jour le mot de passe pour le moment</value>
   </data>
   <data name="RemoveMasterPassword" xml:space="preserve">
-    <value>Supprimer le mot de passe principal</value>
+    <value>Supprimer le mot de passe maître</value>
   </data>
   <data name="RemoveMasterPasswordWarning" xml:space="preserve">
-    <value>{0} utilise le SSO avec un chiffrement géré par le client. En continuant cela supprimera votre mot de passe principal de votre compte et exigera le SSO pour la connexion.</value>
+    <value>{0} utilise le SSO avec un chiffrement géré par le client. En continuant, votre mot de passe maître sera supprimé de votre compte et vous devrez utiliser le SSO pour vous connecter.</value>
   </data>
   <data name="RemoveMasterPasswordWarning2" xml:space="preserve">
-    <value>Si vous ne voulez pas supprimer votre mot de passe principal, vous pouvez quitter cette organisation.</value>
+    <value>Si vous ne souhaitez pas supprimer votre mot de passe maître actuel, vous pouvez quitter cette organisation. </value>
   </data>
   <data name="LeaveOrganization" xml:space="preserve">
     <value>Quitter l’organisation</value>
@@ -2134,7 +2134,7 @@ La numérisation se fera automatiquement.</value>
     <value>Assurez-vous que votre navigateur par défaut prend en charge WebAuthn et réessayez.</value>
   </data>
   <data name="ResetPasswordAutoEnrollInviteWarning" xml:space="preserve">
-    <value>Cette organisation dispose d'une politique d'entreprise qui vous inscrira automatiquement à la réinitialisation du mot de passe. L'inscription permettra aux administrateurs de l'organisation de changer votre mot de passe principal.</value>
+    <value>Cette organisation a une politique d'entreprise qui vous inscrira automatiquement à la réinitialisation du mot de passe. L'inscription permettra aux administrateurs de l'organisation de changer votre mot de passe maître.</value>
   </data>
   <data name="VaultTimeoutPolicyInEffect" xml:space="preserve">
     <value>Les politiques de votre organisation affectent le délai d'expiration de votre coffre-fort. Le délai d'expiration maximal autorisé est de {0} heure(s) et {1} minute(s)</value>
@@ -2218,7 +2218,7 @@ La numérisation se fera automatiquement.</value>
     <value>Saisissez le code de vérification que nous avons envoyé votre adresse e-mail</value>
   </data>
   <data name="SubmitCrashLogs" xml:space="preserve">
-    <value>Envoyer les journaux de plantage</value>
+    <value>Envoyer le journal d'erreurs</value>
   </data>
   <data name="SubmitCrashLogsDescription" xml:space="preserve">
     <value>Aidez Bitwarden à améliorer la stabilité de l'application en autorisant les rapports d'erreurs.</value>
@@ -2254,7 +2254,7 @@ La numérisation se fera automatiquement.</value>
     <value>Filtrer les éléments par coffre</value>
   </data>
   <data name="AllVaults" xml:space="preserve">
-    <value>Tous les coffres</value>
+    <value>Tous les Coffres</value>
   </data>
   <data name="Vaults" xml:space="preserve">
     <value>Coffres</value>
@@ -2293,12 +2293,15 @@ La numérisation se fera automatiquement.</value>
     <value>Ajouter un TOTP</value>
   </data>
   <data name="SetupTotp" xml:space="preserve">
-    <value>Configurer TOTP</value>
+    <value>Configurer le TOTP</value>
   </data>
   <data name="OnceTheKeyIsSuccessfullyEntered" xml:space="preserve">
     <value>Une fois que la clé est entrée avec succès,
 sélectionnez Ajouter TOTP pour stocker la clé en toute sécurité</value>
   </data>
+  <data name="SelectAddTotpToStoreTheKeySafely" xml:space="preserve">
+    <value></value>
+  </data>
   <data name="NeverLockWarning" xml:space="preserve">
     <value>Définir vos options de verrouillage sur "Jamais" garde votre coffre ouvert à n'importe qui ayant accès à votre appareil. Si vous utilisez cette option, vous devez vous assurer que votre appareil est bien protégé.</value>
   </data>
@@ -2381,22 +2384,22 @@ sélectionnez Ajouter TOTP pour stocker la clé en toute sécurité</value>
     <value>Que souhaitez-vous générer ?</value>
   </data>
   <data name="UsernameType" xml:space="preserve">
-    <value>Type de nom d'utilisateur</value>
+    <value>Type de Nom d'Utilisateur</value>
   </data>
   <data name="PlusAddressedEmail" xml:space="preserve">
-    <value>Courriel sous-adressé</value>
+    <value>Email prenant en charge le "plus-addressing"</value>
   </data>
   <data name="CatchAllEmail" xml:space="preserve">
-    <value>Courriel "catch-all"</value>
+    <value>Collecteur d'e-mail</value>
   </data>
   <data name="ForwardedEmailAlias" xml:space="preserve">
-    <value>Alias de courriel transféré</value>
+    <value>Alias d'email transféré</value>
   </data>
   <data name="RandomWord" xml:space="preserve">
     <value>Mot aléatoire</value>
   </data>
   <data name="EmailRequiredParenthesis" xml:space="preserve">
-    <value>Courriel (requis)</value>
+    <value>E-mail (requis)</value>
   </data>
   <data name="DomainNameRequiredParenthesis" xml:space="preserve">
     <value>Nom de domaine (requis)</value>
@@ -2438,20 +2441,17 @@ sélectionnez Ajouter TOTP pour stocker la clé en toute sécurité</value>
     <value>L'erreur {0} inconnue est survenue.</value>
   </data>
   <data name="PlusAddressedEmailDescription" xml:space="preserve">
-    <value>Utilisez les capacités de sous-adresse de votre fournisseur de messagerie électronique</value>
+    <value>Utilisez les capacités de sous-adressage de votre fournisseur de messagerie</value>
   </data>
   <data name="CatchAllEmailDescription" xml:space="preserve">
-    <value>Utilisez la boîte de réception "catch-all" configurée sur votre domaine.</value>
+    <value>Utilisez la boîte de réception de votre email collecteur/attrape-tout (catch-all).</value>
   </data>
   <data name="ForwardedEmailDescription" xml:space="preserve">
-    <value>Générer un alias de courriel avec un service de transfert externe.</value>
+    <value>Générer un alias d'email avec un service de transfert externe.</value>
   </data>
   <data name="Random" xml:space="preserve">
     <value>Aléatoire</value>
   </data>
-  <data name="ConnectToWatch" xml:space="preserve">
-    <value>Se connecter à la montre</value>
-  </data>
   <data name="AccessibilityServiceDisclosure" xml:space="preserve">
     <value>Confidentialité du Service d'accessibilité</value>
   </data>
@@ -2476,7 +2476,7 @@ Voulez-vous basculer vers ce compte ?</value>
     <value>Vous êtes nouveau ici ?</value>
   </data>
   <data name="GetMasterPasswordwordHint" xml:space="preserve">
-    <value>Obtenir l'indice du mot de passe principal</value>
+    <value>Obtenir l'indice du mot de passe maître</value>
   </data>
   <data name="LoggingInAsX" xml:space="preserve">
     <value>Connecté en tant que {0}</value>
@@ -2485,7 +2485,7 @@ Voulez-vous basculer vers ce compte ?</value>
     <value>Ce n'est pas vous ?</value>
   </data>
   <data name="LogInWithMasterPassword" xml:space="preserve">
-    <value>Se connecter avec le mot de passe principal</value>
+    <value>Connectez-vous avec le mot de passe maître</value>
   </data>
   <data name="LogInWithAnotherDevice" xml:space="preserve">
     <value>Connectez-vous avec un autre appareil</value>
@@ -2497,7 +2497,7 @@ Voulez-vous basculer vers ce compte ?</value>
     <value>Une notification a été envoyée à votre appareil.</value>
   </data>
   <data name="PleaseMakeSureYourVaultIsUnlockedAndTheFingerprintPhraseMatchesOnTheOtherDevice" xml:space="preserve">
-    <value>Veuillez vous assurer que votre coffre est déverrouillé et que la phrase d'empreinte correspond à celle de l'autre appareil.</value>
+    <value>Veuillez vous assurer que votre coffre est déverrouillé et que l'empreinte digitale est identique sur l'autre appareil.</value>
   </data>
   <data name="ResendNotification" xml:space="preserve">
     <value>Renvoyer la notification</value>
@@ -2511,7 +2511,4 @@ Voulez-vous basculer vers ce compte ?</value>
   <data name="ThisRequestIsNoLongerValid" xml:space="preserve">
     <value>Cette demande n'est plus valide</value>
   </data>
-  <data name="EnableCamerPermissionToUseTheScanner" xml:space="preserve">
-    <value>Activer la permission de l'appareil photo pour utiliser le scanner</value>
-  </data>
 </root>

src/App/Resources/AppResources.he.resx

@@ -376,7 +376,7 @@
   </data>
   <data name="ValueHasBeenCopied" xml:space="preserve">
     <value>{0} הועתק.</value>
-    <comment>Confirmation message after successfully copying a value to the clipboard.</comment>
+    <comment>Confirmation message after suceessfully copying a value to the clipboard.</comment>
   </data>
   <data name="VerifyFingerprint" xml:space="preserve">
     <value>אמת טביעת אצבע</value>
@@ -2302,6 +2302,9 @@ Scanning will happen automatically.</value>
     <value>Once the key is successfully entered,
 select Add TOTP to store the key safely</value>
   </data>
+  <data name="SelectAddTotpToStoreTheKeySafely" xml:space="preserve">
+    <value></value>
+  </data>
   <data name="NeverLockWarning" xml:space="preserve">
     <value>Setting your lock options to “Never” keeps your vault available to anyone with access to your device. If you use this option, you should ensure that you keep your device properly protected.</value>
   </data>
@@ -2452,9 +2455,6 @@ select Add TOTP to store the key safely</value>
   <data name="Random" xml:space="preserve">
     <value>Random</value>
   </data>
-  <data name="ConnectToWatch" xml:space="preserve">
-    <value>Connect to Watch</value>
-  </data>
   <data name="AccessibilityServiceDisclosure" xml:space="preserve">
     <value>Accessibility Service Disclosure</value>
   </data>
@@ -2514,7 +2514,4 @@ Do you want to switch to this account?</value>
   <data name="ThisRequestIsNoLongerValid" xml:space="preserve">
     <value>This request is no longer valid</value>
   </data>
-  <data name="EnableCamerPermissionToUseTheScanner" xml:space="preserve">
-    <value>Enable camera permission to use the scanner</value>
-  </data>
 </root>

src/App/Resources/AppResources.hi.resx

@@ -376,7 +376,7 @@
   </data>
   <data name="ValueHasBeenCopied" xml:space="preserve">
     <value>{0} कॉपी कर लिया गया है।</value>
-    <comment>Confirmation message after successfully copying a value to the clipboard.</comment>
+    <comment>Confirmation message after suceessfully copying a value to the clipboard.</comment>
   </data>
   <data name="VerifyFingerprint" xml:space="preserve">
     <value>अंगुलिछाप दें</value>
@@ -2301,6 +2301,9 @@ Scanning will happen automatically.</value>
     <value>Once the key is successfully entered,
 select Add TOTP to store the key safely</value>
   </data>
+  <data name="SelectAddTotpToStoreTheKeySafely" xml:space="preserve">
+    <value></value>
+  </data>
   <data name="NeverLockWarning" xml:space="preserve">
     <value>Setting your lock options to “Never” keeps your vault available to anyone with access to your device. If you use this option, you should ensure that you keep your device properly protected.</value>
   </data>
@@ -2451,9 +2454,6 @@ select Add TOTP to store the key safely</value>
   <data name="Random" xml:space="preserve">
     <value>Random</value>
   </data>
-  <data name="ConnectToWatch" xml:space="preserve">
-    <value>Connect to Watch</value>
-  </data>
   <data name="AccessibilityServiceDisclosure" xml:space="preserve">
     <value>Accessibility Service Disclosure</value>
   </data>
@@ -2513,7 +2513,4 @@ Do you want to switch to this account?</value>
   <data name="ThisRequestIsNoLongerValid" xml:space="preserve">
     <value>This request is no longer valid</value>
   </data>
-  <data name="EnableCamerPermissionToUseTheScanner" xml:space="preserve">
-    <value>Enable camera permission to use the scanner</value>
-  </data>
 </root>

src/App/Resources/AppResources.hr.resx

@@ -376,7 +376,7 @@
   </data>
   <data name="ValueHasBeenCopied" xml:space="preserve">
     <value>{0} kopirano</value>
-    <comment>Confirmation message after successfully copying a value to the clipboard.</comment>
+    <comment>Confirmation message after suceessfully copying a value to the clipboard.</comment>
   </data>
   <data name="VerifyFingerprint" xml:space="preserve">
     <value>Potvrdi otisak prsta</value>
@@ -2297,6 +2297,9 @@
   <data name="OnceTheKeyIsSuccessfullyEntered" xml:space="preserve">
     <value>Jednom kada je ključ uspješno unesen, odaberi „Dodaj TOTP” za sigurno spremanje ključa</value>
   </data>
+  <data name="SelectAddTotpToStoreTheKeySafely" xml:space="preserve">
+    <value></value>
+  </data>
   <data name="NeverLockWarning" xml:space="preserve">
     <value>Postavljanje zaključavanja na „Nikad” čini tvoj trezor dostupnim svima koji imaju pristupom tvom uređaju. Ako koristiš ovu mogućnost, pobrini se da je uređaj dostatno zaštićen.</value>
   </data>
@@ -2447,9 +2450,6 @@
   <data name="Random" xml:space="preserve">
     <value>Nasumično</value>
   </data>
-  <data name="ConnectToWatch" xml:space="preserve">
-    <value>Connect to Watch</value>
-  </data>
   <data name="AccessibilityServiceDisclosure" xml:space="preserve">
     <value>Odobrenje servisa pristupačnosti</value>
   </data>
@@ -2507,9 +2507,6 @@
     <value>Pogledaj sve mogućnosti prijave</value>
   </data>
   <data name="ThisRequestIsNoLongerValid" xml:space="preserve">
-    <value>Ovaj zahtjev više nije valjan</value>
-  </data>
-  <data name="EnableCamerPermissionToUseTheScanner" xml:space="preserve">
-    <value>Enable camera permission to use the scanner</value>
+    <value>This request is no longer valid</value>
   </data>
 </root>

src/App/Resources/AppResources.hu.resx

@@ -376,7 +376,7 @@
   </data>
   <data name="ValueHasBeenCopied" xml:space="preserve">
     <value>{0} a vágólapra került.</value>
-    <comment>Confirmation message after successfully copying a value to the clipboard.</comment>
+    <comment>Confirmation message after suceessfully copying a value to the clipboard.</comment>
   </data>
   <data name="VerifyFingerprint" xml:space="preserve">
     <value>Ujjlenyomat megerősítése</value>
@@ -2298,6 +2298,9 @@
     <value>A kulcs sikeres megadása után válasszuk ki a 
 TOTP hozzáadása a kulcs biztonságos tárolásához lehetőséget.</value>
   </data>
+  <data name="SelectAddTotpToStoreTheKeySafely" xml:space="preserve">
+    <value></value>
+  </data>
   <data name="NeverLockWarning" xml:space="preserve">
     <value>Ha a zárolási lehetőségeket "Soha” értékre állítjuk, akkor a széf bárki számára elérhető lesz, aki hozzáfér az eszközhöz. Ha ezt az opciót használjuk, akkor gondoskodni kell arról, hogy az eszköz megfelelően védett legyen.</value>
   </data>
@@ -2448,9 +2451,6 @@ TOTP hozzáadása a kulcs biztonságos tárolásához lehetőséget.</value>
   <data name="Random" xml:space="preserve">
     <value>Véletlen</value>
   </data>
-  <data name="ConnectToWatch" xml:space="preserve">
-    <value>Kapcsolódás a Watch-hoz</value>
-  </data>
   <data name="AccessibilityServiceDisclosure" xml:space="preserve">
     <value>Kisegítő lehetőségek szolgáltatás publikálása</value>
   </data>
@@ -2510,7 +2510,4 @@ Szeretnénk átváltani erre a fiókra?</value>
   <data name="ThisRequestIsNoLongerValid" xml:space="preserve">
     <value>A kérés már nem érvényes.</value>
   </data>
-  <data name="EnableCamerPermissionToUseTheScanner" xml:space="preserve">
-    <value>Kamera engedélyezése a lapolvasó használatához</value>
-  </data>
 </root>

src/App/Resources/AppResources.id.resx

@@ -296,7 +296,7 @@
     <comment>Text to define that there are more options things to see.</comment>
   </data>
   <data name="MyVault" xml:space="preserve">
-    <value>Brankas Saya</value>
+    <value>Berangkas Saya</value>
     <comment>The title for the vault page.</comment>
   </data>
   <data name="Authenticator" xml:space="preserve">
@@ -376,7 +376,7 @@
   </data>
   <data name="ValueHasBeenCopied" xml:space="preserve">
     <value>{0} disalin.</value>
-    <comment>Confirmation message after successfully copying a value to the clipboard.</comment>
+    <comment>Confirmation message after suceessfully copying a value to the clipboard.</comment>
   </data>
   <data name="VerifyFingerprint" xml:space="preserve">
     <value>Verifikasi Sidik Jari</value>
@@ -900,8 +900,8 @@
     <value>Tidak dapat membaca kunci autentikasi.</value>
   </data>
   <data name="PointYourCameraAtTheQRCode" xml:space="preserve">
-    <value>Arahkan kamera anda pada kode QR.
-Proses pindai akan terjadi secara otomatis.</value>
+    <value>Point your camera at the QR Code.
+Scanning will happen automatically.</value>
   </data>
   <data name="ScanQrTitle" xml:space="preserve">
     <value>Pindai Kode QR</value>
@@ -2299,6 +2299,9 @@ Proses pindai akan terjadi secara otomatis.</value>
     <value>Once the key is successfully entered,
 select Add TOTP to store the key safely</value>
   </data>
+  <data name="SelectAddTotpToStoreTheKeySafely" xml:space="preserve">
+    <value></value>
+  </data>
   <data name="NeverLockWarning" xml:space="preserve">
     <value>Setting your lock options to “Never” keeps your vault available to anyone with access to your device. If you use this option, you should ensure that you keep your device properly protected.</value>
   </data>
@@ -2449,9 +2452,6 @@ select Add TOTP to store the key safely</value>
   <data name="Random" xml:space="preserve">
     <value>Random</value>
   </data>
-  <data name="ConnectToWatch" xml:space="preserve">
-    <value>Connect to Watch</value>
-  </data>
   <data name="AccessibilityServiceDisclosure" xml:space="preserve">
     <value>Accessibility Service Disclosure</value>
   </data>
@@ -2511,7 +2511,4 @@ Do you want to switch to this account?</value>
   <data name="ThisRequestIsNoLongerValid" xml:space="preserve">
     <value>This request is no longer valid</value>
   </data>
-  <data name="EnableCamerPermissionToUseTheScanner" xml:space="preserve">
-    <value>Enable camera permission to use the scanner</value>
-  </data>
 </root>

src/App/Resources/AppResources.it.resx

@@ -376,7 +376,7 @@
   </data>
   <data name="ValueHasBeenCopied" xml:space="preserve">
     <value>{0} copiata.</value>
-    <comment>Confirmation message after successfully copying a value to the clipboard.</comment>
+    <comment>Confirmation message after suceessfully copying a value to the clipboard.</comment>
   </data>
   <data name="VerifyFingerprint" xml:space="preserve">
     <value>Verifica impronta</value>
@@ -2137,7 +2137,7 @@
     <value>Questa organizzazione ha una politica aziendale che ti iscriverà automaticamente al ripristino della password. Ciò permetterà agli amministratori dell'organizzazione di cambiare la tua password principale.</value>
   </data>
   <data name="VaultTimeoutPolicyInEffect" xml:space="preserve">
-    <value>Your organization policies are affecting your vault timeout. Maximum allowed vault timeout is {0} hour(s) and {1} minute(s)</value>
+    <value>Le policy dell'organizzazione controllano il timeout della tua cassaforte. Il tempo massimo consentito è di $HOURS$ ore e $MINUTES$ minuti</value>
   </data>
   <data name="VaultTimeoutToLarge" xml:space="preserve">
     <value>Il timeout della tua cassaforte supera i limiti impostati dalla tua organizzazione.</value>
@@ -2299,6 +2299,9 @@
     <value>Una volta inserita la chiave,
 seleziona Aggiungi TOTP per salvare la chiave in modo sicuro</value>
   </data>
+  <data name="SelectAddTotpToStoreTheKeySafely" xml:space="preserve">
+    <value></value>
+  </data>
   <data name="NeverLockWarning" xml:space="preserve">
     <value>Impostare le opzioni di blocco su “Mai” fa sì che la tua cassaforte sia a disposizione di chiunque abbia accesso al tuo dispositivo. Se si utilizza questa opzione, è necessario assicurarsi di mantenere il dispositivo adeguatamente protetto.</value>
   </data>
@@ -2449,9 +2452,6 @@ seleziona Aggiungi TOTP per salvare la chiave in modo sicuro</value>
   <data name="Random" xml:space="preserve">
     <value>Casuale</value>
   </data>
-  <data name="ConnectToWatch" xml:space="preserve">
-    <value>Connetti a Watch</value>
-  </data>
   <data name="AccessibilityServiceDisclosure" xml:space="preserve">
     <value>Maggiori informazioni sul servizio di accessibilità</value>
   </data>
@@ -2511,7 +2511,4 @@ Vuoi passare a questo account?</value>
   <data name="ThisRequestIsNoLongerValid" xml:space="preserve">
     <value>La richiesta non è più valida</value>
   </data>
-  <data name="EnableCamerPermissionToUseTheScanner" xml:space="preserve">
-    <value>Abilita i permessi della fotocamera per usare lo scanner</value>
-  </data>
 </root>

src/App/Resources/AppResources.ja.resx

@@ -376,7 +376,7 @@
   </data>
   <data name="ValueHasBeenCopied" xml:space="preserve">
     <value>{0} をコピーしました。</value>
-    <comment>Confirmation message after successfully copying a value to the clipboard.</comment>
+    <comment>Confirmation message after suceessfully copying a value to the clipboard.</comment>
   </data>
   <data name="VerifyFingerprint" xml:space="preserve">
     <value>指紋の確認</value>
@@ -477,13 +477,13 @@
     <value>マスターパスワードのヒントを受信するため、アカウントのメールアドレスを入力してください。</value>
   </data>
   <data name="ExntesionReenable" xml:space="preserve">
-    <value>App Extension を再度有効化</value>
+    <value>アプリの拡張機能を再度有効化</value>
   </data>
   <data name="ExtensionAlmostDone" xml:space="preserve">
     <value>ほぼ完了！</value>
   </data>
   <data name="ExtensionEnable" xml:space="preserve">
-    <value>App Extension を有効化</value>
+    <value>アプリの拡張機能を有効化</value>
   </data>
   <data name="ExtensionInSafari" xml:space="preserve">
     <value>Safari では、共有アイコンを使って Bitwarden を見つけてください（ヒント：メニューの一番下の行を右側にスクロール）</value>
@@ -1457,7 +1457,7 @@
     <value>表示するフォルダーがありません。</value>
   </data>
   <data name="FingerprintPhrase" xml:space="preserve">
-    <value>パスフレーズ</value>
+    <value>指紋句</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">
@@ -2299,6 +2299,9 @@
     <value>キーを入力したら、安全に保存するため
 『TOTP を追加』を選択してください。</value>
   </data>
+  <data name="SelectAddTotpToStoreTheKeySafely" xml:space="preserve">
+    <value></value>
+  </data>
   <data name="NeverLockWarning" xml:space="preserve">
     <value>ロックオプションを「なし」に設定すると、あなたのデバイスを操作できる誰もが保管庫を見られます。 このオプションを使用する場合は、デバイスを適切に保護しておく必要があります。</value>
   </data>
@@ -2449,9 +2452,6 @@
   <data name="Random" xml:space="preserve">
     <value>ランダム</value>
   </data>
-  <data name="ConnectToWatch" xml:space="preserve">
-    <value>ウォッチに接続</value>
-  </data>
   <data name="AccessibilityServiceDisclosure" xml:space="preserve">
     <value>アクセシビリティサービスの開示</value>
   </data>
@@ -2511,7 +2511,4 @@
   <data name="ThisRequestIsNoLongerValid" xml:space="preserve">
     <value>このリクエストは無効になりました</value>
   </data>
-  <data name="EnableCamerPermissionToUseTheScanner" xml:space="preserve">
-    <value>スキャナを使用できるようカメラ権限を許可する</value>
-  </data>
 </root>