PM-4327 Comments clearing

# Conflicts:
#	src/App/Platforms/Android/Autofill/AutofillExternalSelectionActivity.cs

.github/workflows/build-beta.yml

@@ -24,7 +24,7 @@ jobs:
       hotfix_branch_exists: ${{ steps.branch-check.outputs.hotfix_branch_exists }}
     steps:
       - name: Checkout repo
-        uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 # v4.1.6
+        uses: actions/checkout@44c2b7a8a4ea60a981eaca3cf939b5f4305c123b # v4.1.5
         with:
           submodules: 'true'
 
@@ -80,7 +80,7 @@ jobs:
           echo "GitHub event: $GITHUB_EVENT"
 
       - name: Checkout repo
-        uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 # v4.1.6
+        uses: actions/checkout@44c2b7a8a4ea60a981eaca3cf939b5f4305c123b # v4.1.5
         with:
           fetch-depth: 0
           ref: ${{ inputs.ref }}

.github/workflows/build.yml

@@ -21,7 +21,7 @@ jobs:
     runs-on: ubuntu-22.04
     steps:
       - name: Checkout repo
-        uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 # v4.1.6
+        uses: actions/checkout@44c2b7a8a4ea60a981eaca3cf939b5f4305c123b # v4.1.5
 
       - name: Set up CLOC
         run: |
@@ -40,7 +40,7 @@ jobs:
       hotfix_branch_exists: ${{ steps.branch-check.outputs.hotfix_branch_exists }}
     steps:
       - name: Checkout repo
-        uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 # v4.1.6
+        uses: actions/checkout@44c2b7a8a4ea60a981eaca3cf939b5f4305c123b # v4.1.5
         with:
           submodules: 'true'
 
@@ -109,7 +109,7 @@ jobs:
           echo "GitHub event: $GITHUB_EVENT"
 
       - name: Checkout repo
-        uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 # v4.1.6
+        uses: actions/checkout@44c2b7a8a4ea60a981eaca3cf939b5f4305c123b # v4.1.5
         with:
           fetch-depth: 0
 
@@ -335,7 +335,7 @@ jobs:
           echo "GitHub event: $GITHUB_EVENT"
 
       - name: Checkout repo
-        uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 # v4.1.6
+        uses: actions/checkout@44c2b7a8a4ea60a981eaca3cf939b5f4305c123b # v4.1.5
 
       - name: Login to Azure - CI Subscription
         uses: Azure/login@e15b166166a8746d1a47596803bd8c1b595455cf # v1.6.0
@@ -470,7 +470,7 @@ jobs:
           echo "GitHub event: $GITHUB_EVENT"
 
       - name: Checkout repo
-        uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 # v4.1.6
+        uses: actions/checkout@44c2b7a8a4ea60a981eaca3cf939b5f4305c123b # v4.1.5
         with:
           submodules: 'true'
 
@@ -718,7 +718,7 @@ jobs:
       _CROWDIN_PROJECT_ID: "269690"
     steps:
       - name: Checkout repo
-        uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 # v4.1.6
+        uses: actions/checkout@44c2b7a8a4ea60a981eaca3cf939b5f4305c123b # v4.1.5
 
       - name: Login to Azure - CI Subscription
         uses: Azure/login@e15b166166a8746d1a47596803bd8c1b595455cf # v1.6.0
@@ -733,7 +733,7 @@ jobs:
           secrets: "crowdin-api-token"
 
       - name: Upload Sources
-        uses: crowdin/github-action@61ac8b980551f674046220c3e104bddae2916ac5 # v2.0.0
+        uses: crowdin/github-action@8c663f791efc0498270241e9923a8853c99a3a8e # v1.20.3
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
           CROWDIN_API_TOKEN: ${{ steps.retrieve-secrets.outputs.crowdin-api-token }}

.github/workflows/cleanup-rc-branch.yml

@@ -24,7 +24,7 @@ jobs:
           secrets: "github-pat-bitwarden-devops-bot-repo-scope"
 
       - name: Checkout main
-        uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 # v4.1.6
+        uses: actions/checkout@44c2b7a8a4ea60a981eaca3cf939b5f4305c123b # v4.1.5
         with:
           ref: main
           token: ${{ steps.retrieve-bot-secrets.outputs.github-pat-bitwarden-devops-bot-repo-scope }}

.github/workflows/crowdin-pull.yml

@@ -15,7 +15,7 @@ jobs:
       _CROWDIN_PROJECT_ID: "269690"
     steps:
       - name: Checkout repo
-        uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 # v4.1.6
+        uses: actions/checkout@44c2b7a8a4ea60a981eaca3cf939b5f4305c123b # v4.1.5
 
       - name: Login to Azure - CI Subscription
         uses: Azure/login@e15b166166a8746d1a47596803bd8c1b595455cf # v1.6.0
@@ -30,7 +30,7 @@ jobs:
           secrets: "crowdin-api-token, github-gpg-private-key, github-gpg-private-key-passphrase"
 
       - name: Download translations
-        uses: crowdin/github-action@61ac8b980551f674046220c3e104bddae2916ac5 # v2.0.0
+        uses: crowdin/github-action@8c663f791efc0498270241e9923a8853c99a3a8e # v1.20.3
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
           CROWDIN_API_TOKEN: ${{ steps.retrieve-secrets.outputs.crowdin-api-token }}

.github/workflows/release.yml

@@ -38,7 +38,7 @@ jobs:
           fi
 
       - name: Checkout repo
-        uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 # v4.1.6
+        uses: actions/checkout@44c2b7a8a4ea60a981eaca3cf939b5f4305c123b # v4.1.5
 
       - name: Check Release Version
         id: version
@@ -65,9 +65,10 @@ jobs:
           description: 'Deployment ${{ steps.version.outputs.version }} from branch ${{ steps.branch.outputs.branch-name }}'
           task: release
 
+
       - name: Download all artifacts
         if: ${{ inputs.release_type != 'Dry Run' }}
-        uses: bitwarden/gh-actions/download-artifacts@main
+        uses: dawidd6/action-download-artifact@09f2f74827fd3a8607589e5ad7f9398816f540fe # v3.1.4
         with:
           workflow: build.yml
           workflow_conclusion: success
@@ -75,7 +76,7 @@ jobs:
 
       - name: Dry Run - Download all artifacts
         if: ${{ inputs.release_type == 'Dry Run' }}
-        uses: bitwarden/gh-actions/download-artifacts@main
+        uses: dawidd6/action-download-artifact@09f2f74827fd3a8607589e5ad7f9398816f540fe # v3.1.4
         with:
           workflow: build.yml
           workflow_conclusion: success
@@ -125,11 +126,11 @@ jobs:
     if: inputs.fdroid_publish
     steps:
       - name: Checkout repo
-        uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 # v4.1.6
+        uses: actions/checkout@44c2b7a8a4ea60a981eaca3cf939b5f4305c123b # v4.1.5
 
       - name: Download F-Droid .apk artifact
         if: ${{ inputs.release_type != 'Dry Run' }}
-        uses: bitwarden/gh-actions/download-artifacts@main
+        uses: dawidd6/action-download-artifact@09f2f74827fd3a8607589e5ad7f9398816f540fe # v3.1.4
         with:
           workflow: build.yml
           workflow_conclusion: success
@@ -138,7 +139,7 @@ jobs:
 
       - name: Dry Run - Download F-Droid .apk artifact
         if: ${{ inputs.release_type == 'Dry Run' }}
-        uses: bitwarden/gh-actions/download-artifacts@main
+        uses: dawidd6/action-download-artifact@09f2f74827fd3a8607589e5ad7f9398816f540fe # v3.1.4
         with:
           workflow: build.yml
           workflow_conclusion: success
@@ -151,7 +152,9 @@ jobs:
           node-version: '16.x'
 
       - name: Set up F-Droid server
-        run: pip install git+https://gitlab.com/fdroid/fdroidserver.git
+        run: |
+          sudo apt-get -qq update
+          sudo apt-get -qqy install --no-install-recommends fdroidserver wget
 
       - name: Set up Git credentials
         env:
@@ -164,10 +167,9 @@ jobs:
 
       - name: Print environment
         run: |
-          echo "Node Version: $(node --version)"
+          node --version
-          echo "NPM Version: $(npm --version)"
+          npm --version
-          echo "Git Version: $(git --version)"
+          git --version
-          echo "F-Droid Server Version: $(fdroid --version)"
           echo "GitHub ref: $GITHUB_REF"
           echo "GitHub event: $GITHUB_EVENT"
 
@@ -192,30 +194,27 @@ jobs:
         env:
           FDROID_STORE_KEYSTORE_PASSWORD: ${{ secrets.FDROID_STORE_KEYSTORE_PASSWORD }}
         run: |
-          # Create required directories.
+          cd $GITHUB_WORKSPACE
           mkdir dist
-          mkdir -p store/temp/fdroid
+          cp CNAME ./dist
-          mkdir -p store/fdroid/repo
+          cd store
-
+          chmod 600 fdroid/config.py fdroid/keystore.jks
-          # Configure F-Droid server.
+          mkdir -p temp/fdroid
-          cp CNAME dist/
-          chmod 600 store/fdroid/config.yml store/fdroid/keystore.jks
           TEMP_DIR="$GITHUB_WORKSPACE/store/temp/fdroid"
-          echo "keypass: $FDROID_STORE_KEYSTORE_PASSWORD" >> store/fdroid/config.yml
+          cd fdroid
-          echo "keystorepass: $FDROID_STORE_KEYSTORE_PASSWORD" >> store/fdroid/config.yml
+          echo "keypass=\"$FDROID_STORE_KEYSTORE_PASSWORD\"" >>config.py
-          echo "local_copy_dir: $TEMP_DIR" >> store/fdroid/config.yml
+          echo "keystorepass=\"$FDROID_STORE_KEYSTORE_PASSWORD\"" >>config.py
-          mv $GITHUB_WORKSPACE/com.x8bit.bitwarden-fdroid.apk store/fdroid/repo/
+          echo "local_copy_dir=\"$TEMP_DIR\"" >>config.py
-
+          mkdir -p repo
-          # Run update and deploy.
+          mv $GITHUB_WORKSPACE/com.x8bit.bitwarden-fdroid.apk ./repo/
-          cd store/fdroid
           fdroid update
-          fdroid deploy
+          fdroid server update
-          cd ../..
+          cd ..
-
+          rm -rf temp/fdroid/archive
-          # Move files for distribution.
+          mv -v temp/fdroid ../dist
-          rm -rf store/temp/fdroid/archive
+          cd fdroid
-          mv -v store/temp/fdroid dist
+          cp index.html btn.png qr.png ../../dist/fdroid
-          cp store/fdroid/index.html store/fdroid/btn.png store/fdroid/qr.png dist/fdroid
+          cd $GITHUB_WORKSPACE
 
       - name: Deploy to gh-pages
         if: ${{ inputs.release_type != 'Dry Run' }}

.github/workflows/version-bump.yml

@@ -12,10 +12,6 @@ on:
         description: "Cut RC branch?"
         default: true
         type: boolean
-      enable_slack_notification:
-        description: "Enable Slack notifications for upcoming release?"
-        default: false
-        type: boolean
 
 jobs:
   bump_version:
@@ -30,16 +26,8 @@ jobs:
         with:
           version: ${{ inputs.version_number_override }}
 
-      - name: Slack Notification Check
-        run: |
-          if [[ "${{ inputs.enable_slack_notification }}" == true ]]; then
-            echo "Slack notifications enabled."
-          else
-            echo "Slack notifications disabled."
-          fi
-
       - name: Checkout Branch
-        uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 # v4.1.6
+        uses: actions/checkout@44c2b7a8a4ea60a981eaca3cf939b5f4305c123b # v4.1.5
         with:
           ref: main
 
@@ -269,14 +257,6 @@ jobs:
           PR_NUMBER: ${{ steps.create-pr.outputs.pr_number }}
         run: gh pr merge $PR_NUMBER --squash --auto --delete-branch
 
-      - name: Report upcoming release version to Slack
-        if: ${{ steps.version-changed.outputs.changes_to_commit == 'TRUE' && inputs.enable_slack_notification == true }}
-        uses: bitwarden/gh-actions/report-upcoming-release-version@main
-        with:
-          version: ${{ steps.set-final-version-output.outputs.version }}
-          project: ${{ github.repository }}
-          AZURE_KV_CI_SERVICE_PRINCIPAL: ${{ secrets.AZURE_KV_CI_SERVICE_PRINCIPAL }}
-
   cut_rc:
     name: Cut RC branch
     if: ${{ inputs.cut_rc_branch == true }}
@@ -284,7 +264,7 @@ jobs:
     runs-on: ubuntu-22.04
     steps:
       - name: Checkout Branch
-        uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 # v4.1.6
+        uses: actions/checkout@44c2b7a8a4ea60a981eaca3cf939b5f4305c123b # v4.1.5
         with:
           ref: main
 

src/App/Platforms/Android/AndroidManifest.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android" xmlns:tools="http://schemas.android.com/tools" android:versionCode="1" android:versionName="2024.6.0" android:installLocation="internalOnly" package="com.x8bit.bitwarden">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android" xmlns:tools="http://schemas.android.com/tools" android:versionCode="1" android:versionName="2024.5.1" android:installLocation="internalOnly" package="com.x8bit.bitwarden">
 	<uses-sdk android:minSdkVersion="21" android:targetSdkVersion="34" />
 	<uses-permission android:name="android.permission.INTERNET" />
 	<uses-permission android:name="android.permission.NFC" />
@@ -24,7 +24,7 @@
 		<meta-data android:name="com.samsung.android.sdk.multiwindow.penwindow.enable" android:value="true" />
 		<!-- Support for LG "Dual Window" mode (for Android < 7.0 users) -->
 		<meta-data android:name="com.lge.support.SPLIT_WINDOW" android:value="true" />
-		<!-- Declare MainActivity manually so we can set LaunchMode using API dependant resource -->
+		<!-- Declare exported activities manually so we can set LaunchMode using API dependant resource -->
 		<activity android:name="com.x8bit.bitwarden.MainActivity" android:configChanges="keyboard|keyboardHidden|navigation|orientation|screenSize|uiMode" android:exported="true" android:icon="@mipmap/ic_launcher" android:label="Bitwarden" android:launchMode="@integer/launchModeAPIlevel" android:theme="@style/LaunchTheme">
 			<intent-filter>
 				<action android:name="android.intent.action.MAIN" />
@@ -39,6 +39,14 @@
 				<data android:mimeType="text/*" />
 			</intent-filter>
 		</activity>
+		<activity android:name="com.x8bit.bitwarden.WebAuthCallbackActivity" android:launchMode="@integer/webAuthCallbackLaunchMode" android:noHistory="true" android:exported="true">
+			<intent-filter>
+				<action android:name="android.intent.action.VIEW" />
+				<category android:name="android.intent.category.DEFAULT" />
+				<category android:name="android.intent.category.BROWSABLE" />
+				<data android:scheme="bitwarden" />
+			</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 -->

src/App/Platforms/Android/Autofill/AutofillExternalSelectionActivity.cs

@@ -10,7 +10,8 @@ namespace Bit.Droid.Autofill
 {
     [Activity(
         NoHistory = true,
-        LaunchMode = LaunchMode.SingleTop)]
+        LaunchMode = LaunchMode.SingleTop,
+        Exported = false)]
     public class AutofillExternalSelectionActivity : MauiAppCompatActivity
     {
         protected override void OnCreate(Bundle bundle)

src/App/Platforms/Android/Resources/values-v30/manifest.xml

@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <resources>
   <integer name="launchModeAPIlevel">0</integer>
+  <integer name="webAuthCallbackLaunchMode">1</integer>
 </resources>

src/App/Platforms/Android/Resources/values/manifest.xml

@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <resources>
   <integer name="launchModeAPIlevel">2</integer>
+  <integer name="webAuthCallbackLaunchMode">3</integer>
 </resources>

src/App/Platforms/Android/WebAuthCallbackActivity.cs

@@ -1,17 +1,12 @@
 using Android.App;
 using Android.Content.PM;
 using Android.OS;
+using Android.Runtime;
 using Bit.App.Droid.Utilities;
 
 namespace Bit.Droid
 {
-    [Activity(
+    [Register("com.x8bit.bitwarden.WebAuthCallbackActivity")]
-        NoHistory = true, 
-        LaunchMode = LaunchMode.SingleTop,
-        Exported = true)]
-    [IntentFilter(new[] { Android.Content.Intent.ActionView },
-        Categories = new[] { Android.Content.Intent.CategoryDefault, Android.Content.Intent.CategoryBrowsable },
-        DataScheme = "bitwarden")]
     public class WebAuthCallbackActivity : WebAuthenticatorCallbackActivity
     {
         protected override void OnCreate(Bundle savedInstanceState)

src/App/Platforms/iOS/Info.plist

@@ -11,7 +11,7 @@
 	<key>CFBundleIdentifier</key>
 	<string>com.8bit.bitwarden</string>
 	<key>CFBundleShortVersionString</key>
-	<string>2024.6.0</string>
+	<string>2024.5.1</string>
 	<key>CFBundleVersion</key>
 	<string>1</string>
 	<key>CFBundleIconName</key>

src/Core/Resources/Localization/AppResources.ar.resx

@@ -422,7 +422,7 @@
     <value>خدمة التعبئة التلقائية</value>
   </data>
   <data name="SetBitwardenAsPasskeyManagerDescription" xml:space="preserve">
-    <value>تعيين Bitwarden كموفر مفتاح المرور الخاص بك في إعدادات الجهاز.</value>
+    <value>Set Bitwarden as your passkey provider in device settings.</value>
   </data>
   <data name="AvoidAmbiguousCharacters" xml:space="preserve">
     <value>تجنب الأحرف الغامضة</value>

src/Core/Resources/Localization/AppResources.cs.resx

@@ -502,7 +502,7 @@
     <value>Pro spuštění rozšíření klepněte  na ikonu Bitwardenu v menu.</value>
   </data>
   <data name="ExtensionTurnOn" xml:space="preserve">
-    <value>Pro zapnutí Bitwardenu v prohlížeči Safari a dalších aplikacích klepněte na ikonu "Další" v dolní části menu.</value>
+    <value>Pro zapnutí Bitwardenu v prohlížeči Safari a dalších aplikacích klepněte na ikonu "Další“ v dolní části menu.</value>
   </data>
   <data name="Favorite" xml:space="preserve">
     <value>Oblíbené</value>

src/Core/Resources/Localization/AppResources.de.resx

@@ -3001,6 +3001,6 @@ Möchtest du zu diesem Konto wechseln?</value>
     <value>Der Passkey-Vorgang ist fehlgeschlagen, da die App nicht in den Asset-Links gefunden wurde</value>
   </data>
   <data name="PasskeyOperationFailedBecauseAppCouldNotBeVerified" xml:space="preserve">
-    <value>Der Passkey-Vorgang ist fehlgeschlagen, da die App nicht verifiziert werden konnte</value>
+    <value>Der Passwort-Vorgang ist fehlgeschlagen, da die App nicht verifiziert werden konnte</value>
   </data>
 </root>

src/Core/Resources/Localization/AppResources.es.resx

@@ -422,7 +422,7 @@
     <value>Servicio de autocompletado</value>
   </data>
   <data name="SetBitwardenAsPasskeyManagerDescription" xml:space="preserve">
-    <value>Establece Bitwarden como tu proveedor de claves de acceso en los ajustes del dispositivo.</value>
+    <value>Set Bitwarden as your passkey provider in device settings.</value>
   </data>
   <data name="AvoidAmbiguousCharacters" xml:space="preserve">
     <value>Evitar caracteres ambiguos</value>
@@ -1195,7 +1195,7 @@ El escaneo se realizará automáticamente.</value>
     <value>Windows Hello</value>
   </data>
   <data name="BitwardenCredentialProviderGoToSettings" xml:space="preserve">
-    <value>No hemos podido abrir automáticamente el menú de ajustes del proveedor de credenciales de Android. Puedes navegar al menú de ajustes del proveedor de credenciales de Android manualmente desde Ajustes &gt; Sistema &gt; Contraseñas y cuentas &gt; Contraseñas, claves de acceso y servicios de datos.</value>
+    <value>We were unable to automatically open the Android credential provider settings menu for you. You can navigate to the credential provider settings menu manually from Android Settings &gt; System &gt; Passwords &amp; accounts &gt; Passwords, passkeys and data services.</value>
   </data>
   <data name="BitwardenAutofillGoToSettings" xml:space="preserve">
     <value>No hemos podido abrir automáticamente las opciones de autorellenado de Android. Puedes ir al menú de opciones de autorellenado manualmente desde Ajustes de Android &gt; Sistema &gt; Idiomas y entradas &gt; Avanzado &gt; Servicio autocompletar.</value>
@@ -1822,7 +1822,7 @@ El escaneo se realizará automáticamente.</value>
     <value>Bitwarden necesita atención - Activar "Sobrescribir" en "Servicios de Auto-llenado" desde la configuración de Bitwarden</value>
   </data>
   <data name="PasskeyManagement" xml:space="preserve">
-    <value>Gestión de claves de acceso</value>
+    <value>Passkey management</value>
   </data>
   <data name="AutofillServices" xml:space="preserve">
     <value>Servicios de Autollenado</value>
@@ -1867,19 +1867,19 @@ El escaneo se realizará automáticamente.</value>
     <value>Una política de organización está afectando sus opciones de propiedad.</value>
   </data>
   <data name="Send" xml:space="preserve">
-    <value>Send</value>
+    <value>Envío</value>
     <comment>'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated.</comment>
   </data>
   <data name="AllSends" xml:space="preserve">
-    <value>Todos los Sends</value>
+    <value>Todos los Envíos</value>
     <comment>'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated.</comment>
   </data>
   <data name="Sends" xml:space="preserve">
-    <value>Sends</value>
+    <value>Envíos</value>
     <comment>'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated.</comment>
   </data>
   <data name="NameInfo" xml:space="preserve">
-    <value>Un nombre amigable para describir este Send.</value>
+    <value>Un nombre amigable para describir este Envío.</value>
     <comment>'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated.</comment>
   </data>
   <data name="Text" xml:space="preserve">
@@ -1972,15 +1972,15 @@ El escaneo se realizará automáticamente.</value>
     <value>La contraseña ha sido eliminada.</value>
   </data>
   <data name="NotesInfo" xml:space="preserve">
-    <value>Notas privadas sobre este Send.</value>
+    <value>Notas privadas sobre este Envío.</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>Desactivar este Send para que nadie pueda acceder a él</value>
+    <value>Desactivar este Envío para que nadie pueda acceder a él.</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">
-    <value>No hay Sends en tu cuenta.</value>
+    <value>No hay Envíos en tu cuenta.</value>
     <comment>'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated.</comment>
   </data>
   <data name="AddASend" xml:space="preserve">
@@ -1994,35 +1994,35 @@ El escaneo se realizará automáticamente.</value>
     <value>Compartir enlace</value>
   </data>
   <data name="SendLink" xml:space="preserve">
-    <value>Enlace Send</value>
+    <value>Enviar enlace</value>
     <comment>'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated.</comment>
   </data>
   <data name="SearchSends" xml:space="preserve">
-    <value>Buscar Sends</value>
+    <value>Buscar Envíos</value>
     <comment>'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated.</comment>
   </data>
   <data name="EditSend" xml:space="preserve">
-    <value>Editar Send</value>
+    <value>Editar Envío</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>Nuevo Send</value>
+    <value>Añadir Envío</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">
-    <value>¿Seguro que quieres eliminar este Send?</value>
+    <value>¿Seguro que quieres eliminar este Envío?</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 eliminado</value>
+    <value>El Envío se ha eliminado.</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 guardado</value>
+    <value>Envío actualizado.</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 creado</value>
+    <value>Nuevo Envío creado.</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">
@@ -2044,7 +2044,7 @@ El escaneo se realizará automáticamente.</value>
     <value>Personalizado</value>
   </data>
   <data name="ShareOnSave" xml:space="preserve">
-    <value>Compartir este Send al guardarlo</value>
+    <value>Compartir este Envío al guardarlo.</value>
     <comment>'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated.</comment>
   </data>
   <data name="SendDisabledWarning" xml:space="preserve">
@@ -2203,7 +2203,7 @@ El escaneo se realizará automáticamente.</value>
     <value>Enviando</value>
   </data>
   <data name="CopySendLinkOnSave" xml:space="preserve">
-    <value>Copiar enlace del Send al guardar</value>
+    <value>Copiar enlace Enviar al guardar</value>
   </data>
   <data name="SendingCode" xml:space="preserve">
     <value>Enviando código...</value>
@@ -2810,7 +2810,7 @@ seleccione Agregar TOTP para almacenar la clave de forma segura</value>
     <value>{0} horas</value>
   </data>
   <data name="PasskeyManagementExplanationLong" xml:space="preserve">
-    <value>Usa Bitwarden para guardar nuevas claves de acceso e iniciar sesión con las claves de acceso almacenadas en tu caja fuerte.</value>
+    <value>Use Bitwarden to save new passkeys and log in with passkeys stored in your vault.</value>
   </data>
   <data name="AutofillServicesExplanationLong" xml:space="preserve">
     <value>El Framework de Autofill de Android se utiliza para ayudar a rellenar información de inicio de sesión en otras aplicaciones en tu dispositivo.</value>
@@ -2841,7 +2841,7 @@ seleccione Agregar TOTP para almacenar la clave de forma segura</value>
     <value>¿Continuar a la App Store?</value>
   </data>
   <data name="ContinueToDeviceSettings" xml:space="preserve">
-    <value>¿Continuar a los ajustes del dispositivo?</value>
+    <value>Continue to device Settings?</value>
   </data>
   <data name="TwoStepLoginDescriptionLong" xml:space="preserve">
     <value>Haz tu cuenta más segura al configurar el inicio de sesión en dos pasos en la aplicación web de Bitwarden.</value>
@@ -2894,25 +2894,25 @@ seleccione Agregar TOTP para almacenar la clave de forma segura</value>
     <value>Configura una opción de desbloqueo para cambiar tu acción de tiempo de espera de tu caja fuerte.</value>
   </data>
   <data name="ChooseALoginToSaveThisPasskeyTo" xml:space="preserve">
-    <value>Escoge un inicio de sesión para guardar esta clave de acceso</value>
+    <value>Choose a login to save this passkey to</value>
   </data>
   <data name="SavePasskeyAsNewLogin" xml:space="preserve">
-    <value>Guardar clave de acceso como un nuevo inicio de sesión</value>
+    <value>Save passkey as new login</value>
   </data>
   <data name="SavePasskey" xml:space="preserve">
-    <value>Guardar clave de acceso</value>
+    <value>Save passkey</value>
   </data>
   <data name="PasskeysForX" xml:space="preserve">
-    <value>Claves de acceso para {0}</value>
+    <value>Passkeys for {0}</value>
   </data>
   <data name="PasswordsForX" xml:space="preserve">
-    <value>Contraseñas para {0}</value>
+    <value>Passwords for {0}</value>
   </data>
   <data name="OverwritePasskey" xml:space="preserve">
-    <value>¿Sobreescribir clave de acceso?</value>
+    <value>Overwrite passkey?</value>
   </data>
   <data name="ThisItemAlreadyContainsAPasskeyAreYouSureYouWantToOverwriteTheCurrentPasskey" xml:space="preserve">
-    <value>Este elemento ya contiene una clave de acceso. ¿Estás seguro de que quieres sobreescribir la clave de acceso actual?</value>
+    <value>This item already contains a passkey. Are you sure you want to overwrite the current passkey?</value>
   </data>
   <data name="DuoTwoStepLoginIsRequiredForYourAccount" xml:space="preserve">
     <value>Se requiere el inicio de sesión en dos pasos Duo para su cuenta. </value>
@@ -2924,86 +2924,86 @@ seleccione Agregar TOTP para almacenar la clave de forma segura</value>
     <value>Iniciar Duo</value>
   </data>
   <data name="VerificationRequiredByX" xml:space="preserve">
-    <value>Verificación requerida por {0}</value>
+    <value>Verification required by {0}</value>
   </data>
   <data name="VerificationRequiredForThisActionSetUpAnUnlockMethodInBitwardenToContinue" xml:space="preserve">
-    <value>Verificación requerida para esta acción. Establece un método de desbloqueo en Bitwarden para continuar.</value>
+    <value>Verification required for this action. Set up an unlock method in Bitwarden to continue.</value>
   </data>
   <data name="ErrorCreatingPasskey" xml:space="preserve">
-    <value>Error creando clave de acceso</value>
+    <value>Error creating passkey</value>
   </data>
   <data name="ErrorReadingPasskey" xml:space="preserve">
-    <value>Error leyendo clave de acceso</value>
+    <value>Error reading passkey</value>
   </data>
   <data name="ThereWasAProblemCreatingAPasskeyForXTryAgainLater" xml:space="preserve">
-    <value>Hubo un problema creando la clave de acceso para {0}. Inténtalo de nuevo más tarde.</value>
+    <value>There was a problem creating a passkey for {0}. Try again later.</value>
     <comment>The parameter is the RpId</comment>
   </data>
   <data name="ThereWasAProblemReadingAPasskeyForXTryAgainLater" xml:space="preserve">
-    <value>Hubo un problema leyendo la clave de acceso para {0}. Inténtalo de nuevo más tarde.</value>
+    <value>There was a problem reading your passkey for {0}. Try again later.</value>
     <comment>The parameter is the RpId</comment>
   </data>
   <data name="VerifyingIdentityEllipsis" xml:space="preserve">
-    <value>Verificando identidad...</value>
+    <value>Verifying identity...</value>
   </data>
   <data name="Passwords" xml:space="preserve">
-    <value>Contraseñas</value>
+    <value>Passwords</value>
   </data>
   <data name="UnknownAccount" xml:space="preserve">
-    <value>Cuenta desconocida</value>
+    <value>Unknown account</value>
   </data>
   <data name="SetUpAutofill" xml:space="preserve">
-    <value>Establecer autocompletar</value>
+    <value>Set up auto-fill</value>
   </data>
   <data name="GetInstantAccessToYourPasswordsAndPasskeys" xml:space="preserve">
-    <value>¡Consigue acceso instantáneo a tus contraseñas y claves de acceso!</value>
+    <value>Get instant access to your passwords and passkeys!</value>
   </data>
   <data name="SetUpAutoFillDescriptionLong" xml:space="preserve">
-    <value>Para configurar el autocompletado y la administración de claves de acceso, establezca Bitwarden como su proveedor preferido en los ajustes de iOS.</value>
+    <value>To set up password auto-fill and passkey management, set Bitwarden as your preferred provider in the iOS Settings.</value>
   </data>
   <data name="FirstDotGoToYourDeviceSettingsPasswordsPasswordOptions" xml:space="preserve">
-    <value>1. Ve a los Ajustes de tu dispositivo &gt; Contraseñas &gt; Opciones de Contraseña</value>
+    <value>1. Go to your device's Settings &gt; Passwords &gt; Password Options</value>
   </data>
   <data name="SecondDotTurnOnAutoFill" xml:space="preserve">
-    <value>2. Habilita el autocompletado</value>
+    <value>2. Turn on AutoFill</value>
   </data>
   <data name="ThirdDotSelectBitwardenToUseForPasswordsAndPasskeys" xml:space="preserve">
-    <value>3. Selecciona "Bitwarden" para usar contraseñas y claves de acceso</value>
+    <value>3. Select "Bitwarden" to use for passwords and passkeys</value>
   </data>
   <data name="YourPasskeyWillBeSavedToYourBitwardenVault" xml:space="preserve">
-    <value>Tu clave de acceso se guardará en tu caja fuerte de Bitwarden</value>
+    <value>Your passkey will be saved to your Bitwarden vault</value>
   </data>
   <data name="YourPasskeyWillBeSavedToYourBitwardenVaultForX" xml:space="preserve">
-    <value>Tu clave de acceso se guardará en tu caja fuerte de Bitwarden para {0}</value>
+    <value>Your passkey will be saved to your Bitwarden vault for {0}</value>
   </data>
   <data name="OrganizationUnassignedItemsMessageUSEUDescriptionLong" xml:space="preserve">
-    <value>Los elementos de organización sin asignar ya no están visibles en la vista Todas las cajas fuertes y solo se puede acceder a ellos a través de la consola de administrador. Asigne estos elementos a una colección desde la Consola de Administrador para hacerlos visibles.</value>
+    <value>Unassigned organization items are no longer visible in the All Vaults view and only accessible via the Admin Console. Assign these items to a collection from the Admin Console to make them visible.</value>
   </data>
   <data name="OrganizationUnassignedItemsMessageSelfHost041624DescriptionLong" xml:space="preserve">
-    <value>El 16 de mayo de 2024, los elementos de organización no asignados ya no serán visibles en la vista Todas las cajas fuertes y solo serán accesibles a través de la Consola de Administrador. Asigna estos objetos a una colección desde la Consola de Administrador para hacerlos visibles.</value>
+    <value>On May 16, 2024, unassigned organization items will no longer be visible in the All Vaults view and only accessible via the Admin Console. Assign these items to a collection from the Admin Console to make them visible.</value>
   </data>
   <data name="RemindMeLater" xml:space="preserve">
-    <value>Recuérdamelo más tarde</value>
+    <value>Remind me later</value>
   </data>
   <data name="Notice" xml:space="preserve">
-    <value>Aviso</value>
+    <value>Notice</value>
   </data>
   <data name="PasskeysNotSupportedForThisApp" xml:space="preserve">
-    <value>Claves de acceso no soportadas para esta aplicación</value>
+    <value>Passkeys not supported for this app</value>
   </data>
   <data name="PasskeyOperationFailedBecauseBrowserIsNotPrivileged" xml:space="preserve">
-    <value>Falló la operación de la clave de acceso porque el navegador no tiene privilegios</value>
+    <value>Passkey operation failed because browser is not privileged</value>
   </data>
   <data name="PasskeyOperationFailedBecauseBrowserSignatureDoesNotMatch" xml:space="preserve">
-    <value>Falló la operación de la clave de acceso porque la firma del navegador no coincide</value>
+    <value>Passkey operation failed because browser signature does not match</value>
   </data>
   <data name="PasskeyOperationFailedBecauseOfMissingAssetLinks" xml:space="preserve">
-    <value>Falló la operación de la clave de acceso porque faltan enlaces de recursos</value>
+    <value>Passkey operation failed because of missing asset links</value>
   </data>
   <data name="PasskeyOperationFailedBecauseAppNotFoundInAssetLinks" xml:space="preserve">
-    <value>Falló la operación de la clave de acceso porque la aplicación no encontró los enlaces de recursos</value>
+    <value>Passkey operation failed because app not found in asset links</value>
   </data>
   <data name="PasskeyOperationFailedBecauseAppCouldNotBeVerified" xml:space="preserve">
-    <value>Falló la operación de la clave de acceso porque la aplicación no pudo ser verificada</value>
+    <value>Passkey operation failed because app could not be verified</value>
   </data>
 </root>

src/Core/Resources/Localization/AppResources.fi.resx

@@ -2397,7 +2397,7 @@ turvallisesti valitsemalla "Lisää TOTP"</value>
     <value>Catch-all-sähköposti</value>
   </data>
   <data name="ForwardedEmailAlias" xml:space="preserve">
-    <value>Sähköpostialias ohjaukseen</value>
+    <value>Sähköpostialias välitykseen</value>
   </data>
   <data name="RandomWord" xml:space="preserve">
     <value>Satunnainen sana</value>
@@ -2991,7 +2991,7 @@ Haluatko vaihtaa tähän tiliin?</value>
     <value>Suojausavaimia ei tueta tässä sovelluksessa</value>
   </data>
   <data name="PasskeyOperationFailedBecauseBrowserIsNotPrivileged" xml:space="preserve">
-    <value>Suojausavaintoiminto epäonnistui, koska selainta ei ole hyväksytty</value>
+    <value>Suojausavaintoiminto epäonnistui, koska selainta ei ole korotettu</value>
   </data>
   <data name="PasskeyOperationFailedBecauseBrowserSignatureDoesNotMatch" xml:space="preserve">
     <value>Suojausavaintoiminto epäonnistui, koska selaimen allekirjoitus ei täsmää</value>
@@ -3003,6 +3003,6 @@ Haluatko vaihtaa tähän tiliin?</value>
     <value>Suojausavaintoiminto epäonnistui, koska sovellusta ei löytynyt asset-liitoksista</value>
   </data>
   <data name="PasskeyOperationFailedBecauseAppCouldNotBeVerified" xml:space="preserve">
-    <value>Suojausavaintoiminto epäonnistui, koska sovellusta ei voitu varmentaa</value>
+    <value>Suojausavaintoiminto epäonnistui, koska sovellusta ei voitu vahvistaa</value>
   </data>
 </root>

src/Core/Resources/Localization/AppResources.fr.resx

@@ -2905,7 +2905,7 @@ Voulez-vous basculer vers ce compte ?</value>
     <value>Clés d'accès pour {0}</value>
   </data>
   <data name="PasswordsForX" xml:space="preserve">
-    <value>Mots de passe pour {0}</value>
+    <value>Passwords for {0}</value>
   </data>
   <data name="OverwritePasskey" xml:space="preserve">
     <value>Overwrite passkey?</value>
@@ -2946,7 +2946,7 @@ Voulez-vous basculer vers ce compte ?</value>
     <value>Verifying identity...</value>
   </data>
   <data name="Passwords" xml:space="preserve">
-    <value>Mots de passe</value>
+    <value>Passwords</value>
   </data>
   <data name="UnknownAccount" xml:space="preserve">
     <value>Unknown account</value>

src/Core/Resources/Localization/AppResources.lv.resx

@@ -1662,7 +1662,7 @@ Nolasīšana notiks automātiski.</value>
     <value>Jāapstiprina identitāte, lai turpinātu.</value>
   </data>
   <data name="ExportVaultWarning" xml:space="preserve">
-    <value>Šī izguve satur glabātavas datus nešifrētā veidā. Izgūto datni nevajadzētu glabāt vai sūtīt nedrošos veidos (piemēram, e-pastā). Tā ir jāizdzēš uzreiz pēc izmantošanas.</value>
+    <value>Šī izguve satur glabātavas datus nešifrētā veidā. Izdoto datni nevajadzētu glabāt vai sūtīt nedrošos veidos (piemēram, e-pastā). Izdzēst to uzreiz pēc izmantošanas.</value>
   </data>
   <data name="EncExportKeyWarning" xml:space="preserve">
     <value>Šī izguve šifrē datus ar konta šifrēšanas atslēgu. Ja tā jebkad tiks mainīta, izvadi vajadzētu veikt vēlreiz, jo vairs nebūs iespējams atšifrēt šo datni.</value>
@@ -2853,7 +2853,7 @@ Vai pārslēgties uz šo kontu?</value>
     <comment>The parameter is an URL, like vault.bitwarden.com.</comment>
   </data>
   <data name="LearnMoreAboutHowToUseBitwardenOnTheHelpCenter" xml:space="preserve">
-    <value>Vairāk par to, kā izmantot Bitwarden, var uzzināt palīdzības centrā.</value>
+    <value>Par to, kā izmantot Bitwarden, vairāk var uzzināt palīdzības centrā.</value>
   </data>
   <data name="ContactSupportDescriptionLong" xml:space="preserve">
     <value>Meklējamais nav atrodams? Ir iespēja sazināties ar Bitwarden atbalstu bitwarden.com.</value>
@@ -2865,7 +2865,7 @@ Vai pārslēgties uz šo kontu?</value>
     <value>Vairāk sava Bitwarden konta iespēju var izpētīt tīmekļa vietnē.</value>
   </data>
   <data name="LearnAboutOrganizationsDescriptionLong" xml:space="preserve">
-    <value>Bitwarden nodrošina iespēju kopīgot savas glabātavas vienumus ar citiem, kad tiek izmantota apvienība. Vairāk var uzzināt tīmekļvietnē bitwarden.com.</value>
+    <value>Bitwarden nodrošina iespēju kopīgot savas glabātavas vienumus ar citiem, kad tiek izmantota apvienība. Vairāk var uzzināt bitwarden.com tīmekļvietnē.</value>
   </data>
   <data name="RateAppDescriptionLong" xml:space="preserve">
     <value>Var palīdzēt citiem noskaidrot, vai Bitwarden tiem der. To var izdarīt lietotņu veikalā, atstājot vērtējumu.</value>

src/Core/Resources/Localization/AppResources.pt-BR.resx

@@ -1195,7 +1195,7 @@ A leitura será feita automaticamente.</value>
     <value>Windows Hello</value>
   </data>
   <data name="BitwardenCredentialProviderGoToSettings" xml:space="preserve">
-    <value>Não foi possível abrir automaticamente o menu de configurações do provedor de credenciais do Android para você. Você pode navegar para o menu de configurações do provedor de credenciais manualmente a partir de Configurações do Android &gt; Sistema &gt; Senhas e Contas &gt; Senhas chaves e serviços de dados.</value>
+    <value>We were unable to automatically open the Android credential provider settings menu for you. You can navigate to the credential provider settings menu manually from Android Settings &gt; System &gt; Passwords &amp; accounts &gt; Passwords, passkeys and data services.</value>
   </data>
   <data name="BitwardenAutofillGoToSettings" xml:space="preserve">
     <value>Não foi possível abrir automaticamente o menu de configurações de autopreenchimento do Android para você. Você pode navegar para o menu de configurações de autopreenchimento manualmente a partir de Configurações do Android &gt; Sistema &gt; Idiomas e Entrada &gt; Avançado &gt; Serviço de autopreenchimento.</value>

src/Core/Resources/Localization/AppResources.pt-PT.resx

@@ -136,7 +136,7 @@
     <comment>Alert title when something goes wrong.</comment>
   </data>
   <data name="Back" xml:space="preserve">
-    <value>Voltar</value>
+    <value>Retroceder</value>
     <comment>Navigate back to the previous screen.</comment>
   </data>
   <data name="Bitwarden" xml:space="preserve">
@@ -961,7 +961,7 @@ A leitura será efetuada automaticamente.</value>
     <value>Ambiente personalizado</value>
   </data>
   <data name="CustomEnvironmentFooter" xml:space="preserve">
-    <value>Para utilizadores avançados. Pode especificar o URL de base de cada serviço de forma independente.</value>
+    <value>Para utilizadores avançados. Pode especificar o URL de base de cada serviço independentemente.</value>
   </data>
   <data name="EnvironmentSaved" xml:space="preserve">
     <value>Os URLs de ambiente foram guardados.</value>

src/Core/Resources/Localization/AppResources.sv.resx

@@ -422,7 +422,7 @@
     <value>Hjälpmedelsservice för automatisk ifyllnad</value>
   </data>
   <data name="SetBitwardenAsPasskeyManagerDescription" xml:space="preserve">
-    <value>Ange Bitwarden som din lösenordsleverantör i enhetsinställningarna.</value>
+    <value>Set Bitwarden as your passkey provider in device settings.</value>
   </data>
   <data name="AvoidAmbiguousCharacters" xml:space="preserve">
     <value>Undvik tvetydiga tecken</value>
@@ -1196,7 +1196,7 @@ Skanningen sker automatiskt.</value>
     <value>Windows Hello</value>
   </data>
   <data name="BitwardenCredentialProviderGoToSettings" xml:space="preserve">
-    <value>Det gick inte att automatiskt öppna menyn för Android-autentiseringsleverantörsinställningar för dig. Du kan navigera till menyn autentiseringsleverantörsinställningar manuellt från Android Inställningar &gt; System &gt; Lösenord och konton &gt; Lösenord, Nyckelord och datatjänster.</value>
+    <value>We were unable to automatically open the Android credential provider settings menu for you. You can navigate to the credential provider settings menu manually from Android Settings &gt; System &gt; Passwords &amp; accounts &gt; Passwords, passkeys and data services.</value>
   </data>
   <data name="BitwardenAutofillGoToSettings" xml:space="preserve">
     <value>Det gick inte att automatiskt öppna inställningsmenyn för Android automatisk ifyllnad. Du kan navigera till menyn manuellt från Android inställningar &gt; System &gt; Språk och inmatning &gt; Avancerat &gt; Tjänsten autofyll.</value>
@@ -1824,7 +1824,7 @@ Skanningen sker automatiskt.</value>
     <value>Bitwarden behöver din uppmärksamhet - Aktivera "Överlappning" under "Tjänster för automatisk ifyllnad" i Bitwardens inställningar</value>
   </data>
   <data name="PasskeyManagement" xml:space="preserve">
-    <value>Passkey hantering</value>
+    <value>Passkey management</value>
   </data>
   <data name="AutofillServices" xml:space="preserve">
     <value>Tjänster för automatisk ifyllnad</value>
@@ -2897,19 +2897,19 @@ Vill du byta till detta konto?</value>
     <value>Choose a login to save this passkey to</value>
   </data>
   <data name="SavePasskeyAsNewLogin" xml:space="preserve">
-    <value>Spara passkey som ny inloggning</value>
+    <value>Save passkey as new login</value>
   </data>
   <data name="SavePasskey" xml:space="preserve">
-    <value>Spara passkey</value>
+    <value>Save passkey</value>
   </data>
   <data name="PasskeysForX" xml:space="preserve">
-    <value>Passkeys för {0}</value>
+    <value>Passkeys for {0}</value>
   </data>
   <data name="PasswordsForX" xml:space="preserve">
-    <value>Lösenord för {0}</value>
+    <value>Passwords for {0}</value>
   </data>
   <data name="OverwritePasskey" xml:space="preserve">
-    <value>Skriv över passkey?</value>
+    <value>Overwrite passkey?</value>
   </data>
   <data name="ThisItemAlreadyContainsAPasskeyAreYouSureYouWantToOverwriteTheCurrentPasskey" xml:space="preserve">
     <value>This item already contains a passkey. Are you sure you want to overwrite the current passkey?</value>
@@ -2924,16 +2924,16 @@ Vill du byta till detta konto?</value>
     <value>Starta Duo</value>
   </data>
   <data name="VerificationRequiredByX" xml:space="preserve">
-    <value>Verifiering krävs av {0}</value>
+    <value>Verification required by {0}</value>
   </data>
   <data name="VerificationRequiredForThisActionSetUpAnUnlockMethodInBitwardenToContinue" xml:space="preserve">
     <value>Verification required for this action. Set up an unlock method in Bitwarden to continue.</value>
   </data>
   <data name="ErrorCreatingPasskey" xml:space="preserve">
-    <value>Fel vid skapande av passkey</value>
+    <value>Error creating passkey</value>
   </data>
   <data name="ErrorReadingPasskey" xml:space="preserve">
-    <value>Fel vid läsning av passkey</value>
+    <value>Error reading passkey</value>
   </data>
   <data name="ThereWasAProblemCreatingAPasskeyForXTryAgainLater" xml:space="preserve">
     <value>There was a problem creating a passkey for {0}. Try again later.</value>
@@ -2944,7 +2944,7 @@ Vill du byta till detta konto?</value>
     <comment>The parameter is the RpId</comment>
   </data>
   <data name="VerifyingIdentityEllipsis" xml:space="preserve">
-    <value>Verifierar identitet...</value>
+    <value>Verifying identity...</value>
   </data>
   <data name="Passwords" xml:space="preserve">
     <value>Lösenord</value>
@@ -2965,22 +2965,22 @@ Vill du byta till detta konto?</value>
     <value>1. Gå till din enhets Inställningar &gt; Lösenord &gt; Lösenordsalternativ</value>
   </data>
   <data name="SecondDotTurnOnAutoFill" xml:space="preserve">
-    <value>2. Slå på AutoFyll</value>
+    <value>2. Turn on AutoFill</value>
   </data>
   <data name="ThirdDotSelectBitwardenToUseForPasswordsAndPasskeys" xml:space="preserve">
-    <value>3. Välj att använda "Bitwarden" för lösenord och passkeys</value>
+    <value>3. Select "Bitwarden" to use for passwords and passkeys</value>
   </data>
   <data name="YourPasskeyWillBeSavedToYourBitwardenVault" xml:space="preserve">
     <value>Your passkey will be saved to your Bitwarden vault</value>
   </data>
   <data name="YourPasskeyWillBeSavedToYourBitwardenVaultForX" xml:space="preserve">
-    <value>Din passkey kommer att sparas i ditt Bitwarden-valv för {0}</value>
+    <value>Your passkey will be saved to your Bitwarden vault for {0}</value>
   </data>
   <data name="OrganizationUnassignedItemsMessageUSEUDescriptionLong" xml:space="preserve">
     <value>Unassigned organization items are no longer visible in the All Vaults view and only accessible via the Admin Console. Assign these items to a collection from the Admin Console to make them visible.</value>
   </data>
   <data name="OrganizationUnassignedItemsMessageSelfHost041624DescriptionLong" xml:space="preserve">
-    <value>Den 16 maj 2024 kommer otilldelade organisationsobjekt inte längre att synas i alla valvs-vyn och endast nås via administratörskonsollen. Tilldela dessa objekt till en samling från administratörskonsollen för att göra dem synliga.</value>
+    <value>On May 16, 2024, unassigned organization items will no longer be visible in the All Vaults view and only accessible via the Admin Console. Assign these items to a collection from the Admin Console to make them visible.</value>
   </data>
   <data name="RemindMeLater" xml:space="preserve">
     <value>Påminn mig senare</value>

src/Core/Resources/Localization/AppResources.tr.resx

@@ -422,7 +422,7 @@
     <value>Otomatik doldurma hizmeti</value>
   </data>
   <data name="SetBitwardenAsPasskeyManagerDescription" xml:space="preserve">
-    <value>Cihaz ayarlarınızdan Bitwarden'ı geçiş anahtarı sağlayıcınız olarak ayarlayın.</value>
+    <value>Set Bitwarden as your passkey provider in device settings.</value>
   </data>
   <data name="AvoidAmbiguousCharacters" xml:space="preserve">
     <value>Okurken karışabilecek karakterleri kullanma</value>
@@ -2891,7 +2891,7 @@ Bu hesaba geçmek ister misiniz?</value>
     <value>Kasa zaman aşımı eyleminizi değiştirmek için bir kilit açma yöntemi ayarlayın.</value>
   </data>
   <data name="ChooseALoginToSaveThisPasskeyTo" xml:space="preserve">
-    <value>Bu geçiş anahtarının kaydedileceği hesabı seçin</value>
+    <value>Choose a login to save this passkey to</value>
   </data>
   <data name="SavePasskeyAsNewLogin" xml:space="preserve">
     <value>Geçiş anahtarını yeni hesap olarak kaydet</value>

src/Core/Resources/Localization/AppResources.zh-Hans.resx

@@ -422,7 +422,7 @@
     <value>自动填充服务</value>
   </data>
   <data name="SetBitwardenAsPasskeyManagerDescription" xml:space="preserve">
-    <value>在设备的设置中将 Bitwarden 设置为您的通行密钥提供程序。</value>
+    <value>在设备设置中将 Bitwarden 设置为您的通行密钥提供程序。</value>
   </data>
   <data name="AvoidAmbiguousCharacters" xml:space="preserve">
     <value>避免易混淆的字符</value>
@@ -1195,7 +1195,7 @@
     <value>Windows Hello</value>
   </data>
   <data name="BitwardenCredentialProviderGoToSettings" xml:space="preserve">
-    <value>我们无法为您自动打开 Android 凭据提供程序设置菜单。您可以通过 Android 设置 &gt; 系统 &gt; 密码和账户 &gt; 密码、通行密钥和数据服务手动定位到凭据提供程序设置菜单。</value>
+    <value>我们无法为您自动打开 Android 凭据提供者设置菜单。您可以通过“Android 设置 &gt; 系统 &gt; 密码和账户 &gt; 密码、通行密钥和数据服务”手动定位到凭据提供者设置菜单。</value>
   </data>
   <data name="BitwardenAutofillGoToSettings" xml:space="preserve">
     <value>我们无法为您自动打开 Android 自动填充设置菜单。您可以通过 Android 设置 &gt; 系统 &gt; 语言和输入 &gt; 高级 &gt; 自动填充服务，来手动导航到自动填充设置。</value>
@@ -2500,7 +2500,7 @@
     <value>在 {1} 上以 {0} 身份登录</value>
   </data>
   <data name="NotYou" xml:space="preserve">
-    <value>不是您吗？</value>
+    <value>不是你？</value>
   </data>
   <data name="LogInWithMasterPassword" xml:space="preserve">
     <value>使用主密码登录</value>
@@ -2820,7 +2820,7 @@
     <value>附加选项</value>
   </data>
   <data name="ContinueToWebApp" xml:space="preserve">
-    <value>前往网页应用吗？</value>
+    <value>前往网页 App 吗？</value>
   </data>
   <data name="ContinueToX" xml:space="preserve">
     <value>前往 {0} 吗？</value>
@@ -2852,7 +2852,7 @@
     <comment>The parameter is an URL, like vault.bitwarden.com.</comment>
   </data>
   <data name="LearnMoreAboutHowToUseBitwardenOnTheHelpCenter" xml:space="preserve">
-    <value>访问帮助中心了解更多如何使用 Bitwarden 的信息。</value>
+    <value>在帮助中心了解更多如何使用 Bitwarden 的信息。</value>
   </data>
   <data name="ContactSupportDescriptionLong" xml:space="preserve">
     <value>找不到您想要的吗？请在 bitwarden.com 上联系 Bitwarden 支持。</value>
@@ -2864,7 +2864,7 @@
     <value>在网页应用上探索您的 Bitwarden 账户的更多功能。</value>
   </data>
   <data name="LearnAboutOrganizationsDescriptionLong" xml:space="preserve">
-    <value>Bitwarden 允许您使用组织与他人共享您的密码库项目。访问 bitwarden.com 网站了解更多信息。</value>
+    <value>Bitwarden 允许您使用组织与他人共享您的密码库项目。访问 bitwarden.com 网站以了解更多。</value>
   </data>
   <data name="RateAppDescriptionLong" xml:space="preserve">
     <value>帮助别人了解 Bitwarden 是否适合他们。立即访问 App Store 并留下评分。</value>
@@ -2938,7 +2938,7 @@
     <comment>The parameter is the RpId</comment>
   </data>
   <data name="ThereWasAProblemReadingAPasskeyForXTryAgainLater" xml:space="preserve">
-    <value>读取 {0} 的通行密钥时出错。请稍后再试。</value>
+    <value>读取 {0} 的通行密钥时。请稍后再试。</value>
     <comment>The parameter is the RpId</comment>
   </data>
   <data name="VerifyingIdentityEllipsis" xml:space="preserve">

src/Core/Services/CipherService.cs

@@ -571,40 +571,29 @@ namespace Bit.Core.Services
             await UpsertAsync(data);
         }
 
-        public async Task ShareWithServerAsync(CipherView cipherView, string organizationId, HashSet<string> collectionIds)
+        public async Task ShareWithServerAsync(CipherView cipher, string organizationId, HashSet<string> collectionIds)
         {
             var attachmentTasks = new List<Task>();
-            Cipher cipher = null;
+            if (cipher.Attachments != null)
-            //If the cipher doesn't have a key, we update it 
-            if(cipherView.Key == null && await ShouldUseCipherKeyEncryptionAsync())
             {
-                await UpdateAndUpsertAsync(cipherView, cipher => _apiService.PutCipherAsync(cipherView.Id, new CipherRequest(cipher)));
+                foreach (var attachment in cipher.Attachments)
-                cipher = await GetAsync(cipherView.Id);
-                cipherView = await cipher.DecryptAsync();
-            }
-            if (cipherView.Attachments != null)
-            {
-                foreach (var attachment in cipherView.Attachments)
                 {
                     if (attachment.Key == null)
                     {
-                        attachmentTasks.Add(ShareAttachmentWithServerAsync(attachment, cipherView.Id, organizationId));
+                        attachmentTasks.Add(ShareAttachmentWithServerAsync(attachment, cipher.Id, organizationId));
                     }
                 }
             }
             await Task.WhenAll(attachmentTasks);
-            cipherView.OrganizationId = organizationId;
+            cipher.OrganizationId = organizationId;
-            cipherView.CollectionIds = collectionIds;
+            cipher.CollectionIds = collectionIds;
-            await UpdateAndUpsertAsync(cipherView, cipher => _apiService.PutShareCipherAsync(cipherView.Id, new CipherShareRequest(cipher)), collectionIds);
+            var encCipher = await EncryptAsync(cipher);
-
+            var request = new CipherShareRequest(encCipher);
-            async Task UpdateAndUpsertAsync(CipherView cipherView, Func<Cipher,Task<CipherResponse>> callPutCipherApi, HashSet<string> collectionIds = null)
+            var response = await _apiService.PutShareCipherAsync(cipher.Id, request);
-            {
+            var userId = await _stateService.GetActiveUserIdAsync();
-                var cipher = await EncryptAsync(cipherView);
+            var data = new CipherData(response, userId, collectionIds);
-                var response = await callPutCipherApi(cipher);
-                var data = new CipherData(response, await _stateService.GetActiveUserIdAsync(), collectionIds);
             await UpsertAsync(data);
         }
-        }
 
         public async Task<Cipher> SaveAttachmentRawWithServerAsync(Cipher cipher, CipherView cipherView, string filename, byte[] data)
         {

src/iOS.Autofill/CredentialProviderViewController.cs

@@ -152,17 +152,17 @@ namespace Bit.iOS.Autofill
             }
         }
 
-        public override async void ProvideCredentialWithoutUserInteraction(ASPasswordCredentialIdentity credentialIdentity)
+        //public override async void ProvideCredentialWithoutUserInteraction(ASPasswordCredentialIdentity credentialIdentity)
-        {
+        //{
-           try
+        //    try
-           {
+        //    {
-               await ProvideCredentialWithoutUserInteractionAsync(credentialIdentity);
+        //        await ProvideCredentialWithoutUserInteractionAsync(credentialIdentity);
-           }
+        //    }
-           catch (Exception ex)
+        //    catch (Exception ex)
-           {
+        //    {
-               OnProvidingCredentialException(ex);
+        //        OnProvidingCredentialException(ex);
-           }
+        //    }
-        }
+        //}
 
         [Export("prepareInterfaceToProvideCredentialForRequest:")]
         public override async void PrepareInterfaceToProvideCredential(IASCredentialRequest credentialRequest)
@@ -197,17 +197,17 @@ namespace Bit.iOS.Autofill
             }
         }
 
-        public override async void PrepareInterfaceToProvideCredential(ASPasswordCredentialIdentity credentialIdentity)
+        //public override async void PrepareInterfaceToProvideCredential(ASPasswordCredentialIdentity credentialIdentity)
-        {
+        //{
-           try
+        //    try
-           {
+        //    {
-               await PrepareInterfaceToProvideCredentialAsync(c => c.PasswordCredentialIdentity = credentialIdentity);
+        //        await PrepareInterfaceToProvideCredentialAsync(c => c.PasswordCredentialIdentity = credentialIdentity);
-           }
+        //    }
-           catch (Exception ex)
+        //    catch (Exception ex)
-           {
+        //    {
-               OnProvidingCredentialException(ex);
+        //        OnProvidingCredentialException(ex);
-           }
+        //    }
-        }
+        //}
 
         public override async void PrepareInterfaceForExtensionConfiguration()
         {
@@ -699,7 +699,7 @@ namespace Bit.iOS.Autofill
         {
             var appOptions = new AppOptions { IosExtension = true };
             var twoFactorPage = new TwoFactorPage(authingWithSso, appOptions);
-            var app = new App.App(appOptions);
+            var app = new App.App();
             ThemeManager.SetTheme(app.Resources);
             ThemeManager.ApplyResourcesTo(twoFactorPage);
             if (twoFactorPage.BindingContext is TwoFactorPageViewModel vm)

src/iOS.Autofill/Info.plist

@@ -11,7 +11,7 @@
 	<key>CFBundleIdentifier</key>
 	<string>com.8bit.bitwarden.autofill</string>
 	<key>CFBundleShortVersionString</key>
-	<string>2024.6.0</string>
+	<string>2024.5.1</string>
 	<key>CFBundleVersion</key>
 	<string>1</string>
 	<key>CFBundleLocalizations</key>

src/iOS.Extension/Info.plist

@@ -11,7 +11,7 @@
 	<key>CFBundleIdentifier</key>
 	<string>com.8bit.bitwarden.find-login-action-extension</string>
 	<key>CFBundleShortVersionString</key>
-	<string>2024.6.0</string>
+	<string>2024.5.1</string>
 	<key>CFBundleLocalizations</key>
 	<array>
 		<string>en</string>

src/iOS.ShareExtension/Info.plist

@@ -15,7 +15,7 @@
 	<key>CFBundlePackageType</key>
 	<string>XPC!</string>
 	<key>CFBundleShortVersionString</key>
-	<string>2024.6.0</string>
+	<string>2024.5.1</string>
 	<key>CFBundleVersion</key>
 	<string>1</string>
 	<key>MinimumOSVersion</key>

store/fdroid/config.py

@@ -0,0 +1,20 @@
+#!/usr/bin/env python3
+
+repo_url = "https://mobileapp.bitwarden.com/fdroid/repo"
+repo_name = "Bitwarden F-Droid Repo"
+repo_icon = "fdroid-icon.png"
+repo_description = """
+F-Droid repo for Bitwarden.
+"""
+
+archive_older = 2
+archive_url = "https://does.not.exist"
+archive_name = "Bitwarden Archive Repo"
+archive_icon = "fdroid-icon.png"
+archive_description = """
+F-Droid archive repo for Bitwarden.
+"""
+
+repo_keyalias = "bitwarden-Virtual-Machine"
+keystore = "keystore.jks"
+keydname = "CN=bitwarden-Virtual-Machine, OU=F-Droid"

store/fdroid/config.yml

@@ -1,18 +0,0 @@
----
-
-repo_url: https://mobileapp.bitwarden.com/fdroid/repo
-repo_name: Bitwarden F-Droid Repo
-repo_icon: fdroid-icon.png
-repo_description: >-
-  F-Droid repo for Bitwarden.
-
-archive_older: 2
-archive_url: https://does.not.exist/archive
-archive_name: Bitwarden Archive Repo
-archive_icon: fdroid-icon.png
-archive_description: >-
-  F-Droid archive repo for Bitwarden.
-
-repo_keyalias: bitwarden-Virtual-Machine
-keystore: keystore.jks
-keydname: CN=bitwarden-Virtual-Machine, OU=F-Droid