PM-2149 Added cancellation support to upload attachment, which also includes adding cancellation to SendAsync in the ApiService

.github/renovate.json

@@ -1,37 +1,22 @@
 {
-  "$schema": "https://docs.renovatebot.com/renovate-schema.json",
-  "extends": [
-    "config:base",
-    ":combinePatchMinorReleases",
-    ":dependencyDashboard",
-    ":maintainLockFilesWeekly",
-    ":pinAllExceptPeerDependencies",
-    ":prConcurrentLimit10",
-    ":rebaseStalePrs",
-    "schedule:weekends",
-    ":separateMajorReleases"
-  ],
-  "enabledManagers": ["cargo", "github-actions", "npm", "nuget"],
-  "packageRules": [
-    {
-      "groupName": "cargo minor",
-      "matchManagers": ["cargo"],
-      "matchUpdateTypes": ["minor", "patch"]
-    },
-    {
-      "groupName": "gh minor",
-      "matchManagers": ["github-actions"],
-      "matchUpdateTypes": ["minor", "patch"]
-    },
-    {
-      "groupName": "npm minor",
-      "matchManagers": ["npm"],
-      "matchUpdateTypes": ["minor", "patch"]
-    },
-    {
-      "groupName": "nuget minor",
-      "matchManagers": ["nuget"],
-      "matchUpdateTypes": ["minor", "patch"]
-    },
-  ]
-}
+    "$schema": "https://docs.renovatebot.com/renovate-schema.json",
+    "extends": [
+      "config:base",
+      "schedule:monthly",
+      ":maintainLockFilesMonthly",
+      ":preserveSemverRanges",
+      ":rebaseStalePrs",
+      ":disableDependencyDashboard"
+    ],
+    "enabledManagers": [
+      "nuget"
+    ],
+    "packageRules": [
+      {
+        "matchManagers": ["nuget"],
+        "groupName": "Nuget updates",
+        "groupSlug": "nuget",
+        "separateMajorMinor": false
+      }
+    ]
+  }

src/Android/MainActivity.cs

@@ -44,7 +44,6 @@ namespace Bit.Droid
         private IAppIdService _appIdService;
         private IEventService _eventService;
         private IPushNotificationListenerService _pushNotificationListenerService;
-        private IVaultTimeoutService _vaultTimeoutService;
         private ILogger _logger;
         private PendingIntent _eventUploadPendingIntent;
         private AppOptions _appOptions;
@@ -69,7 +68,6 @@ namespace Bit.Droid
             _appIdService = ServiceContainer.Resolve<IAppIdService>("appIdService");
             _eventService = ServiceContainer.Resolve<IEventService>("eventService");
             _pushNotificationListenerService = ServiceContainer.Resolve<IPushNotificationListenerService>();
-            _vaultTimeoutService = ServiceContainer.Resolve<IVaultTimeoutService>();
             _logger = ServiceContainer.Resolve<ILogger>("logger");
 
             TabLayoutResource = Resource.Layout.Tabbar;
@@ -234,7 +232,6 @@ namespace Bit.Droid
 
         protected override void OnActivityResult(int requestCode, Result resultCode, Intent data)
         {
-            _vaultTimeoutService.ResetTimeoutDelay = true;
             if (resultCode == Result.Ok &&
                (requestCode == Core.Constants.SelectFileRequestCode || requestCode == Core.Constants.SaveFileRequestCode))
             {

src/Android/Properties/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="2023.5.1" 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="2023.4.1" android:installLocation="internalOnly" package="com.x8bit.bitwarden">
 	<uses-sdk android:minSdkVersion="21" android:targetSdkVersion="33" />
 	<uses-permission android:name="android.permission.INTERNET" />
 	<uses-permission android:name="android.permission.NFC" />

src/Android/Services/DeviceActionService.cs

@@ -83,7 +83,7 @@ namespace Bit.Droid.Services
             return launchIntentSender != null;
         }
 
-        public async Task ShowLoadingAsync(string text)
+        public async Task ShowLoadingAsync(string text, System.Threading.CancellationTokenSource cts = null, string cancelButtonText = null)
         {
             if (_progressDialog != null)
             {
@@ -98,10 +98,16 @@ namespace Bit.Droid.Services
             txtLoading.Text = text;
             txtLoading.SetTextColor(ThemeHelpers.TextColor);
 
-            _progressDialog = new AlertDialog.Builder(activity)
+            var progressDialogBuilder = new AlertDialog.Builder(activity)
                 .SetView(dialogView)
-                .SetCancelable(false)
-                .Create();
+                .SetCancelable(cts != null);
+
+            if (cts != null)
+            {
+                progressDialogBuilder.SetNegativeButton(cancelButtonText ?? AppResources.Cancel, (sender, args) => cts?.Cancel());
+            }
+
+            _progressDialog = progressDialogBuilder.Create();
             _progressDialog.Show();
         }
 

src/App/Abstractions/IDeviceActionService.cs

@@ -1,4 +1,5 @@
-using System.Threading.Tasks;
+using System.Threading;
+using System.Threading.Tasks;
 using Bit.Core.Enums;
 using Bit.Core.Models;
 
@@ -13,7 +14,7 @@ namespace Bit.App.Abstractions
         string GetBuildNumber();
 
         void Toast(string text, bool longDuration = false);
-        Task ShowLoadingAsync(string text);
+        Task ShowLoadingAsync(string text, CancellationTokenSource cts = null, string cancelButtonText = null);
         Task HideLoadingAsync();
         Task<string> DisplayPromptAync(string title = null, string description = null, string text = null,
             string okButtonText = null, string cancelButtonText = null, bool numericKeyboard = false,

src/App/App.xaml.cs

@@ -297,7 +297,7 @@ namespace Bit.App
             {
                 await _vaultTimeoutService.CheckVaultTimeoutAsync();
                 // Reset delay on every start
-                _vaultTimeoutService.DelayTimeoutMs = null;
+                _vaultTimeoutService.DelayLockAndLogoutMs = null;
             }
 
             await _configService.GetAsync();

src/App/Lists/ItemLayouts/CustomFields/HiddenCustomFieldItemLayout.xaml

@@ -54,9 +54,7 @@
             IsPassword="{Binding ShowHiddenValue, Converter={StaticResource inverseBool}}"
             IsEnabled="{Binding ShowViewHidden}"
             IsSpellCheckEnabled="False"
-            IsTextPredictionEnabled="False"
-            AutomationProperties.IsInAccessibleTree="True"
-            AutomationProperties.Name="{Binding Field.Name}">
+            IsTextPredictionEnabled="False">
             <Entry.Keyboard>
                 <Keyboard x:FactoryMethod="Create">
                     <x:Arguments>

src/App/Lists/ItemLayouts/CustomFields/TextCustomFieldItemLayout.xaml

@@ -41,9 +41,7 @@
             StyleClass="box-value"
             Grid.Row="1"
             Grid.Column="0"
-            IsVisible="{Binding IsEditing}"
-            AutomationProperties.IsInAccessibleTree="True"
-            AutomationProperties.Name="{Binding Field.Name}" />
+            IsVisible="{Binding IsEditing}" />
         <controls:IconButton
             StyleClass="box-row-button, box-row-button-platform"
             Text="{Binding Source={x:Static core:BitwardenIcons.Clone}}"

src/App/Pages/Accounts/EnvironmentPage.xaml

@@ -34,8 +34,7 @@
                         Placeholder="ex. https://bitwarden.company.com"
                         StyleClass="box-value"
                         ReturnType="Go"
-                        ReturnCommand="{Binding SubmitCommand}"
-                        AutomationId="ServerUrlEntry"/>
+                        ReturnCommand="{Binding SubmitCommand}" />
                 </StackLayout>
                 <Label
                     Text="{u:I18n SelfHostedEnvironmentFooter}"
@@ -54,8 +53,7 @@
                         x:Name="_webVaultEntry"
                         Text="{Binding WebVaultUrl}"
                         Keyboard="Url"
-                        StyleClass="box-value"
-                        AutomationId="WebVaultUrlEntry"/>
+                        StyleClass="box-value" />
                 </StackLayout>
                 <StackLayout StyleClass="box-row">
                     <Label
@@ -65,8 +63,7 @@
                         x:Name="_apiEntry"
                         Text="{Binding ApiUrl}"
                         Keyboard="Url"
-                        StyleClass="box-value"
-                        AutomationId="ApiUrlEntry"/>
+                        StyleClass="box-value" />
                 </StackLayout>
                 <StackLayout StyleClass="box-row">
                     <Label
@@ -76,8 +73,7 @@
                         x:Name="_identityEntry"
                         Text="{Binding IdentityUrl}"
                         Keyboard="Url"
-                        StyleClass="box-value"
-                        AutomationId="IdentityUrlEntry"/>
+                        StyleClass="box-value" />
                 </StackLayout>
                 <StackLayout StyleClass="box-row">
                     <Label
@@ -89,20 +85,11 @@
                         Keyboard="Url"
                         StyleClass="box-value"
                         ReturnType="Go"
-                        ReturnCommand="{Binding SubmitCommand}"
-                        AutomationId="IconsUrlEntry"/>
+                        ReturnCommand="{Binding SubmitCommand}" />
                 </StackLayout>
                 <Label
                     Text="{u:I18n CustomEnvironmentFooter}"
                     StyleClass="box-footer-label" />
-                <StackLayout StyleClass="box-row">
-                    <Button Text="{u:I18n LoadFromFile}"
-                            StyleClass="btn-primary"
-                            Command="{Binding LoadFromFileCommand}" />
-                    <Button Text="{u:I18n Clear}"
-                            StyleClass="btn-secondary"
-                            Command="{Binding ClearCommand}" />
-                </StackLayout>
             </StackLayout>
         </StackLayout>
     </ScrollView>

src/App/Pages/Accounts/EnvironmentPageViewModel.cs

@@ -1,15 +1,11 @@
 using System;
-using System.IO;
 using System.Threading.Tasks;
 using System.Windows.Input;
 using Bit.App.Resources;
 using Bit.Core.Abstractions;
 using Bit.Core.Models.Data;
 using Bit.Core.Utilities;
-using Newtonsoft.Json;
 using Xamarin.CommunityToolkit.ObjectModel;
-using Xamarin.Essentials;
-using Xamarin.Forms;
 
 namespace Bit.App.Pages
 {
@@ -31,13 +27,9 @@ namespace Bit.App.Pages
             IconsUrl = _environmentService.IconsUrl;
             NotificationsUrls = _environmentService.NotificationsUrl;
             SubmitCommand = new AsyncCommand(SubmitAsync, onException: ex => OnSubmitException(ex), allowsMultipleExecutions: false);
-            LoadFromFileCommand = new AsyncCommand(LoadEnvironmentsFromFile, onException: ex => OnSubmitException(ex), allowsMultipleExecutions: false);
-            ClearCommand = new Command(ClearAllUrls);
         }
 
         public ICommand SubmitCommand { get; }
-        public ICommand LoadFromFileCommand { get; }
-        public ICommand ClearCommand { get; }
         public string BaseUrl { get; set; }
         public string ApiUrl { get; set; }
         public string IdentityUrl { get; set; }
@@ -95,75 +87,5 @@ namespace Bit.App.Pages
             _logger.Value.Exception(ex);
             Page.DisplayAlert(AppResources.AnErrorHasOccurred, AppResources.GenericErrorMessage, AppResources.Ok);
         }
-
-        private async Task LoadEnvironmentsFromFile()
-        {
-            try
-            {
-                string jsonString;
-                var result = await FilePicker.PickAsync(new PickOptions
-                {
-                    PickerTitle = "This a test to pick files"
-                });
-                if (result != null)
-                {
-                    if (result.FileName.EndsWith("json", StringComparison.OrdinalIgnoreCase) ||
-                        result.FileName.EndsWith("txt", StringComparison.OrdinalIgnoreCase))
-                    {
-                        var stream = await result.OpenReadAsync();
-                        using (var reader = new System.IO.StreamReader(stream))
-                        {
-                            jsonString = reader.ReadToEnd();
-                        }
-                        var envUrls = JsonConvert.DeserializeObject<EnvironmentsData>(jsonString);
-                        BaseUrl = envUrls.Base;
-                        ApiUrl = envUrls.Api;
-                        IdentityUrl = envUrls.Identity;
-                        WebVaultUrl = envUrls.Vault;
-                        IconsUrl = envUrls.Icons;
-                        NotificationsUrls = envUrls.Notifications;
-                        NotifyUrlsChanged();
-                    }
-                }
-            }
-            catch (Exception ex)
-            {
-                HandleException(ex);
-            }
-        }
-
-        private void ClearAllUrls()
-        {
-            BaseUrl = string.Empty;
-            ApiUrl = string.Empty;
-            IdentityUrl = string.Empty;
-            WebVaultUrl = string.Empty;
-            IconsUrl = string.Empty;
-            NotificationsUrls = string.Empty;
-            NotifyUrlsChanged();
-        }
-
-        private void NotifyUrlsChanged() {
-            TriggerPropertyChanged(nameof(BaseUrl), new[]
-                        {
-                            nameof(ApiUrl),
-                            nameof(IdentityUrl),
-                            nameof(WebVaultUrl),
-                            nameof(IconsUrl),
-                            nameof(NotificationsUrls)
-                        });
-        }
-    }
-
-    public class EnvironmentsData
-    {
-        public string Base { get; set; }
-        public string Admin { get; set; }
-        public string Api { get; set; }
-        public string Identity { get; set; }
-        public string Icons { get; set; }
-        public string Notifications { get; set; }
-        public string Sso { get; set; }
-        public string Vault { get; set; }
     }
 }

src/App/Pages/Accounts/HomePage.xaml

@@ -49,9 +49,7 @@
                         Keyboard="Email"
                         StyleClass="box-value"
                         ReturnType="Go"
-                        ReturnCommand="{Binding ContinueCommand}"
-                        AutomationId="EmailAddressEntry"
-                        >
+                        ReturnCommand="{Binding ContinueCommand}">
                         <VisualStateManager.VisualStateGroups>
                             <VisualStateGroup x:Name="CommonStates">
                                 <VisualState x:Name="Disabled">
@@ -80,8 +78,7 @@
                             FontSize="13"
                             TextColor="{DynamicResource PrimaryColor}"
                             VerticalOptions="Center"
-                            VerticalTextAlignment="Center"
-                            AutomationId="RegionSelectorDropdown"/>
+                            VerticalTextAlignment="Center"/>
                     </StackLayout>
                     <StackLayout
                         Orientation="Horizontal"
@@ -95,27 +92,21 @@
                             StyleClass="text-sm"
                             HorizontalOptions="FillAndExpand"
                             VerticalOptions="Center"
-                            VerticalTextAlignment="Center"
-                            />
+                            VerticalTextAlignment="Center"/>
                         <Switch
                             Scale="0.8"
                             IsToggled="{Binding RememberEmail}"
-                            VerticalOptions="Center"
-                            AutomationId="RememberMeSwitch"
-                            />
+                            VerticalOptions="Center"/>
                     </StackLayout>
                 </StackLayout>
                 <Button Text="{u:I18n Continue}"
                         StyleClass="btn-primary"
                         IsEnabled="{Binding CanContinue}"
-                        Command="{Binding ContinueCommand}"
-                        AutomationId="ContinueButton"
-                        />
+                        Command="{Binding ContinueCommand}" />
                         
                 <Label FormattedText="{Binding CreateAccountText}"
                        Margin="0, 10"
-                        StyleClass="box-footer-label"
-                        AutomationId="CreateAccountLabel">
+                        StyleClass="box-footer-label">
                     <Label.GestureRecognizers>
                         <TapGestureRecognizer Command="{Binding CreateAccountCommand}" />
                     </Label.GestureRecognizers>
@@ -141,4 +132,5 @@
             MainPage="{Binding Source={x:Reference _page}}"
             BindingContext="{Binding AccountSwitchingOverlayViewModel}"/>
     </AbsoluteLayout>
+
 </pages:BaseContentPage>

src/App/Pages/Accounts/HomePageViewModel.cs

@@ -165,7 +165,6 @@ namespace Bit.App.Pages
 
         public async Task ShowEnvironmentPickerAsync()
         {
-            _displayEuEnvironment = await _configService.GetFeatureFlagBoolAsync(Constants.DisplayEuEnvironmentFlag);
             var options = _displayEuEnvironment
                     ? new string[] { AppResources.US, AppResources.EU, AppResources.SelfHosted }
                     : new string[] { AppResources.US, AppResources.SelfHosted };
@@ -186,7 +185,6 @@ namespace Bit.App.Pages
                 }
 
                 await _environmentService.SetUrlsAsync(result == AppResources.EU ? EnvironmentUrlData.DefaultEU : EnvironmentUrlData.DefaultUS);
-                await _configService.GetAsync(true);
                 SelectedEnvironmentName = result;
             });
         }
@@ -212,7 +210,6 @@ namespace Bit.App.Pages
             }
             else
             {
-                await _configService.GetAsync(true);
                 SelectedEnvironmentName = AppResources.SelfHosted;
             }
         }

src/App/Pages/Accounts/LockPage.xaml

@@ -71,8 +71,7 @@
                                 Grid.Row="1"
                                 Grid.Column="0"
                                 ReturnType="Go"
-                                ReturnCommand="{Binding SubmitCommand}" 
-                                AutomationId="PinEntry"/>
+                                ReturnCommand="{Binding SubmitCommand}" />
                             <controls:IconButton
                                 StyleClass="box-row-button, box-row-button-platform"
                                 Text="{Binding ShowPasswordIcon}"
@@ -82,8 +81,7 @@
                                 Grid.RowSpan="2"
                                 AutomationProperties.IsInAccessibleTree="True"
                                 AutomationProperties.Name="{u:I18n ToggleVisibility}" 
-                                AutomationProperties.HelpText="{Binding PasswordVisibilityAccessibilityText}"
-                                AutomationId="PinVisibilityToggle"/>
+                                AutomationProperties.HelpText="{Binding PasswordVisibilityAccessibilityText}"/>
                         </Grid>
                         <Grid
                             x:Name="_passwordGrid"
@@ -113,8 +111,7 @@
                                 Grid.Row="1"
                                 Grid.Column="0"
                                 ReturnType="Go"
-                                ReturnCommand="{Binding SubmitCommand}"
-                                AutomationId="MasterPasswordEntry"/>
+                                ReturnCommand="{Binding SubmitCommand}" />
                             <controls:IconButton
                                 StyleClass="box-row-button, box-row-button-platform"
                                 Text="{Binding ShowPasswordIcon}"
@@ -124,9 +121,7 @@
                                 Grid.RowSpan="2"
                                 AutomationProperties.IsInAccessibleTree="True"
                                 AutomationProperties.Name="{u:I18n ToggleVisibility}"
-                                AutomationProperties.HelpText="{Binding PasswordVisibilityAccessibilityText}"
-                                AutomationId="PasswordVisibilityToggle"
-                                />
+                                AutomationProperties.HelpText="{Binding PasswordVisibilityAccessibilityText}" />
                         </Grid>
                         <StackLayout
                             StyleClass="box-row"
@@ -152,8 +147,7 @@
                             x:Name="_unlockButton"
                             Text="{u:I18n Unlock}"
                             StyleClass="btn-primary"
-                            Clicked="Unlock_Clicked"
-                            AutomationId="UnlockVaultButton"/>
+                            Clicked="Unlock_Clicked" />
                     </StackLayout>
                 </StackLayout>
             </ScrollView>

src/App/Pages/Accounts/LoginPage.xaml

@@ -9,15 +9,16 @@
     xmlns:u="clr-namespace:Bit.App.Utilities"
     x:DataType="pages:LoginPageViewModel"
     x:Name="_page"
-    Title="{Binding PageTitle}"
-    AutomationId="PageTitleLabel">
+    Title="{Binding PageTitle}">
     
     <ContentPage.BindingContext>
         <pages:LoginPageViewModel />
     </ContentPage.BindingContext>
+
     <ContentPage.ToolbarItems>
         <controls:ExtendedToolbarItem
                 x:Name="_accountAvatar"
+                x:Key="accountAvatar"
                 IconImageSource="{Binding AvatarImageSource}"
                 Command="{Binding Source={x:Reference _accountListOverlay}, Path=ToggleVisibililtyCommand}"
                 Order="Primary"
@@ -33,8 +34,7 @@
             <ToolbarItem Icon="more_vert.png" Clicked="More_Clicked" Order="Primary"
                 x:Name="_moreItem" x:Key="moreItem"
                  AutomationProperties.IsInAccessibleTree="True"
-                 AutomationProperties.Name="{u:I18n Options}"
-                 AutomationId="OptionsButton"/>
+                 AutomationProperties.Name="{u:I18n Options}" />
             <ToolbarItem Text="{u:I18n GetPasswordHint}"
                 x:Key="getPasswordHint"
                 x:Name="_getPasswordHint"
@@ -75,9 +75,7 @@
                                 Grid.Row="1"
                                 Grid.Column="0"
                                 ReturnType="Go"
-                                ReturnCommand="{Binding LogInCommand}"
-                                AutomationId="MasterPasswordEntry"
-                            />
+                                ReturnCommand="{Binding LogInCommand}" />
                             <controls:IconButton
                                 StyleClass="box-row-button, box-row-button-platform"
                                 Text="{Binding ShowPasswordIcon}"
@@ -86,7 +84,6 @@
                                 Grid.Column="1"
                                 Grid.RowSpan="1"
                                 AutomationProperties.IsInAccessibleTree="True"
-                                AutomationId="PasswordVisibilityToggle"
                                 AutomationProperties.Name="{u:I18n ToggleVisibility}"
                                 AutomationProperties.HelpText="{Binding PasswordVisibilityAccessibilityText}"/>
                             <Label
@@ -96,9 +93,7 @@
                                 Padding="0,5,0,0"
                                 Grid.Row="2"
                                 Grid.Column="0"
-                                Grid.ColumnSpan="2"
-                                AutomationId="GetMasterPasswordHintLabel"
-                                >
+                                Grid.ColumnSpan="2">
                                 <Label.GestureRecognizers>
                                     <TapGestureRecognizer Tapped="Hint_Clicked" />
                                 </Label.GestureRecognizers>
@@ -109,24 +104,19 @@
                         <Button x:Name="_loginWithMasterPassword"
                             Text="{u:I18n LogInWithMasterPassword}" 
                                 StyleClass="btn-primary"
-                                Clicked="LogIn_Clicked"
-                                AutomationId="LogInWithMasterPasswordButton"
-                                />
+                                Clicked="LogIn_Clicked" />
                         <controls:IconLabelButton
                             HorizontalOptions="Fill"
                             VerticalOptions="CenterAndExpand"
                             Icon="{Binding Source={x:Static core:BitwardenIcons.Device}}"
                             Label="{u:I18n LogInWithAnotherDevice}"
                             ButtonCommand="{Binding LogInWithDeviceCommand}"
-                            IsVisible="{Binding IsKnownDevice}"
-                            AutomationId="LogInWithAnotherDeviceButton"
-                            />
+                            IsVisible="{Binding IsKnownDevice}"/>
                         <controls:IconLabelButton
                             HorizontalOptions="Fill"
                             VerticalOptions="CenterAndExpand"
                             Icon="{Binding Source={x:Static core:BitwardenIcons.Suitcase}}"
-                            Label="{u:I18n LogInSso}"
-                            AutomationId="LogInWithSsoButton">
+                            Label="{u:I18n LogInSso}">
                             <controls:IconLabelButton.GestureRecognizers>
                                 <TapGestureRecognizer Tapped="LogInSSO_Clicked" />
                             </controls:IconLabelButton.GestureRecognizers>
@@ -134,15 +124,12 @@
                         <Label
                             Text="{Binding LoggingInAsText}"
                             StyleClass="text-sm"
-                            Margin="0,40,0,0"
-                            AutomationId="LoggingInAsLabel"
-                            />
+                            Margin="0,40,0,0"/>
                         <Label
                             Text="{u:I18n NotYou}"
                             StyleClass="text-md"
                             HorizontalOptions="Start"
-                            TextColor="{DynamicResource HyperlinkColor}"
-                            AutomationId="NotYouLabel">
+                            TextColor="{DynamicResource HyperlinkColor}">
                             <Label.GestureRecognizers>
                                 <TapGestureRecognizer Tapped="Cancel_Clicked" />
                             </Label.GestureRecognizers>

src/App/Pages/Accounts/RegisterPage.xaml

@@ -35,8 +35,7 @@
                         x:Name="_email"
                         Text="{Binding Email}"
                         Keyboard="Email"
-                        StyleClass="box-value"
-                        AutomationId="EmailAddressEntry"/>
+                        StyleClass="box-value" />
                 </StackLayout>
                 <Grid StyleClass="box-row">
                     <Grid.RowDefinitions>
@@ -60,8 +59,7 @@
                         IsTextPredictionEnabled="False"
                         IsPassword="{Binding ShowPassword, Converter={StaticResource inverseBool}}"
                         Grid.Row="1"
-                        Grid.Column="0"
-                        AutomationId="MasterPasswordEntry"/>
+                        Grid.Column="0" />
                     <controls:IconButton
                         StyleClass="box-row-button, box-row-button-platform"
                         Text="{Binding ShowPasswordIcon}"
@@ -71,8 +69,7 @@
                         Grid.RowSpan="2"
                         AutomationProperties.IsInAccessibleTree="True"
                         AutomationProperties.Name="{u:I18n ToggleVisibility}" 
-                        AutomationProperties.HelpText="{Binding PasswordVisibilityAccessibilityText}"
-                        AutomationId="PasswordVisibilityToggle"/>
+                        AutomationProperties.HelpText="{Binding PasswordVisibilityAccessibilityText}"/>
                 </Grid>
                 <Label
                     StyleClass="box-sub-label"
@@ -112,8 +109,7 @@
                         IsTextPredictionEnabled="False"
                         IsPassword="{Binding ShowPassword, Converter={StaticResource inverseBool}}"
                         Grid.Row="1"
-                        Grid.Column="0"
-                        AutomationId="ConfirmMasterPasswordEntry"/>
+                        Grid.Column="0" />
                     <controls:IconButton
                         StyleClass="box-row-button, box-row-button-platform"
                         Text="{Binding ShowPasswordIcon}"
@@ -122,7 +118,6 @@
                         Grid.Column="1"
                         Grid.RowSpan="2"
                         AutomationProperties.IsInAccessibleTree="True"
-                        AutomationId="ConfirmPasswordVisibilityToggle"
                         AutomationProperties.Name="{u:I18n ToggleVisibility}"
                         AutomationProperties.HelpText="{Binding PasswordVisibilityAccessibilityText}" />
                 </Grid>
@@ -135,8 +130,7 @@
                         Text="{Binding Hint}"
                         StyleClass="box-value"
                         ReturnType="Go"
-                        ReturnCommand="{Binding SubmitCommand}"
-                        AutomationId="MasterPasswordHintLabel" />
+                        ReturnCommand="{Binding SubmitCommand}" />
                 </StackLayout>
                 <Label
                     Text="{u:I18n MasterPasswordHintDescription}"
@@ -148,8 +142,7 @@
                         IsToggled="{Binding CheckExposedMasterPassword}"
                         StyleClass="box-value"
                         HorizontalOptions="Start"
-                        Margin="0, 0, 10, 0"
-                        AutomationId="CheckExposedMasterPasswordToggle"/>
+                        Margin="0, 0, 10, 0"/>
                     <Label
                         Text="{u:I18n CheckKnownDataBreachesForThisPassword}"
                         StyleClass="box-footer-label"
@@ -161,8 +154,7 @@
                         IsToggled="{Binding AcceptPolicies}"
                         StyleClass="box-value"
                         HorizontalOptions="Start"
-                        Margin="0, 0, 10, 0"
-                        AutomationId="AcceptPoliciesToggle"/>
+                        Margin="0, 0, 10, 0"/>
                     <Label StyleClass="box-footer-label"
                            HorizontalOptions="Fill">
                         <Label.FormattedText>

src/App/Pages/Vault/AttachmentsPageViewModel.cs

@@ -1,6 +1,7 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
+using System.Threading;
 using System.Threading.Tasks;
 using System.Windows.Input;
 using Bit.App.Abstractions;
@@ -31,6 +32,7 @@ namespace Bit.App.Pages
         private bool _hasUpdatedKey;
         private bool _canAccessAttachments;
         private string _fileName;
+        private CancellationTokenSource _uploadCts;
 
         public AttachmentsPageViewModel()
         {
@@ -119,11 +121,15 @@ namespace Bit.App.Pages
                     AppResources.AnErrorHasOccurred);
                 return false;
             }
+
+            _uploadCts = new CancellationTokenSource();
+            var uploadCts = _uploadCts;
+
             try
             {
-                await _deviceActionService.ShowLoadingAsync(AppResources.Saving);
+                await _deviceActionService.ShowLoadingAsync(AppResources.Saving, uploadCts);
                 _cipherDomain = await _cipherService.SaveAttachmentRawWithServerAsync(
-                    _cipherDomain, FileName, FileData);
+                    _cipherDomain, FileName, FileData, uploadCts.Token);
                 Cipher = await _cipherDomain.DecryptAsync();
                 await _deviceActionService.HideLoadingAsync();
                 _platformUtilsService.ShowToast("success", null, AppResources.AttachementAdded);
@@ -132,6 +138,11 @@ namespace Bit.App.Pages
                 FileName = null;
                 return true;
             }
+            catch (OperationCanceledException)
+            {
+                await _deviceActionService.HideLoadingAsync();
+                await _platformUtilsService.ShowDialogAsync(AppResources.UploadHasBeenCanceled, AppResources.Attachments);
+            }
             catch (ApiException e)
             {
                 _logger.Exception(e);
@@ -156,7 +167,7 @@ namespace Bit.App.Pages
             // Prevent Android from locking if vault timeout set to "immediate"
             if (Device.RuntimePlatform == Device.Android)
             {
-                _vaultTimeoutService.DelayTimeoutMs = 60000;
+                _vaultTimeoutService.DelayLockAndLogoutMs = 60000;
             }
             await _fileService.SelectFileAsync();
         }

src/App/Pages/Vault/CipherAddEditPage.xaml

@@ -125,9 +125,7 @@
                     <Entry
                         x:Name="_nameEntry"
                         Text="{Binding Cipher.Name}"
-                        StyleClass="box-value"
-                        AutomationProperties.IsInAccessibleTree="True"
-                        AutomationProperties.Name="{u:I18n Name}" />
+                        StyleClass="box-value" />
                 </StackLayout>
                 <StackLayout IsVisible="{Binding IsLogin}" Spacing="0" Padding="0">
                     <Grid StyleClass="box-row, box-row-input"
@@ -140,9 +138,7 @@
                             x:Name="_loginUsernameEntry"
                             Text="{Binding Cipher.Login.Username}"
                             StyleClass="box-value" 
-                            Grid.Row="1"
-                            AutomationProperties.IsInAccessibleTree="True"
-                            AutomationProperties.Name="{u:I18n Username}"/>
+                            Grid.Row="1"/>
                         <controls:IconButton 
                             StyleClass="box-row-button, box-row-button-platform"
                             Text="{Binding Source={x:Static core:BitwardenIcons.Generate}}"
@@ -178,9 +174,7 @@
                             IsPassword="{Binding ShowPassword, Converter={StaticResource inverseBool}}"
                             IsSpellCheckEnabled="False"
                             IsTextPredictionEnabled="False"
-                            IsEnabled="{Binding Cipher.ViewPassword}"
-                            AutomationProperties.IsInAccessibleTree="True"
-                            AutomationProperties.Name="{u:I18n Password}"/>
+                            IsEnabled="{Binding Cipher.ViewPassword}"/>
                         <controls:IconButton 
                             StyleClass="box-row-button, box-row-button-platform"
                             Text="{Binding Source={x:Static core:BitwardenIcons.CheckCircle}}"
@@ -260,9 +254,7 @@
                             StyleClass="box-value"
                             Grid.Row="1"
                             Grid.Column="0"
-                            Grid.ColumnSpan="{Binding TotpColumnSpan}"
-                            AutomationProperties.IsInAccessibleTree="True"
-                            AutomationProperties.Name="{u:I18n AuthenticatorKey}" />
+                            Grid.ColumnSpan="{Binding TotpColumnSpan}" />
                         <controls:IconButton 
                             StyleClass="box-row-button, box-row-button-platform"
                             Text="{Binding Source={x:Static core:BitwardenIcons.Clone}}"
@@ -270,9 +262,7 @@
                             IsVisible="{Binding HasTotpValue}"
                             Grid.Row="0"
                             Grid.Column="1"
-                            Grid.RowSpan="2"
-                            AutomationProperties.IsInAccessibleTree="True"
-                            AutomationProperties.Name="{u:I18n CopyTotp}" />
+                            Grid.RowSpan="2" />
                         <controls:IconButton 
                             StyleClass="box-row-button, box-row-button-platform"
                             Text="{Binding Source={x:Static core:BitwardenIcons.Camera}}"
@@ -317,9 +307,7 @@
                             Grid.Column="0"
                             IsPassword="{Binding ShowCardNumber, Converter={StaticResource inverseBool}}"
                             IsSpellCheckEnabled="False"
-                            IsTextPredictionEnabled="False"
-                            AutomationProperties.IsInAccessibleTree="True"
-                            AutomationProperties.Name="{u:I18n Number}" />
+                            IsTextPredictionEnabled="False" />
                         <controls:IconButton 
                             StyleClass="box-row-button, box-row-button-platform"
                             Text="{Binding ShowCardNumberIcon}"
@@ -358,9 +346,7 @@
                             x:Name="_cardExpYearEntry"
                             Text="{Binding Cipher.Card.ExpYear}"
                             StyleClass="box-value"
-                            Keyboard="Numeric"
-                            AutomationProperties.IsInAccessibleTree="True"
-                            AutomationProperties.Name="{u:I18n ExpirationYear}" />
+                            Keyboard="Numeric" />
                     </StackLayout>
                     <Grid StyleClass="box-row, box-row-input">
                         <Grid.RowDefinitions>
@@ -385,9 +371,7 @@
                             Keyboard="Numeric"
                             IsPassword="{Binding ShowCardCode, Converter={StaticResource inverseBool}}"
                             IsSpellCheckEnabled="False"
-                            IsTextPredictionEnabled="False"
-                            AutomationProperties.IsInAccessibleTree="True"
-                            AutomationProperties.Name="{u:I18n SecurityCode}" />
+                            IsTextPredictionEnabled="False" />
                         <controls:IconButton 
                             StyleClass="box-row-button, box-row-button-platform"
                             Text="{Binding ShowCardCodeIcon}"
@@ -417,9 +401,7 @@
                         <Entry
                             x:Name="_identityFirstNameEntry"
                             Text="{Binding Cipher.Identity.FirstName}"
-                            StyleClass="box-value,capitalize-word-input"
-                            AutomationProperties.IsInAccessibleTree="True"
-                            AutomationProperties.Name="{u:I18n FirstName}"/>
+                            StyleClass="box-value,capitalize-word-input"/>
                     </StackLayout>
                     <StackLayout StyleClass="box-row, box-row-input">
                         <Label
@@ -428,9 +410,7 @@
                         <Entry
                             x:Name="_identityMiddleNameEntry"
                             Text="{Binding Cipher.Identity.MiddleName}"
-                            StyleClass="box-value,capitalize-word-input"
-                            AutomationProperties.IsInAccessibleTree="True"
-                            AutomationProperties.Name="{u:I18n MiddleName}" />
+                            StyleClass="box-value,capitalize-word-input" />
                     </StackLayout>
                     <StackLayout StyleClass="box-row, box-row-input">
                         <Label
@@ -439,9 +419,7 @@
                         <Entry
                             x:Name="_identityLastNameEntry"
                             Text="{Binding Cipher.Identity.LastName}"
-                            StyleClass="box-value,capitalize-word-input"
-                            AutomationProperties.IsInAccessibleTree="True"
-                            AutomationProperties.Name="{u:I18n LastName}" />
+                            StyleClass="box-value,capitalize-word-input" />
                     </StackLayout>
                     <StackLayout StyleClass="box-row, box-row-input">
                         <Label
@@ -450,9 +428,7 @@
                         <Entry
                             x:Name="_identityUsernameEntry"
                             Text="{Binding Cipher.Identity.Username}"
-                            StyleClass="box-value"
-                            AutomationProperties.IsInAccessibleTree="True"
-                            AutomationProperties.Name="{u:I18n Username}" />
+                            StyleClass="box-value" />
                     </StackLayout>
                     <StackLayout StyleClass="box-row, box-row-input">
                         <Label
@@ -461,9 +437,7 @@
                         <Entry
                             x:Name="_identityCompanyEntry"
                             Text="{Binding Cipher.Identity.Company}"
-                            StyleClass="box-value" 
-                            AutomationProperties.IsInAccessibleTree="True"
-                            AutomationProperties.Name="{u:I18n Company}"/>
+                            StyleClass="box-value" />
                     </StackLayout>
                     <StackLayout StyleClass="box-row, box-row-input">
                         <Label
@@ -472,9 +446,7 @@
                         <Entry
                             x:Name="_identitySsnEntry"
                             Text="{Binding Cipher.Identity.SSN}"
-                            StyleClass="box-value" 
-                            AutomationProperties.IsInAccessibleTree="True"
-                            AutomationProperties.Name="{u:I18n SSN}"/>
+                            StyleClass="box-value" />
                     </StackLayout>
                     <StackLayout StyleClass="box-row, box-row-input">
                         <Label
@@ -483,9 +455,7 @@
                         <Entry
                             x:Name="_identityPassportNumberEntry"
                             Text="{Binding Cipher.Identity.PassportNumber}"
-                            StyleClass="box-value" 
-                            AutomationProperties.IsInAccessibleTree="True"
-                            AutomationProperties.Name="{u:I18n PassportNumber}"/>
+                            StyleClass="box-value" />
                     </StackLayout>
                     <StackLayout StyleClass="box-row, box-row-input">
                         <Label
@@ -494,9 +464,7 @@
                         <Entry
                             x:Name="_identityLicenseNumberEntry"
                             Text="{Binding Cipher.Identity.LicenseNumber}"
-                            StyleClass="box-value"
-                            AutomationProperties.IsInAccessibleTree="True"
-                            AutomationProperties.Name="{u:I18n LicenseNumber}" />
+                            StyleClass="box-value" />
                     </StackLayout>
                     <StackLayout StyleClass="box-row, box-row-input">
                         <Label
@@ -506,9 +474,7 @@
                             x:Name="_identityEmailEntry"
                             Keyboard="Email"
                             Text="{Binding Cipher.Identity.Email}"
-                            StyleClass="box-value" 
-                            AutomationProperties.IsInAccessibleTree="True"
-                            AutomationProperties.Name="{u:I18n Email}"/>
+                            StyleClass="box-value" />
                     </StackLayout>
                     <StackLayout StyleClass="box-row, box-row-input">
                         <Label
@@ -518,9 +484,7 @@
                             x:Name="_identityPhoneEntry"
                             Text="{Binding Cipher.Identity.Phone}"
                             Keyboard="Telephone"
-                            StyleClass="box-value"
-                            AutomationProperties.IsInAccessibleTree="True"
-                            AutomationProperties.Name="{u:I18n Phone}" />
+                            StyleClass="box-value" />
                     </StackLayout>
                     <StackLayout StyleClass="box-row, box-row-input">
                         <Label
@@ -529,9 +493,7 @@
                         <Entry
                             x:Name="_identityAddress1Entry"
                             Text="{Binding Cipher.Identity.Address1}"
-                            StyleClass="box-value" 
-                            AutomationProperties.IsInAccessibleTree="True"
-                            AutomationProperties.Name="{u:I18n Address1}"/>
+                            StyleClass="box-value" />
                     </StackLayout>
                     <StackLayout StyleClass="box-row, box-row-input">
                         <Label
@@ -540,9 +502,7 @@
                         <Entry
                             x:Name="_identityAddress2Entry"
                             Text="{Binding Cipher.Identity.Address2}"
-                            StyleClass="box-value"
-                            AutomationProperties.IsInAccessibleTree="True"
-                            AutomationProperties.Name="{u:I18n Address2}" />
+                            StyleClass="box-value" />
                     </StackLayout>
                     <StackLayout StyleClass="box-row, box-row-input">
                         <Label
@@ -551,9 +511,7 @@
                         <Entry
                             x:Name="_identityAddress3Entry"
                             Text="{Binding Cipher.Identity.Address3}"
-                            StyleClass="box-value"
-                            AutomationProperties.IsInAccessibleTree="True"
-                            AutomationProperties.Name="{u:I18n Address3}" />
+                            StyleClass="box-value" />
                     </StackLayout>
                     <StackLayout StyleClass="box-row, box-row-input">
                         <Label
@@ -562,9 +520,7 @@
                         <Entry
                             x:Name="_identityCityEntry"
                             Text="{Binding Cipher.Identity.City}"
-                            StyleClass="box-value,capitalize-sentence-input"
-                            AutomationProperties.IsInAccessibleTree="True"
-                            AutomationProperties.Name="{u:I18n CityTown}" />
+                            StyleClass="box-value,capitalize-sentence-input" />
                     </StackLayout>
                     <StackLayout StyleClass="box-row, box-row-input">
                         <Label
@@ -573,9 +529,7 @@
                         <Entry
                             x:Name="_identityStateEntry"
                             Text="{Binding Cipher.Identity.State}"
-                            StyleClass="box-value,capitalize-sentence-input"
-                            AutomationProperties.IsInAccessibleTree="True"
-                            AutomationProperties.Name="{u:I18n StateProvince}" />
+                            StyleClass="box-value,capitalize-sentence-input" />
                     </StackLayout>
                     <StackLayout StyleClass="box-row, box-row-input">
                         <Label
@@ -584,9 +538,7 @@
                         <Entry
                             x:Name="_identityPostalCodeEntry"
                             Text="{Binding Cipher.Identity.PostalCode}"
-                            StyleClass="box-value"
-                            AutomationProperties.IsInAccessibleTree="True"
-                            AutomationProperties.Name="{u:I18n ZipPostalCode}" />
+                            StyleClass="box-value" />
                     </StackLayout>
                     <StackLayout StyleClass="box-row, box-row-input">
                         <Label
@@ -595,9 +547,7 @@
                         <Entry
                             x:Name="_identityCountryEntry"
                             Text="{Binding Cipher.Identity.Country}"
-                            StyleClass="box-value,capitalize-sentence-input"
-                            AutomationProperties.IsInAccessibleTree="True"
-                            AutomationProperties.Name="{u:I18n Country}" />
+                            StyleClass="box-value,capitalize-sentence-input" />
                     </StackLayout>
                 </StackLayout>
             </StackLayout>
@@ -628,9 +578,7 @@
                                     Keyboard="Url"
                                     StyleClass="box-value"
                                     Grid.Row="1"
-                                    Grid.Column="0"
-                                    AutomationProperties.IsInAccessibleTree="True"
-                                    AutomationProperties.Name="{u:I18n URI}" />
+                                    Grid.Column="0" />
                                 <controls:IconButton
                                     StyleClass="box-row-button, box-row-button-platform"
                                     Text="{Binding Source={x:Static core:BitwardenIcons.Cog}}"
@@ -683,7 +631,7 @@
                         Command="{Binding PasswordPromptHelpCommand}"
                         TextColor="{DynamicResource MutedColor}"
                         AutomationProperties.IsInAccessibleTree="True"
-                        AutomationProperties.Name="{u:I18n MasterPasswordRePromptHelp}"
+                        AutomationProperties.Name="{u:I18n ToggleVisibility}"
                         HorizontalOptions="StartAndExpand" />
                     <Switch
                         IsToggled="{Binding PasswordPrompt}"
@@ -704,9 +652,7 @@
                         AutoSize="TextChanges"
                         StyleClass="box-value"
                         effects:ScrollEnabledEffect.IsScrollEnabled="false"
-                        Text="{Binding Cipher.Notes}"
-                        AutomationProperties.IsInAccessibleTree="True"
-                        AutomationProperties.Name="{u:I18n Notes}" >
+                        Text="{Binding Cipher.Notes}">
                         <Editor.Behaviors>
                             <behaviors:EditorPreventAutoBottomScrollingOnFocusedBehavior ParentScrollView="{x:Reference _scrollView}" />
                         </Editor.Behaviors>
@@ -771,7 +717,7 @@
                                     <Switch
                                         IsToggled="{Binding Checked}"
                                         StyleClass="box-value"
-                                        HorizontalOptions="End"/>
+                                        HorizontalOptions="End" />
                                 </StackLayout>
                                 <BoxView StyleClass="box-row-separator" />
                             </StackLayout>

src/App/Resources/AppResources.Designer.cs

@@ -3541,15 +3541,6 @@ namespace Bit.App.Resources {
             }
         }
         
-        /// <summary>
-        ///   Looks up a localized string similar to Load from file.
-        /// </summary>
-        public static string LoadFromFile {
-            get {
-                return ResourceManager.GetString("LoadFromFile", resourceCulture);
-            }
-        }
-        
         /// <summary>
         ///   Looks up a localized string similar to Loading.
         /// </summary>
@@ -3903,15 +3894,6 @@ namespace Bit.App.Resources {
             }
         }
         
-        /// <summary>
-        ///   Looks up a localized string similar to Master password re-prompt help.
-        /// </summary>
-        public static string MasterPasswordRePromptHelp {
-            get {
-                return ResourceManager.GetString("MasterPasswordRePromptHelp", resourceCulture);
-            }
-        }
-        
         /// <summary>
         ///   Looks up a localized string similar to Match detection.
         /// </summary>
@@ -6443,15 +6425,6 @@ namespace Bit.App.Resources {
             }
         }
         
-        /// <summary>
-        ///   Looks up a localized string similar to Unlocking may fail due to insufficient memory. Decrease your KDF memory settings to resolve.
-        /// </summary>
-        public static string UnlockingMayFailDueToInsufficientMemoryDecreaseYourKDFMemorySettingsToResolve {
-            get {
-                return ResourceManager.GetString("UnlockingMayFailDueToInsufficientMemoryDecreaseYourKDFMemorySettingsToResolve", resourceCulture);
-            }
-        }
-        
         /// <summary>
         ///   Looks up a localized string similar to Unlock vault.
         /// </summary>
@@ -6542,6 +6515,15 @@ namespace Bit.App.Resources {
             }
         }
         
+        /// <summary>
+        ///   Looks up a localized string similar to Upload has been canceled.
+        /// </summary>
+        public static string UploadHasBeenCanceled {
+            get {
+                return ResourceManager.GetString("UploadHasBeenCanceled", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   Looks up a localized string similar to Uppercase (A to Z).
         /// </summary>

src/App/Resources/AppResources.af.resx

@@ -1753,10 +1753,10 @@ Skandering gebeur outomaties.</value>
     <comment>Confirmation alert message when soft-deleting a cipher.</comment>
   </data>
   <data name="AccountBiometricInvalidated" xml:space="preserve">
-    <value>Biometriese ontgrendeling vir hierdie rekening is gedeaktiveer hangende bevestiging van hoofwagwoord.</value>
+    <value>Biometric unlock for this account is disabled pending verification of master password.</value>
   </data>
   <data name="AccountBiometricInvalidatedExtension" xml:space="preserve">
-    <value>Outovul-biometriese ontgrendeline vir hierdie rekening is gedeaktiveer hangende bevestiging van hoofwagwoord.</value>
+    <value>Autofill biometric unlock for this account is disabled pending verification of master password.</value>
   </data>
   <data name="EnableSyncOnRefresh" xml:space="preserve">
     <value>Aktiveer sinchronisering by verfrissing</value>
@@ -2495,8 +2495,8 @@ Wil u na die rekening omskakel?</value>
   <data name="GetMasterPasswordwordHint" xml:space="preserve">
     <value>Kry hoofwagwoord wenk</value>
   </data>
-  <data name="LoggingInAsXOnY" xml:space="preserve">
-    <value>Teken aan as {0} op {1}</value>
+  <data name="LoggingInAsX" xml:space="preserve">
+    <value>Teken in as {0}</value>
   </data>
   <data name="NotYou" xml:space="preserve">
     <value>Nie jy nie?</value>
@@ -2609,31 +2609,10 @@ Wil u na die rekening omskakel?</value>
   <data name="ThereAreNoItemsThatMatchTheSearch" xml:space="preserve">
     <value>Daar is geen items wat met die soekterm ooreenstem nie</value>
   </data>
-  <data name="US" xml:space="preserve">
-    <value>VS</value>
-  </data>
-  <data name="EU" xml:space="preserve">
-    <value>EU</value>
-  </data>
-  <data name="SelfHosted" xml:space="preserve">
-    <value>Selghehuisves</value>
-  </data>
-  <data name="DataRegion" xml:space="preserve">
-    <value>Datastreek</value>
-  </data>
-  <data name="Region" xml:space="preserve">
-    <value>Streek</value>
-  </data>
   <data name="UpdateWeakMasterPasswordWarning" xml:space="preserve">
-    <value>U hoofwagwoord voldoen nie aan een of meer van die organisasiebeleide nie. Om toegang tot die kluis te kry, moet u nou u hoofwagwoord bywerk. Deur voort te gaan sal u van u huidige sessie afgeteken word, en u sal weer moet aanteken. Aktiewe sessies op ander toestelle kan vir tot een uur aktief bly.</value>
+    <value>Your master password does not meet one or more of your organization policies. 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="CurrentMasterPassword" xml:space="preserve">
-    <value>Huidige hoofwagwoord</value>
-  </data>
-  <data name="MasterPasswordRePromptHelp" xml:space="preserve">
-    <value>Master password re-prompt help</value>
-  </data>
-  <data name="UnlockingMayFailDueToInsufficientMemoryDecreaseYourKDFMemorySettingsToResolve" xml:space="preserve">
-    <value>Unlocking may fail due to insufficient memory. Decrease your KDF memory settings to resolve</value>
+    <value>Current master password</value>
   </data>
 </root>

src/App/Resources/AppResources.ar.resx

@@ -1753,10 +1753,10 @@
     <comment>Confirmation alert message when soft-deleting a cipher.</comment>
   </data>
   <data name="AccountBiometricInvalidated" xml:space="preserve">
-    <value>تم تعطيل فتح القفل الحيوي لهذا الحساب في انتظار التحقق من كلمة المرور الرئيسية.</value>
+    <value>Biometric unlock for this account is disabled pending verification of master password.</value>
   </data>
   <data name="AccountBiometricInvalidatedExtension" xml:space="preserve">
-    <value>إلغاء القفل الحيوي للملء التلقائي لهذا الحساب معطل في انتظار التحقق من كلمة المرور الرئيسية.</value>
+    <value>Autofill biometric unlock for this account is disabled pending verification of master password.</value>
   </data>
   <data name="EnableSyncOnRefresh" xml:space="preserve">
     <value>تمكين المزامنة عند التحديث</value>
@@ -2496,8 +2496,8 @@
   <data name="GetMasterPasswordwordHint" xml:space="preserve">
     <value>احصل على تلميح كلمة المرور الرئيسية</value>
   </data>
-  <data name="LoggingInAsXOnY" xml:space="preserve">
-    <value>تسجيل الدخول كـ {0} في {1}</value>
+  <data name="LoggingInAsX" xml:space="preserve">
+    <value>تسجيل الدخول كـ {0}</value>
   </data>
   <data name="NotYou" xml:space="preserve">
     <value>ليس أنت؟</value>
@@ -2610,31 +2610,10 @@
   <data name="ThereAreNoItemsThatMatchTheSearch" xml:space="preserve">
     <value>لا توجد عناصر تطابق البحث</value>
   </data>
-  <data name="US" xml:space="preserve">
-    <value>الولايات المتحدة</value>
-  </data>
-  <data name="EU" xml:space="preserve">
-    <value>الاتحاد الأوروبي</value>
-  </data>
-  <data name="SelfHosted" xml:space="preserve">
-    <value>استضافة ذاتية</value>
-  </data>
-  <data name="DataRegion" xml:space="preserve">
-    <value>منطقة البيانات</value>
-  </data>
-  <data name="Region" xml:space="preserve">
-    <value>المنطقة</value>
-  </data>
   <data name="UpdateWeakMasterPasswordWarning" xml:space="preserve">
     <value>كلمة المرور الرئيسية الخاصة بك لا تفي بواحدة أو أكثر من سياسات مؤسستك. من أجل الوصول إلى الخزنة، يجب عليك تحديث كلمة المرور الرئيسية الآن. سيتم تسجيل خروجك من الجلسة الحالية، مما يتطلب منك تسجيل الدخول مرة أخرى. وقد تظل الجلسات النشطة على أجهزة أخرى نشطة لمدة تصل إلى ساعة واحدة.</value>
   </data>
   <data name="CurrentMasterPassword" xml:space="preserve">
     <value>كلمة المرور الرئيسية الحالية</value>
   </data>
-  <data name="MasterPasswordRePromptHelp" xml:space="preserve">
-    <value>Master password re-prompt help</value>
-  </data>
-  <data name="UnlockingMayFailDueToInsufficientMemoryDecreaseYourKDFMemorySettingsToResolve" xml:space="preserve">
-    <value>Unlocking may fail due to insufficient memory. Decrease your KDF memory settings to resolve</value>
-  </data>
 </root>

src/App/Resources/AppResources.az.resx

@@ -2494,8 +2494,8 @@ Bu hesaba keçmək istəyirsiniz?</value>
   <data name="GetMasterPasswordwordHint" xml:space="preserve">
     <value>Ana parol üçün məsləhət alın</value>
   </data>
-  <data name="LoggingInAsXOnY" xml:space="preserve">
-    <value>{1} üzərində {0} olaraq giriş edildi</value>
+  <data name="LoggingInAsX" xml:space="preserve">
+    <value>{0} olaraq giriş edilir</value>
   </data>
   <data name="NotYou" xml:space="preserve">
     <value>Siz deyilsiniz?</value>
@@ -2608,31 +2608,10 @@ Bu hesaba keçmək istəyirsiniz?</value>
   <data name="ThereAreNoItemsThatMatchTheSearch" xml:space="preserve">
     <value>Axtarışa uyğun gələn heç bir element yoxdur</value>
   </data>
-  <data name="US" xml:space="preserve">
-    <value>ABŞ</value>
-  </data>
-  <data name="EU" xml:space="preserve">
-    <value>AB</value>
-  </data>
-  <data name="SelfHosted" xml:space="preserve">
-    <value>Öz-özünə sahiblik edən</value>
-  </data>
-  <data name="DataRegion" xml:space="preserve">
-    <value>Data bölgəsi</value>
-  </data>
-  <data name="Region" xml:space="preserve">
-    <value>Bölgə</value>
-  </data>
   <data name="UpdateWeakMasterPasswordWarning" xml:space="preserve">
     <value>Ana parolunuz təşkilatınızdakı siyasətlərdən birinə və ya bir neçəsinə uyğun gəlmir. Anbara müraciət üçün ana parolunuzu indi güncəlləməlisiniz. Davam etsəniz, hazırkı seansdan çıxış etmiş və təkrar giriş etməli olacaqsınız. Digər cihazlardakı aktiv seanslar bir saata qədər aktiv qalmağa davam edə bilər.</value>
   </data>
   <data name="CurrentMasterPassword" xml:space="preserve">
     <value>Hazırkı ana parol</value>
   </data>
-  <data name="MasterPasswordRePromptHelp" xml:space="preserve">
-    <value>Ana parolu təkrar soruş köməyi</value>
-  </data>
-  <data name="UnlockingMayFailDueToInsufficientMemoryDecreaseYourKDFMemorySettingsToResolve" xml:space="preserve">
-    <value>Unlocking may fail due to insufficient memory. Decrease your KDF memory settings to resolve</value>
-  </data>
 </root>

src/App/Resources/AppResources.be.resx

@@ -2495,8 +2495,8 @@
   <data name="GetMasterPasswordwordHint" xml:space="preserve">
     <value>Атрымаць падказку да асноўнага пароля</value>
   </data>
-  <data name="LoggingInAsXOnY" xml:space="preserve">
-    <value>Вы ўваходзіце як {0} у {1}</value>
+  <data name="LoggingInAsX" xml:space="preserve">
+    <value>Увайсці як {0}</value>
   </data>
   <data name="NotYou" xml:space="preserve">
     <value>Не вы?</value>
@@ -2609,31 +2609,10 @@
   <data name="ThereAreNoItemsThatMatchTheSearch" xml:space="preserve">
     <value>Адсутнічаюць элементы, якія адпавядаюць пошуку</value>
   </data>
-  <data name="US" xml:space="preserve">
-    <value>ЗША</value>
-  </data>
-  <data name="EU" xml:space="preserve">
-    <value>ЕС</value>
-  </data>
-  <data name="SelfHosted" xml:space="preserve">
-    <value>Уласнае размяшчэнне</value>
-  </data>
-  <data name="DataRegion" xml:space="preserve">
-    <value>Рэгіён даных</value>
-  </data>
-  <data name="Region" xml:space="preserve">
-    <value>Рэгіён</value>
-  </data>
   <data name="UpdateWeakMasterPasswordWarning" xml:space="preserve">
     <value>Ваш асноўны пароль не адпавядае адной або некалькім палітыкам арганізацыі. Для атрымання доступу да сховішча, вы павінны абнавіць яго. Працягваючы, вы выйдзіце з бягучага сеанса і вам неабходна будзе ўвайсці паўторна. Актыўныя сеансы на іншых прыладах могуць заставацца актыўнымі на працягу адной гадзіны.</value>
   </data>
   <data name="CurrentMasterPassword" xml:space="preserve">
     <value>Бягучы асноўны пароль</value>
   </data>
-  <data name="MasterPasswordRePromptHelp" xml:space="preserve">
-    <value>Дапамога з паўторным запытам асноўнага пароля</value>
-  </data>
-  <data name="UnlockingMayFailDueToInsufficientMemoryDecreaseYourKDFMemorySettingsToResolve" xml:space="preserve">
-    <value>Па прычыне недахопу памяці можа адбыцца збой разблакіроўкі. Паменшыце налады памяці KDF, каб вырашыць гэту праблему</value>
-  </data>
 </root>

src/App/Resources/AppResources.bg.resx

@@ -2495,8 +2495,8 @@ select Add TOTP to store the key safely</value>
   <data name="GetMasterPasswordwordHint" xml:space="preserve">
     <value>Получете подсказване за главната парола</value>
   </data>
-  <data name="LoggingInAsXOnY" xml:space="preserve">
-    <value>Влизате като {0} в {1}</value>
+  <data name="LoggingInAsX" xml:space="preserve">
+    <value>Вписване като {0}</value>
   </data>
   <data name="NotYou" xml:space="preserve">
     <value>Това не сте Вие?</value>
@@ -2609,31 +2609,10 @@ select Add TOTP to store the key safely</value>
   <data name="ThereAreNoItemsThatMatchTheSearch" xml:space="preserve">
     <value>Няма елементи, които отговарят на търсенето</value>
   </data>
-  <data name="US" xml:space="preserve">
-    <value>САЩ</value>
-  </data>
-  <data name="EU" xml:space="preserve">
-    <value>ЕС</value>
-  </data>
-  <data name="SelfHosted" xml:space="preserve">
-    <value>Собствен хостинг</value>
-  </data>
-  <data name="DataRegion" xml:space="preserve">
-    <value>Регион на данните</value>
-  </data>
-  <data name="Region" xml:space="preserve">
-    <value>Регион</value>
-  </data>
   <data name="UpdateWeakMasterPasswordWarning" xml:space="preserve">
     <value>Вашата главна парола не отговаря на една или повече политики на организацията Ви. За да получите достъп до трезора, трябва да промените главната си парола сега. Това означава, че ще бъдете отписан(а) от текущата си сесия и ще трябва да се впишете отново. Активните сесии на други устройства може да продължат да бъдат активни още един час.</value>
   </data>
   <data name="CurrentMasterPassword" xml:space="preserve">
     <value>Текуща главна парола</value>
   </data>
-  <data name="MasterPasswordRePromptHelp" xml:space="preserve">
-    <value>Помощ за повторното запитване за главната парола</value>
-  </data>
-  <data name="UnlockingMayFailDueToInsufficientMemoryDecreaseYourKDFMemorySettingsToResolve" xml:space="preserve">
-    <value>Отключването може да бъде неуспешно заради недостатъчно памет. Намалете настройките на паметта за KDF, за да разрешите проблема.</value>
-  </data>
 </root>

src/App/Resources/AppResources.bn.resx

@@ -2496,8 +2496,8 @@ Do you want to switch to this account?</value>
   <data name="GetMasterPasswordwordHint" xml:space="preserve">
     <value>Get master password hint</value>
   </data>
-  <data name="LoggingInAsXOnY" xml:space="preserve">
-    <value>Logging in as {0} on {1}</value>
+  <data name="LoggingInAsX" xml:space="preserve">
+    <value>Logging in as {0}</value>
   </data>
   <data name="NotYou" xml:space="preserve">
     <value>Not you?</value>
@@ -2610,31 +2610,10 @@ Do you want to switch to this account?</value>
   <data name="ThereAreNoItemsThatMatchTheSearch" xml:space="preserve">
     <value>There are no items that match the search</value>
   </data>
-  <data name="US" xml:space="preserve">
-    <value>US</value>
-  </data>
-  <data name="EU" xml:space="preserve">
-    <value>EU</value>
-  </data>
-  <data name="SelfHosted" xml:space="preserve">
-    <value>Self-hosted</value>
-  </data>
-  <data name="DataRegion" xml:space="preserve">
-    <value>Data region</value>
-  </data>
-  <data name="Region" xml:space="preserve">
-    <value>Region</value>
-  </data>
   <data name="UpdateWeakMasterPasswordWarning" xml:space="preserve">
     <value>Your master password does not meet one or more of your organization policies. 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="CurrentMasterPassword" xml:space="preserve">
     <value>Current master password</value>
   </data>
-  <data name="MasterPasswordRePromptHelp" xml:space="preserve">
-    <value>Master password re-prompt help</value>
-  </data>
-  <data name="UnlockingMayFailDueToInsufficientMemoryDecreaseYourKDFMemorySettingsToResolve" xml:space="preserve">
-    <value>Unlocking may fail due to insufficient memory. Decrease your KDF memory settings to resolve</value>
-  </data>
 </root>

src/App/Resources/AppResources.bs.resx

@@ -2494,8 +2494,8 @@ Skeniranje će biti izvršeno automatski.</value>
   <data name="GetMasterPasswordwordHint" xml:space="preserve">
     <value>Dobijte podsjetnik glavne lozinke</value>
   </data>
-  <data name="LoggingInAsXOnY" xml:space="preserve">
-    <value>Logging in as {0} on {1}</value>
+  <data name="LoggingInAsX" xml:space="preserve">
+    <value>Prijava kao {0}</value>
   </data>
   <data name="NotYou" xml:space="preserve">
     <value>Nisi ti?</value>
@@ -2608,31 +2608,10 @@ Skeniranje će biti izvršeno automatski.</value>
   <data name="ThereAreNoItemsThatMatchTheSearch" xml:space="preserve">
     <value>There are no items that match the search</value>
   </data>
-  <data name="US" xml:space="preserve">
-    <value>US</value>
-  </data>
-  <data name="EU" xml:space="preserve">
-    <value>EU</value>
-  </data>
-  <data name="SelfHosted" xml:space="preserve">
-    <value>Self-hosted</value>
-  </data>
-  <data name="DataRegion" xml:space="preserve">
-    <value>Data region</value>
-  </data>
-  <data name="Region" xml:space="preserve">
-    <value>Region</value>
-  </data>
   <data name="UpdateWeakMasterPasswordWarning" xml:space="preserve">
     <value>Your master password does not meet one or more of your organization policies. 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="CurrentMasterPassword" xml:space="preserve">
     <value>Current master password</value>
   </data>
-  <data name="MasterPasswordRePromptHelp" xml:space="preserve">
-    <value>Master password re-prompt help</value>
-  </data>
-  <data name="UnlockingMayFailDueToInsufficientMemoryDecreaseYourKDFMemorySettingsToResolve" xml:space="preserve">
-    <value>Unlocking may fail due to insufficient memory. Decrease your KDF memory settings to resolve</value>
-  </data>
 </root>

src/App/Resources/AppResources.ca.resx

@@ -2495,8 +2495,8 @@ Voleu canviar a aquest compte?</value>
   <data name="GetMasterPasswordwordHint" xml:space="preserve">
     <value>Obteniu la pista de la contrasenya mestra</value>
   </data>
-  <data name="LoggingInAsXOnY" xml:space="preserve">
-    <value>Inici de sessió com a {0} a {1}</value>
+  <data name="LoggingInAsX" xml:space="preserve">
+    <value>Connectat com {0}</value>
   </data>
   <data name="NotYou" xml:space="preserve">
     <value>No sou vosaltres?</value>
@@ -2609,31 +2609,10 @@ Voleu canviar a aquest compte?</value>
   <data name="ThereAreNoItemsThatMatchTheSearch" xml:space="preserve">
     <value>No hi ha elements que coincidisquen amb la cerca</value>
   </data>
-  <data name="US" xml:space="preserve">
-    <value>EUA</value>
-  </data>
-  <data name="EU" xml:space="preserve">
-    <value>UE</value>
-  </data>
-  <data name="SelfHosted" xml:space="preserve">
-    <value>Autoallotjat</value>
-  </data>
-  <data name="DataRegion" xml:space="preserve">
-    <value>Regió de dades</value>
-  </data>
-  <data name="Region" xml:space="preserve">
-    <value>Regió</value>
-  </data>
   <data name="UpdateWeakMasterPasswordWarning" xml:space="preserve">
     <value>La vostra contrasenya mestra no compleix una o més de les polítiques de l'organització. Per accedir a la caixa forta, heu d'actualitzar-la ara. Si continueu, es tancarà la sessió actual i us demanarà que torneu a iniciar-la. Les sessions en altres dispositius poden continuar romanent actives fins a una hora.</value>
   </data>
   <data name="CurrentMasterPassword" xml:space="preserve">
     <value>Contrasenya mestra actual</value>
   </data>
-  <data name="MasterPasswordRePromptHelp" xml:space="preserve">
-    <value>Ajuda per tornar a demanar la contrasenya mestra</value>
-  </data>
-  <data name="UnlockingMayFailDueToInsufficientMemoryDecreaseYourKDFMemorySettingsToResolve" xml:space="preserve">
-    <value>El desbloqueig pot fallar a causa de memòria insuficient. Disminueix la configuració de memòria KDF per resoldre-ho</value>
-  </data>
 </root>

src/App/Resources/AppResources.cs.resx

@@ -2494,8 +2494,8 @@ Chcete se přepnout na tento účet?</value>
   <data name="GetMasterPasswordwordHint" xml:space="preserve">
     <value>Získat nápovědu pro hlavní heslo</value>
   </data>
-  <data name="LoggingInAsXOnY" xml:space="preserve">
-    <value>Přihlašování jako {0} na {1}</value>
+  <data name="LoggingInAsX" xml:space="preserve">
+    <value>Přihlášování jako {0}</value>
   </data>
   <data name="NotYou" xml:space="preserve">
     <value>Nejste to Vy?</value>
@@ -2608,31 +2608,10 @@ Chcete se přepnout na tento účet?</value>
   <data name="ThereAreNoItemsThatMatchTheSearch" xml:space="preserve">
     <value>Neexistují žádné položky, které by odpovídaly hledání</value>
   </data>
-  <data name="US" xml:space="preserve">
-    <value>US</value>
-  </data>
-  <data name="EU" xml:space="preserve">
-    <value>EU</value>
-  </data>
-  <data name="SelfHosted" xml:space="preserve">
-    <value>Vlastní hosting</value>
-  </data>
-  <data name="DataRegion" xml:space="preserve">
-    <value>Datový region</value>
-  </data>
-  <data name="Region" xml:space="preserve">
-    <value>Region</value>
-  </data>
   <data name="UpdateWeakMasterPasswordWarning" xml:space="preserve">
     <value>Vaše hlavní heslo nesplňuje jednu nebo více zásad Vaší organizace. Pro přístup k trezoru musíte nyní aktualizovat své hlavní heslo. Pokračování Vás odhlásí z Vaší aktuální relace a bude nutné se přihlásit. Aktivní relace na jiných zařízeních mohou zůstat aktivní až po dobu jedné hodiny.</value>
   </data>
   <data name="CurrentMasterPassword" xml:space="preserve">
     <value>Aktuální hlavní heslo</value>
   </data>
-  <data name="MasterPasswordRePromptHelp" xml:space="preserve">
-    <value>Nápověda pro znovuzeptání se na hlavní heslo</value>
-  </data>
-  <data name="UnlockingMayFailDueToInsufficientMemoryDecreaseYourKDFMemorySettingsToResolve" xml:space="preserve">
-    <value>Odemknutí může selhat z důvodu nedostatku paměti. Pro vyřešení snižte nastavení paměti KDF.</value>
-  </data>
 </root>

src/App/Resources/AppResources.cy.resx

@@ -2496,8 +2496,8 @@ Do you want to switch to this account?</value>
   <data name="GetMasterPasswordwordHint" xml:space="preserve">
     <value>Get master password hint</value>
   </data>
-  <data name="LoggingInAsXOnY" xml:space="preserve">
-    <value>Logging in as {0} on {1}</value>
+  <data name="LoggingInAsX" xml:space="preserve">
+    <value>Logging in as {0}</value>
   </data>
   <data name="NotYou" xml:space="preserve">
     <value>Not you?</value>
@@ -2610,31 +2610,10 @@ Do you want to switch to this account?</value>
   <data name="ThereAreNoItemsThatMatchTheSearch" xml:space="preserve">
     <value>There are no items that match the search</value>
   </data>
-  <data name="US" xml:space="preserve">
-    <value>US</value>
-  </data>
-  <data name="EU" xml:space="preserve">
-    <value>EU</value>
-  </data>
-  <data name="SelfHosted" xml:space="preserve">
-    <value>Self-hosted</value>
-  </data>
-  <data name="DataRegion" xml:space="preserve">
-    <value>Data region</value>
-  </data>
-  <data name="Region" xml:space="preserve">
-    <value>Region</value>
-  </data>
   <data name="UpdateWeakMasterPasswordWarning" xml:space="preserve">
     <value>Your master password does not meet one or more of your organization policies. 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="CurrentMasterPassword" xml:space="preserve">
     <value>Current master password</value>
   </data>
-  <data name="MasterPasswordRePromptHelp" xml:space="preserve">
-    <value>Master password re-prompt help</value>
-  </data>
-  <data name="UnlockingMayFailDueToInsufficientMemoryDecreaseYourKDFMemorySettingsToResolve" xml:space="preserve">
-    <value>Unlocking may fail due to insufficient memory. Decrease your KDF memory settings to resolve</value>
-  </data>
 </root>

src/App/Resources/AppResources.da.resx

@@ -2495,8 +2495,8 @@ Vil du skifte til denne konto?</value>
   <data name="GetMasterPasswordwordHint" xml:space="preserve">
     <value>Få hovedadgangskodetip</value>
   </data>
-  <data name="LoggingInAsXOnY" xml:space="preserve">
-    <value>Logger ind som {0} på {1}</value>
+  <data name="LoggingInAsX" xml:space="preserve">
+    <value>Logger ind som {0}</value>
   </data>
   <data name="NotYou" xml:space="preserve">
     <value>Ikke dig?</value>
@@ -2609,31 +2609,10 @@ Vil du skifte til denne konto?</value>
   <data name="ThereAreNoItemsThatMatchTheSearch" xml:space="preserve">
     <value>Ingen emner matcher søgningen</value>
   </data>
-  <data name="US" xml:space="preserve">
-    <value>USA</value>
-  </data>
-  <data name="EU" xml:space="preserve">
-    <value>EU</value>
-  </data>
-  <data name="SelfHosted" xml:space="preserve">
-    <value>Selv-hostet</value>
-  </data>
-  <data name="DataRegion" xml:space="preserve">
-    <value>Dataregion</value>
-  </data>
-  <data name="Region" xml:space="preserve">
-    <value>Region</value>
-  </data>
   <data name="UpdateWeakMasterPasswordWarning" xml:space="preserve">
     <value>Din hovedadgangskode overholder ikke én eller flere organisationspolitikker. For at få adgang til boksen skal hovedadgangskode opdateres nu. Fortsættes, logges du ud af den nuværende session og vil skulle logger ind igen. Aktive sessioner på andre enheder kan forblive aktive i op til én time.</value>
   </data>
   <data name="CurrentMasterPassword" xml:space="preserve">
     <value>Aktuel hovedadgangskode</value>
   </data>
-  <data name="MasterPasswordRePromptHelp" xml:space="preserve">
-    <value>Hjælp til genanmodning om hovedadgangskode</value>
-  </data>
-  <data name="UnlockingMayFailDueToInsufficientMemoryDecreaseYourKDFMemorySettingsToResolve" xml:space="preserve">
-    <value>Oplåsning kan fejle grundet utilstrækkelig hukommelse. Reducér KDF-hukommelsesindstillinger for at afhjælpe</value>
-  </data>
 </root>

src/App/Resources/AppResources.de.resx

@@ -2494,8 +2494,8 @@ Möchtest du zu diesem Konto wechseln?</value>
   <data name="GetMasterPasswordwordHint" xml:space="preserve">
     <value>Hinweis zum Master-Passwort erhalten</value>
   </data>
-  <data name="LoggingInAsXOnY" xml:space="preserve">
-    <value>Anmelden als {0} auf {1}</value>
+  <data name="LoggingInAsX" xml:space="preserve">
+    <value>Anmelden als {0}</value>
   </data>
   <data name="NotYou" xml:space="preserve">
     <value>Nicht du?</value>
@@ -2608,31 +2608,10 @@ Möchtest du zu diesem Konto wechseln?</value>
   <data name="ThereAreNoItemsThatMatchTheSearch" xml:space="preserve">
     <value>Es gibt keine Einträge, die mit der Suche übereinstimmen</value>
   </data>
-  <data name="US" xml:space="preserve">
-    <value>US</value>
-  </data>
-  <data name="EU" xml:space="preserve">
-    <value>EU</value>
-  </data>
-  <data name="SelfHosted" xml:space="preserve">
-    <value>Selbst gehostet</value>
-  </data>
-  <data name="DataRegion" xml:space="preserve">
-    <value>Datenregion</value>
-  </data>
-  <data name="Region" xml:space="preserve">
-    <value>Region</value>
-  </data>
   <data name="UpdateWeakMasterPasswordWarning" xml:space="preserve">
     <value>Dein Master-Passwort entspricht nicht einer oder mehreren Richtlinien deiner Organisation. Um auf den Tresor zugreifen zu können, musst du dein Master-Passwort jetzt aktualisieren. Wenn du fortfährst, wirst du von deiner aktuellen Sitzung abgemeldet und musst dich erneut anmelden. Aktive Sitzungen auf anderen Geräten können noch bis zu einer Stunde lang aktiv bleiben.</value>
   </data>
   <data name="CurrentMasterPassword" xml:space="preserve">
     <value>Aktuelles Master-Passwort</value>
   </data>
-  <data name="MasterPasswordRePromptHelp" xml:space="preserve">
-    <value>Hilfe zum erneuten Abfragen des Master-Passworts</value>
-  </data>
-  <data name="UnlockingMayFailDueToInsufficientMemoryDecreaseYourKDFMemorySettingsToResolve" xml:space="preserve">
-    <value>Das Entsperren kann aufgrund von unzureichendem Arbeitsspeicher fehlschlagen. Verringere deine KDF-Speichereinstellungen, um das Problem zu beheben.</value>
-  </data>
 </root>

src/App/Resources/AppResources.el.resx

@@ -2495,8 +2495,8 @@
   <data name="GetMasterPasswordwordHint" xml:space="preserve">
     <value>Λάβετε υπόδειξη κύριου κωδικού</value>
   </data>
-  <data name="LoggingInAsXOnY" xml:space="preserve">
-    <value>Σύνδεση ως {0} στις {1}</value>
+  <data name="LoggingInAsX" xml:space="preserve">
+    <value>Σύνδεση ως {0}</value>
   </data>
   <data name="NotYou" xml:space="preserve">
     <value>Δεν είστε εσείς;</value>
@@ -2609,31 +2609,10 @@
   <data name="ThereAreNoItemsThatMatchTheSearch" xml:space="preserve">
     <value>Δεν υπάρχουν στοιχεία που να ταιριάζουν με την αναζήτηση</value>
   </data>
-  <data name="US" xml:space="preserve">
-    <value>US</value>
-  </data>
-  <data name="EU" xml:space="preserve">
-    <value>EU</value>
-  </data>
-  <data name="SelfHosted" xml:space="preserve">
-    <value>Self-hosted</value>
-  </data>
-  <data name="DataRegion" xml:space="preserve">
-    <value>Data region</value>
-  </data>
-  <data name="Region" xml:space="preserve">
-    <value>Περιοχή</value>
-  </data>
   <data name="UpdateWeakMasterPasswordWarning" xml:space="preserve">
     <value>Ο κύριος κωδικός πρόσβασής σας δεν πληροί μία ή περισσότερες πολιτικές του οργανισμού σας. Για να αποκτήσετε πρόσβαση στο Vault σας, πρέπει να ενημερώσετε τον κύριο κωδικό πρόσβασής σας τώρα. Η διαδικασία θα σας αποσυνδέσει από την τρέχουσα συνεδρία σας, απαιτώντας από εσάς να συνδεθείτε ξανά. Οι ενεργές συνεδρίες σε άλλες συσκευές ενδέχεται να συνεχίσουν να είναι ενεργές εώς και μία ώρα.</value>
   </data>
   <data name="CurrentMasterPassword" xml:space="preserve">
     <value>Τρέχων κύριος κωδικός</value>
   </data>
-  <data name="MasterPasswordRePromptHelp" xml:space="preserve">
-    <value>Master password re-prompt help</value>
-  </data>
-  <data name="UnlockingMayFailDueToInsufficientMemoryDecreaseYourKDFMemorySettingsToResolve" xml:space="preserve">
-    <value>Unlocking may fail due to insufficient memory. Decrease your KDF memory settings to resolve</value>
-  </data>
 </root>

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

@@ -2495,8 +2495,8 @@ Do you want to switch to this account?</value>
   <data name="GetMasterPasswordwordHint" xml:space="preserve">
     <value>Get master password hint</value>
   </data>
-  <data name="LoggingInAsXOnY" xml:space="preserve">
-    <value>Logging in as {0} on {1}</value>
+  <data name="LoggingInAsX" xml:space="preserve">
+    <value>Logging in as {0}</value>
   </data>
   <data name="NotYou" xml:space="preserve">
     <value>Not you?</value>
@@ -2609,31 +2609,10 @@ Do you want to switch to this account?</value>
   <data name="ThereAreNoItemsThatMatchTheSearch" xml:space="preserve">
     <value>There are no items that match the search</value>
   </data>
-  <data name="US" xml:space="preserve">
-    <value>US</value>
-  </data>
-  <data name="EU" xml:space="preserve">
-    <value>EU</value>
-  </data>
-  <data name="SelfHosted" xml:space="preserve">
-    <value>Self-hosted</value>
-  </data>
-  <data name="DataRegion" xml:space="preserve">
-    <value>Data region</value>
-  </data>
-  <data name="Region" xml:space="preserve">
-    <value>Region</value>
-  </data>
   <data name="UpdateWeakMasterPasswordWarning" xml:space="preserve">
     <value>Your master password does not meet one or more of your organization policies. 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="CurrentMasterPassword" xml:space="preserve">
     <value>Current master password</value>
   </data>
-  <data name="MasterPasswordRePromptHelp" xml:space="preserve">
-    <value>Master password re-prompt help</value>
-  </data>
-  <data name="UnlockingMayFailDueToInsufficientMemoryDecreaseYourKDFMemorySettingsToResolve" xml:space="preserve">
-    <value>Unlocking may fail due to insufficient memory. Decrease your KDF memory settings to resolve</value>
-  </data>
 </root>

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

@@ -2509,8 +2509,8 @@ Do you want to switch to this account?</value>
   <data name="GetMasterPasswordwordHint" xml:space="preserve">
     <value>Get master password hint</value>
   </data>
-  <data name="LoggingInAsXOnY" xml:space="preserve">
-    <value>Logging in as {0} on {1}</value>
+  <data name="LoggingInAsX" xml:space="preserve">
+    <value>Logging in as {0}</value>
   </data>
   <data name="NotYou" xml:space="preserve">
     <value>Not you?</value>
@@ -2623,31 +2623,10 @@ Do you want to switch to this account?</value>
   <data name="ThereAreNoItemsThatMatchTheSearch" xml:space="preserve">
     <value>There are no items that match the search</value>
   </data>
-  <data name="US" xml:space="preserve">
-    <value>US</value>
-  </data>
-  <data name="EU" xml:space="preserve">
-    <value>EU</value>
-  </data>
-  <data name="SelfHosted" xml:space="preserve">
-    <value>Self-hosted</value>
-  </data>
-  <data name="DataRegion" xml:space="preserve">
-    <value>Data region</value>
-  </data>
-  <data name="Region" xml:space="preserve">
-    <value>Region</value>
-  </data>
   <data name="UpdateWeakMasterPasswordWarning" xml:space="preserve">
     <value>Your master password does not meet one or more of your organization policies. 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="CurrentMasterPassword" xml:space="preserve">
     <value>Current master password</value>
   </data>
-  <data name="MasterPasswordRePromptHelp" xml:space="preserve">
-    <value>Master password re-prompt help</value>
-  </data>
-  <data name="UnlockingMayFailDueToInsufficientMemoryDecreaseYourKDFMemorySettingsToResolve" xml:space="preserve">
-    <value>Unlocking may fail due to insufficient memory. Decrease your KDF memory settings to resolve</value>
-  </data>
 </root>

src/App/Resources/AppResources.es.resx

@@ -2496,8 +2496,8 @@ seleccione Agregar TOTP para almacenar la clave de forma segura</value>
   <data name="GetMasterPasswordwordHint" xml:space="preserve">
     <value>Obtener pista de contraseña maestra</value>
   </data>
-  <data name="LoggingInAsXOnY" xml:space="preserve">
-    <value>Iniciando sesión como {0} en {1}</value>
+  <data name="LoggingInAsX" xml:space="preserve">
+    <value>Iniciando sesión como {0}</value>
   </data>
   <data name="NotYou" xml:space="preserve">
     <value>¿No eres tú?</value>
@@ -2610,31 +2610,10 @@ seleccione Agregar TOTP para almacenar la clave de forma segura</value>
   <data name="ThereAreNoItemsThatMatchTheSearch" xml:space="preserve">
     <value>No hay elementos que coincidan con la búsqueda</value>
   </data>
-  <data name="US" xml:space="preserve">
-    <value>EE.UU.</value>
-  </data>
-  <data name="EU" xml:space="preserve">
-    <value>Unión Europea</value>
-  </data>
-  <data name="SelfHosted" xml:space="preserve">
-    <value>Autoalojado</value>
-  </data>
-  <data name="DataRegion" xml:space="preserve">
-    <value>Región de datos</value>
-  </data>
-  <data name="Region" xml:space="preserve">
-    <value>Región</value>
-  </data>
   <data name="UpdateWeakMasterPasswordWarning" xml:space="preserve">
     <value>Su contraseña maestra no cumple con una o más de las políticas de su organización. Para acceder a la caja fuerte, debe actualizar su contraseña maestra ahora. Proceder le desconectará de su sesión actual, requiriendo que vuelva a iniciar sesión. Las sesiones activas en otros dispositivos pueden seguir estando activas durante hasta una hora.</value>
   </data>
   <data name="CurrentMasterPassword" xml:space="preserve">
     <value>Contraseña maestra actual</value>
   </data>
-  <data name="MasterPasswordRePromptHelp" xml:space="preserve">
-    <value>Master password re-prompt help</value>
-  </data>
-  <data name="UnlockingMayFailDueToInsufficientMemoryDecreaseYourKDFMemorySettingsToResolve" xml:space="preserve">
-    <value>El desbloqueo puede fallar por falta de memoria. Disminuye los ajustes de memoria KDF para resolver</value>
-  </data>
 </root>

src/App/Resources/AppResources.et.resx

@@ -2495,8 +2495,8 @@ Soovid selle konto peale lülituda?</value>
   <data name="GetMasterPasswordwordHint" xml:space="preserve">
     <value>Tuleta ülemparooli vihjega meelde</value>
   </data>
-  <data name="LoggingInAsXOnY" xml:space="preserve">
-    <value>Logging in as {0} on {1}</value>
+  <data name="LoggingInAsX" xml:space="preserve">
+    <value>Sisselogimas kui {0}</value>
   </data>
   <data name="NotYou" xml:space="preserve">
     <value>Pole sina?</value>
@@ -2609,31 +2609,10 @@ Soovid selle konto peale lülituda?</value>
   <data name="ThereAreNoItemsThatMatchTheSearch" xml:space="preserve">
     <value>Otsingusõnale ei vasta kirjeid</value>
   </data>
-  <data name="US" xml:space="preserve">
-    <value>US</value>
-  </data>
-  <data name="EU" xml:space="preserve">
-    <value>EU</value>
-  </data>
-  <data name="SelfHosted" xml:space="preserve">
-    <value>Self-hosted</value>
-  </data>
-  <data name="DataRegion" xml:space="preserve">
-    <value>Data region</value>
-  </data>
-  <data name="Region" xml:space="preserve">
-    <value>Region</value>
-  </data>
   <data name="UpdateWeakMasterPasswordWarning" xml:space="preserve">
     <value>Sinu ülemparool ei vasta ühele või rohkemale organisatsiooni poolt seatud poliitikale. Hoidlale ligipääsemiseks pead oma ülemaprooli uuendama. Jätkamisel logitakse sind praegusest sessioonist välja, mistõttu pead uuesti sisse logima. Teistes seadmetes olevad aktiivsed sessioonid aeguvad umbes ühe tunni jooksul.</value>
   </data>
   <data name="CurrentMasterPassword" xml:space="preserve">
     <value>Praegune ülemparool</value>
   </data>
-  <data name="MasterPasswordRePromptHelp" xml:space="preserve">
-    <value>Master password re-prompt help</value>
-  </data>
-  <data name="UnlockingMayFailDueToInsufficientMemoryDecreaseYourKDFMemorySettingsToResolve" xml:space="preserve">
-    <value>Unlocking may fail due to insufficient memory. Decrease your KDF memory settings to resolve</value>
-  </data>
 </root>

src/App/Resources/AppResources.eu.resx

@@ -584,7 +584,7 @@
     <value>Pasahitz nagusia ahazten baduzu, pista batek pasahitza gogoratzen lagunduko dizu.</value>
   </data>
   <data name="MasterPasswordLengthValMessageX" xml:space="preserve">
-    <value>Pasahitz nagusiak {0} karaktere izan behar ditu gutxienez.</value>
+    <value>Master password must be at least {0} characters long.</value>
   </data>
   <data name="MinNumbers" xml:space="preserve">
     <value>Gutxieneko zenbaki kopurua</value>
@@ -1752,10 +1752,10 @@
     <comment>Confirmation alert message when soft-deleting a cipher.</comment>
   </data>
   <data name="AccountBiometricInvalidated" xml:space="preserve">
-    <value>Desblokeatze biometrikoa desgaituta dago kontu honentzat, pasahitz nagusia egiaztatzeko zain.</value>
+    <value>Biometric unlock for this account is disabled pending verification of master password.</value>
   </data>
   <data name="AccountBiometricInvalidatedExtension" xml:space="preserve">
-    <value>Desblokeatze biometriko automatikoa desgaituta dago kontu honentzat, pasahitz nagusia egiaztatzeko zain.</value>
+    <value>Autofill biometric unlock for this account is disabled pending verification of master password.</value>
   </data>
   <data name="EnableSyncOnRefresh" xml:space="preserve">
     <value>Gaitu eguneratzean sinkronizatzea</value>
@@ -2494,8 +2494,8 @@ Kontu honetara aldatu nahi duzu?</value>
   <data name="GetMasterPasswordwordHint" xml:space="preserve">
     <value>Jaso pasahitz nagusiaren pista</value>
   </data>
-  <data name="LoggingInAsXOnY" xml:space="preserve">
-    <value>{0} bezala saioa hasten {1}(e)n</value>
+  <data name="LoggingInAsX" xml:space="preserve">
+    <value>{0} bezala hasi saioa</value>
   </data>
   <data name="NotYou" xml:space="preserve">
     <value>Ez zara zu?</value>
@@ -2531,31 +2531,31 @@ Kontu honetara aldatu nahi duzu?</value>
     <value>Pending login requests</value>
   </data>
   <data name="DeclineAllRequests" xml:space="preserve">
-    <value>Ukatu eskaera guztiak</value>
+    <value>Decline all requests</value>
   </data>
   <data name="AreYouSureYouWantToDeclineAllPendingLogInRequests" xml:space="preserve">
-    <value>Ziur al zaude zain dauden saioa hasteko eskaera guztiak ukatu nahi dituzula?</value>
+    <value>Are you sure you want to decline all pending login requests?</value>
   </data>
   <data name="RequestsDeclined" xml:space="preserve">
-    <value>Eskaerak ukatuta</value>
+    <value>Requests declined</value>
   </data>
   <data name="NoPendingRequests" xml:space="preserve">
-    <value>Ez dago eskaerarik zain</value>  
+    <value>No pending requests</value>  
   </data>
   <data name="EnableCamerPermissionToUseTheScanner" xml:space="preserve">
     <value>Gaitu kameraren baimena eskanerra erabiltzeko</value>
   </data>
   <data name="Language" xml:space="preserve">
-    <value>Hizkuntza</value>
+    <value>Language</value>
   </data>
   <data name="LanguageChangeXDescription" xml:space="preserve">
-    <value>{0} hizkuntza ezarri da. Berrabiarazi aplikazioa mesedez aldaketa ikusi ahal izateko</value>
+    <value>The language has been changed to {0}. Please restart the app to see the change</value>
   </data>
   <data name="LanguageChangeRequiresAppRestart" xml:space="preserve">
-    <value>Hizkuntza aldatzeak aplikazioa berabiaraztea behar du</value>
+    <value>Language change requires app restart</value>
   </data>
   <data name="DefaultSystem" xml:space="preserve">
-    <value>Lehenetsia (Sistema)</value>
+    <value>Default (System)</value>
   </data>
   <data name="Important" xml:space="preserve">
     <value>Garrantzitsua</value>
@@ -2594,7 +2594,7 @@ Kontu honetara aldatu nahi duzu?</value>
     <value>Pasahitz ahul hau datu-urraketa batean aurkitu da. Erabil ezazu beste inon erabili ez duzun pasahitz sendi bat zure kontua babesteko. Ziur zaude pasahitz hau erabili nahi duzula?</value>
   </data>
   <data name="OrganizationSsoIdentifierRequired" xml:space="preserve">
-    <value>Erakundearen identifikazio bakarra (SSO) beharrezkoa da.</value>
+    <value>Organization SSO identifier required.</value>
   </data>
   <data name="AddTheKeyToAnExistingOrNewItem" xml:space="preserve">
     <value>Add the key to an existing or new item</value>
@@ -2603,36 +2603,15 @@ Kontu honetara aldatu nahi duzu?</value>
     <value>There are no items in your vault that match "{0}"</value>
   </data>
   <data name="SearchForAnItemOrAddANewItem" xml:space="preserve">
-    <value>Bilatu elementu bat ala gehitu elementu berria</value>
+    <value>Search for an item or add a new item</value>
   </data>
   <data name="ThereAreNoItemsThatMatchTheSearch" xml:space="preserve">
-    <value>Ez dago bilaketarekin bat datorren emaitzarik</value>
-  </data>
-  <data name="US" xml:space="preserve">
-    <value>AEB</value>
-  </data>
-  <data name="EU" xml:space="preserve">
-    <value>EU</value>
-  </data>
-  <data name="SelfHosted" xml:space="preserve">
-    <value>Self-hosted</value>
-  </data>
-  <data name="DataRegion" xml:space="preserve">
-    <value>Data region</value>
-  </data>
-  <data name="Region" xml:space="preserve">
-    <value>Eskualdea</value>
+    <value>There are no items that match the search</value>
   </data>
   <data name="UpdateWeakMasterPasswordWarning" xml:space="preserve">
     <value>Your master password does not meet one or more of your organization policies. 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="CurrentMasterPassword" xml:space="preserve">
-    <value>Uneko pasahitz nagusia</value>
-  </data>
-  <data name="MasterPasswordRePromptHelp" xml:space="preserve">
-    <value>Master password re-prompt help</value>
-  </data>
-  <data name="UnlockingMayFailDueToInsufficientMemoryDecreaseYourKDFMemorySettingsToResolve" xml:space="preserve">
-    <value>Unlocking may fail due to insufficient memory. Decrease your KDF memory settings to resolve</value>
+    <value>Current master password</value>
   </data>
 </root>

src/App/Resources/AppResources.fa.resx

@@ -2496,8 +2496,8 @@
   <data name="GetMasterPasswordwordHint" xml:space="preserve">
     <value>دریافت یادآور کلمه عبور اصلی</value>
   </data>
-  <data name="LoggingInAsXOnY" xml:space="preserve">
-    <value>Logging in as {0} on {1}</value>
+  <data name="LoggingInAsX" xml:space="preserve">
+    <value>در حال ورود به عنوان {0}</value>
   </data>
   <data name="NotYou" xml:space="preserve">
     <value>شما نیستید؟</value>
@@ -2610,31 +2610,10 @@
   <data name="ThereAreNoItemsThatMatchTheSearch" xml:space="preserve">
     <value>هیچ موردی وجود ندارد که با جستجو مطابقت داشته باشد</value>
   </data>
-  <data name="US" xml:space="preserve">
-    <value>US</value>
-  </data>
-  <data name="EU" xml:space="preserve">
-    <value>EU</value>
-  </data>
-  <data name="SelfHosted" xml:space="preserve">
-    <value>Self-hosted</value>
-  </data>
-  <data name="DataRegion" xml:space="preserve">
-    <value>Data region</value>
-  </data>
-  <data name="Region" xml:space="preserve">
-    <value>Region</value>
-  </data>
   <data name="UpdateWeakMasterPasswordWarning" xml:space="preserve">
     <value>کلمه عبور اصلی شما با یک یا چند سیاست سازمان‌تان مطابقت ندارد. برای دسترسی به گاوصندوق، باید همین حالا کلمه عبور اصلی خود را به‌روز کنید. در صورت ادامه، شما از نشست فعلی خود خارج می‌شوید و باید دوباره وارد سیستم شوید. نشست فعال در دستگاه های دیگر ممکن است تا یک ساعت همچنان فعال باقی بمانند.</value>
   </data>
   <data name="CurrentMasterPassword" xml:space="preserve">
     <value>کلمه عبور اصلی فعلی</value>
   </data>
-  <data name="MasterPasswordRePromptHelp" xml:space="preserve">
-    <value>Master password re-prompt help</value>
-  </data>
-  <data name="UnlockingMayFailDueToInsufficientMemoryDecreaseYourKDFMemorySettingsToResolve" xml:space="preserve">
-    <value>Unlocking may fail due to insufficient memory. Decrease your KDF memory settings to resolve</value>
-  </data>
 </root>

src/App/Resources/AppResources.fi.resx

@@ -1492,7 +1492,7 @@ Koodi luetaan automaattisesti.</value>
     <value>Aseta PIN-koodi Bitwardenin avaukselle. PIN-asetukset tyhjentyvät, jos kirjaudut kokonaan ulos sovelluksesta.</value>
   </data>
   <data name="LoggedInAsOn" xml:space="preserve">
-    <value>Kirjautui palvelimelle {1} tunnuksella {0}.</value>
+    <value>Kirjautui tunnuksella {0} palvelimelle {1}.</value>
     <comment>ex: Logged in as user@example.com on bitwarden.com.</comment>
   </data>
   <data name="VaultLockedMasterPassword" xml:space="preserve">
@@ -2496,8 +2496,8 @@ Haluatko vaihtaa tähän tiliin?</value>
   <data name="GetMasterPasswordwordHint" xml:space="preserve">
     <value>Pyydä pääsalasanan vihjettä</value>
   </data>
-  <data name="LoggingInAsXOnY" xml:space="preserve">
-    <value>Kirjaudutaan palvelimelle {1} tunnuksella {0}</value>
+  <data name="LoggingInAsX" xml:space="preserve">
+    <value>Kirjaudutaan tunnuksella {0}</value>
   </data>
   <data name="NotYou" xml:space="preserve">
     <value>Etkö se ollut sinä?</value>
@@ -2610,31 +2610,10 @@ Haluatko vaihtaa tähän tiliin?</value>
   <data name="ThereAreNoItemsThatMatchTheSearch" xml:space="preserve">
     <value>Hakua vastaavia kohteita ei ole</value>
   </data>
-  <data name="US" xml:space="preserve">
-    <value>US</value>
-  </data>
-  <data name="EU" xml:space="preserve">
-    <value>EU</value>
-  </data>
-  <data name="SelfHosted" xml:space="preserve">
-    <value>Itse ylläpidetty</value>
-  </data>
-  <data name="DataRegion" xml:space="preserve">
-    <value>Tietoalue</value>
-  </data>
-  <data name="Region" xml:space="preserve">
-    <value>Alue</value>
-  </data>
   <data name="UpdateWeakMasterPasswordWarning" xml:space="preserve">
     <value>Pääsalasanasi ei täytä yhden tai useamman organisaatiokäytännön vaatimuksia ja holvin käyttämiseksi sinun on vaihdettava se nyt. Tämä uloskirjaa kaikki nykyiset istunnot pakottaen uudelleenkirjautumisen. Muiden laitteiden aktiiviset istunnot saattavat toimia vielä tunnin ajan.</value>
   </data>
   <data name="CurrentMasterPassword" xml:space="preserve">
     <value>Nykyinen pääsalasana</value>
   </data>
-  <data name="MasterPasswordRePromptHelp" xml:space="preserve">
-    <value>Pääsalasanan uudelleenkyselyn ohje</value>
-  </data>
-  <data name="UnlockingMayFailDueToInsufficientMemoryDecreaseYourKDFMemorySettingsToResolve" xml:space="preserve">
-    <value>Lukituksen avaus voi epäonnistua riittämättömän keskusmuistin vuoksi. Tämän välttämiseksi voit madaltaa KDF-muistiasetuksiasi.</value>
-  </data>
 </root>

src/App/Resources/AppResources.fil.resx

@@ -2496,8 +2496,8 @@ Gusto mo bang pumunta sa account na ito?</value>
   <data name="GetMasterPasswordwordHint" xml:space="preserve">
     <value>Kunin ang palatandaan ng master password</value>
   </data>
-  <data name="LoggingInAsXOnY" xml:space="preserve">
-    <value>Logging in as {0} on {1}</value>
+  <data name="LoggingInAsX" xml:space="preserve">
+    <value>Nagla-log in bilang si {0}</value>
   </data>
   <data name="NotYou" xml:space="preserve">
     <value>Hindi ikaw?</value>
@@ -2610,31 +2610,10 @@ Gusto mo bang pumunta sa account na ito?</value>
   <data name="ThereAreNoItemsThatMatchTheSearch" xml:space="preserve">
     <value>Walang mga item na tumutugma sa paghahanap</value>
   </data>
-  <data name="US" xml:space="preserve">
-    <value>US</value>
-  </data>
-  <data name="EU" xml:space="preserve">
-    <value>EU</value>
-  </data>
-  <data name="SelfHosted" xml:space="preserve">
-    <value>Self-hosted</value>
-  </data>
-  <data name="DataRegion" xml:space="preserve">
-    <value>Data region</value>
-  </data>
-  <data name="Region" xml:space="preserve">
-    <value>Region</value>
-  </data>
   <data name="UpdateWeakMasterPasswordWarning" xml:space="preserve">
     <value>Your master password does not meet one or more of your organization policies. 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="CurrentMasterPassword" xml:space="preserve">
     <value>Current master password</value>
   </data>
-  <data name="MasterPasswordRePromptHelp" xml:space="preserve">
-    <value>Master password re-prompt help</value>
-  </data>
-  <data name="UnlockingMayFailDueToInsufficientMemoryDecreaseYourKDFMemorySettingsToResolve" xml:space="preserve">
-    <value>Unlocking may fail due to insufficient memory. Decrease your KDF memory settings to resolve</value>
-  </data>
 </root>

src/App/Resources/AppResources.fr.resx

@@ -2496,8 +2496,8 @@ Voulez-vous basculer vers ce compte ?</value>
   <data name="GetMasterPasswordwordHint" xml:space="preserve">
     <value>Obtenir l'indice du mot de passe principal</value>
   </data>
-  <data name="LoggingInAsXOnY" xml:space="preserve">
-    <value>Connexion en tant que {0} sur {1}</value>
+  <data name="LoggingInAsX" xml:space="preserve">
+    <value>Connecté en tant que {0}</value>
   </data>
   <data name="NotYou" xml:space="preserve">
     <value>Ce n'est pas vous ?</value>
@@ -2610,31 +2610,10 @@ Voulez-vous basculer vers ce compte ?</value>
   <data name="ThereAreNoItemsThatMatchTheSearch" xml:space="preserve">
     <value>Il n'y a pas d'éléments qui correspondent à la recherche</value>
   </data>
-  <data name="US" xml:space="preserve">
-    <value>US</value>
-  </data>
-  <data name="EU" xml:space="preserve">
-    <value>EU</value>
-  </data>
-  <data name="SelfHosted" xml:space="preserve">
-    <value>Auto-hébergé</value>
-  </data>
-  <data name="DataRegion" xml:space="preserve">
-    <value>Région des données</value>
-  </data>
-  <data name="Region" xml:space="preserve">
-    <value>Région</value>
-  </data>
   <data name="UpdateWeakMasterPasswordWarning" xml:space="preserve">
     <value>Votre mot de passe principal ne répond pas aux exigences de politique de sécurité de cette organisation. Pour accéder au coffre, vous devez mettre à jour votre mot de passe principal dès maintenant. En poursuivant, vous serez déconnecté de votre session actuelle et vous devrez vous reconnecter. Les sessions actives sur d'autres appareils peuver rester actives pendant encore une heure.</value>
   </data>
   <data name="CurrentMasterPassword" xml:space="preserve">
     <value>Mot de passe principal actuel</value>
   </data>
-  <data name="MasterPasswordRePromptHelp" xml:space="preserve">
-    <value>Aide sur la ressaisie du mot de passe principal</value>
-  </data>
-  <data name="UnlockingMayFailDueToInsufficientMemoryDecreaseYourKDFMemorySettingsToResolve" xml:space="preserve">
-    <value>Le déverrouillage peut échouer en raison d'une mémoire insuffisante. Diminuez les paramètres de mémoire KDF pour y remédier</value>
-  </data>
 </root>

src/App/Resources/AppResources.gl.resx

@@ -2496,8 +2496,8 @@ Do you want to switch to this account?</value>
   <data name="GetMasterPasswordwordHint" xml:space="preserve">
     <value>Get master password hint</value>
   </data>
-  <data name="LoggingInAsXOnY" xml:space="preserve">
-    <value>Logging in as {0} on {1}</value>
+  <data name="LoggingInAsX" xml:space="preserve">
+    <value>Logging in as {0}</value>
   </data>
   <data name="NotYou" xml:space="preserve">
     <value>Not you?</value>
@@ -2610,31 +2610,10 @@ Do you want to switch to this account?</value>
   <data name="ThereAreNoItemsThatMatchTheSearch" xml:space="preserve">
     <value>There are no items that match the search</value>
   </data>
-  <data name="US" xml:space="preserve">
-    <value>US</value>
-  </data>
-  <data name="EU" xml:space="preserve">
-    <value>EU</value>
-  </data>
-  <data name="SelfHosted" xml:space="preserve">
-    <value>Self-hosted</value>
-  </data>
-  <data name="DataRegion" xml:space="preserve">
-    <value>Data region</value>
-  </data>
-  <data name="Region" xml:space="preserve">
-    <value>Region</value>
-  </data>
   <data name="UpdateWeakMasterPasswordWarning" xml:space="preserve">
     <value>Your master password does not meet one or more of your organization policies. 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="CurrentMasterPassword" xml:space="preserve">
     <value>Current master password</value>
   </data>
-  <data name="MasterPasswordRePromptHelp" xml:space="preserve">
-    <value>Master password re-prompt help</value>
-  </data>
-  <data name="UnlockingMayFailDueToInsufficientMemoryDecreaseYourKDFMemorySettingsToResolve" xml:space="preserve">
-    <value>Unlocking may fail due to insufficient memory. Decrease your KDF memory settings to resolve</value>
-  </data>
 </root>

src/App/Resources/AppResources.he.resx

@@ -2498,8 +2498,8 @@ Do you want to switch to this account?</value>
   <data name="GetMasterPasswordwordHint" xml:space="preserve">
     <value>Get master password hint</value>
   </data>
-  <data name="LoggingInAsXOnY" xml:space="preserve">
-    <value>Logging in as {0} on {1}</value>
+  <data name="LoggingInAsX" xml:space="preserve">
+    <value>Logging in as {0}</value>
   </data>
   <data name="NotYou" xml:space="preserve">
     <value>Not you?</value>
@@ -2612,31 +2612,10 @@ Do you want to switch to this account?</value>
   <data name="ThereAreNoItemsThatMatchTheSearch" xml:space="preserve">
     <value>There are no items that match the search</value>
   </data>
-  <data name="US" xml:space="preserve">
-    <value>US</value>
-  </data>
-  <data name="EU" xml:space="preserve">
-    <value>EU</value>
-  </data>
-  <data name="SelfHosted" xml:space="preserve">
-    <value>Self-hosted</value>
-  </data>
-  <data name="DataRegion" xml:space="preserve">
-    <value>Data region</value>
-  </data>
-  <data name="Region" xml:space="preserve">
-    <value>Region</value>
-  </data>
   <data name="UpdateWeakMasterPasswordWarning" xml:space="preserve">
     <value>Your master password does not meet one or more of your organization policies. 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="CurrentMasterPassword" xml:space="preserve">
     <value>Current master password</value>
   </data>
-  <data name="MasterPasswordRePromptHelp" xml:space="preserve">
-    <value>Master password re-prompt help</value>
-  </data>
-  <data name="UnlockingMayFailDueToInsufficientMemoryDecreaseYourKDFMemorySettingsToResolve" xml:space="preserve">
-    <value>Unlocking may fail due to insufficient memory. Decrease your KDF memory settings to resolve</value>
-  </data>
 </root>

src/App/Resources/AppResources.hi.resx

@@ -168,7 +168,7 @@
     <comment>Delete an entity (verb).</comment>
   </data>
   <data name="Deleting" xml:space="preserve">
-    <value>मिटा रहे है...</value>
+    <value>मिटाया जा रहा हैं...</value>
     <comment>Message shown when interacting with the server</comment>
   </data>
   <data name="DoYouReallyWantToDelete" xml:space="preserve">
@@ -261,19 +261,19 @@
     <comment>The button text that allows user to launch the website to their web browser.</comment>
   </data>
   <data name="LogIn" xml:space="preserve">
-    <value>लॉगइन करें</value>
+    <value>लॉग इन करें</value>
     <comment>The login button text (verb).</comment>
   </data>
   <data name="LogInNoun" xml:space="preserve">
-    <value>लॉगइन करें</value>
+    <value>लॉग इन</value>
     <comment>Title for login page. (noun)</comment>
   </data>
   <data name="LogOut" xml:space="preserve">
-    <value>लॉगआउट करें</value>
+    <value>लॉग आउट करें</value>
     <comment>The log out button text (verb).</comment>
   </data>
   <data name="LogoutConfirmation" xml:space="preserve">
-    <value>पक्का लॉगआउट करें?</value>
+    <value>पक्का लॉग आउट करें?</value>
   </data>
   <data name="RemoveAccount" xml:space="preserve">
     <value>खाता हटाएं</value>
@@ -285,14 +285,14 @@
     <value>खाता पहले से जोड़ा गया</value>
   </data>
   <data name="SwitchToAlreadyAddedAccountConfirmation" xml:space="preserve">
-    <value>खाता अभी इस्तेमाल करें?</value>
+    <value>अभी खाता इस्तेमाल करें?</value>
   </data>
   <data name="MasterPassword" xml:space="preserve">
     <value>मुख्य पासवर्ड</value>
     <comment>Label for a master password.</comment>
   </data>
   <data name="More" xml:space="preserve">
-    <value>ज़्यादा</value>
+    <value>और</value>
     <comment>Text to define that there are more options things to see.</comment>
   </data>
   <data name="MyVault" xml:space="preserve">
@@ -330,7 +330,7 @@
     <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">
@@ -394,7 +394,7 @@
     <value>देखें</value>
   </data>
   <data name="VisitOurWebsite" xml:space="preserve">
-    <value>हमारे वेबसाइट पर जाएं</value>
+    <value>हमारी वेबसाइट पर जाएं</value>
   </data>
   <data name="VisitOurWebsiteDescription" xml:space="preserve">
     <value>मदद लेने, खबर लेने, हमें ईमेल करने, और/या बिटवार्डन के इस्तेमाल के बारे में ज़्यादा जानने के लिए हमारी वेबसाइट पर जाएं।</value>
@@ -410,7 +410,7 @@
     <value>खाता</value>
   </data>
   <data name="AccountCreated" xml:space="preserve">
-    <value>आपका नया खाता बनाया गया! अब लॉगइन कर सकते हैं।</value>
+    <value>आपका नया खाता बनाया गया! अब आप लॉग इन कर सकते हैं।</value>
   </data>
   <data name="AddAnItem" xml:space="preserve">
     <value>चीज़ जोड़ें</value>
@@ -419,40 +419,40 @@
     <value>ऐप एक्सटेंशन</value>
   </data>
   <data name="AutofillAccessibilityDescription" xml:space="preserve">
-    <value>दूसरे ऐप और वेबसाइट पर अपनेआप लॉगइन भरने के लिए बिटवार्डन सुलभता सेवा इस्तेमाल करें।</value>
+    <value>Use the bitwarden accessibility service to auto-fill your logins across apps and the web.</value>
   </data>
   <data name="AutofillService" xml:space="preserve">
-    <value>अपनेआप-भर सेवा</value>
+    <value>भरण सेवा</value>
   </data>
   <data name="AvoidAmbiguousCharacters" xml:space="preserve">
     <value>अस्पष्ट अक्षर से बचें</value>
   </data>
   <data name="BitwardenAppExtension" xml:space="preserve">
-    <value>बिटवार्डन ऐप एक्सटेंशन</value>
+    <value>bitwarden App Extension</value>
   </data>
   <data name="BitwardenAppExtensionAlert2" xml:space="preserve">
-    <value>बिटवार्डन ऐप एक्सटेंशन तिजोरी में नए चीज़ डालने का सबसे आसात तरीका है। बिटवार्डन ऐप एक्सटेंशन के इस्तेमाल से जुड़ी जानकारी लेने के लिए "सेटिंग" में जाएं।</value>
+    <value>अपने तिजोरी में नए आइटम डालने का सबसे सरल तरीका है Bitwarden ऐप विस्तारण। Bitwarden ऐप विस्तरण के उपयोग संबंधी जानकारी पाने के लिए "सेटिंग्स" में जाएं।</value>
   </data>
   <data name="BitwardenAppExtensionDescription" xml:space="preserve">
-    <value>सफारी और दूसरे ऐप में अपने लॉगइन अपनेआप भरने के लिए बिटवार्डन इस्तेमाल करें।</value>
+    <value>Use bitwarden in Safari and other apps to auto-fill your logins.</value>
   </data>
   <data name="BitwardenAutofillService" xml:space="preserve">
-    <value>बिटवार्डन अपनेआप-भर सेवा</value>
+    <value>bitwarden Auto-fill Service</value>
   </data>
   <data name="BitwardenAutofillAccessibilityServiceDescription" xml:space="preserve">
-    <value>अपने लॉगइन अपनेआप भरने के लिए बिटवार्डन सुलभता सेवा इस्तेमाल करें।</value>
+    <value>Use the bitwarden accessibility service to auto-fill your logins.</value>
   </data>
   <data name="ChangeEmail" xml:space="preserve">
     <value>ईमेल बदलें</value>
   </data>
   <data name="ChangeEmailConfirmation" xml:space="preserve">
-    <value>Bitwarden.com वेब तिजोरी पर ईमेल पता बदला जा सकता है। इस वेबसाइट पर अभी जाएं?</value>
+    <value>आप bitwarden.com वेब तिजोरी पर आपका ईमेल पता परिवर्तित कर सकते हैं। आप अब वेबसाइट पर जाएँ करने के लिए चाहते हैं?</value>
   </data>
   <data name="ChangeMasterPassword" xml:space="preserve">
-    <value>मुख्य पासवर्ड बदलें</value>
+    <value>मास्टर पासवर्ड बदलें</value>
   </data>
   <data name="ChangePasswordConfirmation" xml:space="preserve">
-    <value>मुख्य पासवर्ड बिटवार्डन वेब तिजोरी पर जाकर बदला जा सकता है। वेबसाइट पर अभी जाएं?</value>
+    <value>मास्टर पासवर्ड Bitwarden के वेब-तिजोरी पर जाकर बदला जा सकता है। क्या आप वहां जाना चाहते हैं?</value>
   </data>
   <data name="Close" xml:space="preserve">
     <value>बंद करें</value>
@@ -461,75 +461,75 @@
     <value>जारी रखें</value>
   </data>
   <data name="CreateAccount" xml:space="preserve">
-    <value>खाता बनाएं</value>
+    <value>खाता बनाएँ</value>
   </data>
   <data name="CreatingAccount" xml:space="preserve">
-    <value>खाता बना रहे है...</value>
+    <value>खाता बना रहें है...</value>
     <comment>Message shown when interacting with the server</comment>
   </data>
   <data name="EditItem" xml:space="preserve">
-    <value>चीज़ बदलाव करें</value>
+    <value>आइटम संपादित करें</value>
   </data>
   <data name="EnableAutomaticSyncing" xml:space="preserve">
-    <value>अपनेआप-सिंक की अनुमति दें</value>
+    <value>स्वतः सिंक चालू करें।</value>
   </data>
   <data name="EnterEmailForHint" xml:space="preserve">
-    <value>मुख्य पासवर्ड इशारा लेने के लिए अपने खाते का ईमेल पता डालें।</value>
+    <value>अपने मास्टर पासवर्ड संकेत प्राप्त करने के लिए अपने खाते का ईमेल पता दर्ज करें।</value>
   </data>
   <data name="ExntesionReenable" xml:space="preserve">
-    <value>ऐप एक्सटेंशन वापस चालू करें</value>
+    <value>ऐप विस्तारण को फिर चालू करें</value>
   </data>
   <data name="ExtensionAlmostDone" xml:space="preserve">
-    <value>करीब-करीब खत्म!</value>
+    <value>लगभग सम्पूर्ण!</value>
   </data>
   <data name="ExtensionEnable" xml:space="preserve">
-    <value>ऐप एक्सटेंशन चालू करें</value>
+    <value>ऐप विस्तारण को चालू करें</value>
   </data>
   <data name="ExtensionInSafari" xml:space="preserve">
-    <value>सफारी में, शेयर आइकन से बिटवार्डन का पता लगाएं (इशारा: मेन्यू के सबसे निचले पट्टी पर दाएं तरफ जाएं)।</value>
+    <value>In Safari, find bitwarden using the share icon (hint: scroll to the right on the bottom row of the menu).</value>
     <comment>Safari is the name of apple's web browser</comment>
   </data>
   <data name="ExtensionInstantAccess" xml:space="preserve">
-    <value>अपने पासवर्ड को तुरंत एक्सेस करें!</value>
+    <value>अपने पासवर्ड को तुरंत प्राप्त करें</value>
   </data>
   <data name="ExtensionReady" xml:space="preserve">
-    <value>आप लॉगइन करने के लिए तैयार हैं!</value>
+    <value>आप लॉग इन करने के लिए तैयार हैं!</value>
   </data>
   <data name="ExtensionSetup" xml:space="preserve">
-    <value>अब सफारी, क्रोम, और दूसरे सपोर्ट किए गए ऐप से लॉगइन आसानी से एक्सेस किए जा सकते है।</value>
+    <value>Your logins are now easily accessable from Safari, Chrome, and other supported apps.</value>
   </data>
   <data name="ExtensionSetup2" xml:space="preserve">
-    <value>सफारी और क्रोम में, शेयर आइकन से बिटवार्डन का पता लगाएं (इशारा: मेन्यू के सबसे निचले पट्टी पर दाएं तरफ जाएं)</value>
+    <value>In Safari and Chrome, find bitwarden using the share icon (hint: scroll to the right on the bottom row of the share menu).</value>
   </data>
   <data name="ExtensionTapIcon" xml:space="preserve">
-    <value>एक्सटेंशन खोलने के लिए मेन्यू में बिटवार्डन आइकन पर दबाएं।</value>
+    <value>Tap the bitwarden icon in the menu to launch the extension.</value>
   </data>
   <data name="ExtensionTurnOn" xml:space="preserve">
-    <value>सफारी और दूसरे ऐप में बिटवार्डन चालू करने के लिए, मेन्यू के सबसे निचले पट्टी में "ज़्यादा" आइकन दबाएं।</value>
+    <value>To turn on bitwarden in Safari and other apps, tap the "more" icon on the bottom row of the menu.</value>
   </data>
   <data name="Favorite" xml:space="preserve">
-    <value>मनपसंद</value>
+    <value>पसंदीदा</value>
   </data>
   <data name="Fingerprint" xml:space="preserve">
     <value>फिंगरप्रिंट</value>
   </data>
   <data name="GeneratePassword" xml:space="preserve">
-    <value>पासवर्ड बनाएं</value>
+    <value>पासवर्ड उत्पन्न करें</value>
   </data>
   <data name="GetPasswordHint" xml:space="preserve">
-    <value>मुख्य पासवर्ड इशारा लें</value>
+    <value>मास्टर पासवर्ड संकेत प्राप्त करें</value>
   </data>
   <data name="ImportItems" xml:space="preserve">
-    <value>चीज़ आयात करें</value>
+    <value>आइटम्स आयात करें</value>
   </data>
   <data name="ImportItemsConfirmation" xml:space="preserve">
-    <value>Bitwarden.com वेब तिजोरी से थोक में चीज़ आयात किए जा सकते हैं। वेबसाइट पर अभी जाएं?</value>
+    <value>Bitwarden के वेब-तिजोरी से एक साथ कई आइटम आयातित किए जा सकते हैं। क्या आप वहां जाना चाहते हैं?</value>
   </data>
   <data name="ImportItemsDescription" xml:space="preserve">
-    <value>दूसरे पासवर्ड मैनेजमेंट ऐप से थोक में चीज़ जल्दी आयात करें।</value>
+    <value>दूसरे पासवर्ड प्रबंधन ऐप से एक साथ कई आइटम जल्दी आयातित करें।</value>
   </data>
   <data name="LastSync" xml:space="preserve">
-    <value>आखिरी सिंक:</value>
+    <value>आखिरी बार सिंक हुआ:</value>
   </data>
   <data name="Length" xml:space="preserve">
     <value>लंबाई</value>
@@ -538,7 +538,7 @@
     <value>लॉक</value>
   </data>
   <data name="FifteenMinutes" xml:space="preserve">
-    <value>15 मिनट</value>
+    <value>15 मिनिट</value>
   </data>
   <data name="OneHour" xml:space="preserve">
     <value>1 घंटा</value>
@@ -550,86 +550,87 @@
     <value>4 घंटे</value>
   </data>
   <data name="Immediately" xml:space="preserve">
-    <value>तुरंत</value>
+    <value>तत्‍काल
+</value>
   </data>
   <data name="VaultTimeout" xml:space="preserve">
-    <value>तिजोरी वक्त खत्म</value>
+    <value>तिजोरी का समय समाप्त</value>
   </data>
   <data name="VaultTimeoutAction" xml:space="preserve">
-    <value>तिजोरी वक्त खत्म</value>
+    <value>तिजोरी का समय समाप्त</value>
   </data>
   <data name="VaultTimeoutLogOutConfirmation" xml:space="preserve">
-    <value>लॉगआउट करने के बाद तिजोरी में जाना मुमकिन नहीं होगा और वक्त खत्म होने के बाद ऑनलाइन सत्यापन की ज़रूरत होगी। इस सेटिंग को पक्का इस्तेमाल करें?</value>
+    <value>लॉग आउट करने से तिजोरी में प्रवेश संभव नहीं होगा और समय समाप्त होने के बाद ऑनलाइन प्रमाणीकरण की आश्यकता होगी। आप इस सेटिंग्स को प्रयोग करने के लिए विश्वस्त हैं?</value>
   </data>
   <data name="LoggingIn" xml:space="preserve">
-    <value>लॉगइन कर रहे है...</value>
+    <value>लॉगिन कर रहा है...</value>
     <comment>Message shown when interacting with the server</comment>
   </data>
   <data name="LoginOrCreateNewAccount" xml:space="preserve">
-    <value>अपनी महफूज़ तिजोरी एक्सेस करने के लिए नया खाता बनाएं या लॉगइन करें।</value>
+    <value>सुरक्षित तिजोरी में प्रवेश करने के लिए नया खाता बनाएं या लॉग इन करें।</value>
   </data>
   <data name="Manage" xml:space="preserve">
-    <value>मैनेज करें</value>
+    <value>प्रबंधन</value>
   </data>
   <data name="MasterPasswordConfirmationValMessage" xml:space="preserve">
     <value>पासवर्ड गलत है।</value>
   </data>
   <data name="MasterPasswordDescription" xml:space="preserve">
-    <value>मुख्य पासवर्ड वो पासवर्ड है जो तिजोरी एक्सेस करने के लिए इस्तेमाल होता है। मुख्य पासवर्ड ना भूलना बहुत ज़रूरी है। भूलने के बाद पासवर्ड वापस पाना मुमकिन नहीं होगा।</value>
+    <value>मास्टर पासवर्ड वह पासवर्ड है जो तिजोरी में प्रवेश के लिए प्रयोग होता है। आप मास्टर पासवर्ड ना भूले यह अतिआवश्यक है। भूलने की अवस्था में पासवर्ड को दोबारा पाना संभव नहीं होगा।</value>
   </data>
   <data name="MasterPasswordHint" xml:space="preserve">
-    <value>मुख्य पासवर्ड इशारा (ज़रूरी नहीं)</value>
+    <value>मास्टर पासवर्ड संकेत (वैकल्पिक)</value>
   </data>
   <data name="MasterPasswordHintDescription" xml:space="preserve">
-    <value>मुख्य पासवर्ड इशारा आपको पासवर्ड भूल जाने के स्थिति में उसको याद करने में मदद करता है।</value>
+    <value>मास्टर पासवर्ड संकेत आपको भूल जाने की अवस्था में पासवर्ड को याद करने में सहायता करता है।</value>
   </data>
   <data name="MasterPasswordLengthValMessageX" xml:space="preserve">
-    <value>मुख्य पासवर्ड कम-से-कम {0} अक्षर लंबा होना चाहिए।</value>
+    <value>Master password must be at least {0} characters long.</value>
   </data>
   <data name="MinNumbers" xml:space="preserve">
-    <value>कम-से-कम अंक</value>
+    <value>कम से कम अंक</value>
     <comment>Minimum numeric characters for password generator settings</comment>
   </data>
   <data name="MinSpecial" xml:space="preserve">
-    <value>कम-से-कम खास अक्षर</value>
+    <value>कम से कम विशेष अक्षर</value>
     <comment>Minimum special characters for password generator settings</comment>
   </data>
   <data name="MoreSettings" xml:space="preserve">
-    <value>ज़्यादा सेटिंग</value>
+    <value>अधिक सेटिंग्‍स</value>
   </data>
   <data name="MustLogInMainApp" xml:space="preserve">
-    <value>एक्सटेशन इस्तेमाल करने से पहले मुख्य बिटवार्डन ऐप में लॉगइन करना पड़ेगा।</value>
+    <value>You must log into the main bitwarden app before you can use the extension.</value>
   </data>
   <data name="Never" xml:space="preserve">
     <value>कभी नहीं</value>
   </data>
   <data name="NewItemCreated" xml:space="preserve">
-    <value>नया चीज़ बनाया गया</value>
+    <value>नया आइटम बनाया गया</value>
   </data>
   <data name="NoFavorites" xml:space="preserve">
-    <value>तिजोरी में कोई मनपसंद चीज़ नहीं है।</value>
+    <value>तिजोरी में कोई अभिमत आइटम नहीं है।</value>
   </data>
   <data name="NoItems" xml:space="preserve">
-    <value>तिजोरी में कोई चीज़ नहीं है।</value>
+    <value>तिजोरी में कोई आइटम नहीं है।</value>
   </data>
   <data name="NoItemsTap" xml:space="preserve">
-    <value>इस वेबसाइट/ऐप के लिए तिजोरी में कोई चीज़ नहीं है। चीज़ जोड़ने के लिए दबाएं।</value>
+    <value>There are no items in your vault for this website. Tap to add one.</value>
   </data>
   <data name="NoUsernamePasswordConfigured" xml:space="preserve">
-    <value>इस लॉगइन में कोई यूजरनाम या पासवर्ड नहीं है।</value>
+    <value>इस आइटम में कोई यूजरनेम या पासवर्ड नहीं पड़ा है।</value>
   </data>
   <data name="OkGotIt" xml:space="preserve">
     <value>ठीक है, समझ गए!</value>
     <comment>Confirmation, like "Ok, I understand it"</comment>
   </data>
   <data name="OptionDefaults" xml:space="preserve">
-    <value>विकल्प डिफॉल्ट मुख्य बिटवार्डन ऐप के पासवर्ड जनरेटर औज़ार से सेट होता है।</value>
+    <value>Option defaults are set from the main bitwarden app's password generator tool.</value>
   </data>
   <data name="Options" xml:space="preserve">
     <value>विकल्प</value>
   </data>
   <data name="Other" xml:space="preserve">
-    <value>दूसरे</value>
+    <value>अन्य</value>
   </data>
   <data name="PasswordGenerated" xml:space="preserve">
     <value>पासवर्ड बनाया गया</value>
@@ -638,13 +639,13 @@
     <value>पासवर्ड जनरेटर</value>
   </data>
   <data name="PasswordHint" xml:space="preserve">
-    <value>पासवर्ड इशारा</value>
+    <value>पासवर्ड संकेत</value>
   </data>
   <data name="PasswordHintAlert" xml:space="preserve">
-    <value>हमने आपको मुख्य पासवर्ड इशारा एक ईमेल के साथ भेजा है।</value>
+    <value>हमने आपको मास्टर पासवर्ड संकेत के साथ एक ईमेल भेजा है।</value>
   </data>
   <data name="PasswordOverrideAlert" xml:space="preserve">
-    <value>चालू पासवर्ड पक्का ओवरराइट करें?</value>
+    <value>आप पुराने पासवर्ड के ऊपर दूसरा पासवर्ड लिखने के लिए आश्वस्त हैं?</value>
   </data>
   <data name="PushNotificationAlert" xml:space="preserve">
     <value>bitwarden keeps your vault automatically synced by using push notifications. For the best possible experience, please select "Ok" on the following prompt when asked to enable push notifications.</value>
@@ -808,7 +809,7 @@
     <value>You are searching for an auto-fill login for "{0}".</value>
   </data>
   <data name="LearnOrg" xml:space="preserve">
-    <value>संगठन के बारे में जानें</value>
+    <value>Learn about organizations</value>
   </data>
   <data name="CannotOpenApp" xml:space="preserve">
     <value>"{0}" ऐप नहीं खोल सकता।</value>
@@ -849,7 +850,7 @@
     <value>दो-चरण लॉगिन विकल्प</value>
   </data>
   <data name="UseAnotherTwoStepMethod" xml:space="preserve">
-    <value>कोई दूसरा दो-कदम लॉगइन तरीका इस्तेमाल करें</value>
+    <value>Use another two-step login method</value>
   </data>
   <data name="VerificationEmailNotSent" xml:space="preserve">
     <value>Could not send verification email. Try again.</value>
@@ -1210,7 +1211,7 @@ Scanning will happen automatically.</value>
     <value>छुपा हुआ</value>
   </data>
   <data name="FieldTypeLinked" xml:space="preserve">
-    <value>जुड़ा हुआ</value>
+    <value>Linked</value>
   </data>
   <data name="FieldTypeText" xml:space="preserve">
     <value>वाक्य</value>
@@ -1285,7 +1286,7 @@ Scanning will happen automatically.</value>
     <comment>ex. Date this password was updated</comment>
   </data>
   <data name="DateUpdated" xml:space="preserve">
-    <value>अपडेट किया गया</value>
+    <value>Updated</value>
     <comment>ex. Date this item was updated</comment>
   </data>
   <data name="AutofillActivated" xml:space="preserve">
@@ -1575,7 +1576,7 @@ Scanning will happen automatically.</value>
     <comment>The color black</comment>
   </data>
   <data name="Nord" xml:space="preserve">
-    <value>नॉर्ड</value>
+    <value>Nord</value>
     <comment>'Nord' is the name of a specific color scheme. It should not be translated.</comment>
   </data>
   <data name="SolarizedDark" xml:space="preserve">
@@ -1871,7 +1872,7 @@ Scanning will happen automatically.</value>
     <value>An organization policy is affecting your ownership options.</value>
   </data>
   <data name="Send" xml:space="preserve">
-    <value>सेंड</value>
+    <value>Send</value>
     <comment>'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated.</comment>
   </data>
   <data name="AllSends" xml:space="preserve">
@@ -1879,7 +1880,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="Sends" xml:space="preserve">
-    <value>सेंड्स</value>
+    <value>Sends</value>
     <comment>'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated.</comment>
   </data>
   <data name="NameInfo" xml:space="preserve">
@@ -1887,10 +1888,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="Text" xml:space="preserve">
-    <value>टेक्सट</value>
+    <value>Text</value>
   </data>
   <data name="TypeText" xml:space="preserve">
-    <value>टेक्सट</value>
+    <value>Text</value>
   </data>
   <data name="TypeTextInfo" xml:space="preserve">
     <value>The text you want to send.</value>
@@ -1900,7 +1901,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="TypeFile" xml:space="preserve">
-    <value>फाइल</value>
+    <value>File</value>
   </data>
   <data name="TypeFileInfo" xml:space="preserve">
     <value>The file you want to send.</value>
@@ -2030,22 +2031,22 @@ 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="OneDay" xml:space="preserve">
-    <value>1 दिन</value>
+    <value>1 day</value>
   </data>
   <data name="TwoDays" xml:space="preserve">
-    <value>2 दिन</value>
+    <value>2 days</value>
   </data>
   <data name="ThreeDays" xml:space="preserve">
-    <value>3 दिन</value>
+    <value>3 days</value>
   </data>
   <data name="SevenDays" xml:space="preserve">
-    <value>7 दिन</value>
+    <value>7 days</value>
   </data>
   <data name="ThirtyDays" xml:space="preserve">
-    <value>30 दिन</value>
+    <value>30 days</value>
   </data>
   <data name="Custom" xml:space="preserve">
-    <value>कस्टम</value>
+    <value>Custom</value>
   </data>
   <data name="ShareOnSave" xml:space="preserve">
     <value>Share this Send upon save</value>
@@ -2162,7 +2163,7 @@ Scanning will happen automatically.</value>
     <value>Unlocked</value>
   </data>
   <data name="AccountLocked" xml:space="preserve">
-    <value>बंद</value>
+    <value>Locked</value>
   </data>
   <data name="AccountLoggedOut" xml:space="preserve">
     <value>Logged out</value>
@@ -2204,7 +2205,7 @@ Scanning will happen automatically.</value>
     <value>Send code</value>
   </data>
   <data name="Sending" xml:space="preserve">
-    <value>भेज रहे</value>
+    <value>Sending</value>
   </data>
   <data name="CopySendLinkOnSave" xml:space="preserve">
     <value>Copy Send link on save</value>
@@ -2267,7 +2268,7 @@ Scanning will happen automatically.</value>
     <value>All vaults</value>
   </data>
   <data name="Vaults" xml:space="preserve">
-    <value>तिजोरी</value>
+    <value>Vaults</value>
   </data>
   <data name="VaultFilterDescription" xml:space="preserve">
     <value>Vault: {0}</value>
@@ -2276,7 +2277,7 @@ Scanning will happen automatically.</value>
     <value>सब</value>
   </data>
   <data name="Totp" xml:space="preserve">
-    <value>टीओटीपी</value>
+    <value>TOTP</value>
   </data>
   <data name="VerificationCodes" xml:space="preserve">
     <value>Verification codes</value>
@@ -2340,10 +2341,10 @@ select Add TOTP to store the key safely</value>
     <value>IP address</value>
   </data>
   <data name="Time" xml:space="preserve">
-    <value>समय</value>
+    <value>Time</value>
   </data>
   <data name="Near" xml:space="preserve">
-    <value>पास</value>
+    <value>Near</value>
   </data>
   <data name="ConfirmLogIn" xml:space="preserve">
     <value>Confirm login</value>
@@ -2367,120 +2368,120 @@ select Add TOTP to store the key safely</value>
     <value>लॉगइन मांग माने</value>
   </data>
   <data name="UseThisDeviceToApproveLoginRequestsMadeFromOtherDevices" xml:space="preserve">
-    <value>इस डिवाइस का इस्तेमाल दूसरे डिवाइस के लॉगइन मांगे मानने के लिए करें।</value>
+    <value>Use this device to approve login requests made from other devices.</value>
   </data>
   <data name="AllowNotifications" xml:space="preserve">
     <value>सूचना देने दें</value>
   </data>
   <data name="ReceivePushNotificationsForNewLoginRequests" xml:space="preserve">
-    <value>नए लॉगइन मांग के लिए पुश सूचना लें</value>
+    <value>Receive push notifications for new login requests</value>
   </data>
   <data name="NoThanks" xml:space="preserve">
-    <value>ना, शुक्रिया</value>
+    <value>No thanks</value>
   </data>
   <data name="ConfimLogInAttempForX" xml:space="preserve">
-    <value>{0} के लिए लॉगइन कोशिश पक्का करें</value>
+    <value>Confirm login attempt for {0}</value>
   </data>
   <data name="AllNotifications" xml:space="preserve">
-    <value>सारे सूचनाएं</value>
+    <value>All notifications</value>
   </data>
   <data name="PasswordType" xml:space="preserve">
-    <value>पासवर्ड प्रकार</value>
+    <value>Password type</value>
   </data>
   <data name="WhatWouldYouLikeToGenerate" xml:space="preserve">
-    <value>क्या बनाएं?</value>
+    <value>What would you like to generate?</value>
   </data>
   <data name="UsernameType" xml:space="preserve">
-    <value>यूज़रनाम प्रकार</value>
+    <value>Username type</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>
+    <value>Random word</value>
   </data>
   <data name="EmailRequiredParenthesis" xml:space="preserve">
-    <value>ईमेल (ज़रूरी)</value>
+    <value>Email (required)</value>
   </data>
   <data name="DomainNameRequiredParenthesis" xml:space="preserve">
-    <value>डोमेन नाम (ज़रूरी)</value>
+    <value>Domain name (required)</value>
   </data>
   <data name="APIKeyRequiredParenthesis" xml:space="preserve">
-    <value>एपीआई चाबी (ज़रूरी)</value>
+    <value>API key (required)</value>
   </data>
   <data name="Service" xml:space="preserve">
-    <value>सेवा</value>
+    <value>Service</value>
   </data>
   <data name="AnonAddy" xml:space="preserve">
-    <value>एननऐडी</value>
+    <value>AnonAddy</value>
     <comment>"AnonAddy" is the product name and should not be translated.</comment>
   </data>
   <data name="FirefoxRelay" xml:space="preserve">
-    <value>फायरफॉक्स रीले</value>
+    <value>Firefox Relay</value>
     <comment>"Firefox Relay" is the product name and should not be translated.</comment>
   </data>
   <data name="SimpleLogin" xml:space="preserve">
-    <value>सिंपललॉगइन</value>
+    <value>SimpleLogin</value>
     <comment>"SimpleLogin" is the product name and should not be translated.</comment>
   </data>
   <data name="DuckDuckGo" xml:space="preserve">
-    <value>डकडकगो</value>
+    <value>DuckDuckGo</value>
     <comment>"DuckDuckGo" is the product name and should not be translated.</comment>
   </data>
   <data name="Fastmail" xml:space="preserve">
-    <value>फास्टमेल</value>
+    <value>Fastmail</value>
     <comment>"Fastmail" is the product name and should not be translated.</comment>
   </data>
   <data name="APIAccessToken" xml:space="preserve">
-    <value>एपीआई एक्सेस टोकन</value>
+    <value>API access token</value>
   </data>
   <data name="AreYouSureYouWantToOverwriteTheCurrentUsername" xml:space="preserve">
-    <value>चालू यूज़रनाम को पक्का ओवरराइट करें?</value>
+    <value>Are you sure you want to overwrite the current username?</value>
   </data>
   <data name="GenerateUsername" xml:space="preserve">
-    <value>यूज़रनाम बनाएं</value>
+    <value>Generate username</value>
   </data>
   <data name="EmailType" xml:space="preserve">
-    <value>ईमेल टाइप</value>
+    <value>Email Type</value>
   </data>
   <data name="WebsiteRequired" xml:space="preserve">
-    <value>वेबसाइट (ज़रूरी)</value>
+    <value>Website (required)</value>
   </data>
   <data name="UnknownXErrorMessage" xml:space="preserve">
-    <value>अनजान {0} गड़बड़ हुई।</value>
+    <value>Unknown {0} error occurred.</value>
   </data>
   <data name="PlusAddressedEmailDescription" xml:space="preserve">
-    <value>अपने ईमेल प्रदाता की उपपता ताकत इस्तेमाल करें</value>
+    <value>Use your email provider's subaddress capabilities</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>
+    <value>Random</value>
   </data>
   <data name="ConnectToWatch" xml:space="preserve">
-    <value>घड़ी से जुड़े</value>
+    <value>Connect to Watch</value>
   </data>
   <data name="AccessibilityServiceDisclosure" xml:space="preserve">
-    <value>सुलभता सेवा प्रकटीकरण</value>
+    <value>Accessibility Service Disclosure</value>
   </data>
   <data name="AccessibilityDisclosureText" xml:space="preserve">
     <value>Bitwarden uses the Accessibility Service to search for login fields in apps and websites, then establish the appropriate field IDs for entering a username &amp; password when a match for the app or site is found. We do not store any of the information presented to us by the service, nor do we make any attempt to control any on-screen elements beyond text entry of credentials.</value>
   </data>
   <data name="Accept" xml:space="preserve">
-    <value>मानें</value>
+    <value>Accept</value>
   </data>
   <data name="Decline" xml:space="preserve">
-    <value>नकारें</value>
+    <value>Decline</value>
   </data>
   <data name="LoginRequestHasAlreadyExpired" xml:space="preserve">
     <value>Login request has already expired.</value>
@@ -2496,8 +2497,8 @@ Do you want to switch to this account?</value>
   <data name="GetMasterPasswordwordHint" xml:space="preserve">
     <value>Get master password hint</value>
   </data>
-  <data name="LoggingInAsXOnY" xml:space="preserve">
-    <value>Logging in as {0} on {1}</value>
+  <data name="LoggingInAsX" xml:space="preserve">
+    <value>Logging in as {0}</value>
   </data>
   <data name="NotYou" xml:space="preserve">
     <value>Not you?</value>
@@ -2533,7 +2534,7 @@ Do you want to switch to this account?</value>
     <value>लंबित लॉगइन मांगे</value>
   </data>
   <data name="DeclineAllRequests" xml:space="preserve">
-    <value>सारे मांग नकारें</value>
+    <value>सारे मांग नकारे</value>
   </data>
   <data name="AreYouSureYouWantToDeclineAllPendingLogInRequests" xml:space="preserve">
     <value>सारे लंबित लॉगइन मांग पक्का नकारें?</value>
@@ -2563,7 +2564,7 @@ Do you want to switch to this account?</value>
     <value>ज़रूरी</value>
   </data>
   <data name="YourMasterPasswordCannotBeRecoveredIfYouForgetItXCharactersMinimum" xml:space="preserve">
-    <value>मुख्य पासवर्ड भूलने के बाद रिकवर नहीं कर सकते। {0} अक्षर कम-से-कम।</value>
+    <value>आप अपना मुख्य पासवर्ड भूलने के बाद वापस नहीं ले सकते। {0} अक्षर कम-से-कम।</value>
   </data>
   <data name="WeakMasterPassword" xml:space="preserve">
     <value>कमज़ोर मुख्य पासवर्ड</value>
@@ -2610,31 +2611,10 @@ Do you want to switch to this account?</value>
   <data name="ThereAreNoItemsThatMatchTheSearch" xml:space="preserve">
     <value>कोई भी चीज़ खोज शब्द से मेल नहीं खाता</value>
   </data>
-  <data name="US" xml:space="preserve">
-    <value>अमेरिकी संयुक्त राज्य</value>
-  </data>
-  <data name="EU" xml:space="preserve">
-    <value>यूरोपीय संघ</value>
-  </data>
-  <data name="SelfHosted" xml:space="preserve">
-    <value>खुद-होस्ट</value>
-  </data>
-  <data name="DataRegion" xml:space="preserve">
-    <value>डाटा इलाका</value>
-  </data>
-  <data name="Region" xml:space="preserve">
-    <value>इलाका</value>
-  </data>
   <data name="UpdateWeakMasterPasswordWarning" xml:space="preserve">
     <value>आपका मुख्य पासवर्ड आपके संगठन के एक या उससे ज़्यादा नीति को नहीं मानता। तिजोरी एक्सेस करने के लिए आपको अपना मुख्य पासवर्ड अभी बदलना होगा। ये करने से आप अपने चालू सत्र से लॉग आउट हो जाएंगे, जिसके वजह से आपको वापस लॉग इन करना पड़ेगा। दूसरे डिवाइसों पर चालू सत्र एक घंटे तक सक्रिय रह सकते हैं।</value>
   </data>
   <data name="CurrentMasterPassword" xml:space="preserve">
     <value>चालू मुख्य पासवर्ड</value>
   </data>
-  <data name="MasterPasswordRePromptHelp" xml:space="preserve">
-    <value>Master password re-prompt help</value>
-  </data>
-  <data name="UnlockingMayFailDueToInsufficientMemoryDecreaseYourKDFMemorySettingsToResolve" xml:space="preserve">
-    <value>Unlocking may fail due to insufficient memory. Decrease your KDF memory settings to resolve</value>
-  </data>
 </root>

src/App/Resources/AppResources.hr.resx

@@ -2493,8 +2493,8 @@
   <data name="GetMasterPasswordwordHint" xml:space="preserve">
     <value>Slanje podsjetnika glavne lozinke</value>
   </data>
-  <data name="LoggingInAsXOnY" xml:space="preserve">
-    <value>Logging in as {0} on {1}</value>
+  <data name="LoggingInAsX" xml:space="preserve">
+    <value>Prijava kao {0}</value>
   </data>
   <data name="NotYou" xml:space="preserve">
     <value>Nisi ti?</value>
@@ -2607,31 +2607,10 @@
   <data name="ThereAreNoItemsThatMatchTheSearch" xml:space="preserve">
     <value>Nema stavki koje odgovaraju pretrazi</value>
   </data>
-  <data name="US" xml:space="preserve">
-    <value>US</value>
-  </data>
-  <data name="EU" xml:space="preserve">
-    <value>EU</value>
-  </data>
-  <data name="SelfHosted" xml:space="preserve">
-    <value>Self-hosted</value>
-  </data>
-  <data name="DataRegion" xml:space="preserve">
-    <value>Data region</value>
-  </data>
-  <data name="Region" xml:space="preserve">
-    <value>Region</value>
-  </data>
   <data name="UpdateWeakMasterPasswordWarning" xml:space="preserve">
     <value>Your master password does not meet one or more of your organization policies. 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="CurrentMasterPassword" xml:space="preserve">
     <value>Current master password</value>
   </data>
-  <data name="MasterPasswordRePromptHelp" xml:space="preserve">
-    <value>Master password re-prompt help</value>
-  </data>
-  <data name="UnlockingMayFailDueToInsufficientMemoryDecreaseYourKDFMemorySettingsToResolve" xml:space="preserve">
-    <value>Unlocking may fail due to insufficient memory. Decrease your KDF memory settings to resolve</value>
-  </data>
 </root>

src/App/Resources/AppResources.hu.resx

@@ -2494,8 +2494,8 @@ Szeretnénk átváltani erre a fiókra?</value>
   <data name="GetMasterPasswordwordHint" xml:space="preserve">
     <value>Mesterjelszó emlékeztető kérése</value>
   </data>
-  <data name="LoggingInAsXOnY" xml:space="preserve">
-    <value>Bejelentkezve mint {0} :: {1}.</value>
+  <data name="LoggingInAsX" xml:space="preserve">
+    <value>Bejelentkezve mint {0}</value>
   </data>
   <data name="NotYou" xml:space="preserve">
     <value>Ez tévedés?</value>
@@ -2608,31 +2608,10 @@ Szeretnénk átváltani erre a fiókra?</value>
   <data name="ThereAreNoItemsThatMatchTheSearch" xml:space="preserve">
     <value>Nincsenek a keresésnek megfelelő elemek.</value>
   </data>
-  <data name="US" xml:space="preserve">
-    <value>US</value>
-  </data>
-  <data name="EU" xml:space="preserve">
-    <value>EU</value>
-  </data>
-  <data name="SelfHosted" xml:space="preserve">
-    <value>Saját kiszolgáló</value>
-  </data>
-  <data name="DataRegion" xml:space="preserve">
-    <value>Adatrégió</value>
-  </data>
-  <data name="Region" xml:space="preserve">
-    <value>Régió</value>
-  </data>
   <data name="UpdateWeakMasterPasswordWarning" xml:space="preserve">
     <value>A mesterjelszó nem felel meg egy vagy több szervezeti szabályzatnak. A széf eléréséhez frissíteni kell a meszerjelszót. A továbblépés kijelentkeztet az aktuális munkamenetből és újra be kell jelentkezni. A többi eszközön lévő aktív munkamenetek akár egy óráig is aktívak maradhatnak.</value>
   </data>
   <data name="CurrentMasterPassword" xml:space="preserve">
     <value>Jelenlegi mesterjelszó</value>
   </data>
-  <data name="MasterPasswordRePromptHelp" xml:space="preserve">
-    <value>Mesterjelszó újbóli bekérés súgó</value>
-  </data>
-  <data name="UnlockingMayFailDueToInsufficientMemoryDecreaseYourKDFMemorySettingsToResolve" xml:space="preserve">
-    <value>A feloldás meghiúsulhat, mert nincs elegendő memória. A megoldáshoz csökkentsül a KDF memóriabeállításait.</value>
-  </data>
 </root>

src/App/Resources/AppResources.id.resx

@@ -2495,8 +2495,8 @@ Do you want to switch to this account?</value>
   <data name="GetMasterPasswordwordHint" xml:space="preserve">
     <value>Get master password hint</value>
   </data>
-  <data name="LoggingInAsXOnY" xml:space="preserve">
-    <value>Logging in as {0} on {1}</value>
+  <data name="LoggingInAsX" xml:space="preserve">
+    <value>Logging in as {0}</value>
   </data>
   <data name="NotYou" xml:space="preserve">
     <value>Not you?</value>
@@ -2609,31 +2609,10 @@ Do you want to switch to this account?</value>
   <data name="ThereAreNoItemsThatMatchTheSearch" xml:space="preserve">
     <value>There are no items that match the search</value>
   </data>
-  <data name="US" xml:space="preserve">
-    <value>US</value>
-  </data>
-  <data name="EU" xml:space="preserve">
-    <value>EU</value>
-  </data>
-  <data name="SelfHosted" xml:space="preserve">
-    <value>Self-hosted</value>
-  </data>
-  <data name="DataRegion" xml:space="preserve">
-    <value>Data region</value>
-  </data>
-  <data name="Region" xml:space="preserve">
-    <value>Region</value>
-  </data>
   <data name="UpdateWeakMasterPasswordWarning" xml:space="preserve">
     <value>Your master password does not meet one or more of your organization policies. 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="CurrentMasterPassword" xml:space="preserve">
     <value>Current master password</value>
   </data>
-  <data name="MasterPasswordRePromptHelp" xml:space="preserve">
-    <value>Master password re-prompt help</value>
-  </data>
-  <data name="UnlockingMayFailDueToInsufficientMemoryDecreaseYourKDFMemorySettingsToResolve" xml:space="preserve">
-    <value>Unlocking may fail due to insufficient memory. Decrease your KDF memory settings to resolve</value>
-  </data>
 </root>

src/App/Resources/AppResources.it.resx

@@ -2495,8 +2495,8 @@ Vuoi passare a questo account?</value>
   <data name="GetMasterPasswordwordHint" xml:space="preserve">
     <value>Ottieni suggerimento per la password principale</value>
   </data>
-  <data name="LoggingInAsXOnY" xml:space="preserve">
-    <value>Accedendo come {0} su {1}</value>
+  <data name="LoggingInAsX" xml:space="preserve">
+    <value>Accedendo come</value>
   </data>
   <data name="NotYou" xml:space="preserve">
     <value>Non sei tu?</value>
@@ -2609,31 +2609,10 @@ Vuoi passare a questo account?</value>
   <data name="ThereAreNoItemsThatMatchTheSearch" xml:space="preserve">
     <value>Nessun elemento corrisponde alla ricerca</value>
   </data>
-  <data name="US" xml:space="preserve">
-    <value>US</value>
-  </data>
-  <data name="EU" xml:space="preserve">
-    <value>UE</value>
-  </data>
-  <data name="SelfHosted" xml:space="preserve">
-    <value>Self-hosted</value>
-  </data>
-  <data name="DataRegion" xml:space="preserve">
-    <value>Area dati</value>
-  </data>
-  <data name="Region" xml:space="preserve">
-    <value>Regione</value>
-  </data>
   <data name="UpdateWeakMasterPasswordWarning" xml:space="preserve">
     <value>La tua password principale non soddisfa uno o più politiche della tua organizzazione. Per accedere alla cassaforte, aggiornala ora. Procedere ti farà uscire dalla sessione corrente, richiedendoti di accedere di nuovo. Le sessioni attive su altri dispositivi potrebbero continuare a rimanere attive per un massimo di un'ora.</value>
   </data>
   <data name="CurrentMasterPassword" xml:space="preserve">
     <value>Password principale corrente</value>
   </data>
-  <data name="MasterPasswordRePromptHelp" xml:space="preserve">
-    <value>Auto per chiedere la password principale di nuovo</value>
-  </data>
-  <data name="UnlockingMayFailDueToInsufficientMemoryDecreaseYourKDFMemorySettingsToResolve" xml:space="preserve">
-    <value>Lo sblocco potrebbe fallire a causa di memoria insufficiente. Riduci le impostazioni della memoria KDF per risolvere il problema</value>
-  </data>
 </root>

src/App/Resources/AppResources.ja.resx

@@ -2495,8 +2495,8 @@
   <data name="GetMasterPasswordwordHint" xml:space="preserve">
     <value>マスターパスワードのヒントを取得する</value>
   </data>
-  <data name="LoggingInAsXOnY" xml:space="preserve">
-    <value>{1} で {0} としてログイン</value>
+  <data name="LoggingInAsX" xml:space="preserve">
+    <value>{0} としてログイン</value>
   </data>
   <data name="NotYou" xml:space="preserve">
     <value>あなたではないですか？</value>
@@ -2609,31 +2609,10 @@
   <data name="ThereAreNoItemsThatMatchTheSearch" xml:space="preserve">
     <value>検索に一致するアイテムはありません</value>
   </data>
-  <data name="US" xml:space="preserve">
-    <value>米国</value>
-  </data>
-  <data name="EU" xml:space="preserve">
-    <value>EU</value>
-  </data>
-  <data name="SelfHosted" xml:space="preserve">
-    <value>自己ホスト型</value>
-  </data>
-  <data name="DataRegion" xml:space="preserve">
-    <value>データのリージョン</value>
-  </data>
-  <data name="Region" xml:space="preserve">
-    <value>リージョン</value>
-  </data>
   <data name="UpdateWeakMasterPasswordWarning" xml:space="preserve">
     <value>マスターパスワードが組織のポリシーに適合していません。保管庫にアクセスするには、今すぐマスターパスワードを更新しなければなりません。続行すると現在のセッションからログアウトし、再度ログインする必要があります。 他のデバイス上のアクティブなセッションは、最大1時間アクティブであり続けることがあります。</value>
   </data>
   <data name="CurrentMasterPassword" xml:space="preserve">
     <value>現在のマスターパスワード</value>
   </data>
-  <data name="MasterPasswordRePromptHelp" xml:space="preserve">
-    <value>マスターパスワードの再プロンプトヘルプ</value>
-  </data>
-  <data name="UnlockingMayFailDueToInsufficientMemoryDecreaseYourKDFMemorySettingsToResolve" xml:space="preserve">
-    <value>メモリ不足のためロック解除に失敗することがあります。KDF のメモリ設定を減らして解決してください</value>
-  </data>
 </root>

src/App/Resources/AppResources.ka.resx

@@ -2496,8 +2496,8 @@ Do you want to switch to this account?</value>
   <data name="GetMasterPasswordwordHint" xml:space="preserve">
     <value>Get master password hint</value>
   </data>
-  <data name="LoggingInAsXOnY" xml:space="preserve">
-    <value>Logging in as {0} on {1}</value>
+  <data name="LoggingInAsX" xml:space="preserve">
+    <value>Logging in as {0}</value>
   </data>
   <data name="NotYou" xml:space="preserve">
     <value>Not you?</value>
@@ -2610,31 +2610,10 @@ Do you want to switch to this account?</value>
   <data name="ThereAreNoItemsThatMatchTheSearch" xml:space="preserve">
     <value>There are no items that match the search</value>
   </data>
-  <data name="US" xml:space="preserve">
-    <value>US</value>
-  </data>
-  <data name="EU" xml:space="preserve">
-    <value>EU</value>
-  </data>
-  <data name="SelfHosted" xml:space="preserve">
-    <value>Self-hosted</value>
-  </data>
-  <data name="DataRegion" xml:space="preserve">
-    <value>Data region</value>
-  </data>
-  <data name="Region" xml:space="preserve">
-    <value>Region</value>
-  </data>
   <data name="UpdateWeakMasterPasswordWarning" xml:space="preserve">
     <value>Your master password does not meet one or more of your organization policies. 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="CurrentMasterPassword" xml:space="preserve">
     <value>Current master password</value>
   </data>
-  <data name="MasterPasswordRePromptHelp" xml:space="preserve">
-    <value>Master password re-prompt help</value>
-  </data>
-  <data name="UnlockingMayFailDueToInsufficientMemoryDecreaseYourKDFMemorySettingsToResolve" xml:space="preserve">
-    <value>Unlocking may fail due to insufficient memory. Decrease your KDF memory settings to resolve</value>
-  </data>
 </root>

src/App/Resources/AppResources.kn.resx

@@ -2496,8 +2496,8 @@ Do you want to switch to this account?</value>
   <data name="GetMasterPasswordwordHint" xml:space="preserve">
     <value>Get master password hint</value>
   </data>
-  <data name="LoggingInAsXOnY" xml:space="preserve">
-    <value>Logging in as {0} on {1}</value>
+  <data name="LoggingInAsX" xml:space="preserve">
+    <value>Logging in as {0}</value>
   </data>
   <data name="NotYou" xml:space="preserve">
     <value>Not you?</value>
@@ -2610,31 +2610,10 @@ Do you want to switch to this account?</value>
   <data name="ThereAreNoItemsThatMatchTheSearch" xml:space="preserve">
     <value>There are no items that match the search</value>
   </data>
-  <data name="US" xml:space="preserve">
-    <value>US</value>
-  </data>
-  <data name="EU" xml:space="preserve">
-    <value>EU</value>
-  </data>
-  <data name="SelfHosted" xml:space="preserve">
-    <value>Self-hosted</value>
-  </data>
-  <data name="DataRegion" xml:space="preserve">
-    <value>Data region</value>
-  </data>
-  <data name="Region" xml:space="preserve">
-    <value>Region</value>
-  </data>
   <data name="UpdateWeakMasterPasswordWarning" xml:space="preserve">
     <value>Your master password does not meet one or more of your organization policies. 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="CurrentMasterPassword" xml:space="preserve">
     <value>Current master password</value>
   </data>
-  <data name="MasterPasswordRePromptHelp" xml:space="preserve">
-    <value>Master password re-prompt help</value>
-  </data>
-  <data name="UnlockingMayFailDueToInsufficientMemoryDecreaseYourKDFMemorySettingsToResolve" xml:space="preserve">
-    <value>Unlocking may fail due to insufficient memory. Decrease your KDF memory settings to resolve</value>
-  </data>
 </root>

src/App/Resources/AppResources.ko.resx

@@ -2495,8 +2495,8 @@ Do you want to switch to this account?</value>
   <data name="GetMasterPasswordwordHint" xml:space="preserve">
     <value>마스터 비밀번호 힌트 얻기</value>
   </data>
-  <data name="LoggingInAsXOnY" xml:space="preserve">
-    <value>Logging in as {0} on {1}</value>
+  <data name="LoggingInAsX" xml:space="preserve">
+    <value>{0}(으)로 로그인 중</value>
   </data>
   <data name="NotYou" xml:space="preserve">
     <value>본인이 아닌가요?</value>
@@ -2609,31 +2609,10 @@ Do you want to switch to this account?</value>
   <data name="ThereAreNoItemsThatMatchTheSearch" xml:space="preserve">
     <value>검색어와 일치하는 항목이 없습니다</value>
   </data>
-  <data name="US" xml:space="preserve">
-    <value>US</value>
-  </data>
-  <data name="EU" xml:space="preserve">
-    <value>EU</value>
-  </data>
-  <data name="SelfHosted" xml:space="preserve">
-    <value>Self-hosted</value>
-  </data>
-  <data name="DataRegion" xml:space="preserve">
-    <value>Data region</value>
-  </data>
-  <data name="Region" xml:space="preserve">
-    <value>Region</value>
-  </data>
   <data name="UpdateWeakMasterPasswordWarning" xml:space="preserve">
     <value>Your master password does not meet one or more of your organization policies. 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="CurrentMasterPassword" xml:space="preserve">
     <value>Current master password</value>
   </data>
-  <data name="MasterPasswordRePromptHelp" xml:space="preserve">
-    <value>Master password re-prompt help</value>
-  </data>
-  <data name="UnlockingMayFailDueToInsufficientMemoryDecreaseYourKDFMemorySettingsToResolve" xml:space="preserve">
-    <value>Unlocking may fail due to insufficient memory. Decrease your KDF memory settings to resolve</value>
-  </data>
 </root>

src/App/Resources/AppResources.lt.resx

@@ -2496,8 +2496,8 @@ Ar norite pereiti prie šios paskyros?</value>
   <data name="GetMasterPasswordwordHint" xml:space="preserve">
     <value>Gauti pagrindinio slaptažodžio užuominą</value>
   </data>
-  <data name="LoggingInAsXOnY" xml:space="preserve">
-    <value>Logging in as {0} on {1}</value>
+  <data name="LoggingInAsX" xml:space="preserve">
+    <value>Prisijungiama kaip {0}</value>
   </data>
   <data name="NotYou" xml:space="preserve">
     <value>Ne jūs?</value>
@@ -2610,31 +2610,10 @@ Ar norite pereiti prie šios paskyros?</value>
   <data name="ThereAreNoItemsThatMatchTheSearch" xml:space="preserve">
     <value>Elementų, atitinkančių paiešką, nėra</value>
   </data>
-  <data name="US" xml:space="preserve">
-    <value>US</value>
-  </data>
-  <data name="EU" xml:space="preserve">
-    <value>EU</value>
-  </data>
-  <data name="SelfHosted" xml:space="preserve">
-    <value>Self-hosted</value>
-  </data>
-  <data name="DataRegion" xml:space="preserve">
-    <value>Data region</value>
-  </data>
-  <data name="Region" xml:space="preserve">
-    <value>Region</value>
-  </data>
   <data name="UpdateWeakMasterPasswordWarning" xml:space="preserve">
     <value>Jūsų pagrindinis slaptažodis neatitinka vieno ar kelių organizacijos slaptažodžiui keliamų reikalavimų. Norėdami prisijungti prie saugyklos, jūs turite atnaujinti savo pagrindinį slaptažodį. Jeigu nuspręsite tęsti, jūs būsite atjungti nuo dabartinės sesijos ir jums reikės vėl prisijungti. Visos aktyvios sesijos kituose įrenginiuose gali išlikti aktyvios iki vienos valandos.</value>
   </data>
   <data name="CurrentMasterPassword" xml:space="preserve">
     <value>Dabartinis pagrindinis slaptažodis</value>
   </data>
-  <data name="MasterPasswordRePromptHelp" xml:space="preserve">
-    <value>Master password re-prompt help</value>
-  </data>
-  <data name="UnlockingMayFailDueToInsufficientMemoryDecreaseYourKDFMemorySettingsToResolve" xml:space="preserve">
-    <value>Unlocking may fail due to insufficient memory. Decrease your KDF memory settings to resolve</value>
-  </data>
 </root>

src/App/Resources/AppResources.lv.resx

@@ -2495,8 +2495,8 @@ Vai pārslēgties uz šo kontu?</value>
   <data name="GetMasterPasswordwordHint" xml:space="preserve">
     <value>Saņemt galvenās paroles norādi</value>
   </data>
-  <data name="LoggingInAsXOnY" xml:space="preserve">
-    <value>Piesakās {1} kā {0}</value>
+  <data name="LoggingInAsX" xml:space="preserve">
+    <value>Piesakās kā {0}</value>
   </data>
   <data name="NotYou" xml:space="preserve">
     <value>Tas neesi Tu?</value>
@@ -2609,31 +2609,10 @@ Vai pārslēgties uz šo kontu?</value>
   <data name="ThereAreNoItemsThatMatchTheSearch" xml:space="preserve">
     <value>Nav vienumu, kas atbilstu meklējumam</value>
   </data>
-  <data name="US" xml:space="preserve">
-    <value>ASV</value>
-  </data>
-  <data name="EU" xml:space="preserve">
-    <value>ES</value>
-  </data>
-  <data name="SelfHosted" xml:space="preserve">
-    <value>Pašizvietots</value>
-  </data>
-  <data name="DataRegion" xml:space="preserve">
-    <value>Datu apgabals</value>
-  </data>
-  <data name="Region" xml:space="preserve">
-    <value>Apgabals</value>
-  </data>
   <data name="UpdateWeakMasterPasswordWarning" xml:space="preserve">
     <value>Galvenā parole neatbilst vienam vai vairākiem apvienības nosacījumiem. Ir jāatjaunina galvenā parole, lai varētu piekļūt glabātavai. Turpinot notiks atteikšanās no pašreizējās sesijas, un būs nepieciešams pieteikties no jauna. Citās ierīcēs esošās sesijas var turpināt darboties līdz vienai stundai.</value>
   </data>
   <data name="CurrentMasterPassword" xml:space="preserve">
     <value>Pašreizējā galvenā parole</value>
   </data>
-  <data name="MasterPasswordRePromptHelp" xml:space="preserve">
-    <value>Galvenās paroles pārvaicāšanas palīdzība</value>
-  </data>
-  <data name="UnlockingMayFailDueToInsufficientMemoryDecreaseYourKDFMemorySettingsToResolve" xml:space="preserve">
-    <value>Atslēgšana var neizdoties nepietiekamas atmiņas dēļ. Lai to novērstu, jāsamazina KDF atmiņas iestatījmi</value>
-  </data>
 </root>

src/App/Resources/AppResources.ml.resx

@@ -276,7 +276,7 @@
     <value>നിങ്ങൾക്ക് ലോഗ് ഔട്ട് ചെയ്യണമെന്ന് ഉറപ്പാണോ?</value>
   </data>
   <data name="RemoveAccount" xml:space="preserve">
-    <value>അക്കൗണ്ട് നീക്കംചെയ്യുക</value>
+    <value>Remove account</value>
   </data>
   <data name="RemoveAccountConfirmation" xml:space="preserve">
     <value>Are you sure you want to remove this account?</value>
@@ -584,7 +584,7 @@
     <value>നിങ്ങളുടെ പാസ്‌വേഡ് മറന്നാൽ അത് ഓർമ്മിക്കാൻ ഒരു പ്രാഥമിക പാസ്‌വേഡ് സൂചന സഹായിക്കും.</value>
   </data>
   <data name="MasterPasswordLengthValMessageX" xml:space="preserve">
-    <value>പ്രാഥമിക പാസ്‌വേഡിന് കുറഞ്ഞത് {0} പ്രതീകങ്ങളെങ്കിലും ദൈർഘ്യമുണ്ടായിരിക്കണം.</value>
+    <value>Master password must be at least {0} characters long.</value>
   </data>
   <data name="MinNumbers" xml:space="preserve">
     <value>കുറഞ്ഞ സംഖ്യകൾ</value>
@@ -775,10 +775,10 @@
     <value>പ്രവർത്തനക്ഷമമാക്കി</value>
   </data>
   <data name="Off" xml:space="preserve">
-    <value>ഓഫ്</value>
+    <value>Off</value>
   </data>
   <data name="On" xml:space="preserve">
-    <value>ഓൺ</value>
+    <value>On</value>
   </data>
   <data name="Status" xml:space="preserve">
     <value>അവസ്ഥ</value>
@@ -900,8 +900,8 @@
     <value>ഓതന്റിക്കേറ്റർ കീ വായിക്കാൻ കഴിയുന്നില്ല.</value>
   </data>
   <data name="PointYourCameraAtTheQRCode" xml:space="preserve">
-    <value>നിങ്ങളുടെ ക്യാമറ QR കോഡിലേക്ക് ചൂണ്ടുക.
-സ്കാനിംഗ് സ്വയമേവ നടക്കും.</value>
+    <value>Point your camera at the QR Code.
+Scanning will happen automatically.</value>
   </data>
   <data name="ScanQrTitle" xml:space="preserve">
     <value>QR കോഡ് സ്കാൻ ചെയ്യുക</value>
@@ -1080,7 +1080,7 @@
     <value>പേരിന്റെ അവസാന ഭാഗം</value>
   </data>
   <data name="FullName" xml:space="preserve">
-    <value>പൂര്‍ണ്ണമായ പേര്</value>
+    <value>Full name</value>
   </data>
   <data name="LicenseNumber" xml:space="preserve">
     <value>ലൈസൻസ് നമ്പർ</value>
@@ -1210,7 +1210,7 @@
     <value>മറച്ചത്</value>
   </data>
   <data name="FieldTypeLinked" xml:space="preserve">
-    <value>ബന്ധിപ്പിച്ചത്</value>
+    <value>Linked</value>
   </data>
   <data name="FieldTypeText" xml:space="preserve">
     <value>വാചകം</value>
@@ -1384,10 +1384,10 @@
     <value>കളക്ഷനുകൾ  തിരയുക</value>
   </data>
   <data name="SearchFileSends" xml:space="preserve">
-    <value>അയച്ച വാക്കുകൾ തിരയുക</value>
+    <value>Search file Sends</value>
   </data>
   <data name="SearchTextSends" xml:space="preserve">
-    <value>അയച്ച വാക്കുകൾ തിരയുക</value>
+    <value>Search text Sends</value>
   </data>
   <data name="SearchGroup" xml:space="preserve">
     <value>Search {0}</value>
@@ -1662,10 +1662,10 @@
     <value>Send a verification code to your email</value>
   </data>
   <data name="CodeSent" xml:space="preserve">
-    <value>കോഡ് അയച്ചു!</value>
+    <value>Code sent!</value>
   </data>
   <data name="ConfirmYourIdentity" xml:space="preserve">
-    <value>തുടരാൻ നിങ്ങളുടെ ഐഡന്റിറ്റി സ്ഥിരീകരിക്കുക.</value>
+    <value>Confirm your identity to continue.</value>
   </data>
   <data name="ExportVaultWarning" xml:space="preserve">
     <value>ഈ എക്‌സ്‌പോർട്ടിൽ എൻക്രിപ്റ്റ് ചെയ്യാത്ത ഫോർമാറ്റിൽ നിങ്ങളുടെ വാൾട് ഡാറ്റ അടങ്ങിയിരിക്കുന്നു. എക്‌സ്‌പോർട് ചെയ്ത ഫയൽ സുരക്ഷിതമല്ലാത്ത ചാനലുകളിൽ (ഇമെയിൽ പോലുള്ളവ) നിങ്ങൾ സംഭരിക്കുകയോ അയയ്ക്കുകയോ ചെയ്യരുത്. നിങ്ങൾ ഇത് ഉപയോഗിച്ചുകഴിഞ്ഞാലുടൻ അത് മായ്ച്ചുകളയണം.</value>
@@ -1886,7 +1886,7 @@
     <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">
-    <value>വാചകം</value>
+    <value>Text</value>
   </data>
   <data name="TypeText" xml:space="preserve">
     <value>വാചകം</value>
@@ -1905,13 +1905,13 @@
     <value>നിങ്ങൾ അയയ്ക്കാൻ ആഗ്രഹിക്കുന്ന ഫയൽ.</value>
   </data>
   <data name="FileTypeIsSelected" xml:space="preserve">
-    <value>ഫയൽ തരം തിരഞ്ഞെടുത്തു.</value>
+    <value>File type is selected.</value>
   </data>
   <data name="FileTypeIsNotSelected" xml:space="preserve">
-    <value>ഫയൽ തരം തിരഞ്ഞെടുത്തിട്ടില്ല, തിരഞ്ഞെടുക്കാൻ ടാപ്പുചെയ്യുക.</value>
+    <value>File type is not selected, tap to select.</value>
   </data>
   <data name="TextTypeIsSelected" xml:space="preserve">
-    <value>ഫയൽ തരം തിരഞ്ഞെടുത്തു.</value>
+    <value>Text type is selected.</value>
   </data>
   <data name="TextTypeIsNotSelected" xml:space="preserve">
     <value>Text type is not selected, tap to select.</value>
@@ -1927,7 +1927,7 @@
     <comment>'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated.</comment>
   </data>
   <data name="PendingDelete" xml:space="preserve">
-    <value>പരിപൂർണ്ണമാവാത്ത ഇല്ലാതാക്കൽ</value>
+    <value>Pending deletion</value>
   </data>
   <data name="ExpirationDate" xml:space="preserve">
     <value>കാലഹരണപ്പെടുന്ന തീയതി</value>
@@ -2495,8 +2495,8 @@ Do you want to switch to this account?</value>
   <data name="GetMasterPasswordwordHint" xml:space="preserve">
     <value>Get master password hint</value>
   </data>
-  <data name="LoggingInAsXOnY" xml:space="preserve">
-    <value>Logging in as {0} on {1}</value>
+  <data name="LoggingInAsX" xml:space="preserve">
+    <value>Logging in as {0}</value>
   </data>
   <data name="NotYou" xml:space="preserve">
     <value>Not you?</value>
@@ -2609,31 +2609,10 @@ Do you want to switch to this account?</value>
   <data name="ThereAreNoItemsThatMatchTheSearch" xml:space="preserve">
     <value>There are no items that match the search</value>
   </data>
-  <data name="US" xml:space="preserve">
-    <value>US</value>
-  </data>
-  <data name="EU" xml:space="preserve">
-    <value>EU</value>
-  </data>
-  <data name="SelfHosted" xml:space="preserve">
-    <value>Self-hosted</value>
-  </data>
-  <data name="DataRegion" xml:space="preserve">
-    <value>Data region</value>
-  </data>
-  <data name="Region" xml:space="preserve">
-    <value>Region</value>
-  </data>
   <data name="UpdateWeakMasterPasswordWarning" xml:space="preserve">
     <value>Your master password does not meet one or more of your organization policies. 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="CurrentMasterPassword" xml:space="preserve">
     <value>Current master password</value>
   </data>
-  <data name="MasterPasswordRePromptHelp" xml:space="preserve">
-    <value>Master password re-prompt help</value>
-  </data>
-  <data name="UnlockingMayFailDueToInsufficientMemoryDecreaseYourKDFMemorySettingsToResolve" xml:space="preserve">
-    <value>Unlocking may fail due to insufficient memory. Decrease your KDF memory settings to resolve</value>
-  </data>
 </root>

src/App/Resources/AppResources.my.resx

@@ -2496,8 +2496,8 @@ Do you want to switch to this account?</value>
   <data name="GetMasterPasswordwordHint" xml:space="preserve">
     <value>Get master password hint</value>
   </data>
-  <data name="LoggingInAsXOnY" xml:space="preserve">
-    <value>Logging in as {0} on {1}</value>
+  <data name="LoggingInAsX" xml:space="preserve">
+    <value>Logging in as {0}</value>
   </data>
   <data name="NotYou" xml:space="preserve">
     <value>Not you?</value>
@@ -2610,31 +2610,10 @@ Do you want to switch to this account?</value>
   <data name="ThereAreNoItemsThatMatchTheSearch" xml:space="preserve">
     <value>There are no items that match the search</value>
   </data>
-  <data name="US" xml:space="preserve">
-    <value>US</value>
-  </data>
-  <data name="EU" xml:space="preserve">
-    <value>EU</value>
-  </data>
-  <data name="SelfHosted" xml:space="preserve">
-    <value>Self-hosted</value>
-  </data>
-  <data name="DataRegion" xml:space="preserve">
-    <value>Data region</value>
-  </data>
-  <data name="Region" xml:space="preserve">
-    <value>Region</value>
-  </data>
   <data name="UpdateWeakMasterPasswordWarning" xml:space="preserve">
     <value>Your master password does not meet one or more of your organization policies. 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="CurrentMasterPassword" xml:space="preserve">
     <value>Current master password</value>
   </data>
-  <data name="MasterPasswordRePromptHelp" xml:space="preserve">
-    <value>Master password re-prompt help</value>
-  </data>
-  <data name="UnlockingMayFailDueToInsufficientMemoryDecreaseYourKDFMemorySettingsToResolve" xml:space="preserve">
-    <value>Unlocking may fail due to insufficient memory. Decrease your KDF memory settings to resolve</value>
-  </data>
 </root>

src/App/Resources/AppResources.nb.resx

@@ -2496,8 +2496,8 @@ Vil du bytte til denne kontoen?</value>
   <data name="GetMasterPasswordwordHint" xml:space="preserve">
     <value>Få et hint om hovedpassordet</value>
   </data>
-  <data name="LoggingInAsXOnY" xml:space="preserve">
-    <value>Logging in as {0} on {1}</value>
+  <data name="LoggingInAsX" xml:space="preserve">
+    <value>Logger inn som {0}</value>
   </data>
   <data name="NotYou" xml:space="preserve">
     <value>Ikke du?</value>
@@ -2610,31 +2610,10 @@ Vil du bytte til denne kontoen?</value>
   <data name="ThereAreNoItemsThatMatchTheSearch" xml:space="preserve">
     <value>Det er ingen elementer som samsvarer med søket</value>
   </data>
-  <data name="US" xml:space="preserve">
-    <value>US</value>
-  </data>
-  <data name="EU" xml:space="preserve">
-    <value>EU</value>
-  </data>
-  <data name="SelfHosted" xml:space="preserve">
-    <value>Self-hosted</value>
-  </data>
-  <data name="DataRegion" xml:space="preserve">
-    <value>Data region</value>
-  </data>
-  <data name="Region" xml:space="preserve">
-    <value>Region</value>
-  </data>
   <data name="UpdateWeakMasterPasswordWarning" xml:space="preserve">
     <value>Your master password does not meet one or more of your organization policies. 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="CurrentMasterPassword" xml:space="preserve">
-    <value>Nåværende hovedpassord</value>
-  </data>
-  <data name="MasterPasswordRePromptHelp" xml:space="preserve">
-    <value>Master password re-prompt help</value>
-  </data>
-  <data name="UnlockingMayFailDueToInsufficientMemoryDecreaseYourKDFMemorySettingsToResolve" xml:space="preserve">
-    <value>Unlocking may fail due to insufficient memory. Decrease your KDF memory settings to resolve</value>
+    <value>Current master password</value>
   </data>
 </root>

src/App/Resources/AppResources.ne.resx

@@ -2496,8 +2496,8 @@ Do you want to switch to this account?</value>
   <data name="GetMasterPasswordwordHint" xml:space="preserve">
     <value>Get master password hint</value>
   </data>
-  <data name="LoggingInAsXOnY" xml:space="preserve">
-    <value>Logging in as {0} on {1}</value>
+  <data name="LoggingInAsX" xml:space="preserve">
+    <value>Logging in as {0}</value>
   </data>
   <data name="NotYou" xml:space="preserve">
     <value>Not you?</value>
@@ -2610,31 +2610,10 @@ Do you want to switch to this account?</value>
   <data name="ThereAreNoItemsThatMatchTheSearch" xml:space="preserve">
     <value>There are no items that match the search</value>
   </data>
-  <data name="US" xml:space="preserve">
-    <value>US</value>
-  </data>
-  <data name="EU" xml:space="preserve">
-    <value>EU</value>
-  </data>
-  <data name="SelfHosted" xml:space="preserve">
-    <value>Self-hosted</value>
-  </data>
-  <data name="DataRegion" xml:space="preserve">
-    <value>Data region</value>
-  </data>
-  <data name="Region" xml:space="preserve">
-    <value>Region</value>
-  </data>
   <data name="UpdateWeakMasterPasswordWarning" xml:space="preserve">
     <value>Your master password does not meet one or more of your organization policies. 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="CurrentMasterPassword" xml:space="preserve">
     <value>Current master password</value>
   </data>
-  <data name="MasterPasswordRePromptHelp" xml:space="preserve">
-    <value>Master password re-prompt help</value>
-  </data>
-  <data name="UnlockingMayFailDueToInsufficientMemoryDecreaseYourKDFMemorySettingsToResolve" xml:space="preserve">
-    <value>Unlocking may fail due to insufficient memory. Decrease your KDF memory settings to resolve</value>
-  </data>
 </root>

src/App/Resources/AppResources.nl.resx

@@ -2495,8 +2495,8 @@ Wilt u naar dit account wisselen?</value>
   <data name="GetMasterPasswordwordHint" xml:space="preserve">
     <value>Hoofdwachtwoordhint krijgen</value>
   </data>
-  <data name="LoggingInAsXOnY" xml:space="preserve">
-    <value>Inloggen als {0} op {1}</value>
+  <data name="LoggingInAsX" xml:space="preserve">
+    <value>Inloggen als {0}</value>
   </data>
   <data name="NotYou" xml:space="preserve">
     <value>Ben jij dit niet?</value>
@@ -2609,31 +2609,10 @@ Wilt u naar dit account wisselen?</value>
   <data name="ThereAreNoItemsThatMatchTheSearch" xml:space="preserve">
     <value>Er zijn geen items die overeenkomen met de zoekopdracht</value>
   </data>
-  <data name="US" xml:space="preserve">
-    <value>US</value>
-  </data>
-  <data name="EU" xml:space="preserve">
-    <value>EU</value>
-  </data>
-  <data name="SelfHosted" xml:space="preserve">
-    <value>Zelfgehost</value>
-  </data>
-  <data name="DataRegion" xml:space="preserve">
-    <value>Dataregio</value>
-  </data>
-  <data name="Region" xml:space="preserve">
-    <value>Regio</value>
-  </data>
   <data name="UpdateWeakMasterPasswordWarning" xml:space="preserve">
     <value>Je hoofdwachtwoord voldoet niet aan en of meerdere oganisatiebeleidsonderdelen. Om toegang te krijgen tot de kluis, moet je je hoofdwachtwoord nu bijwerken. Doorgaan zal je huidige sessie uitloggen, waarna je opnieuw moet inloggen. Actieve sessies op andere apparaten blijven mogelijk nog een uur actief.</value>
   </data>
   <data name="CurrentMasterPassword" xml:space="preserve">
     <value>Huidig hoofdwachtwoord</value>
   </data>
-  <data name="MasterPasswordRePromptHelp" xml:space="preserve">
-    <value>Hulptekst hoofdwachtwoord opnieuw vragen</value>
-  </data>
-  <data name="UnlockingMayFailDueToInsufficientMemoryDecreaseYourKDFMemorySettingsToResolve" xml:space="preserve">
-    <value>Ontgrendelen kan mislukken als er onvoldoende geheugen is. Verminder je KDF-geheugeninstellingen om dit op te lossen</value>
-  </data>
 </root>

src/App/Resources/AppResources.nn.resx

@@ -425,7 +425,7 @@
     <value>Sjølvutfyllingsteneste</value>
   </data>
   <data name="AvoidAmbiguousCharacters" xml:space="preserve">
-    <value>Unngå forvekslingsbare teikn</value>
+    <value>Avoid ambiguous characters</value>
   </data>
   <data name="BitwardenAppExtension" xml:space="preserve">
     <value>Bitwarden App-utviding</value>
@@ -684,7 +684,7 @@
     <value>Oppføringa er retta.</value>
   </data>
   <data name="Submitting" xml:space="preserve">
-    <value>Sender inn...</value>
+    <value>Submitting...</value>
     <comment>Message shown when interacting with the server</comment>
   </data>
   <data name="Syncing" xml:space="preserve">
@@ -811,7 +811,7 @@
     <value>Lær om samskipnader</value>
   </data>
   <data name="CannotOpenApp" xml:space="preserve">
-    <value>Kan ikkje opne appen "{0}".</value>
+    <value>Cannot open the app "{0}".</value>
     <comment>Message shown when trying to launch an app that does not exist on the user's device.</comment>
   </data>
   <data name="AuthenticatorAppTitle" xml:space="preserve">
@@ -834,7 +834,7 @@
     <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>
   </data>
   <data name="RecoveryCodeTitle" xml:space="preserve">
-    <value>Gjenopprettingskode</value>
+    <value>Recovery code</value>
     <comment>For 2FA</comment>
   </data>
   <data name="RememberMe" xml:space="preserve">
@@ -842,11 +842,11 @@
     <comment>Remember my two-step login</comment>
   </data>
   <data name="SendVerificationCodeAgain" xml:space="preserve">
-    <value>Send e-post om stadfestingskode på nytt</value>
+    <value>Send verification code email again</value>
     <comment>For 2FA</comment>
   </data>
   <data name="TwoStepLoginOptions" xml:space="preserve">
-    <value>Alternativ for totrinnsinnlogging</value>
+    <value>Two-step login options</value>
   </data>
   <data name="UseAnotherTwoStepMethod" xml:space="preserve">
     <value>Use another two-step login method</value>
@@ -863,17 +863,17 @@
     <value>To continue, hold your YubiKey NEO against the back of the device or insert your YubiKey into your device's USB port, then touch its button.</value>
   </data>
   <data name="YubiKeyTitle" xml:space="preserve">
-    <value>YubiKey sikkerheitsnøkkel</value>
+    <value>YubiKey security key</value>
     <comment>"YubiKey" is the product name and should not be translated.</comment>
   </data>
   <data name="AddNewAttachment" xml:space="preserve">
-    <value>Legg til nytt vedlegg</value>
+    <value>Add new attachment</value>
   </data>
   <data name="Attachments" xml:space="preserve">
-    <value>Vedlegg</value>
+    <value>Attachments</value>
   </data>
   <data name="UnableToDownloadFile" xml:space="preserve">
-    <value>Kunne ikkje laste ned fila.</value>
+    <value>Unable to download file.</value>
   </data>
   <data name="UnableToOpenFile" xml:space="preserve">
     <value>Eininga di kan ikkje opna denne filtypen.</value>
@@ -900,8 +900,8 @@
     <value>Kan ikkje lesa autentiseringsnykel.</value>
   </data>
   <data name="PointYourCameraAtTheQRCode" xml:space="preserve">
-    <value>Peik kameraet ditt mot QR-koden.
-Skanning skjer automatisk.</value>
+    <value>Point your camera at the QR Code.
+Scanning will happen automatically.</value>
   </data>
   <data name="ScanQrTitle" xml:space="preserve">
     <value>Skann QR-kode</value>
@@ -919,7 +919,7 @@ Skanning skjer automatisk.</value>
     <value>If a login has an authenticator key, copy the TOTP verification code to your clip-board when you auto-fill the login.</value>
   </data>
   <data name="CopyTotpAutomatically" xml:space="preserve">
-    <value>Kopier TOTP-en automatisk</value>
+    <value>Copy TOTP automatically</value>
   </data>
   <data name="PremiumRequired" xml:space="preserve">
     <value>Ei Premium-tinging er påkravd for å bruka denne funksjonen.</value>
@@ -974,7 +974,7 @@ Skanning skjer automatisk.</value>
     <comment>Validation error when something is not formatted correctly, such as a URL or email address.</comment>
   </data>
   <data name="IdentityUrl" xml:space="preserve">
-    <value>URL for identitetstenar</value>
+    <value>Identity server URL</value>
     <comment>"Identity" refers to an identity server. See more context here https://en.wikipedia.org/wiki/Identity_management</comment>
   </data>
   <data name="SelfHostedEnvironment" xml:space="preserve">
@@ -1056,10 +1056,10 @@ Skanning skjer automatisk.</value>
     <value>Dr.</value>
   </data>
   <data name="ExpirationMonth" xml:space="preserve">
-    <value>Utlaupsmånad</value>
+    <value>Expiration month</value>
   </data>
   <data name="ExpirationYear" xml:space="preserve">
-    <value>Utlaupsår</value>
+    <value>Expiration year</value>
   </data>
   <data name="February" xml:space="preserve">
     <value>Februar</value>
@@ -1083,7 +1083,7 @@ Skanning skjer automatisk.</value>
     <value>Fullt namn</value>
   </data>
   <data name="LicenseNumber" xml:space="preserve">
-    <value>Førarkortnummer</value>
+    <value>License number</value>
   </data>
   <data name="March" xml:space="preserve">
     <value>Mars</value>
@@ -1137,10 +1137,10 @@ Skanning skjer automatisk.</value>
     <value>Adresse</value>
   </data>
   <data name="Expiration" xml:space="preserve">
-    <value>Utlaup</value>
+    <value>Expiration</value>
   </data>
   <data name="ShowWebsiteIcons" xml:space="preserve">
-    <value>Vis nettstadikon</value>
+    <value>Show website icons</value>
   </data>
   <data name="ShowWebsiteIconsDescription" xml:space="preserve">
     <value>Show a recognizable image next to each login.</value>
@@ -1186,13 +1186,13 @@ Skanning skjer automatisk.</value>
     <comment>What Apple calls their facial recognition reader.</comment>
   </data>
   <data name="FaceIDDirection" xml:space="preserve">
-    <value>Bruk Face ID for å stadfeste.</value>
+    <value>Use Face ID to verify.</value>
   </data>
   <data name="UseFaceIDToUnlock" xml:space="preserve">
-    <value>Bruk Face ID til å låse opp</value>
+    <value>Use Face ID To Unlock</value>
   </data>
   <data name="VerifyFaceID" xml:space="preserve">
-    <value>Stadfest Face ID</value>
+    <value>Verify Face ID</value>
   </data>
   <data name="WindowsHello" xml:space="preserve">
     <value>Windows Hello</value>
@@ -2496,8 +2496,8 @@ Do you want to switch to this account?</value>
   <data name="GetMasterPasswordwordHint" xml:space="preserve">
     <value>Get master password hint</value>
   </data>
-  <data name="LoggingInAsXOnY" xml:space="preserve">
-    <value>Loggar inn som {0} på {1}</value>
+  <data name="LoggingInAsX" xml:space="preserve">
+    <value>Logging in as {0}</value>
   </data>
   <data name="NotYou" xml:space="preserve">
     <value>Not you?</value>
@@ -2610,31 +2610,10 @@ Do you want to switch to this account?</value>
   <data name="ThereAreNoItemsThatMatchTheSearch" xml:space="preserve">
     <value>There are no items that match the search</value>
   </data>
-  <data name="US" xml:space="preserve">
-    <value>US</value>
-  </data>
-  <data name="EU" xml:space="preserve">
-    <value>EU</value>
-  </data>
-  <data name="SelfHosted" xml:space="preserve">
-    <value>Self-hosted</value>
-  </data>
-  <data name="DataRegion" xml:space="preserve">
-    <value>Dataregion</value>
-  </data>
-  <data name="Region" xml:space="preserve">
-    <value>Region</value>
-  </data>
   <data name="UpdateWeakMasterPasswordWarning" xml:space="preserve">
     <value>Your master password does not meet one or more of your organization policies. 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="CurrentMasterPassword" xml:space="preserve">
     <value>Current master password</value>
   </data>
-  <data name="MasterPasswordRePromptHelp" xml:space="preserve">
-    <value>Master password re-prompt help</value>
-  </data>
-  <data name="UnlockingMayFailDueToInsufficientMemoryDecreaseYourKDFMemorySettingsToResolve" xml:space="preserve">
-    <value>Unlocking may fail due to insufficient memory. Decrease your KDF memory settings to resolve</value>
-  </data>
 </root>

src/App/Resources/AppResources.or.resx

@@ -2496,8 +2496,8 @@ Do you want to switch to this account?</value>
   <data name="GetMasterPasswordwordHint" xml:space="preserve">
     <value>Get master password hint</value>
   </data>
-  <data name="LoggingInAsXOnY" xml:space="preserve">
-    <value>Logging in as {0} on {1}</value>
+  <data name="LoggingInAsX" xml:space="preserve">
+    <value>Logging in as {0}</value>
   </data>
   <data name="NotYou" xml:space="preserve">
     <value>Not you?</value>
@@ -2610,31 +2610,10 @@ Do you want to switch to this account?</value>
   <data name="ThereAreNoItemsThatMatchTheSearch" xml:space="preserve">
     <value>There are no items that match the search</value>
   </data>
-  <data name="US" xml:space="preserve">
-    <value>US</value>
-  </data>
-  <data name="EU" xml:space="preserve">
-    <value>EU</value>
-  </data>
-  <data name="SelfHosted" xml:space="preserve">
-    <value>ଆତ୍ମ-ଆୟୋଜିତ</value>
-  </data>
-  <data name="DataRegion" xml:space="preserve">
-    <value>ଡାଟା ଅଞ୍ଚଳ</value>
-  </data>
-  <data name="Region" xml:space="preserve">
-    <value>ଅଞ୍ଚଳ</value>
-  </data>
   <data name="UpdateWeakMasterPasswordWarning" xml:space="preserve">
     <value>Your master password does not meet one or more of your organization policies. 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="CurrentMasterPassword" xml:space="preserve">
     <value>Current master password</value>
   </data>
-  <data name="MasterPasswordRePromptHelp" xml:space="preserve">
-    <value>Master password re-prompt help</value>
-  </data>
-  <data name="UnlockingMayFailDueToInsufficientMemoryDecreaseYourKDFMemorySettingsToResolve" xml:space="preserve">
-    <value>Unlocking may fail due to insufficient memory. Decrease your KDF memory settings to resolve</value>
-  </data>
 </root>

src/App/Resources/AppResources.pl.resx

@@ -2495,8 +2495,8 @@ Czy chcesz przełączyć się na to konto?</value>
   <data name="GetMasterPasswordwordHint" xml:space="preserve">
     <value>Uzyskaj podpowiedź hasła głównego</value>
   </data>
-  <data name="LoggingInAsXOnY" xml:space="preserve">
-    <value>Logowanie jako {0} do {1}</value>
+  <data name="LoggingInAsX" xml:space="preserve">
+    <value>Logowanie jako {0}</value>
   </data>
   <data name="NotYou" xml:space="preserve">
     <value>To nie Ty?</value>
@@ -2609,31 +2609,10 @@ Czy chcesz przełączyć się na to konto?</value>
   <data name="ThereAreNoItemsThatMatchTheSearch" xml:space="preserve">
     <value>Brak elementów, które pasują do wyszukiwania</value>
   </data>
-  <data name="US" xml:space="preserve">
-    <value>US</value>
-  </data>
-  <data name="EU" xml:space="preserve">
-    <value>UE</value>
-  </data>
-  <data name="SelfHosted" xml:space="preserve">
-    <value>Samodzielnie hostowany</value>
-  </data>
-  <data name="DataRegion" xml:space="preserve">
-    <value>Region danych</value>
-  </data>
-  <data name="Region" xml:space="preserve">
-    <value>Region</value>
-  </data>
   <data name="UpdateWeakMasterPasswordWarning" xml:space="preserve">
     <value>Twoje hasło główne nie spełnia jednej lub kilku zasad organizacji. Aby uzyskać dostęp do sejfu, musisz teraz zaktualizować swoje hasło główne. Kontynuacja wyloguje Cię z bieżącej sesji, wymagając zalogowania się ponownie. Aktywne sesje na innych urządzeniach mogą pozostać aktywne przez maksymalnie jedną godzinę.</value>
   </data>
   <data name="CurrentMasterPassword" xml:space="preserve">
     <value>Aktualne hasło główne</value>
   </data>
-  <data name="MasterPasswordRePromptHelp" xml:space="preserve">
-    <value>Master password re-prompt help</value>
-  </data>
-  <data name="UnlockingMayFailDueToInsufficientMemoryDecreaseYourKDFMemorySettingsToResolve" xml:space="preserve">
-    <value>Odblokowanie może się nie powieść z powodu niewystarczającej ilości pamięci. Zmniejsz ustawienia pamięci KDF, aby to rozwiązać</value>
-  </data>
 </root>

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

@@ -1756,7 +1756,7 @@ A leitura será feita automaticamente.</value>
     <value>O desbloqueio biométrico desta conta está desabilitado com a verificação da senha mestra.</value>
   </data>
   <data name="AccountBiometricInvalidatedExtension" xml:space="preserve">
-    <value>O desbloqueio biométrico do autopreenchimento está desabilitado para esta conta por pendência de verificação da senha mestra.</value>
+    <value>Autofill biometric unlock for this account is disabled pending verification of master password.</value>
   </data>
   <data name="EnableSyncOnRefresh" xml:space="preserve">
     <value>Ativar sincronização ao atualizar</value>
@@ -2496,8 +2496,8 @@ Você deseja mudar para esta conta?</value>
   <data name="GetMasterPasswordwordHint" xml:space="preserve">
     <value>Obter dica da senha mestra</value>
   </data>
-  <data name="LoggingInAsXOnY" xml:space="preserve">
-    <value>Entrando como {0} em {1}</value>
+  <data name="LoggingInAsX" xml:space="preserve">
+    <value>Entrando como {0}</value>
   </data>
   <data name="NotYou" xml:space="preserve">
     <value>Não é você?</value>
@@ -2610,31 +2610,10 @@ Você deseja mudar para esta conta?</value>
   <data name="ThereAreNoItemsThatMatchTheSearch" xml:space="preserve">
     <value>Não há itens que correspondam à pesquisa</value>
   </data>
-  <data name="US" xml:space="preserve">
-    <value>EUA</value>
-  </data>
-  <data name="EU" xml:space="preserve">
-    <value>Europa</value>
-  </data>
-  <data name="SelfHosted" xml:space="preserve">
-    <value>Auto-hospedado</value>
-  </data>
-  <data name="DataRegion" xml:space="preserve">
-    <value>Região de dados</value>
-  </data>
-  <data name="Region" xml:space="preserve">
-    <value>Região</value>
-  </data>
   <data name="UpdateWeakMasterPasswordWarning" xml:space="preserve">
     <value>A sua senha mestra não atende a uma ou mais das políticas da sua organização. Para acessar o cofre, você deve atualizar a sua senha mestra agora. O processo desconectará você da sessão atual, exigindo que você inicie a sessão novamente. Sessões ativas em outros dispositivos podem continuar ativas por até uma hora.</value>
   </data>
   <data name="CurrentMasterPassword" xml:space="preserve">
     <value>Senha mestra atual</value>
   </data>
-  <data name="MasterPasswordRePromptHelp" xml:space="preserve">
-    <value>Master password re-prompt help</value>
-  </data>
-  <data name="UnlockingMayFailDueToInsufficientMemoryDecreaseYourKDFMemorySettingsToResolve" xml:space="preserve">
-    <value>Unlocking may fail due to insufficient memory. Decrease your KDF memory settings to resolve</value>
-  </data>
 </root>

src/App/Resources/AppResources.resx

@@ -2631,13 +2631,7 @@ Do you want to switch to this account?</value>
   <data name="CurrentMasterPassword" xml:space="preserve">
     <value>Current master password</value>
   </data>
-  <data name="MasterPasswordRePromptHelp" xml:space="preserve">
-    <value>Master password re-prompt help</value>
-  </data>
-  <data name="UnlockingMayFailDueToInsufficientMemoryDecreaseYourKDFMemorySettingsToResolve" xml:space="preserve">
-    <value>Unlocking may fail due to insufficient memory. Decrease your KDF memory settings to resolve</value>
-  </data>
-  <data name="LoadFromFile" xml:space="preserve">
-    <value>Load from file</value>
+  <data name="UploadHasBeenCanceled" xml:space="preserve">
+    <value>Upload has been canceled</value>
   </data>
 </root>

src/App/Resources/AppResources.ro.resx

@@ -2495,8 +2495,8 @@ Doriți să comutați la acest cont?</value>
   <data name="GetMasterPasswordwordHint" xml:space="preserve">
     <value>Obțineți indiciul parolei principale</value>
   </data>
-  <data name="LoggingInAsXOnY" xml:space="preserve">
-    <value>Logging in as {0} on {1}</value>
+  <data name="LoggingInAsX" xml:space="preserve">
+    <value>Autentificare ca {0}</value>
   </data>
   <data name="NotYou" xml:space="preserve">
     <value>Nu sunteți dvs.?</value>
@@ -2609,31 +2609,10 @@ Doriți să comutați la acest cont?</value>
   <data name="ThereAreNoItemsThatMatchTheSearch" xml:space="preserve">
     <value>Nu există lucruri care să corespundă căutării</value>
   </data>
-  <data name="US" xml:space="preserve">
-    <value>US</value>
-  </data>
-  <data name="EU" xml:space="preserve">
-    <value>EU</value>
-  </data>
-  <data name="SelfHosted" xml:space="preserve">
-    <value>Self-hosted</value>
-  </data>
-  <data name="DataRegion" xml:space="preserve">
-    <value>Data region</value>
-  </data>
-  <data name="Region" xml:space="preserve">
-    <value>Region</value>
-  </data>
   <data name="UpdateWeakMasterPasswordWarning" xml:space="preserve">
     <value>Parola principală nu îndeplinește una sau mai multe politici ale organizației. Pentru a accesa seiful trebuie să actualizați acum parola principală. Continuarea te va deconecta din sesiunea curentă, necesitând să te autentifici din nou. Sesiunile active pe alte dispozitive pot continua să rămână active timp de maxim o oră.</value>
   </data>
   <data name="CurrentMasterPassword" xml:space="preserve">
     <value>Parola principală curentă</value>
   </data>
-  <data name="MasterPasswordRePromptHelp" xml:space="preserve">
-    <value>Master password re-prompt help</value>
-  </data>
-  <data name="UnlockingMayFailDueToInsufficientMemoryDecreaseYourKDFMemorySettingsToResolve" xml:space="preserve">
-    <value>Unlocking may fail due to insufficient memory. Decrease your KDF memory settings to resolve</value>
-  </data>
 </root>

src/App/Resources/AppResources.ru.resx

@@ -2495,8 +2495,8 @@
   <data name="GetMasterPasswordwordHint" xml:space="preserve">
     <value>Получить подсказку к мастер-паролю</value>
   </data>
-  <data name="LoggingInAsXOnY" xml:space="preserve">
-    <value>Войти как {0} на {1}</value>
+  <data name="LoggingInAsX" xml:space="preserve">
+    <value>Войти как {0}</value>
   </data>
   <data name="NotYou" xml:space="preserve">
     <value>Не вы?</value>
@@ -2609,31 +2609,10 @@
   <data name="ThereAreNoItemsThatMatchTheSearch" xml:space="preserve">
     <value>Нет элементов, соответствующих запросу</value>
   </data>
-  <data name="US" xml:space="preserve">
-    <value>США</value>
-  </data>
-  <data name="EU" xml:space="preserve">
-    <value>Европа</value>
-  </data>
-  <data name="SelfHosted" xml:space="preserve">
-    <value>Собственный хостинг</value>
-  </data>
-  <data name="DataRegion" xml:space="preserve">
-    <value>Регион данных</value>
-  </data>
-  <data name="Region" xml:space="preserve">
-    <value>Регион</value>
-  </data>
   <data name="UpdateWeakMasterPasswordWarning" xml:space="preserve">
     <value>Ваш мастер-пароль не соответствует требованиям политики вашей организации. Для доступа к хранилищу вы должны обновить свой мастер-пароль прямо сейчас. При этом текущая сессия будет завершена и потребуется повторная авторизация. Сессии на других устройствах могут оставаться активными в течение часа.</value>
   </data>
   <data name="CurrentMasterPassword" xml:space="preserve">
     <value>Текущий мастер-пароль</value>
   </data>
-  <data name="MasterPasswordRePromptHelp" xml:space="preserve">
-    <value>Помощь с повторным запросом мастер-пароля</value>
-  </data>
-  <data name="UnlockingMayFailDueToInsufficientMemoryDecreaseYourKDFMemorySettingsToResolve" xml:space="preserve">
-    <value>Unlocking may fail due to insufficient memory. Decrease your KDF memory settings to resolve</value>
-  </data>
 </root>

src/App/Resources/AppResources.si.resx

@@ -2496,8 +2496,8 @@ Do you want to switch to this account?</value>
   <data name="GetMasterPasswordwordHint" xml:space="preserve">
     <value>Get master password hint</value>
   </data>
-  <data name="LoggingInAsXOnY" xml:space="preserve">
-    <value>Logging in as {0} on {1}</value>
+  <data name="LoggingInAsX" xml:space="preserve">
+    <value>Logging in as {0}</value>
   </data>
   <data name="NotYou" xml:space="preserve">
     <value>Not you?</value>
@@ -2610,31 +2610,10 @@ Do you want to switch to this account?</value>
   <data name="ThereAreNoItemsThatMatchTheSearch" xml:space="preserve">
     <value>There are no items that match the search</value>
   </data>
-  <data name="US" xml:space="preserve">
-    <value>US</value>
-  </data>
-  <data name="EU" xml:space="preserve">
-    <value>EU</value>
-  </data>
-  <data name="SelfHosted" xml:space="preserve">
-    <value>Self-hosted</value>
-  </data>
-  <data name="DataRegion" xml:space="preserve">
-    <value>Data region</value>
-  </data>
-  <data name="Region" xml:space="preserve">
-    <value>Region</value>
-  </data>
   <data name="UpdateWeakMasterPasswordWarning" xml:space="preserve">
     <value>Your master password does not meet one or more of your organization policies. 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="CurrentMasterPassword" xml:space="preserve">
     <value>Current master password</value>
   </data>
-  <data name="MasterPasswordRePromptHelp" xml:space="preserve">
-    <value>Master password re-prompt help</value>
-  </data>
-  <data name="UnlockingMayFailDueToInsufficientMemoryDecreaseYourKDFMemorySettingsToResolve" xml:space="preserve">
-    <value>Unlocking may fail due to insufficient memory. Decrease your KDF memory settings to resolve</value>
-  </data>
 </root>

src/App/Resources/AppResources.sk.resx

@@ -2495,8 +2495,8 @@ Chcete prepnúť na toto konto?</value>
   <data name="GetMasterPasswordwordHint" xml:space="preserve">
     <value>Získať nápoveď pre hlavné heslo</value>
   </data>
-  <data name="LoggingInAsXOnY" xml:space="preserve">
-    <value>Prihlasujete sa ako {0} na {1}</value>
+  <data name="LoggingInAsX" xml:space="preserve">
+    <value>Prihlasujete sa ako {0}</value>
   </data>
   <data name="NotYou" xml:space="preserve">
     <value>Nie ste to vy?</value>
@@ -2609,31 +2609,10 @@ Chcete prepnúť na toto konto?</value>
   <data name="ThereAreNoItemsThatMatchTheSearch" xml:space="preserve">
     <value>Vyhľadávaniu nezodpovedajú žiadne položky</value>
   </data>
-  <data name="US" xml:space="preserve">
-    <value>USA</value>
-  </data>
-  <data name="EU" xml:space="preserve">
-    <value>EÚ</value>
-  </data>
-  <data name="SelfHosted" xml:space="preserve">
-    <value>Vlastný hosting</value>
-  </data>
-  <data name="DataRegion" xml:space="preserve">
-    <value>Dátová oblasť</value>
-  </data>
-  <data name="Region" xml:space="preserve">
-    <value>Región</value>
-  </data>
   <data name="UpdateWeakMasterPasswordWarning" xml:space="preserve">
     <value>Vaše hlavné heslo nespĺňa jednu alebo viacero podmienok vašej organizácie. Ak chcete získať prístup k trezoru, musíte teraz aktualizovať svoje hlavné heslo. Pokračovaním sa odhlásite z aktuálnej relácie a budete sa musieť znova prihlásiť. Aktívne relácie na iných zariadeniach môžu zostať aktívne až jednu hodinu.</value>
   </data>
   <data name="CurrentMasterPassword" xml:space="preserve">
     <value>Súčasné hlavné heslo</value>
   </data>
-  <data name="MasterPasswordRePromptHelp" xml:space="preserve">
-    <value>Pomoc s opätovnou výzvou na zadanie hlavného hesla</value>
-  </data>
-  <data name="UnlockingMayFailDueToInsufficientMemoryDecreaseYourKDFMemorySettingsToResolve" xml:space="preserve">
-    <value>Odomknutie môže zlyhať z dôvodu nedostatku pamäte. Znížte nastavenia pamäte KDF, aby ste vyriešili problém</value>
-  </data>
 </root>

src/App/Resources/AppResources.sl.resx

@@ -382,7 +382,7 @@
     <value>Potrdi prstni odtis</value>
   </data>
   <data name="VerifyMasterPassword" xml:space="preserve">
-    <value>Preverjanje glavnega gesla</value>
+    <value>Potrdi glavno geslo</value>
   </data>
   <data name="VerifyPIN" xml:space="preserve">
     <value>Potrdi PIN</value>
@@ -446,13 +446,13 @@
     <value>Spremeni e-poštni naslov</value>
   </data>
   <data name="ChangeEmailConfirmation" xml:space="preserve">
-    <value>Svoje e-naslov lahko spremenite v spletnem trezorju na bitwarden.com. Želite to stran obiskati sedaj? </value>
+    <value>Svoje glavno geslo lahko spremenite na bitwarden.com spletnem trezorju. Želite to stran obiskati sedaj? </value>
   </data>
   <data name="ChangeMasterPassword" xml:space="preserve">
     <value>Spremeni glavno geslo</value>
   </data>
   <data name="ChangePasswordConfirmation" xml:space="preserve">
-    <value>Svoje glavno geslo lahko spremenite v spletnem trezorju na bitwarden.com. Želite to stran obiskati sedaj? </value>
+    <value>Svoje glavno geslo lahko spremenite na bitwarden.com spletnem trezorju. Želite to stran obiskati sedaj? </value>
   </data>
   <data name="Close" xml:space="preserve">
     <value>Zapri</value>
@@ -461,7 +461,7 @@
     <value>Nadaljuj</value>
   </data>
   <data name="CreateAccount" xml:space="preserve">
-    <value>Ustvarite račun</value>
+    <value>Ustvari račun</value>
   </data>
   <data name="CreatingAccount" xml:space="preserve">
     <value>Ustvarjanje računa... </value>
@@ -474,7 +474,7 @@
     <value>Omogoči samodejno sinhronizacijo</value>
   </data>
   <data name="EnterEmailForHint" xml:space="preserve">
-    <value>Vnesite e-naslov svojega računa in poslali vam bomo namig za glavno geslo.</value>
+    <value>Vnesite e-poštni naslov svojega računa za pridobitev namiga glavnega gesla. </value>
   </data>
   <data name="ExntesionReenable" xml:space="preserve">
     <value>Ponovno omogoči razširitev aplikacije</value>
@@ -562,7 +562,7 @@
     <value>Logging out will remove all access to your vault and requires online authentication after the timeout period. Are you sure you want to use this setting?</value>
   </data>
   <data name="LoggingIn" xml:space="preserve">
-    <value>Prijava poteka...</value>
+    <value>Vpisujem...</value>
     <comment>Message shown when interacting with the server</comment>
   </data>
   <data name="LoginOrCreateNewAccount" xml:space="preserve">
@@ -578,16 +578,16 @@
     <value>The master password is the password you use to access your vault. It is very important that you do not forget your master password. There is no way to recover the password in the event that you forget it.</value>
   </data>
   <data name="MasterPasswordHint" xml:space="preserve">
-    <value>Namig za glavno geslo (neobvezno)</value>
+    <value>Namig glavnega gesla (opcijsko) </value>
   </data>
   <data name="MasterPasswordHintDescription" xml:space="preserve">
-    <value>Namig vam lahko pomaga, da se spomnite glavnega gesla, če bi ga pozabili.</value>
+    <value>Namig glavnega gesla se vam lahko pomaga spomniti geslo, v kolikor bi ga pozabili.</value>
   </data>
   <data name="MasterPasswordLengthValMessageX" xml:space="preserve">
     <value>Glavno geslo mora vsebovati vsaj {0} znakov.</value>
   </data>
   <data name="MinNumbers" xml:space="preserve">
-    <value>Minimalno števk</value>
+    <value>Minimalno števil</value>
     <comment>Minimum numeric characters for password generator settings</comment>
   </data>
   <data name="MinSpecial" xml:space="preserve">
@@ -708,7 +708,7 @@
     <value>Prijava v dveh korakih</value>
   </data>
   <data name="TwoStepLoginConfirmation" xml:space="preserve">
-    <value>Avtentikacija v dveh korakih naredi vaš račun bolj varen, saj od vas zahteva, da svojo prijavo potrdite z drugo napravo oz. na dodaten način, n.pr. varnostni ključ, aplikacija za preverjanje pristnosti, SMS, telefonski klic ali e-pošta. Prijavo v dveh korakih lahko omogočite v spletnem trezorju bitwarden.com. Ali želite to spletno stran obiskati sedaj?</value>
+    <value>Avtentikacija v dveh korakih naredi vaš račun bolj varen, saj od vas zahteva, da svojo prijavo preverite z drugo napravo, kot je varnostni ključ, aplikacija za preverjanje pristnosti, SMS, telefonski klic ali e-pošta. V spletnem trezorju bitwarden.com je lahko omogočite prijavo v dveh korakih. Ali želite spletno stran obiskati sedaj?</value>
   </data>
   <data name="UnlockWith" xml:space="preserve">
     <value>Odkleni z {0}</value>
@@ -937,7 +937,7 @@ Scanning will happen automatically.</value>
     <value>Datoteka</value>
   </data>
   <data name="NoFileChosen" xml:space="preserve">
-    <value>Datoteka ni izbrana</value>
+    <value>Nobena datoteka izbrana</value>
   </data>
   <data name="NoAttachments" xml:space="preserve">
     <value>Ni prilog.</value>
@@ -1384,10 +1384,10 @@ Scanning will happen automatically.</value>
     <value>Preišči zbirko</value>
   </data>
   <data name="SearchFileSends" xml:space="preserve">
-    <value>Išči med datotečnimi pošiljkami</value>
+    <value>Search file Sends</value>
   </data>
   <data name="SearchTextSends" xml:space="preserve">
-    <value>Išči med besedilnimi pošiljkami</value>
+    <value>Search text Sends</value>
   </data>
   <data name="SearchGroup" xml:space="preserve">
     <value>Išči {0}</value>
@@ -1468,7 +1468,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>Bitwaren vam omogoča souporabo vašega trezorja z drugimi s pomočjo računa organizacije. Želite obiskati spletno mesto bitwarden.dom za več informacij?</value>
+    <value>Bitwaren omogoča delitev vašega trezorja z drugimi s pomočjo organizacijskega računa. Želite obiskati bitwarden.dom spletno stran za več informacij?</value>
   </data>
   <data name="ExportVault" xml:space="preserve">
     <value>Izvoz trezorja</value>
@@ -1496,7 +1496,7 @@ Scanning will happen automatically.</value>
     <comment>ex: Logged in as user@example.com on bitwarden.com.</comment>
   </data>
   <data name="VaultLockedMasterPassword" xml:space="preserve">
-    <value>Vaš trezor je zaklenjen. Vpišite svoje glavno geslo za nadaljevanje.</value>
+    <value>Vaš trezor je zaklenjen. Potrdite vaše glavno geslo za nadaljevanje.</value>
   </data>
   <data name="VaultLockedPIN" xml:space="preserve">
     <value>Vaš trezor je zaklenjen. Potrdite PIN kodo za nadaljevanje.</value>
@@ -1813,7 +1813,8 @@ Scanning will happen automatically.</value>
     <value>Nalaganje</value>
   </data>
   <data name="AcceptPolicies" xml:space="preserve">
-    <value>Potrjujem, da se strinjam z naslednjim:</value>
+    <value>By activating this switch you agree to the following:
+</value>
   </data>
   <data name="AcceptPoliciesError" xml:space="preserve">
     <value>Terms of Service and Privacy Policy have not been acknowledged.</value>
@@ -1878,11 +1879,11 @@ 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="Sends" xml:space="preserve">
-    <value>Pošiljke</value>
+    <value>Poslano</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>Prijazno ime, ki opisuje to pošiljko.</value>
+    <value>A friendly name to describe 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="Text" xml:space="preserve">
@@ -1979,15 +1980,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="DisableSend" xml:space="preserve">
-    <value>Onemogoči to pošiljko, da ne bo dostopna nikomur</value>
+    <value>Deactivate 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">
-    <value>Vaš račun ne vsebuje pošiljk.</value>
+    <value>There are no Sends in your account.</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">
-    <value>Dodaj pošiljko</value>
+    <value>Add a 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="CopyLink" xml:space="preserve">
@@ -2001,31 +2002,31 @@ 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="SearchSends" xml:space="preserve">
-    <value>Išči med pošiljkami</value>
+    <value>Išči poslano</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>Uredi pošiljko</value>
+    <value>Uredi poslano</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>Nova pošiljka</value>
+    <value>Dodaj poslano</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>Ali želite izbrisati to pošiljko?</value>
+    <value>Ali želite izbrisati to poslano?</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>Pošiljka je bila izbrisana.</value>
+    <value>Poslano je bilo izbrisano.</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>Pošiljka shranjena.</value>
+    <value>Poslano posodobljeno.</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>Pošiljka ustvarjena.</value>
+    <value>Ustvarjeno novo poslano.</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">
@@ -2047,7 +2048,7 @@ Scanning will happen automatically.</value>
     <value>Po meri</value>
   </data>
   <data name="ShareOnSave" xml:space="preserve">
-    <value>Deli to pošiljko, ko bo shranjena</value>
+    <value>Deli to poslano po shranjevanju.</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">
@@ -2055,7 +2056,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="AboutSend" xml:space="preserve">
-    <value>O pošiljkah</value>
+    <value>O poslanem</value>
     <comment>'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated.</comment>
   </data>
   <data name="HideEmail" xml:space="preserve">
@@ -2066,15 +2067,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="SendFilePremiumRequired" xml:space="preserve">
-    <value>Brezplačni računi so omejeni samo na besedilne pošiljke. Za uporabo datotečnih pošiljk je potrebno članstvo Premium.</value>
+    <value>Brezplačni računi so omejeni samo na skupno rabo besedila. Za uporabo pošiljanje datotek preko Pošlji je potrebno premium članstvo.</value>
     <comment>'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated.</comment>
   </data>
   <data name="SendFileEmailVerificationRequired" xml:space="preserve">
-    <value>Če želite uporabljati datotečne pošiljke, morate potrditi svoj e-naslov. To lahko storite v trezorju na spletu.</value>
+    <value>Če želite uporabljati datoteke s funkcijo Pošlji, morate potrditi svoj e-poštni naslov.</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>Ponovno zahtevaj glavno geslo</value>
+    <value>Master password re-prompt</value>
   </data>
   <data name="PasswordConfirmation" xml:space="preserve">
     <value>Master password confirmation</value>
@@ -2092,7 +2093,7 @@ Scanning will happen automatically.</value>
     <value>Updated master password</value>
   </data>
   <data name="UpdateMasterPassword" xml:space="preserve">
-    <value>Posodobi glavno geslo</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 organization. In order to access the vault, you must update your master password now. Proceeding will log you out of your current session, requiring you to log back in. Active sessions on other devices may continue to remain active for up to one hour.</value>
@@ -2245,7 +2246,7 @@ Scanning will happen automatically.</value>
     <value>Male črke (a-z)</value>
   </data>
   <data name="NumbersZeroToNine" xml:space="preserve">
-    <value>Števke (0-9)</value>
+    <value>Numbers (0 to 9)</value>
   </data>
   <data name="SpecialCharacters" xml:space="preserve">
     <value>Posebni znaki (!@#$%^&amp;*)</value>
@@ -2390,22 +2391,22 @@ select Add TOTP to store the key safely</value>
     <value>Kaj želite generirati?</value>
   </data>
   <data name="UsernameType" xml:space="preserve">
-    <value>Vrsta uporabniškega imena</value>
+    <value>Username type</value>
   </data>
   <data name="PlusAddressedEmail" xml:space="preserve">
-    <value>E-naslov s plusom</value>
+    <value>Plus addressed email</value>
   </data>
   <data name="CatchAllEmail" xml:space="preserve">
-    <value>E-naslov za vse</value>
+    <value>Catch-all email</value>
   </data>
   <data name="ForwardedEmailAlias" xml:space="preserve">
-    <value>Posredniški psevdonim</value>
+    <value>Forwarded email alias</value>
   </data>
   <data name="RandomWord" xml:space="preserve">
-    <value>Naključna beseda</value>
+    <value>Random word</value>
   </data>
   <data name="EmailRequiredParenthesis" xml:space="preserve">
-    <value>E-naslov (obvezno)</value>
+    <value>Email (required)</value>
   </data>
   <data name="DomainNameRequiredParenthesis" xml:space="preserve">
     <value>Domain name (required)</value>
@@ -2446,7 +2447,7 @@ select Add TOTP to store the key safely</value>
     <value>Generiraj uporabniško ime</value>
   </data>
   <data name="EmailType" xml:space="preserve">
-    <value>Vrsta e-pošte</value>
+    <value>Email Type</value>
   </data>
   <data name="WebsiteRequired" xml:space="preserve">
     <value>Website (required)</value>
@@ -2455,16 +2456,16 @@ select Add TOTP to store the key safely</value>
     <value>Unknown {0} error occurred.</value>
   </data>
   <data name="PlusAddressedEmailDescription" xml:space="preserve">
-    <value>Uporabite možnosti podnaslavljanja vašega ponudnika elektronske pošte.</value>
+    <value>Use your email provider's subaddress capabilities</value>
   </data>
   <data name="CatchAllEmailDescription" xml:space="preserve">
-    <value>Uporabite naslov za vse ("catch-all"), ki ste ga nastavili za svojo domeno.</value>
+    <value>Use your domain's configured catch-all inbox.</value>
   </data>
   <data name="ForwardedEmailDescription" xml:space="preserve">
-    <value>Ustvari psevdonim (alias) za elektronski naslov z uporabo zunanjega ponudnika posredovanja pošte.</value>
+    <value>Generate an email alias with an external forwarding service.</value>
   </data>
   <data name="Random" xml:space="preserve">
-    <value>Naključno</value>
+    <value>Random</value>
   </data>
   <data name="ConnectToWatch" xml:space="preserve">
     <value>Connect to Watch</value>
@@ -2495,8 +2496,8 @@ Do you want to switch to this account?</value>
   <data name="GetMasterPasswordwordHint" xml:space="preserve">
     <value>Pridobi namig za glavno geslo</value>
   </data>
-  <data name="LoggingInAsXOnY" xml:space="preserve">
-    <value>Logging in as {0} on {1}</value>
+  <data name="LoggingInAsX" xml:space="preserve">
+    <value>Prijavljate se kot {0}</value>
   </data>
   <data name="NotYou" xml:space="preserve">
     <value>To niste vi?</value>
@@ -2609,31 +2610,10 @@ Do you want to switch to this account?</value>
   <data name="ThereAreNoItemsThatMatchTheSearch" xml:space="preserve">
     <value>Ni elementov, ki bi ustrezali iskanju</value>
   </data>
-  <data name="US" xml:space="preserve">
-    <value>US</value>
-  </data>
-  <data name="EU" xml:space="preserve">
-    <value>EU</value>
-  </data>
-  <data name="SelfHosted" xml:space="preserve">
-    <value>Self-hosted</value>
-  </data>
-  <data name="DataRegion" xml:space="preserve">
-    <value>Podatkovna regija</value>
-  </data>
-  <data name="Region" xml:space="preserve">
-    <value>Regija</value>
-  </data>
   <data name="UpdateWeakMasterPasswordWarning" xml:space="preserve">
     <value>Your master password does not meet one or more of your organization policies. 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="CurrentMasterPassword" xml:space="preserve">
     <value>Trenutno glavno geslo</value>
   </data>
-  <data name="MasterPasswordRePromptHelp" xml:space="preserve">
-    <value>Pomoč o ponovnem zahtevku za glavno geslo</value>
-  </data>
-  <data name="UnlockingMayFailDueToInsufficientMemoryDecreaseYourKDFMemorySettingsToResolve" xml:space="preserve">
-    <value>Unlocking may fail due to insufficient memory. Decrease your KDF memory settings to resolve</value>
-  </data>
 </root>

src/App/Resources/AppResources.sr.resx

@@ -2497,8 +2497,8 @@
   <data name="GetMasterPasswordwordHint" xml:space="preserve">
     <value>Добити савет за Главну Лозинку</value>
   </data>
-  <data name="LoggingInAsXOnY" xml:space="preserve">
-    <value>Пријављено као {0} на {1}</value>
+  <data name="LoggingInAsX" xml:space="preserve">
+    <value>Пријављивање као {0}</value>
   </data>
   <data name="NotYou" xml:space="preserve">
     <value>Не ти?</value>
@@ -2611,31 +2611,10 @@
   <data name="ThereAreNoItemsThatMatchTheSearch" xml:space="preserve">
     <value>Нема ставки које одговарају претрази</value>
   </data>
-  <data name="US" xml:space="preserve">
-    <value>US</value>
-  </data>
-  <data name="EU" xml:space="preserve">
-    <value>EU</value>
-  </data>
-  <data name="SelfHosted" xml:space="preserve">
-    <value>Личан хостинг</value>
-  </data>
-  <data name="DataRegion" xml:space="preserve">
-    <value>Регион података</value>
-  </data>
-  <data name="Region" xml:space="preserve">
-    <value>Регион</value>
-  </data>
   <data name="UpdateWeakMasterPasswordWarning" xml:space="preserve">
     <value>Ваша главна лозинка не испуњава једну или више смерница ваше организације. Да бисте приступили сефу, морате одмах да ажурирате главну лозинку. Ако наставите, одјавићете се са ваше тренутне сесије, што захтева да се поново пријавите. Активне сесије на другим уређајима могу да остану активне до један сат.</value>
   </data>
   <data name="CurrentMasterPassword" xml:space="preserve">
     <value>Тренутна главна лозинка</value>
   </data>
-  <data name="MasterPasswordRePromptHelp" xml:space="preserve">
-    <value>Master password re-prompt help</value>
-  </data>
-  <data name="UnlockingMayFailDueToInsufficientMemoryDecreaseYourKDFMemorySettingsToResolve" xml:space="preserve">
-    <value>Unlocking may fail due to insufficient memory. Decrease your KDF memory settings to resolve</value>
-  </data>
 </root>

src/App/Resources/AppResources.sv.resx

@@ -2497,8 +2497,8 @@ Vill du byta till detta konto?</value>
   <data name="GetMasterPasswordwordHint" xml:space="preserve">
     <value>Hämta huvudlösenordsledtråd</value>
   </data>
-  <data name="LoggingInAsXOnY" xml:space="preserve">
-    <value>Logging in as {0} on {1}</value>
+  <data name="LoggingInAsX" xml:space="preserve">
+    <value>Loggar in som {0}</value>
   </data>
   <data name="NotYou" xml:space="preserve">
     <value>Är det inte du?</value>
@@ -2611,31 +2611,10 @@ Vill du byta till detta konto?</value>
   <data name="ThereAreNoItemsThatMatchTheSearch" xml:space="preserve">
     <value>Det finns inga objekt som matchar sökningen</value>
   </data>
-  <data name="US" xml:space="preserve">
-    <value>US</value>
-  </data>
-  <data name="EU" xml:space="preserve">
-    <value>EU</value>
-  </data>
-  <data name="SelfHosted" xml:space="preserve">
-    <value>Self-hosted</value>
-  </data>
-  <data name="DataRegion" xml:space="preserve">
-    <value>Data region</value>
-  </data>
-  <data name="Region" xml:space="preserve">
-    <value>Region</value>
-  </data>
   <data name="UpdateWeakMasterPasswordWarning" xml:space="preserve">
     <value>Your master password does not meet one or more of your organization policies. 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="CurrentMasterPassword" xml:space="preserve">
     <value>Nuvarande huvudlösenord</value>
   </data>
-  <data name="MasterPasswordRePromptHelp" xml:space="preserve">
-    <value>Master password re-prompt help</value>
-  </data>
-  <data name="UnlockingMayFailDueToInsufficientMemoryDecreaseYourKDFMemorySettingsToResolve" xml:space="preserve">
-    <value>Unlocking may fail due to insufficient memory. Decrease your KDF memory settings to resolve</value>
-  </data>
 </root>

src/App/Resources/AppResources.ta.resx

@@ -190,7 +190,7 @@
     <comment>Full label for a email address.</comment>
   </data>
   <data name="EmailUs" xml:space="preserve">
-    <value>எமக்கு மின்னஞ்சலிடு</value>
+    <value>எங்களுக்கு மின்னஞ்சலிடு</value>
   </data>
   <data name="EmailUsDescription" xml:space="preserve">
     <value>நேரடியாக உதவி பெற அ கருத்து தெரிவிக்க எங்களுக்கு மின்னஞ்சலிடு</value>
@@ -229,7 +229,7 @@
     <value>கோப்புறைகள்</value>
   </data>
   <data name="FolderUpdated" xml:space="preserve">
-    <value>கோப்புறை சேமிக்கப்பட்டது</value>
+    <value>கோப்புறை புதுப்பிக்கப்பட்டது.</value>
   </data>
   <data name="GoToWebsite" xml:space="preserve">
     <value>வலைத்தளத்திற்குச் செல்</value>
@@ -342,7 +342,7 @@
     <comment>Reveal a hidden value (password).</comment>
   </data>
   <data name="ItemDeleted" xml:space="preserve">
-    <value>உருப்படி நீக்கப்பட்டது</value>
+    <value>உருப்படி நீக்கப்பட்டது.</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>கைரேகை பயன்படுத்தி பூட்டவிழ்</value>
+    <value>கைரேகையைப் பயன்படுத்தி பூட்டவிழ்</value>
   </data>
   <data name="Username" xml:space="preserve">
     <value>பயனர்பெயர்</value>
@@ -375,7 +375,7 @@
     <comment>Validation message for when a form field is left blank and is required to be entered.</comment>
   </data>
   <data name="ValueHasBeenCopied" xml:space="preserve">
-    <value>{0} நகலெடுக்கப்பட்டது</value>
+    <value>{0} நகலெடுக்கப்பட்டது.</value>
     <comment>Confirmation message after successfully copying a value to the clipboard.</comment>
   </data>
   <data name="VerifyFingerprint" xml:space="preserve">
@@ -431,7 +431,7 @@
     <value>Bitwarden செயலி நீட்டிப்பு</value>
   </data>
   <data name="BitwardenAppExtensionAlert2" xml:space="preserve">
-    <value>உம் பெட்டகத்திற்கு புதிய உள்நுழைவுகளைச் சேர்ப்பதற்கான மிக எளிய வழி பிட்வார்டன் செயலி நீட்டிப்பிலிருந்தே. "அமைப்புகள்" திரைக்குச் சென்று பிட்வார்டன் செயலி நீட்டிப்பைப் பயன்படுத்துவது பற்றி மேலுமறிக.</value>
+    <value>உங்கள் பெட்டகத்திற்கு புதிய உள்நுழைவுகளைச் சேர்ப்பதற்கான மிக எளிய வழி பிட்வார்டன் செயலி நீட்டிப்பு மூலமே. "அமைப்புகள்" திரைக்கு செல்வதன் மூலம் பிட்வார்டன் செயலி நீட்டிப்பைப் பயன்படுத்துவது பற்றி மேலுமறிக.</value>
   </data>
   <data name="BitwardenAppExtensionDescription" xml:space="preserve">
     <value>Safari மற்றும் பிற செயலிகளில் உமது உள்நுழைவுகளைத் தன்னிரப்ப Bitwardenஐப் பயன்படுத்து.</value>
@@ -461,7 +461,7 @@
     <value>தொடர்</value>
   </data>
   <data name="CreateAccount" xml:space="preserve">
-    <value>கணக்கை உருவாக்கு</value>
+    <value>கணக்கு உருவாக்கு</value>
   </data>
   <data name="CreatingAccount" xml:space="preserve">
     <value>கணக்கை உருவாக்குகிறது...</value>
@@ -471,7 +471,7 @@
     <value>உருப்படியைத் திருத்து</value>
   </data>
   <data name="EnableAutomaticSyncing" xml:space="preserve">
-    <value>தானியங்கு ஒத்திசைவை அனுமதி</value>
+    <value>தானியங்கு ஒத்திசைவை இயக்கு</value>
   </data>
   <data name="EnterEmailForHint" xml:space="preserve">
     <value>உமது பிரதான கடவுச்சொல் குறிப்பைப் பெற உமது கணக்கு மின்னஞ்சல் முகவரியை உள்ளிடு.</value>
@@ -529,7 +529,7 @@
     <value>உங்கள் உருப்படிகளை மற்ற கடவுச்சொல் நிர்வாக செயலிகளிலிருந்து விரைவாக மொத்த இறக்குமதி செய்க.</value>
   </data>
   <data name="LastSync" xml:space="preserve">
-    <value>கடந்த ஒத்திசைவு:</value>
+    <value>கடந்த ஒத்திசைவு: </value>
   </data>
   <data name="Length" xml:space="preserve">
     <value>நீளம்</value>
@@ -1580,20 +1580,20 @@
     <comment>'Nord' is the name of a specific color scheme. It should not be translated.</comment>
   </data>
   <data name="SolarizedDark" xml:space="preserve">
-    <value>சோலரைஸ்டு இருள்</value>
+    <value>Solarized Dark</value>
     <comment>'Solarized Dark' is the name of a specific color scheme. It should not be translated.</comment>
   </data>
   <data name="AutofillBlockedUris" xml:space="preserve">
-    <value>தடுக்கப்பட்ட உரலிகளைத் தன்னிரப்பு</value>
+    <value>Auto-fill blocked URIs</value>
   </data>
   <data name="AutofillBlockedUrisDescription" xml:space="preserve">
-    <value>தடுக்கப்பட்ட உரலிகளுக்கு தன்னிரப்பல் அளிக்கப்படா. பல உரலிகள் காற்புள்ளியுடன் பிரிக்கவும். எ.கா:"https://twitter.com, androidapp://com.twitter.android".</value>
+    <value>Auto-fill will not be offered for blocked URIs. Separate multiple URIs with a comma. For example: "https://twitter.com, androidapp://com.twitter.android".</value>
   </data>
   <data name="AskToAddLogin" xml:space="preserve">
     <value>உள்நுழைவைச் சேர்க்க கேள்</value>
   </data>
   <data name="AskToAddLoginDescription" xml:space="preserve">
-    <value>உமது பெட்டகத்தில் உருப்படி இல்லையெனில் சேர்க்க கேள்.</value>
+    <value>Ask to add an item if one isn't found in your vault.</value>
   </data>
   <data name="OnRestart" xml:space="preserve">
     <value>செயலி மறுதொடக்கத்தில்</value>
@@ -1754,7 +1754,7 @@
     <comment>Confirmation alert message when soft-deleting a cipher.</comment>
   </data>
   <data name="AccountBiometricInvalidated" xml:space="preserve">
-    <value>இக்கணக்கிற்கான உயிரியளவு பூட்டவிழ்த்தல் முடக்கப்பட்டது பிரதான கடவுச்சொல் சரிபார்ப்பு நிலுவையிலுள்ளது.</value>
+    <value>Biometric unlock for this account is disabled pending verification of master password.</value>
   </data>
   <data name="AccountBiometricInvalidatedExtension" xml:space="preserve">
     <value>Autofill biometric unlock for this account is disabled pending verification of master password.</value>
@@ -2144,10 +2144,10 @@
     <value>உம் நிறுவன கொள்கைகள் உம் பெட்டக நேரமுடிவைப் பாதிக்கிறது. அனுமதிக்கப்பட்ட அதிகபட்ச பெட்டக நேரமுடிவு {0} மணிநேரம் மற்றும் {1} நிமிடம(கள்) ஆகும்</value>
   </data>
   <data name="VaultTimeoutPolicyWithActionInEffect" xml:space="preserve">
-    <value>உம் நிறுவன கொள்கைகள் உம் பெட்டக நேரமுடிவைப் பாதிக்கிறது. அனுமதிக்கப்பட்ட அதிகபட்ச பெட்டக நேரமுடிவு {0} மணிநேரம் மற்றும் {1} நிமிடம(கள்) ஆகும். உம் பெட்டக நேரமுடிவுச் செயல் {2} என அமைக்கப்ப்பட்டுள்ளது.</value>
+    <value>Your organization policies are affecting your vault timeout. Maximum allowed vault timeout is {0} hour(s) and {1} minute(s). Your vault timeout action is set to {2}.</value>
   </data>
   <data name="VaultTimeoutActionPolicyInEffect" xml:space="preserve">
-    <value>உம் நிறுவன கொள்கைகள் உம் பெட்டக நேரமுடிவு செயலை {0} என அமைத்துள்ளன.</value>
+    <value>Your organization policies have set your vault timeout action to {0}.</value>
   </data>
   <data name="VaultTimeoutToLarge" xml:space="preserve">
     <value>உமது பெட்டக நேரமுடிவு உம் நிறுவனம் அமைத்த கட்டுப்பாடுகளை தாண்டுகிறது.</value>
@@ -2231,7 +2231,7 @@
     <value>சிதைவுக்குறிப்புகளைச் சமர்ப்பி</value>
   </data>
   <data name="SubmitCrashLogsDescription" xml:space="preserve">
-    <value>சிதைவு அறிக்கைகளைச் சமர்ப்பித்துச் செயலி உறுதிநிலையை மேம்படுத்த Bitwardenக்கு உதவுக.</value>
+    <value>Help Bitwarden improve app stability by submitting crash reports.</value>
   </data>
   <data name="OptionsExpanded" xml:space="preserve">
     <value>தெரிவுகள் விரிவாகின, சுருக்கத் தட்டு.</value>
@@ -2279,25 +2279,25 @@
     <value>TOTP</value>
   </data>
   <data name="VerificationCodes" xml:space="preserve">
-    <value>சரிபார்ப்பு குறியீடுகள்</value>
+    <value>Verification codes</value>
   </data>
   <data name="PremiumSubscriptionRequired" xml:space="preserve">
-    <value>உயர்தரச் சந்தா தேவை</value>
+    <value>Premium subscription required</value>
   </data>
   <data name="CannotAddAuthenticatorKey" xml:space="preserve">
-    <value>அங்கீகரிப்பான் விசையைச் சேர்க்க முடியவில்லையா? </value>
+    <value>Cannot add authenticator key? </value>
   </data>
   <data name="ScanQRCode" xml:space="preserve">
-    <value>விரைவுக்குறியை வருடு</value>
+    <value>Scan QR Code</value>
   </data>
   <data name="CannotScanQRCode" xml:space="preserve">
-    <value>விரைவுக்குறியை வருட முடியவில்லையா? </value>
+    <value>Cannot scan QR Code? </value>
   </data>
   <data name="AuthenticatorKeyScanner" xml:space="preserve">
-    <value>அங்கீகரிப்பான் விசை</value>
+    <value>Authenticator key</value>
   </data>
   <data name="EnterKeyManually" xml:space="preserve">
-    <value>கைமுறையாக விசையை உள்ளிடு</value>
+    <value>Enter key manually</value>
   </data>
   <data name="AddTotp" xml:space="preserve">
     <value>Add TOTP</value>
@@ -2494,10 +2494,10 @@ select Add TOTP to store the key safely</value>
     <value>New around here?</value>
   </data>
   <data name="GetMasterPasswordwordHint" xml:space="preserve">
-    <value>பிரதான கடவுச்சொல் குறிப்பைப் பெறு</value>
+    <value>Get master password hint</value>
   </data>
-  <data name="LoggingInAsXOnY" xml:space="preserve">
-    <value>{1} இல் {0} ஆக உள்நுழைகிறது</value>
+  <data name="LoggingInAsX" xml:space="preserve">
+    <value>{0} ஆக உள்நுழைகிறது</value>
   </data>
   <data name="NotYou" xml:space="preserve">
     <value>நீங்கள் இல்லையா?</value>
@@ -2610,31 +2610,10 @@ select Add TOTP to store the key safely</value>
   <data name="ThereAreNoItemsThatMatchTheSearch" xml:space="preserve">
     <value>There are no items that match the search</value>
   </data>
-  <data name="US" xml:space="preserve">
-    <value>அமெரிக்க ஐக்கிய நாடுகள்</value>
-  </data>
-  <data name="EU" xml:space="preserve">
-    <value>ஐரோப்பிய ஒன்றியம்</value>
-  </data>
-  <data name="SelfHosted" xml:space="preserve">
-    <value>Self-hosted</value>
-  </data>
-  <data name="DataRegion" xml:space="preserve">
-    <value>தரவு இடம்</value>
-  </data>
-  <data name="Region" xml:space="preserve">
-    <value>இடம்</value>
-  </data>
   <data name="UpdateWeakMasterPasswordWarning" xml:space="preserve">
     <value>Your master password does not meet one or more of your organization policies. 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="CurrentMasterPassword" xml:space="preserve">
     <value>Current master password</value>
   </data>
-  <data name="MasterPasswordRePromptHelp" xml:space="preserve">
-    <value>Master password re-prompt help</value>
-  </data>
-  <data name="UnlockingMayFailDueToInsufficientMemoryDecreaseYourKDFMemorySettingsToResolve" xml:space="preserve">
-    <value>Unlocking may fail due to insufficient memory. Decrease your KDF memory settings to resolve</value>
-  </data>
 </root>

src/App/Resources/AppResources.te.resx

@@ -2496,8 +2496,8 @@ Do you want to switch to this account?</value>
   <data name="GetMasterPasswordwordHint" xml:space="preserve">
     <value>Get master password hint</value>
   </data>
-  <data name="LoggingInAsXOnY" xml:space="preserve">
-    <value>Logging in as {0} on {1}</value>
+  <data name="LoggingInAsX" xml:space="preserve">
+    <value>Logging in as {0}</value>
   </data>
   <data name="NotYou" xml:space="preserve">
     <value>Not you?</value>
@@ -2610,31 +2610,10 @@ Do you want to switch to this account?</value>
   <data name="ThereAreNoItemsThatMatchTheSearch" xml:space="preserve">
     <value>There are no items that match the search</value>
   </data>
-  <data name="US" xml:space="preserve">
-    <value>US</value>
-  </data>
-  <data name="EU" xml:space="preserve">
-    <value>EU</value>
-  </data>
-  <data name="SelfHosted" xml:space="preserve">
-    <value>Self-hosted</value>
-  </data>
-  <data name="DataRegion" xml:space="preserve">
-    <value>Data region</value>
-  </data>
-  <data name="Region" xml:space="preserve">
-    <value>Region</value>
-  </data>
   <data name="UpdateWeakMasterPasswordWarning" xml:space="preserve">
     <value>Your master password does not meet one or more of your organization policies. 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="CurrentMasterPassword" xml:space="preserve">
     <value>Current master password</value>
   </data>
-  <data name="MasterPasswordRePromptHelp" xml:space="preserve">
-    <value>Master password re-prompt help</value>
-  </data>
-  <data name="UnlockingMayFailDueToInsufficientMemoryDecreaseYourKDFMemorySettingsToResolve" xml:space="preserve">
-    <value>Unlocking may fail due to insufficient memory. Decrease your KDF memory settings to resolve</value>
-  </data>
 </root>

src/App/Resources/AppResources.th.resx

@@ -2503,8 +2503,8 @@ Do you want to switch to this account?</value>
   <data name="GetMasterPasswordwordHint" xml:space="preserve">
     <value>Get master password hint</value>
   </data>
-  <data name="LoggingInAsXOnY" xml:space="preserve">
-    <value>Logging in as {0} on {1}</value>
+  <data name="LoggingInAsX" xml:space="preserve">
+    <value>Logging in as {0}</value>
   </data>
   <data name="NotYou" xml:space="preserve">
     <value>Not you?</value>
@@ -2617,31 +2617,10 @@ Do you want to switch to this account?</value>
   <data name="ThereAreNoItemsThatMatchTheSearch" xml:space="preserve">
     <value>There are no items that match the search</value>
   </data>
-  <data name="US" xml:space="preserve">
-    <value>US</value>
-  </data>
-  <data name="EU" xml:space="preserve">
-    <value>EU</value>
-  </data>
-  <data name="SelfHosted" xml:space="preserve">
-    <value>Self-hosted</value>
-  </data>
-  <data name="DataRegion" xml:space="preserve">
-    <value>Data region</value>
-  </data>
-  <data name="Region" xml:space="preserve">
-    <value>Region</value>
-  </data>
   <data name="UpdateWeakMasterPasswordWarning" xml:space="preserve">
     <value>Your master password does not meet one or more of your organization policies. 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="CurrentMasterPassword" xml:space="preserve">
     <value>Current master password</value>
   </data>
-  <data name="MasterPasswordRePromptHelp" xml:space="preserve">
-    <value>Master password re-prompt help</value>
-  </data>
-  <data name="UnlockingMayFailDueToInsufficientMemoryDecreaseYourKDFMemorySettingsToResolve" xml:space="preserve">
-    <value>Unlocking may fail due to insufficient memory. Decrease your KDF memory settings to resolve</value>
-  </data>
 </root>

src/App/Resources/AppResources.tr.resx

@@ -2494,8 +2494,8 @@ Bu hesaba geçmek ister misiniz?</value>
   <data name="GetMasterPasswordwordHint" xml:space="preserve">
     <value>Ana parola ipucunu al</value>
   </data>
-  <data name="LoggingInAsXOnY" xml:space="preserve">
-    <value>{1} üzerinde {0} olarak giriş yapılıyor</value>
+  <data name="LoggingInAsX" xml:space="preserve">
+    <value>{0} olarak giriş yapılıyor</value>
   </data>
   <data name="NotYou" xml:space="preserve">
     <value>Siz değil misiniz?</value>
@@ -2608,31 +2608,10 @@ Bu hesaba geçmek ister misiniz?</value>
   <data name="ThereAreNoItemsThatMatchTheSearch" xml:space="preserve">
     <value>Aramayla eşleşen kayıt yok</value>
   </data>
-  <data name="US" xml:space="preserve">
-    <value>ABD</value>
-  </data>
-  <data name="EU" xml:space="preserve">
-    <value>AB</value>
-  </data>
-  <data name="SelfHosted" xml:space="preserve">
-    <value>Barındırılan</value>
-  </data>
-  <data name="DataRegion" xml:space="preserve">
-    <value>Veri bölgesi</value>
-  </data>
-  <data name="Region" xml:space="preserve">
-    <value>Bölge</value>
-  </data>
   <data name="UpdateWeakMasterPasswordWarning" xml:space="preserve">
     <value>Ana parolanız kuruluş ilkelerinizi karşılamıyor. Kasanıza erişmek için ana parolanızı güncellemelisiniz. Devam ettiğinizde oturumunuz kapanacak ve yeniden oturum açmanız gerekecektir. Diğer cihazlardaki aktif oturumlar bir saate kadar aktif kalabilir.</value>
   </data>
   <data name="CurrentMasterPassword" xml:space="preserve">
     <value>Mevcut ana parola</value>
   </data>
-  <data name="MasterPasswordRePromptHelp" xml:space="preserve">
-    <value>Ana parola yeniden istemi yardımı</value>
-  </data>
-  <data name="UnlockingMayFailDueToInsufficientMemoryDecreaseYourKDFMemorySettingsToResolve" xml:space="preserve">
-    <value>Yetersiz bellek nedeniyle kilit açma başarısız olabilir. Çözmek için KDF bellek ayarlarınızı azaltın</value>
-  </data>
 </root>

src/App/Resources/AppResources.uk.resx

@@ -2495,8 +2495,8 @@
   <data name="GetMasterPasswordwordHint" xml:space="preserve">
     <value>Отримати підказку для головного пароля</value>
   </data>
-  <data name="LoggingInAsXOnY" xml:space="preserve">
-    <value>Вхід як {0} на {1}</value>
+  <data name="LoggingInAsX" xml:space="preserve">
+    <value>Вхід у систему як {0}</value>
   </data>
   <data name="NotYou" xml:space="preserve">
     <value>Не ви?</value>
@@ -2609,31 +2609,10 @@
   <data name="ThereAreNoItemsThatMatchTheSearch" xml:space="preserve">
     <value>Немає записів, що відповідають пошуку</value>
   </data>
-  <data name="US" xml:space="preserve">
-    <value>США</value>
-  </data>
-  <data name="EU" xml:space="preserve">
-    <value>ЄС</value>
-  </data>
-  <data name="SelfHosted" xml:space="preserve">
-    <value>Власне розміщення</value>
-  </data>
-  <data name="DataRegion" xml:space="preserve">
-    <value>Регіон даних</value>
-  </data>
-  <data name="Region" xml:space="preserve">
-    <value>Регіон</value>
-  </data>
   <data name="UpdateWeakMasterPasswordWarning" xml:space="preserve">
     <value>Ваш головний пароль не відповідає одній або більше політикам вашої організації. Щоб отримати доступ до сховища, вам необхідно оновити свій головний пароль зараз. Продовживши, ви вийдете з поточного сеансу, після чого потрібно буде повторно виконати вхід. Сеанси на інших пристроях можуть залишатися активними протягом однієї години.</value>
   </data>
   <data name="CurrentMasterPassword" xml:space="preserve">
     <value>Поточний головний пароль</value>
   </data>
-  <data name="MasterPasswordRePromptHelp" xml:space="preserve">
-    <value>Master password re-prompt help</value>
-  </data>
-  <data name="UnlockingMayFailDueToInsufficientMemoryDecreaseYourKDFMemorySettingsToResolve" xml:space="preserve">
-    <value>Unlocking may fail due to insufficient memory. Decrease your KDF memory settings to resolve</value>
-  </data>
 </root>

src/App/Resources/AppResources.vi.resx

@@ -2495,8 +2495,8 @@ Do you want to switch to this account?</value>
   <data name="GetMasterPasswordwordHint" xml:space="preserve">
     <value>Get master password hint</value>
   </data>
-  <data name="LoggingInAsXOnY" xml:space="preserve">
-    <value>Logging in as {0} on {1}</value>
+  <data name="LoggingInAsX" xml:space="preserve">
+    <value>Đăng nhập với {0}</value>
   </data>
   <data name="NotYou" xml:space="preserve">
     <value>Không phải bạn?</value>
@@ -2609,31 +2609,10 @@ Do you want to switch to this account?</value>
   <data name="ThereAreNoItemsThatMatchTheSearch" xml:space="preserve">
     <value>There are no items that match the search</value>
   </data>
-  <data name="US" xml:space="preserve">
-    <value>US</value>
-  </data>
-  <data name="EU" xml:space="preserve">
-    <value>EU</value>
-  </data>
-  <data name="SelfHosted" xml:space="preserve">
-    <value>Self-hosted</value>
-  </data>
-  <data name="DataRegion" xml:space="preserve">
-    <value>Data region</value>
-  </data>
-  <data name="Region" xml:space="preserve">
-    <value>Region</value>
-  </data>
   <data name="UpdateWeakMasterPasswordWarning" xml:space="preserve">
     <value>Your master password does not meet one or more of your organization policies. 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="CurrentMasterPassword" xml:space="preserve">
     <value>Current master password</value>
   </data>
-  <data name="MasterPasswordRePromptHelp" xml:space="preserve">
-    <value>Master password re-prompt help</value>
-  </data>
-  <data name="UnlockingMayFailDueToInsufficientMemoryDecreaseYourKDFMemorySettingsToResolve" xml:space="preserve">
-    <value>Unlocking may fail due to insufficient memory. Decrease your KDF memory settings to resolve</value>
-  </data>
 </root>

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

@@ -2495,8 +2495,8 @@
   <data name="GetMasterPasswordwordHint" xml:space="preserve">
     <value>获取主密码提示</value>
   </data>
-  <data name="LoggingInAsXOnY" xml:space="preserve">
-    <value>在 {1} 上以 {0} 身份登录</value>
+  <data name="LoggingInAsX" xml:space="preserve">
+    <value>正登录为 {0}</value>
   </data>
   <data name="NotYou" xml:space="preserve">
     <value>不是你？</value>
@@ -2609,31 +2609,10 @@
   <data name="ThereAreNoItemsThatMatchTheSearch" xml:space="preserve">
     <value>没有匹配搜索条件的项目</value>
   </data>
-  <data name="US" xml:space="preserve">
-    <value>美国</value>
-  </data>
-  <data name="EU" xml:space="preserve">
-    <value>欧盟</value>
-  </data>
-  <data name="SelfHosted" xml:space="preserve">
-    <value>自托管</value>
-  </data>
-  <data name="DataRegion" xml:space="preserve">
-    <value>数据区域</value>
-  </data>
-  <data name="Region" xml:space="preserve">
-    <value>区域</value>
-  </data>
   <data name="UpdateWeakMasterPasswordWarning" xml:space="preserve">
     <value>您的主密码不符合某一项或多项组织策略要求。要访问密码库，必须立即更新您的主密码。继续操作将使您退出当前会话，并要求您重新登录。其他设备上的活动会话可能会继续保持活动状态长达一小时。</value>
   </data>
   <data name="CurrentMasterPassword" xml:space="preserve">
     <value>当前主密码</value>
   </data>
-  <data name="MasterPasswordRePromptHelp" xml:space="preserve">
-    <value>主密码重新询问帮助</value>
-  </data>
-  <data name="UnlockingMayFailDueToInsufficientMemoryDecreaseYourKDFMemorySettingsToResolve" xml:space="preserve">
-    <value>解锁可能由于内存不足而失败。可以通过减少 KDF 内存设置来解决。</value>
-  </data>
 </root>

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

@@ -2495,8 +2495,8 @@
   <data name="GetMasterPasswordwordHint" xml:space="preserve">
     <value>獲取主密碼提示</value>
   </data>
-  <data name="LoggingInAsXOnY" xml:space="preserve">
-    <value>Logging in as {0} on {1}</value>
+  <data name="LoggingInAsX" xml:space="preserve">
+    <value>正登入為 {0}</value>
   </data>
   <data name="NotYou" xml:space="preserve">
     <value>不是您嗎？</value>
@@ -2609,31 +2609,10 @@
   <data name="ThereAreNoItemsThatMatchTheSearch" xml:space="preserve">
     <value>There are no items that match the search</value>
   </data>
-  <data name="US" xml:space="preserve">
-    <value>US</value>
-  </data>
-  <data name="EU" xml:space="preserve">
-    <value>EU</value>
-  </data>
-  <data name="SelfHosted" xml:space="preserve">
-    <value>Self-hosted</value>
-  </data>
-  <data name="DataRegion" xml:space="preserve">
-    <value>Data region</value>
-  </data>
-  <data name="Region" xml:space="preserve">
-    <value>Region</value>
-  </data>
   <data name="UpdateWeakMasterPasswordWarning" xml:space="preserve">
     <value>您的主密碼不符合您的組織政策之一或多個要求。您必須立即更新您的主密碼以存取密碼庫。進行此操作將登出您目前的工作階段，需要您重新登入。其他裝置上的工作階段可能繼續長達一小時。</value>
   </data>
   <data name="CurrentMasterPassword" xml:space="preserve">
     <value>目前主密碼</value>
   </data>
-  <data name="MasterPasswordRePromptHelp" xml:space="preserve">
-    <value>Master password re-prompt help</value>
-  </data>
-  <data name="UnlockingMayFailDueToInsufficientMemoryDecreaseYourKDFMemorySettingsToResolve" xml:space="preserve">
-    <value>Unlocking may fail due to insufficient memory. Decrease your KDF memory settings to resolve</value>
-  </data>
 </root>

src/Core/Abstractions/IApiService.cs

@@ -1,6 +1,7 @@
 using System;
 using System.Collections.Generic;
 using System.Net.Http;
+using System.Threading;
 using System.Threading.Tasks;
 using Bit.Core.Enums;
 using Bit.Core.Models.Domain;
@@ -47,16 +48,16 @@ namespace Bit.Core.Abstractions
         Task RefreshIdentityTokenAsync();
         Task<SsoPrevalidateResponse> PreValidateSso(string identifier);
         Task<TResponse> SendAsync<TRequest, TResponse>(HttpMethod method, string path,
-            TRequest body, bool authed, bool hasResponse, Action<HttpRequestMessage> alterRequest, bool logoutOnUnauthorized = true);
+            TRequest body, bool authed, bool hasResponse, Action<HttpRequestMessage> alterRequest, bool logoutOnUnauthorized = true, CancellationToken cancellationToken = default);
         void SetUrls(EnvironmentUrls urls);
         [Obsolete("Mar 25 2021: This method has been deprecated in favor of direct uploads. This method still exists for backward compatibility with old server versions.")]
         Task<CipherResponse> PostCipherAttachmentLegacyAsync(string id, MultipartFormDataContent data);
-        Task<AttachmentUploadDataResponse> PostCipherAttachmentAsync(string id, AttachmentRequest request);
+        Task<AttachmentUploadDataResponse> PostCipherAttachmentAsync(string id, AttachmentRequest request, CancellationToken cancellationToken);
         Task<AttachmentResponse> GetAttachmentData(string cipherId, string attachmentId);
         Task PostShareCipherAttachmentAsync(string id, string attachmentId, MultipartFormDataContent data,
             string organizationId);
-        Task<AttachmentUploadDataResponse> RenewAttachmentUploadUrlAsync(string id, string attachmentId);
-        Task PostAttachmentFileAsync(string id, string attachmentId, MultipartFormDataContent data);
+        Task<AttachmentUploadDataResponse> RenewAttachmentUploadUrlAsync(string id, string attachmentId, CancellationToken cancellationToken);
+        Task PostAttachmentFileAsync(string id, string attachmentId, MultipartFormDataContent data, CancellationToken cancellationToken);
         Task<List<BreachAccountResponse>> GetHibpBreachAsync(string username);
         Task PostTwoFactorEmailAsync(TwoFactorEmailRequest request);
         Task PutDeviceTokenAsync(string identifier, DeviceTokenRequest request);

src/Core/Abstractions/IAzureFileUpoadService.cs

@@ -1,4 +1,5 @@
 using System;
+using System.Threading;
 using System.Threading.Tasks;
 using Bit.Core.Models.Domain;
 
@@ -6,6 +7,6 @@ namespace Bit.Core.Abstractions
 {
     public interface IAzureFileUploadService
     {
-        Task Upload(string uri, EncByteArray data, Func<Task<string>> renewalCallback);
+        Task Upload(string uri, EncByteArray data, Func<CancellationToken, Task<string>> renewalCallback, CancellationToken cancellationToken);
     }
 }

src/Core/Abstractions/ICipherService.cs

@@ -1,5 +1,6 @@
 using System;
 using System.Collections.Generic;
+using System.Threading;
 using System.Threading.Tasks;
 using Bit.Core.Enums;
 using Bit.Core.Models.Data;
@@ -27,7 +28,7 @@ namespace Bit.Core.Abstractions
         Task<Cipher> GetAsync(string id);
         Task<CipherView> GetLastUsedForUrlAsync(string url);
         Task ReplaceAsync(Dictionary<string, CipherData> ciphers);
-        Task<Cipher> SaveAttachmentRawWithServerAsync(Cipher cipher, string filename, byte[] data);
+        Task<Cipher> SaveAttachmentRawWithServerAsync(Cipher cipher, string filename, byte[] data, CancellationToken cancellationToken);
         Task SaveCollectionsWithServerAsync(Cipher cipher);
         Task SaveNeverDomainAsync(string domain);
         Task SaveWithServerAsync(Cipher cipher);

src/Core/Abstractions/IFileUploadService.cs

@@ -1,4 +1,5 @@
-using System.Threading.Tasks;
+using System.Threading;
+using System.Threading.Tasks;
 using Bit.Core.Models.Domain;
 using Bit.Core.Models.Response;
 
@@ -6,7 +7,7 @@ namespace Bit.Core.Abstractions
 {
     public interface IFileUploadService
     {
-        Task UploadCipherAttachmentFileAsync(AttachmentUploadDataResponse uploadData, EncString fileName, EncByteArray encryptedFileData);
+        Task UploadCipherAttachmentFileAsync(AttachmentUploadDataResponse uploadData, EncString fileName, EncByteArray encryptedFileData, CancellationToken cancellationToken);
         Task UploadSendFileAsync(SendFileUploadDataResponse uploadData, EncString fileName, EncByteArray encryptedFileData);
     }
 }

src/Core/Abstractions/IVaultTimeoutService.cs

@@ -6,8 +6,7 @@ namespace Bit.Core.Abstractions
 {
     public interface IVaultTimeoutService
     {
-        long? DelayTimeoutMs { get; set; }
-        bool ResetTimeoutDelay { get; set; }
+        long? DelayLockAndLogoutMs { get; set; }
 
         Task CheckVaultTimeoutAsync();
         Task<bool> ShouldTimeoutAsync(string userId = null);

src/Core/Models/Data/EnvironmentUrlData.cs

@@ -2,19 +2,8 @@
 {
     public class EnvironmentUrlData
     {
-        public static EnvironmentUrlData DefaultUS = new EnvironmentUrlData
-        {
-            Base = "https://vault.bitwarden.com",
-            Notifications = "https://notifications.bitwarden.com",
-            Icons = "https://icons.bitwarden.com",
-
-        };
-        public static EnvironmentUrlData DefaultEU = new EnvironmentUrlData
-        {
-            Base = "https://vault.bitwarden.eu",
-            Notifications = "https://notifications.bitwarden.eu",
-            Icons = "https://icons.bitwarden.eu",
-        };
+        public static EnvironmentUrlData DefaultUS = new EnvironmentUrlData { Base = "https://vault.bitwarden.com" };
+        public static EnvironmentUrlData DefaultEU = new EnvironmentUrlData { Base = "https://vault.bitwarden.eu" };
 
         public string Base { get; set; }
         public string Api { get; set; }

src/Core/Services/ApiService.cs

@@ -1,9 +1,9 @@
 using System;
 using System.Collections.Generic;
-using System.Linq;
 using System.Net;
 using System.Net.Http;
 using System.Text;
+using System.Threading;
 using System.Threading.Tasks;
 using Bit.Core.Abstractions;
 using Bit.Core.Enums;
@@ -343,10 +343,10 @@ namespace Bit.Core.Services
                 string.Concat("/ciphers/", id, "/attachment"), data, true, true);
         }
 
-        public Task<AttachmentUploadDataResponse> PostCipherAttachmentAsync(string id, AttachmentRequest request)
+        public Task<AttachmentUploadDataResponse> PostCipherAttachmentAsync(string id, AttachmentRequest request, CancellationToken cancellationToken)
         {
             return SendAsync<AttachmentRequest, AttachmentUploadDataResponse>(HttpMethod.Post,
-                $"/ciphers/{id}/attachment/v2", request, true, true);
+                $"/ciphers/{id}/attachment/v2", request, true, true, cancellationToken: cancellationToken);
         }
 
         public Task<AttachmentResponse> GetAttachmentData(string cipherId, string attachmentId) =>
@@ -366,12 +366,12 @@ namespace Bit.Core.Services
                 data, true, false);
         }
 
-        public Task<AttachmentUploadDataResponse> RenewAttachmentUploadUrlAsync(string cipherId, string attachmentId) =>
-            SendAsync<AttachmentUploadDataResponse>(HttpMethod.Get, $"/ciphers/{cipherId}/attachment/{attachmentId}/renew", true);
+        public Task<AttachmentUploadDataResponse> RenewAttachmentUploadUrlAsync(string cipherId, string attachmentId, CancellationToken cancellationToken) =>
+            SendAsync<AttachmentUploadDataResponse>(HttpMethod.Get, $"/ciphers/{cipherId}/attachment/{attachmentId}/renew", true, cancellationToken);
 
-        public Task PostAttachmentFileAsync(string cipherId, string attachmentId, MultipartFormDataContent data) =>
+        public Task PostAttachmentFileAsync(string cipherId, string attachmentId, MultipartFormDataContent data, CancellationToken cancellationToken) =>
             SendAsync(HttpMethod.Post,
-                $"/ciphers/{cipherId}/attachment/{attachmentId}", data, true);
+                $"/ciphers/{cipherId}/attachment/{attachmentId}", data, true, cancellationToken);
 
         #endregion
 
@@ -640,12 +640,12 @@ namespace Bit.Core.Services
 
         public Task SendAsync(HttpMethod method, string path, bool authed) =>
             SendAsync<object, object>(method, path, null, authed, false);
-        public Task SendAsync<TRequest>(HttpMethod method, string path, TRequest body, bool authed) =>
-            SendAsync<TRequest, object>(method, path, body, authed, false);
-        public Task<TResponse> SendAsync<TResponse>(HttpMethod method, string path, bool authed) =>
-            SendAsync<object, TResponse>(method, path, null, authed, true);
+        public Task SendAsync<TRequest>(HttpMethod method, string path, TRequest body, bool authed, CancellationToken cancellationToken = default) =>
+            SendAsync<TRequest, object>(method, path, body, authed, false, cancellationToken: cancellationToken);
+        public Task<TResponse> SendAsync<TResponse>(HttpMethod method, string path, bool authed, CancellationToken cancellationToken = default) =>
+            SendAsync<object, TResponse>(method, path, null, authed, true, cancellationToken: cancellationToken);
         public async Task<TResponse> SendAsync<TRequest, TResponse>(HttpMethod method, string path, TRequest body,
-            bool authed, bool hasResponse, Action<HttpRequestMessage> alterRequest = null, bool logoutOnUnauthorized = true)
+            bool authed, bool hasResponse, Action<HttpRequestMessage> alterRequest = null, bool logoutOnUnauthorized = true, CancellationToken cancellationToken = default)
         {
             using (var requestMessage = new HttpRequestMessage())
             {
@@ -697,7 +697,15 @@ namespace Bit.Core.Services
                 HttpResponseMessage response;
                 try
                 {
-                    response = await _httpClient.SendAsync(requestMessage);
+                    response = await _httpClient.SendAsync(requestMessage, cancellationToken);
+                }
+                catch (OperationCanceledException)
+                {
+                    throw;
+                }
+                catch (Exception ex) when (ex.Message?.Contains("Socket closed") == true)
+                {
+                    throw new OperationCanceledException();
                 }
                 catch (Exception e)
                 {
@@ -976,19 +984,7 @@ namespace Bit.Core.Services
 
         private bool IsJsonResponse(HttpResponseMessage response)
         {
-            if (response.Content?.Headers is null)
-            {
-                return false;
-            }
-
-            if (response.Content.Headers.ContentType?.MediaType == "application/json")
-            {
-                return true;
-            }
-
-            return response.Content.Headers.TryGetValues("Content-Type", out var vals)
-                   &&
-                   vals?.Any(v => v.Contains("application/json")) is true;
+            return (response.Content?.Headers?.ContentType?.MediaType ?? string.Empty) == "application/json";
         }
 
         #endregion

src/Core/Services/AzureFileUploadService.cs

@@ -5,6 +5,7 @@ using System.Net;
 using System.Net.Http;
 using System.Net.Http.Headers;
 using System.Text;
+using System.Threading;
 using System.Threading.Tasks;
 using System.Web;
 using Bit.Core.Abstractions;
@@ -29,19 +30,19 @@ namespace Bit.Core.Services
             };
         }
 
-        public async Task Upload(string uri, EncByteArray data, Func<Task<string>> renewalCallback)
+        public async Task Upload(string uri, EncByteArray data, Func<CancellationToken, Task<string>> renewalCallback, CancellationToken cancellationToken)
         {
             if (data?.Buffer?.Length <= MAX_SINGLE_BLOB_UPLOAD_SIZE)
             {
-                await AzureUploadBlob(uri, data);
+                await AzureUploadBlob(uri, data, cancellationToken);
             }
             else
             {
-                await AzureUploadBlocks(uri, data, renewalCallback);
+                await AzureUploadBlocks(uri, data, renewalCallback, cancellationToken);
             }
         }
 
-        private async Task AzureUploadBlob(string uri, EncByteArray data)
+        private async Task AzureUploadBlob(string uri, EncByteArray data, CancellationToken cancellationToken)
         {
             using (var requestMessage = new HttpRequestMessage())
             {
@@ -57,7 +58,7 @@ namespace Bit.Core.Services
                 requestMessage.Method = HttpMethod.Put;
                 requestMessage.RequestUri = uriBuilder.Uri;
 
-                var blobResponse = await _httpClient.SendAsync(requestMessage);
+                var blobResponse = await _httpClient.SendAsync(requestMessage, cancellationToken);
 
                 if (blobResponse.StatusCode != HttpStatusCode.Created)
                 {
@@ -66,7 +67,7 @@ namespace Bit.Core.Services
             }
         }
 
-        private async Task AzureUploadBlocks(string uri, EncByteArray data, Func<Task<string>> renewalFunc)
+        private async Task AzureUploadBlocks(string uri, EncByteArray data, Func<CancellationToken, Task<string>> renewalFunc, CancellationToken cancellationToken)
         {
             _httpClient.Timeout = TimeSpan.FromHours(3);
             var baseParams = HttpUtility.ParseQueryString(CoreHelpers.GetUri(uri).Query);
@@ -82,7 +83,7 @@ namespace Bit.Core.Services
 
             while (blockIndex < numBlocks)
             {
-                uri = await RenewUriIfNecessary(uri, renewalFunc);
+                uri = await RenewUriIfNecessary(uri, renewalFunc, cancellationToken);
                 var blockUriBuilder = new UriBuilder(uri);
                 var blockId = EncodeBlockId(blockIndex);
                 var blockParams = HttpUtility.ParseQueryString(blockUriBuilder.Query);
@@ -101,7 +102,7 @@ namespace Bit.Core.Services
                     requestMessage.Method = HttpMethod.Put;
                     requestMessage.RequestUri = blockUriBuilder.Uri;
 
-                    var blockResponse = await _httpClient.SendAsync(requestMessage);
+                    var blockResponse = await _httpClient.SendAsync(requestMessage, cancellationToken);
 
                     if (blockResponse.StatusCode != HttpStatusCode.Created)
                     {
@@ -115,7 +116,7 @@ namespace Bit.Core.Services
 
             using (var requestMessage = new HttpRequestMessage())
             {
-                uri = await RenewUriIfNecessary(uri, renewalFunc);
+                uri = await RenewUriIfNecessary(uri, renewalFunc, cancellationToken);
                 var blockListXml = GenerateBlockListXml(blocksStaged);
                 var blockListUriBuilder = new UriBuilder(uri);
                 var blockListParams = HttpUtility.ParseQueryString(blockListUriBuilder.Query);
@@ -130,7 +131,7 @@ namespace Bit.Core.Services
                 requestMessage.Method = HttpMethod.Put;
                 requestMessage.RequestUri = blockListUriBuilder.Uri;
 
-                var blockListResponse = await _httpClient.SendAsync(requestMessage);
+                var blockListResponse = await _httpClient.SendAsync(requestMessage, cancellationToken);
 
                 if (blockListResponse.StatusCode != HttpStatusCode.Created)
                 {
@@ -139,13 +140,13 @@ namespace Bit.Core.Services
             }
         }
 
-        private async Task<string> RenewUriIfNecessary(string uri, Func<Task<string>> renewalFunc)
+        private async Task<string> RenewUriIfNecessary(string uri, Func<CancellationToken, Task<string>> renewalFunc, CancellationToken cancellationToken)
         {
             var uriParams = HttpUtility.ParseQueryString(CoreHelpers.GetUri(uri).Query);
 
             if (DateTime.TryParse(uriParams.Get("se") ?? "", out DateTime expiry) && expiry < DateTime.UtcNow.AddSeconds(1))
             {
-                return await renewalFunc();
+                return await renewalFunc(cancellationToken);
             }
             return uri;
         }

src/Core/Services/BitwardenFileUploadService.cs

@@ -2,6 +2,7 @@
 using System.Net.Http;
 using System.Net.Http.Headers;
 using System.Net.Mime;
+using System.Threading;
 using System.Threading.Tasks;
 using Bit.Core.Models.Domain;
 
@@ -9,21 +10,21 @@ namespace Bit.Core.Services
 {
     public class BitwardenFileUploadService
     {
+        private readonly ApiService _apiService;
+
         public BitwardenFileUploadService(ApiService apiService)
         {
             _apiService = apiService;
         }
 
-        private readonly ApiService _apiService;
-
-        public async Task Upload(string encryptedFileName, EncByteArray encryptedFileData, Func<MultipartFormDataContent, Task> apiCall)
+        public async Task Upload(string encryptedFileName, EncByteArray encryptedFileData, Func<MultipartFormDataContent, CancellationToken, Task> apiCall, CancellationToken cancellationToken)
         {
             var fd = new MultipartFormDataContent($"--BWMobileFormBoundary{DateTime.UtcNow.Ticks}")
             {
                 { new ByteArrayContent(encryptedFileData.Buffer) { Headers = { ContentType = new MediaTypeHeaderValue(MediaTypeNames.Application.Octet) } }, "data", encryptedFileName }
             };
 
-            await apiCall(fd);
+            await apiCall(fd, cancellationToken);
         }
     }
 }

src/Core/Services/CipherService.cs

@@ -4,6 +4,7 @@ using System.IO;
 using System.Linq;
 using System.Net.Http;
 using System.Text.RegularExpressions;
+using System.Threading;
 using System.Threading.Tasks;
 using Bit.Core.Abstractions;
 using Bit.Core.Enums;
@@ -555,13 +556,15 @@ namespace Bit.Core.Services
             await UpsertAsync(data);
         }
 
-        public async Task<Cipher> SaveAttachmentRawWithServerAsync(Cipher cipher, string filename, byte[] data)
+        public async Task<Cipher> SaveAttachmentRawWithServerAsync(Cipher cipher, string filename, byte[] data, CancellationToken cancellationToken)
         {
             var orgKey = await _cryptoService.GetOrgKeyAsync(cipher.OrganizationId);
             var encFileName = await _cryptoService.EncryptAsync(filename, orgKey);
             var (attachmentKey, orgEncAttachmentKey) = await _cryptoService.MakeEncKeyAsync(orgKey);
             var encFileData = await _cryptoService.EncryptToBytesAsync(data, attachmentKey);
 
+            cancellationToken.ThrowIfCancellationRequested();
+
             CipherResponse response;
             try
             {
@@ -572,9 +575,9 @@ namespace Bit.Core.Services
                     FileSize = encFileData.Buffer.Length,
                 };
 
-                var uploadDataResponse = await _apiService.PostCipherAttachmentAsync(cipher.Id, request);
+                var uploadDataResponse = await _apiService.PostCipherAttachmentAsync(cipher.Id, request, cancellationToken);
                 response = uploadDataResponse.CipherResponse;
-                await _fileUploadService.UploadCipherAttachmentFileAsync(uploadDataResponse, encFileName, encFileData);
+                await _fileUploadService.UploadCipherAttachmentFileAsync(uploadDataResponse, encFileName, encFileData, cancellationToken);
             }
             catch (ApiException e) when (e.Error.StatusCode == System.Net.HttpStatusCode.NotFound || e.Error.StatusCode == System.Net.HttpStatusCode.MethodNotAllowed)
             {

src/Core/Services/FileUploadService.cs

@@ -1,4 +1,5 @@
 using System;
+using System.Threading;
 using System.Threading.Tasks;
 using Bit.Core.Abstractions;
 using Bit.Core.Enums;
@@ -21,7 +22,7 @@ namespace Bit.Core.Services
         private readonly ApiService _apiService;
 
         public async Task UploadCipherAttachmentFileAsync(AttachmentUploadDataResponse uploadData,
-            EncString encryptedFileName, EncByteArray encryptedFileData)
+            EncString encryptedFileName, EncByteArray encryptedFileData, CancellationToken cancellationToken)
         {
             try
             {
@@ -29,15 +30,15 @@ namespace Bit.Core.Services
                 {
                     case FileUploadType.Direct:
                         await _bitwardenFileUploadService.Upload(encryptedFileName.EncryptedString, encryptedFileData,
-                            fd => _apiService.PostAttachmentFileAsync(uploadData.CipherResponse.Id, uploadData.AttachmentId, fd));
+                            (fd, ct) => _apiService.PostAttachmentFileAsync(uploadData.CipherResponse.Id, uploadData.AttachmentId, fd, ct), cancellationToken);
                         break;
                     case FileUploadType.Azure:
-                        Func<Task<string>> renewalCallback = async () =>
+                        Func<CancellationToken, Task<string>> renewalCallback = async ct =>
                         {
-                            var response = await _apiService.RenewAttachmentUploadUrlAsync(uploadData.CipherResponse.Id, uploadData.AttachmentId);
+                            var response = await _apiService.RenewAttachmentUploadUrlAsync(uploadData.CipherResponse.Id, uploadData.AttachmentId, ct);
                             return response.Url;
                         };
-                        await _azureFileUploadService.Upload(uploadData.Url, encryptedFileData, renewalCallback);
+                        await _azureFileUploadService.Upload(uploadData.Url, encryptedFileData, renewalCallback, cancellationToken);
                         break;
                     default:
                         throw new Exception($"Unkown file upload type: {uploadData.FileUploadType}");
@@ -58,16 +59,16 @@ namespace Bit.Core.Services
                 {
                     case FileUploadType.Direct:
                         await _bitwardenFileUploadService.Upload(fileName.EncryptedString, encryptedFileData,
-                            fd => _apiService.PostSendFileAsync(uploadData.SendResponse.Id, uploadData.SendResponse.File.Id, fd));
+                            (fd, _) => _apiService.PostSendFileAsync(uploadData.SendResponse.Id, uploadData.SendResponse.File.Id, fd), default);
                         break;
                     case FileUploadType.Azure:
-                        Func<Task<string>> renewalCallback = async () =>
+                        Func<CancellationToken, Task<string>> renewalCallback = async ct =>
                         {
                             var response = await _apiService.RenewFileUploadUrlAsync(uploadData.SendResponse.Id, uploadData.SendResponse.File.Id);
                             return response.Url;
                         };
 
-                        await _azureFileUploadService.Upload(uploadData.Url, encryptedFileData, renewalCallback);
+                        await _azureFileUploadService.Upload(uploadData.Url, encryptedFileData, renewalCallback, default);
                         break;
                     default:
                         throw new Exception("Unknown file upload type");

src/Core/Services/VaultTimeoutService.cs

@@ -50,8 +50,7 @@ namespace Bit.Core.Services
             _loggedOutCallback = loggedOutCallback;
         }
 
-        public long? DelayTimeoutMs { get; set; }
-        public bool ResetTimeoutDelay { get; set; }
+        public long? DelayLockAndLogoutMs { get; set; }
 
         public async Task<bool> IsLockedAsync(string userId = null)
         {
@@ -118,7 +117,7 @@ namespace Bit.Core.Services
             {
                 return false;
             }
-            if (vaultTimeoutMinutes == 0 && !DelayTimeoutMs.HasValue)
+            if (vaultTimeoutMinutes == 0 && !DelayLockAndLogoutMs.HasValue)
             {
                 return true;
             }
@@ -128,13 +127,8 @@ namespace Bit.Core.Services
                 return false;
             }
             var diffMs = _platformUtilsService.GetActiveTime() - lastActiveTime;
-            if (DelayTimeoutMs.HasValue && diffMs < DelayTimeoutMs)
+            if (DelayLockAndLogoutMs.HasValue && diffMs < DelayLockAndLogoutMs)
             {
-                if (ResetTimeoutDelay)
-                {
-                    DelayTimeoutMs = null;
-                    ResetTimeoutDelay = false;
-                }
                 return false;
             }
             var vaultTimeoutMs = vaultTimeoutMinutes * 60000;

src/iOS.Autofill/Info.plist

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

src/iOS.Core/Constants.cs

@@ -32,6 +32,5 @@
         public const string UTTypeAppExtensionImage = "public.image";
 
         public const string AutofillNeedsIdentityReplacementKey = "autofillNeedsIdentityReplacement";
-        public const int MaximumArgon2IdMemoryBeforeExtensionCrashing = 48;
     }
 }

src/iOS.Core/Controllers/BaseLockPasswordViewController.cs

@@ -225,18 +225,6 @@ namespace Bit.iOS.Core.Controllers
             var kdfConfig = await _stateService.GetActiveUserCustomDataAsync(a => new KdfConfig(a?.Profile));
             var inputtedValue = MasterPasswordCell.TextField.Text;
 
-            // HACK: iOS extensions have constrained memory, given how it works Argon2Id, it's likely to crash
-            // the extension depending on the argon2id memory configured.
-            // So, we warn the user and advise to decrease the configured memory letting them the option to continue, if wanted.
-            if (kdfConfig.Type == KdfType.Argon2id
-                &&
-                kdfConfig.Memory > Constants.MaximumArgon2IdMemoryBeforeExtensionCrashing
-                &&
-                !await _platformUtilsService.ShowDialogAsync(AppResources.UnlockingMayFailDueToInsufficientMemoryDecreaseYourKDFMemorySettingsToResolve, AppResources.Warning, AppResources.Continue, AppResources.Cancel))
-            {
-                return;
-            }
-
             if (_pinLock)
             {
                 var failed = true;

src/iOS.Core/Services/DeviceActionService.cs

@@ -1,5 +1,6 @@
 using System;
 using System.Linq;
+using System.Threading;
 using System.Threading.Tasks;
 using Bit.App.Abstractions;
 using Bit.App.Resources;
@@ -61,7 +62,7 @@ namespace Bit.iOS.Core.Services
             };
         }
 
-        public Task ShowLoadingAsync(string text)
+        public Task ShowLoadingAsync(string text, CancellationTokenSource cts = null, string cancelButtonText = null)
         {
             if (_progressAlert != null)
             {
@@ -84,6 +85,14 @@ namespace Bit.iOS.Core.Services
             _progressAlert = UIAlertController.Create(null, text, UIAlertControllerStyle.Alert);
             _progressAlert.View.TintColor = UIColor.Black;
             _progressAlert.View.Add(loadingIndicator);
+            if (cts != null)
+            {
+                _progressAlert.AddAction(UIAlertAction.Create(cancelButtonText ?? AppResources.Cancel, UIAlertActionStyle.Cancel, x =>
+                {
+                    cts.Cancel();
+                    result.TrySetResult(0);
+                }));
+            }
 
             vc.PresentViewController(_progressAlert, false, () => result.TrySetResult(0));
             return result.Task;

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>2023.5.1</string>
+	<string>2023.4.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>2023.5.1</string>
+	<string>2023.4.1</string>
 	<key>CFBundleVersion</key>
 	<string>1</string>
 	<key>MinimumOSVersion</key>

src/iOS/Info.plist

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

store/apple/af/copy.resx

@@ -146,8 +146,7 @@ Wêreldwye vertalings
 Bitwarden-vertalings bestaan ​​in 40 tale en groei danksy ons wêreldwye gemeenskap.
 
 Kruisplatformtoepassings
-Beveilig en deel gevoelige data in u Bitwarden kluis vanuit enige blaaier, mobiele toestel of werkskermbedryfstelsel, en meer.
-</value>
+Beveilig en deel gevoelige data in u Bitwarden kluis vanuit enige blaaier, mobiele toestel of werkskermbedryfstelsel, en meer.</value>
   <comment>Max 4000 characters</comment>
   </data>
   <data name="Keywords" xml:space="preserve">

store/apple/hi/copy.resx

@@ -130,7 +130,7 @@
 
 आप जिन वेबसाइट पर जाते है उनके लिए बनाएं ताकतवर, खास, और बेतरतीब पासवर्ड उनकी सुरक्षा ज़रूरतो के हिसाब से।
 
-बिटवार्डन सेंड किसी को भी एन्क्रिप्टेड जानकारी, फाइल, और सादा टेक्सट, फौरन भेजें।
+बिटवार्डन सेंड किसी को भी एन्क्रिप्टेड जानकारी, फाइल और सादा टेक्सट, तुरंत भेजें।
 
 बिटवार्डन कंपनियों के लिए टीम और बिज़नेस प्लान भी देता है ताकि आप अपने साथ काम करनेवालो के साथ पासवर्ड शेयर करे सुरक्षित होकर।