From 182e5d8d8d83fdf7562221712e7445ea07e501f2 Mon Sep 17 00:00:00 2001
From: Leendert de Borst <ldeborst@xivisoft.com>
Date: Fri, 4 Jul 2025 06:37:27 +0200
Subject: [PATCH] Localize security settings, footer, email (#820)

---
 .../Settings/PasswordSettingsPopup.razor      |  30 +++--
 .../Main/Layout/Footer.razor                  |  18 ++-
 .../Main/Pages/Emails/Home.razor              |  32 ++---
 .../Settings/ImportExport/ImportExport.razor  |  36 +++---
 .../Components/ActiveSessionsSection.razor    |  27 +++--
 .../Components/DeleteAccountSection.razor     |  11 +-
 .../Components/PasswordChangeSection.razor    |  11 +-
 .../Components/QuickVaultUnlockSection.razor  |  28 +++--
 .../Components/RecentAuthLogsSection.razor    |  24 ++--
 .../Components/ShowRecoveryCodes.razor        |  18 +--
 .../TwoFactorAuthenticationSection.razor      |  15 ++-
 .../Pages/Settings/Security/Security.razor    |   6 +-
 .../Settings/PasswordSettingsPopup.en.resx    | 109 ++++++++++++++++++
 .../Settings/PasswordSettingsPopup.nl.resx    | 109 ++++++++++++++++++
 .../Security/ActiveSessionsSection.en.resx    | 105 +++++++++++++++++
 .../Security/ActiveSessionsSection.nl.resx    | 105 +++++++++++++++++
 .../Security/DeleteAccountSection.en.resx     |  73 ++++++++++++
 .../Security/DeleteAccountSection.nl.resx     |  73 ++++++++++++
 .../Security/PasswordChangeSection.en.resx    |  73 ++++++++++++
 .../Security/PasswordChangeSection.nl.resx    |  73 ++++++++++++
 .../Security/QuickVaultUnlockSection.en.resx  | 101 ++++++++++++++++
 .../Security/QuickVaultUnlockSection.nl.resx  | 101 ++++++++++++++++
 .../Security/RecentAuthLogsSection.en.resx    | 105 +++++++++++++++++
 .../Security/RecentAuthLogsSection.nl.resx    | 105 +++++++++++++++++
 .../Security/ShowRecoveryCodes.en.resx        |  77 +++++++++++++
 .../Security/ShowRecoveryCodes.nl.resx        |  77 +++++++++++++
 .../TwoFactorAuthenticationSection.en.resx    |  81 +++++++++++++
 .../TwoFactorAuthenticationSection.nl.resx    |  81 +++++++++++++
 .../Resources/Layout/Footer.en.resx           |  81 +++++++++++++
 .../Resources/Layout/Footer.nl.resx           |  81 +++++++++++++
 .../Resources/Pages/Main/Emails/Home.en.resx  | 105 +++++++++++++++++
 .../Resources/Pages/Main/Emails/Home.nl.resx  | 105 +++++++++++++++++
 .../ImportExport/ImportExport.en.resx         | 107 +++++++++++++++++
 .../ImportExport/ImportExport.nl.resx         | 107 +++++++++++++++++
 34 files changed, 2186 insertions(+), 104 deletions(-)
 create mode 100644 apps/server/AliasVault.Client/Resources/Components/Main/Settings/PasswordSettingsPopup.en.resx
 create mode 100644 apps/server/AliasVault.Client/Resources/Components/Main/Settings/PasswordSettingsPopup.nl.resx
 create mode 100644 apps/server/AliasVault.Client/Resources/Components/Main/Settings/Security/ActiveSessionsSection.en.resx
 create mode 100644 apps/server/AliasVault.Client/Resources/Components/Main/Settings/Security/ActiveSessionsSection.nl.resx
 create mode 100644 apps/server/AliasVault.Client/Resources/Components/Main/Settings/Security/DeleteAccountSection.en.resx
 create mode 100644 apps/server/AliasVault.Client/Resources/Components/Main/Settings/Security/DeleteAccountSection.nl.resx
 create mode 100644 apps/server/AliasVault.Client/Resources/Components/Main/Settings/Security/PasswordChangeSection.en.resx
 create mode 100644 apps/server/AliasVault.Client/Resources/Components/Main/Settings/Security/PasswordChangeSection.nl.resx
 create mode 100644 apps/server/AliasVault.Client/Resources/Components/Main/Settings/Security/QuickVaultUnlockSection.en.resx
 create mode 100644 apps/server/AliasVault.Client/Resources/Components/Main/Settings/Security/QuickVaultUnlockSection.nl.resx
 create mode 100644 apps/server/AliasVault.Client/Resources/Components/Main/Settings/Security/RecentAuthLogsSection.en.resx
 create mode 100644 apps/server/AliasVault.Client/Resources/Components/Main/Settings/Security/RecentAuthLogsSection.nl.resx
 create mode 100644 apps/server/AliasVault.Client/Resources/Components/Main/Settings/Security/ShowRecoveryCodes.en.resx
 create mode 100644 apps/server/AliasVault.Client/Resources/Components/Main/Settings/Security/ShowRecoveryCodes.nl.resx
 create mode 100644 apps/server/AliasVault.Client/Resources/Components/Main/Settings/Security/TwoFactorAuthenticationSection.en.resx
 create mode 100644 apps/server/AliasVault.Client/Resources/Components/Main/Settings/Security/TwoFactorAuthenticationSection.nl.resx
 create mode 100644 apps/server/AliasVault.Client/Resources/Layout/Footer.en.resx
 create mode 100644 apps/server/AliasVault.Client/Resources/Layout/Footer.nl.resx
 create mode 100644 apps/server/AliasVault.Client/Resources/Pages/Main/Emails/Home.en.resx
 create mode 100644 apps/server/AliasVault.Client/Resources/Pages/Main/Emails/Home.nl.resx
 create mode 100644 apps/server/AliasVault.Client/Resources/Pages/Main/Settings/ImportExport/ImportExport.en.resx
 create mode 100644 apps/server/AliasVault.Client/Resources/Pages/Main/Settings/ImportExport/ImportExport.nl.resx

diff --git a/apps/server/AliasVault.Client/Main/Components/Settings/PasswordSettingsPopup.razor b/apps/server/AliasVault.Client/Main/Components/Settings/PasswordSettingsPopup.razor
index 639340662..0bcba328d 100644
--- a/apps/server/AliasVault.Client/Main/Components/Settings/PasswordSettingsPopup.razor
+++ b/apps/server/AliasVault.Client/Main/Components/Settings/PasswordSettingsPopup.razor
@@ -3,15 +3,19 @@
 @inject GlobalLoadingService GlobalLoadingService
 @inject GlobalNotificationService GlobalNotificationService
 @inject CredentialService CredentialService
+@inject IStringLocalizerFactory LocalizerFactory
+@inject IStringLocalizer<SharedResources> SharedLocalizer
+@using Microsoft.Extensions.Localization
+@using AliasVault.Client.Resources
 
 <ClickOutsideHandler OnClose="OnClose" ContentId="passwordSettingsModal">
     <ModalWrapper OnEnter="HandleEnterKey">
         <div id="passwordSettingsModal" class="relative top-20 mx-auto p-5 shadow-lg rounded-md bg-white dark:bg-gray-800 border-2 border-gray-300 dark:border-gray-400">
             <div class="m-2">
-                <h3 class="text-lg leading-6 font-medium text-gray-900 dark:text-white">Change password generator settings</h3>
+                <h3 class="text-lg leading-6 font-medium text-gray-900 dark:text-white">@Localizer["Title"]</h3>
                 <div class="mt-4 space-y-4">
                     <div>
-                        <label for="password-length" class="block text-sm font-medium text-gray-700 dark:text-gray-300">Password Length: @_workingSettings.Length</label>
+                        <label for="password-length" class="block text-sm font-medium text-gray-700 dark:text-gray-300">@string.Format(Localizer["PasswordLengthLabel"], _workingSettings.Length)</label>
                         <input type="range" id="password-length" min="8" max="64"
                             class="mt-1 block w-full rounded-md border-gray-300 shadow-sm focus:border-primary-500 focus:ring-primary-500 dark:bg-gray-700 dark:border-gray-600 dark:text-white"
                             @bind="_workingSettings.Length" @oninput="HandleLengthInput">
@@ -20,35 +24,35 @@
                     <div class="flex items-center">
                         <input id="use-lowercase" type="checkbox" class="h-4 w-4 text-primary-600 focus:ring-primary-500 border-gray-300 rounded dark:bg-gray-700 dark:border-gray-600"
                             @bind="_workingSettings.UseLowercase" @bind:after="OnPasswordSettingsChanged">
-                        <label for="use-lowercase" class="ml-2 block text-sm text-gray-700 dark:text-gray-300">Include lowercase letters (a-z)</label>
+                        <label for="use-lowercase" class="ml-2 block text-sm text-gray-700 dark:text-gray-300">@Localizer["IncludeLowercaseLabel"]</label>
                     </div>
 
                     <div class="flex items-center">
                         <input id="use-uppercase" type="checkbox" class="h-4 w-4 text-primary-600 focus:ring-primary-500 border-gray-300 rounded dark:bg-gray-700 dark:border-gray-600"
                             @bind="_workingSettings.UseUppercase" @bind:after="OnPasswordSettingsChanged">
-                        <label for="use-uppercase" class="ml-2 block text-sm text-gray-700 dark:text-gray-300">Include uppercase letters (A-Z)</label>
+                        <label for="use-uppercase" class="ml-2 block text-sm text-gray-700 dark:text-gray-300">@Localizer["IncludeUppercaseLabel"]</label>
                     </div>
 
                     <div class="flex items-center">
                         <input id="use-numbers" type="checkbox" class="h-4 w-4 text-primary-600 focus:ring-primary-500 border-gray-300 rounded dark:bg-gray-700 dark:border-gray-600"
                             @bind="_workingSettings.UseNumbers" @bind:after="OnPasswordSettingsChanged">
-                        <label for="use-numbers" class="ml-2 block text-sm text-gray-700 dark:text-gray-300">Include numbers (0-9)</label>
+                        <label for="use-numbers" class="ml-2 block text-sm text-gray-700 dark:text-gray-300">@Localizer["IncludeNumbersLabel"]</label>
                     </div>
 
                     <div class="flex items-center">
                         <input id="use-special-chars" type="checkbox" class="h-4 w-4 text-primary-600 focus:ring-primary-500 border-gray-300 rounded dark:bg-gray-700 dark:border-gray-600"
                             @bind="_workingSettings.UseSpecialChars" @bind:after="OnPasswordSettingsChanged">
-                        <label for="use-special-chars" class="ml-2 block text-sm text-gray-700 dark:text-gray-300">Include special characters (!@@#$%^&amp;*)</label>
+                        <label for="use-special-chars" class="ml-2 block text-sm text-gray-700 dark:text-gray-300">@Localizer["IncludeSpecialCharsLabel"]</label>
                     </div>
 
                     <div class="flex items-center">
                         <input id="use-non-ambiguous" type="checkbox" class="h-4 w-4 text-primary-600 focus:ring-primary-500 border-gray-300 rounded dark:bg-gray-700 dark:border-gray-600"
                             @bind="_workingSettings.UseNonAmbiguousChars" @bind:after="OnPasswordSettingsChanged">
-                        <label for="use-non-ambiguous" class="ml-2 block text-sm text-gray-700 dark:text-gray-300">Avoid ambiguous characters (1, l, I, 0, O, etc.)</label>
+                        <label for="use-non-ambiguous" class="ml-2 block text-sm text-gray-700 dark:text-gray-300">@Localizer["AvoidAmbiguousCharsLabel"]</label>
                     </div>
 
                     <div class="mt-4">
-                        <label class="block text-sm font-medium text-gray-700 dark:text-gray-300">Preview</label>
+                        <label class="block text-sm font-medium text-gray-700 dark:text-gray-300">@Localizer["PreviewLabel"]</label>
                         <div class="mt-1 flex">
                             <CopyPasteFormRow Id="preview-password" Value="@_previewPassword" />
                             <button type="button" class="ml-2 px-3 py-2 text-sm text-gray-500 dark:text-white bg-gray-200 hover:bg-gray-300 focus:ring-4 focus:outline-none focus:ring-gray-300 font-medium rounded-md dark:bg-gray-600 dark:hover:bg-gray-700 dark:focus:ring-gray-800" @onclick="RefreshPreview">
@@ -61,16 +65,16 @@
 
                     <div class="flex @(IsTemporary ? "justify-between" : "justify-end") pt-4 gap-2">
                         <button type="button" class="px-4 py-2 bg-gray-200 text-gray-800 rounded-md hover:bg-gray-300 focus:outline-none focus:ring-2 focus:ring-gray-400 dark:bg-gray-700 dark:text-white dark:hover:bg-gray-600" @onclick="OnClose">
-                            Cancel
+                            @Localizer["CancelButton"]
                         </button>
                         @if (IsTemporary)
                         {
                             <button type="button" class="px-4 py-2 bg-gray-200 text-gray-800 dark:bg-gray-700 dark:text-white rounded-md hover:bg-gray-300 dark:hover:bg-gray-600 focus:outline-none focus:ring-2 focus:ring-gray-500" @onclick="OnSaveTemporary">
-                                Use Just Once
+                                @Localizer["UseJustOnceButton"]
                             </button>
                         }
                         <button type="button" id="save-button" class="px-4 py-2 bg-primary-600 text-white rounded-md hover:bg-primary-700 focus:outline-none focus:ring-2 focus:ring-primary-500 dark:bg-primary-700 dark:hover:bg-primary-600" @onclick="OnSaveGlobal">
-                            Save Globally
+                            @Localizer["SaveGloballyButton"]
                         </button>
                     </div>
                 </div>
@@ -80,6 +84,8 @@
 </ClickOutsideHandler>
 
 @code {
+    private IStringLocalizer Localizer => LocalizerFactory.Create("Components.Main.Settings.PasswordSettingsPopup", "AliasVault.Client");
+
     /// <summary>
     /// The PasswordSettings to mutate.
     /// </summary>
@@ -178,7 +184,7 @@
         var settingsJson = System.Text.Json.JsonSerializer.Serialize(_workingSettings);
         await DbService.Settings.SetSettingAsync("PasswordGenerationSettings", settingsJson);
         GlobalLoadingService.Hide();
-        GlobalNotificationService.AddSuccessMessage("Password generation settings updated globally.", true);
+        GlobalNotificationService.AddSuccessMessage(Localizer["SettingsUpdatedMessage"], true);
 
         // Notify parent with both settings and the generated password.
         await OnSaveSettings.InvokeAsync((_workingSettings, _previewPassword));
diff --git a/apps/server/AliasVault.Client/Main/Layout/Footer.razor b/apps/server/AliasVault.Client/Main/Layout/Footer.razor
index da92c7ddc..8234f9324 100644
--- a/apps/server/AliasVault.Client/Main/Layout/Footer.razor
+++ b/apps/server/AliasVault.Client/Main/Layout/Footer.razor
@@ -1,12 +1,16 @@
 @inject NavigationManager NavigationManager
+@inject IStringLocalizerFactory LocalizerFactory
+@inject IStringLocalizer<SharedResources> SharedLocalizer
 @using AliasVault.Shared.Core
+@using Microsoft.Extensions.Localization
+@using AliasVault.Client.Resources
 @implements IDisposable
 
 <footer class="relative -z-10 lg:fixed bottom-0 left-0 right-0 dark:bg-gray-900 @(ShowBorder ? "border-t border-gray-200 dark:border-gray-700" : "")">
     <div class="container mx-auto px-4 py-4">
         <div class="flex flex-col lg:flex-row justify-between items-center">
             <p class="text-sm text-center text-gray-500 mb-4 lg:mb-0">
-                © 2024 <span>@AppInfo.ApplicationName v@(AppInfo.GetFullVersion())</span>. All rights reserved.
+                © 2024 <span>@AppInfo.ApplicationName v@(AppInfo.GetFullVersion())</span>. @Localizer["CopyrightText"]
             </p>
             <div class="hidden lg:block text-center text-gray-400 text-sm">@_randomQuote</div>
             <ul class="flex flex-wrap items-center justify-center">
@@ -25,12 +29,14 @@
     [Parameter]
     public bool ShowBorder { get; set; } = true;
 
-    private static readonly string[] Quotes =
+    private IStringLocalizer Localizer => LocalizerFactory.Create("Layout.Footer", "AliasVault.Client");
+
+    private string[] Quotes => 
     [
-        "Tip: Use the g+c (go create) keyboard shortcut to quickly create a new alias.",
-        "Tip: Use the g+f (go find) keyboard shortcut to focus the search field.",
-        "Tip: Use the g+h (go home) keyboard shortcut to go to the homepage.",
-        "Tip: Use the g+l (go lock) keyboard shortcut to lock the vault.",
+        Localizer["TipCreateShortcut"],
+        Localizer["TipFindShortcut"],
+        Localizer["TipHomeShortcut"],
+        Localizer["TipLockShortcut"],
     ];
 
     private string _randomQuote = string.Empty;
diff --git a/apps/server/AliasVault.Client/Main/Pages/Emails/Home.razor b/apps/server/AliasVault.Client/Main/Pages/Emails/Home.razor
index 7db8514fa..a009c57ba 100644
--- a/apps/server/AliasVault.Client/Main/Pages/Emails/Home.razor
+++ b/apps/server/AliasVault.Client/Main/Pages/Emails/Home.razor
@@ -13,9 +13,13 @@
 @inject HttpClient HttpClient
 @inject ILogger<Home> Logger
 @inject MinDurationLoadingService LoadingService
+@inject IStringLocalizerFactory LocalizerFactory
+@inject IStringLocalizer<SharedResources> SharedLocalizer
+@using Microsoft.Extensions.Localization
+@using AliasVault.Client.Resources
 @implements IAsyncDisposable
 
-<LayoutPageTitle>Emails</LayoutPageTitle>
+<LayoutPageTitle>@Localizer["PageTitle"]</LayoutPageTitle>
 
 @if (EmailModalVisible)
 {
@@ -24,14 +28,14 @@
 
 <PageHeader
     BreadcrumbItems="@BreadcrumbItems"
-    Title="Emails"
-    Description="You can view all emails received by your private email addresses below.">
+    Title="@Localizer["PageTitle"]"
+    Description="@Localizer["PageDescription"]">
     <CustomActions>
         @if (DbService.Settings.AutoEmailRefresh)
         {
-            <div class="w-3 h-3 mr-2 rounded-full bg-primary-300 border-2 border-primary-100 animate-pulse" title="Auto-refresh enabled"></div>
+            <div class="w-3 h-3 mr-2 rounded-full bg-primary-300 border-2 border-primary-100 animate-pulse" title="@Localizer["AutoRefreshEnabledTooltip"]"></div>
         }
-        <RefreshButton OnClick="RefreshData" ButtonText="Refresh" />
+        <RefreshButton OnClick="RefreshData" ButtonText="@Localizer["RefreshButton"]" />
     </CustomActions>
 </PageHeader>
 
@@ -75,7 +79,7 @@ else if (NoEmailClaims)
 {
     <div class="p-4 mx-4 mt-4 bg-white border border-gray-200 rounded-lg shadow-sm dark:border-gray-700 dark:bg-gray-800">
         <div class="px-4 py-2 text-gray-400 rounded">
-            <p class="text-gray-500 dark:text-gray-400">You are not using any private email addresses (yet). Create a new alias and use a private email address supported by AliasVault. All emails received by these private email addresses will show up here.</p>
+            <p class="text-gray-500 dark:text-gray-400">@Localizer["NoEmailClaimsMessage"]</p>
         </div>
     </div>
 }
@@ -91,7 +95,7 @@ else
                     @if (EmailList.Count == 0)
                     {
                         <li class="p-4 text-center text-gray-500 dark:text-gray-300">
-                            No emails have been received yet.
+                            @Localizer["NoEmailsReceivedMessage"]
                         </li>
                     }
                     else
@@ -116,7 +120,7 @@ else
                 <!-- Single row message for desktop when no emails -->
                 <div class="w-full bg-white border rounded-lg dark:bg-gray-800 dark:border-gray-700 overflow-hidden">
                     <div class="p-4 text-center text-gray-500 dark:text-gray-300">
-                        No emails have been received yet.
+                        @Localizer["NoEmailsReceivedMessage"]
                     </div>
                 </div>
             }
@@ -149,12 +153,12 @@ else
                                                         <circle class="opacity-25" cx="12" cy="12" r="10" stroke="currentColor" stroke-width="4"></circle>
                                                         <path class="opacity-75" fill="currentColor" d="M4 12a8 8 0 018-8V0C5.373 0 0 5.373 0 12h4zm2 5.291A7.962 7.962 0 014 12H0c0 3.042 1.135 5.824 3 7.938l3-2.647z"></path>
                                                     </svg>
-                                                    Loading...
+                                                    @Localizer["LoadingText"]
                                                 </span>
                                             }
                                             else
                                             {
-                                                <span>Load More (@(TotalRecords - EmailList.Count) remaining)</span>
+                                                <span>@string.Format(Localizer["LoadMoreButtonText"], TotalRecords - EmailList.Count)</span>
                                             }
                                         </button>
                                     </li>
@@ -180,6 +184,7 @@ else
 }
 
 @code {
+    private IStringLocalizer Localizer => LocalizerFactory.Create("Pages.Main.Emails.Home", "AliasVault.Client");
     private List<MailListViewModel> EmailList { get; set; } = [];
     private bool IsLoading => LoadingService.IsLoading("emails");
     private int CurrentPage { get; set; } = 1;
@@ -359,8 +364,7 @@ else
                             switch (errorResponse.Code)
                             {
                                 case "CLAIM_DOES_NOT_EXIST":
-                                    GlobalNotificationService.AddErrorMessage("An error occurred while trying to load the emails. Please try to edit and " +
-                                                                              "save any credential entry to synchronize the database, then try again.", true);
+                                    GlobalNotificationService.AddErrorMessage(Localizer["ClaimDoesNotExistError"], true);
                                     break;
                                 default:
                                     throw new ArgumentException(errorResponse.Message);
@@ -633,7 +637,7 @@ else
         }
         catch (Exception ex)
         {
-            GlobalNotificationService.AddErrorMessage($"Failed to load email: {ex.Message}", true);
+            GlobalNotificationService.AddErrorMessage(string.Format(Localizer["LoadEmailsFailedMessage"], ex.Message), true);
             Logger.LogError(ex, "An error occurred while loading email for preview");
         }
     }
@@ -729,7 +733,7 @@ else
         }
         catch (Exception ex)
         {
-            GlobalNotificationService.AddErrorMessage($"Failed to load more emails: {ex.Message}", true);
+            GlobalNotificationService.AddErrorMessage(string.Format(Localizer["LoadMoreEmailsFailedMessage"], ex.Message), true);
             Logger.LogError(ex, "An error occurred while loading more emails");
         }
         finally
diff --git a/apps/server/AliasVault.Client/Main/Pages/Settings/ImportExport/ImportExport.razor b/apps/server/AliasVault.Client/Main/Pages/Settings/ImportExport/ImportExport.razor
index 3b01f8959..26a3f600c 100644
--- a/apps/server/AliasVault.Client/Main/Pages/Settings/ImportExport/ImportExport.razor
+++ b/apps/server/AliasVault.Client/Main/Pages/Settings/ImportExport/ImportExport.razor
@@ -3,22 +3,26 @@
 @inject CredentialService CredentialService
 @inject ILogger<ImportExport> Logger
 @inject ConfirmModalService ConfirmModalService
+@inject IStringLocalizerFactory LocalizerFactory
+@inject IStringLocalizer<SharedResources> SharedLocalizer
+@using Microsoft.Extensions.Localization
+@using AliasVault.Client.Resources
 @using AliasVault.RazorComponents.Services
 @using AliasVault.Client.Main.Pages.Settings.ImportExport.Components
 @using AliasVault.ImportExport
 
-<LayoutPageTitle>Import / Export</LayoutPageTitle>
+<LayoutPageTitle>@Localizer["PageTitle"]</LayoutPageTitle>
 
 <PageHeader
     BreadcrumbItems="@BreadcrumbItems"
-    Title="Import / Export"
-    Description="On this page you can import and export your vault.">
+    Title="@Localizer["PageTitle"]"
+    Description="@Localizer["PageDescription"]">
 </PageHeader>
 
 <div class="p-4 mx-4 mb-4 bg-white border border-gray-200 rounded-lg shadow-sm 2xl:col-span-2 dark:border-gray-700 sm:p-6 dark:bg-gray-800">
-    <h3 class="mb-4 text-xl font-semibold dark:text-white">Import passwords</h3>
+    <h3 class="mb-4 text-xl font-semibold dark:text-white">@Localizer["ImportSectionTitle"]</h3>
     <div class="mb-4 text-sm text-gray-500 dark:text-gray-400">
-        Select a service to import from. If you are using a service that is not listed here and would like to see it supported, please raise an issue on <a href="https://github.com/lanedirt/AliasVault/issues" target="_blank" class="text-primary-500 hover:text-primary-700">GitHub</a> or contact us.
+        @((MarkupString)Localizer["ImportSectionDescription"].Value)
     </div>
     <div class="grid grid-cols-1 md:grid-cols-2 lg:grid-cols-3 gap-4">
         <ImportService1Password />
@@ -37,21 +41,23 @@
 </div>
 
 <div class="p-4 mx-4 mb-4 bg-white border border-gray-200 rounded-lg shadow-sm 2xl:col-span-2 dark:border-gray-700 sm:p-6 dark:bg-gray-800">
-    <h3 class="mb-4 text-xl font-semibold dark:text-white">Export vault</h3>
+    <h3 class="mb-4 text-xl font-semibold dark:text-white">@Localizer["ExportSectionTitle"]</h3>
     <div class="mb-4">
         <p class="text-sm text-gray-500 dark:text-gray-400 mb-4">
-            If you want to export your AliasVault credentials to another AliasVault server (e.g. from cloud to self-hosted or vice-versa) or to another service altogether, you can export it here. Note that all exports are unencrypted so store it in a safe place and delete it when you no longer need it.
+            @Localizer["ExportSectionDescription"]
         </p>
         <div>
-            <Button OnClick="@(() => ShowExportConfirmation(ExportType.Csv))">Export vault to unencrypted CSV file</Button>
+            <Button OnClick="@(() => ShowExportConfirmation(ExportType.Csv))">@Localizer["ExportCsvButton"]</Button>
         </div>
         <div class="mt-6">
-            <Button OnClick="@(() => ShowExportConfirmation(ExportType.Sqlite))">Export vault to unencrypted SQLite file</Button>
+            <Button OnClick="@(() => ShowExportConfirmation(ExportType.Sqlite))">@Localizer["ExportSqliteButton"]</Button>
         </div>
     </div>
 </div>
 
 @code {
+    private IStringLocalizer Localizer => LocalizerFactory.Create("Pages.Main.Settings.ImportExport.ImportExport", "AliasVault.Client");
+
     private ExportType _currentExportType;
 
     private enum ExportType
@@ -64,21 +70,15 @@
     protected override async Task OnInitializedAsync()
     {
         await base.OnInitializedAsync();
-        BreadcrumbItems.Add(new BreadcrumbItem { DisplayName = "Import / Export" });
+        BreadcrumbItems.Add(new BreadcrumbItem { DisplayName = Localizer["PageTitle"] });
     }
 
     private async Task ShowExportConfirmation(ExportType exportType)
     {
         _currentExportType = exportType;
-        var confirmMessage = @"Warning: Exporting your vault to an unencrypted file will expose all of your passwords and sensitive information in plain text. Only do this on trusted computers and ensure you:
+        var confirmMessage = Localizer["ExportWarningMessage"];
 
-• Store the exported file in a secure location
-• Delete the file when you no longer need it
-• Never share the exported file with others
-
-Are you sure you want to continue with the export?";
-
-        var result = await ConfirmModalService.ShowConfirmation("Export vault", confirmMessage);
+        var result = await ConfirmModalService.ShowConfirmation(Localizer["ExportConfirmTitle"], confirmMessage);
         if (!result)
         {
             return;
diff --git a/apps/server/AliasVault.Client/Main/Pages/Settings/Security/Components/ActiveSessionsSection.razor b/apps/server/AliasVault.Client/Main/Pages/Settings/Security/Components/ActiveSessionsSection.razor
index 29f541dc8..de99dc8e1 100644
--- a/apps/server/AliasVault.Client/Main/Pages/Settings/Security/Components/ActiveSessionsSection.razor
+++ b/apps/server/AliasVault.Client/Main/Pages/Settings/Security/Components/ActiveSessionsSection.razor
@@ -1,10 +1,13 @@
 @using AliasVault.Shared.Models.WebApi.Security
 @inject HttpClient Http
 @inject GlobalNotificationService GlobalNotificationService
+@inject IStringLocalizerFactory LocalizerFactory
+@using Microsoft.Extensions.Localization
+@using AliasVault.Client.Resources
 
 <div class="p-4 mb-4 mx-4 bg-white border border-gray-200 rounded-lg shadow-sm dark:border-gray-700 sm:p-6 dark:bg-gray-800">
-    <h3 class="mb-2 text-lg font-medium text-gray-900 dark:text-white">Active Sessions</h3>
-    <p class="text-sm text-gray-600 dark:text-gray-400 mb-4">Below is a list of devices where your account is currently logged in or has an active session. You can log out from any of these sessions here.</p>
+    <h3 class="mb-2 text-lg font-medium text-gray-900 dark:text-white">@Localizer["Title"]</h3>
+    <p class="text-sm text-gray-600 dark:text-gray-400 mb-4">@Localizer["Description"]</p>
 
     @if (IsLoading)
     {
@@ -14,7 +17,7 @@
     {
         @if (!Sessions.Any())
         {
-            <p class="text-sm text-gray-600 dark:text-gray-400">No active sessions found.</p>
+            <p class="text-sm text-gray-600 dark:text-gray-400">@Localizer["NoSessionsMessage"]</p>
         }
         else
         {
@@ -22,10 +25,10 @@
                 <table class="w-full text-sm text-left text-gray-500 dark:text-gray-400">
                     <thead class="text-xs text-gray-700 uppercase bg-gray-50 dark:bg-gray-700 dark:text-gray-400">
                     <tr>
-                        <th scope="col" class="px-6 py-3">Device</th>
-                        <th scope="col" class="px-6 py-3">Last active</th>
-                        <th scope="col" class="px-6 py-3">Expires</th>
-                        <th scope="col" class="px-6 py-3">Action</th>
+                        <th scope="col" class="px-6 py-3">@Localizer["DeviceColumn"]</th>
+                        <th scope="col" class="px-6 py-3">@Localizer["LastActiveColumn"]</th>
+                        <th scope="col" class="px-6 py-3">@Localizer["ExpiresColumn"]</th>
+                        <th scope="col" class="px-6 py-3">@Localizer["ActionColumn"]</th>
                     </tr>
                     </thead>
                     <tbody>
@@ -36,7 +39,7 @@
                             <td class="px-6 py-4">@session.CreatedAt.ToLocalTime().ToString("g")</td>
                             <td class="px-6 py-4">@session.ExpireDate.ToLocalTime().ToString("g")</td>
                             <td class="px-6 py-4">
-                                <Button Color="danger" OnClick="() => RevokeSession(session.Id)">Revoke</Button>
+                                <Button Color="danger" OnClick="() => RevokeSession(session.Id)">@Localizer["RevokeButton"]</Button>
                             </td>
                         </tr>
                     }
@@ -48,6 +51,8 @@
 </div>
 
 @code {
+    private IStringLocalizer Localizer => LocalizerFactory.Create("Components.Main.Settings.Security.ActiveSessionsSection", "AliasVault.Client");
+
     /// <summary>
     /// Gets or sets the list of active sessions (refresh tokens) for the current user.
     /// </summary>
@@ -92,17 +97,17 @@
             var response = await Http.DeleteAsync($"v1/Security/sessions/{id}");
             if (response.IsSuccessStatusCode)
             {
-                GlobalNotificationService.AddSuccessMessage("Session revoked successfully.", true);
+                GlobalNotificationService.AddSuccessMessage(Localizer["RevokeSuccessMessage"], true);
                 await OnSessionsChanged.InvokeAsync();
             }
             else
             {
-                GlobalNotificationService.AddErrorMessage("Failed to revoke session.", true);
+                GlobalNotificationService.AddErrorMessage(Localizer["RevokeErrorMessage"], true);
             }
         }
         catch (Exception ex)
         {
-            GlobalNotificationService.AddErrorMessage($"Failed to revoke session: {ex.Message}.", true);
+            GlobalNotificationService.AddErrorMessage(string.Format(Localizer["RevokeExceptionMessage"], ex.Message), true);
         }
     }
 }
diff --git a/apps/server/AliasVault.Client/Main/Pages/Settings/Security/Components/DeleteAccountSection.razor b/apps/server/AliasVault.Client/Main/Pages/Settings/Security/Components/DeleteAccountSection.razor
index ead9e0f12..3fc46ef8c 100644
--- a/apps/server/AliasVault.Client/Main/Pages/Settings/Security/Components/DeleteAccountSection.razor
+++ b/apps/server/AliasVault.Client/Main/Pages/Settings/Security/Components/DeleteAccountSection.razor
@@ -1,15 +1,20 @@
 @inject HttpClient Http
 @inject NavigationManager NavigationManager
+@inject IStringLocalizerFactory LocalizerFactory
+@using Microsoft.Extensions.Localization
+@using AliasVault.Client.Resources
 
 <div class="p-4 mb-4 mx-4 bg-white border border-gray-200 rounded-lg shadow-sm dark:border-gray-700 sm:p-6 dark:bg-gray-800">
-    <h3 class="mb-2 text-lg font-medium text-gray-900 dark:text-white">Delete account</h3>
+    <h3 class="mb-2 text-lg font-medium text-gray-900 dark:text-white">@Localizer["Title"]</h3>
     <div class="mb-3 text-sm text-gray-600 dark:text-gray-400">
-        Permanently delete your account and all associated data. This action cannot be undone.
+        @Localizer["Description"]
     </div>
-    <Button Color="danger" OnClick="DeleteAccount">Delete Account</Button>
+    <Button Color="danger" OnClick="DeleteAccount">@Localizer["DeleteButton"]</Button>
 </div>
 
 @code {
+    private IStringLocalizer Localizer => LocalizerFactory.Create("Components.Main.Settings.Security.DeleteAccountSection", "AliasVault.Client");
+
     /// <summary>
     /// Navigates to the delete account page.
     /// </summary>
diff --git a/apps/server/AliasVault.Client/Main/Pages/Settings/Security/Components/PasswordChangeSection.razor b/apps/server/AliasVault.Client/Main/Pages/Settings/Security/Components/PasswordChangeSection.razor
index 3e3a3603c..e61409c17 100644
--- a/apps/server/AliasVault.Client/Main/Pages/Settings/Security/Components/PasswordChangeSection.razor
+++ b/apps/server/AliasVault.Client/Main/Pages/Settings/Security/Components/PasswordChangeSection.razor
@@ -1,15 +1,20 @@
 @inject HttpClient Http
 @inject NavigationManager NavigationManager
+@inject IStringLocalizerFactory LocalizerFactory
+@using Microsoft.Extensions.Localization
+@using AliasVault.Client.Resources
 
 <div class="p-4 mb-4 mx-4 bg-white border border-gray-200 rounded-lg shadow-sm dark:border-gray-700 sm:p-6 dark:bg-gray-800">
-    <h3 class="mb-2 text-lg font-medium text-gray-900 dark:text-white">Change master password</h3>
+    <h3 class="mb-2 text-lg font-medium text-gray-900 dark:text-white">@Localizer["Title"]</h3>
 
-    <div class="mb-3 text-sm text-gray-600 dark:text-gray-400">Changing your master password also changes the vault encryption keys. It is advised to periodically change your master password to keep your vaults secure.</div>
+    <div class="mb-3 text-sm text-gray-600 dark:text-gray-400">@Localizer["Description"]</div>
 
-    <Button OnClick="ChangePassword">Change Password</Button>
+    <Button OnClick="ChangePassword">@Localizer["ChangePasswordButton"]</Button>
 </div>
 
 @code {
+    private IStringLocalizer Localizer => LocalizerFactory.Create("Components.Main.Settings.Security.PasswordChangeSection", "AliasVault.Client");
+
     /// <summary>
     /// Gets or sets a value indicating whether Two-Factor Authentication is enabled.
     /// </summary>
diff --git a/apps/server/AliasVault.Client/Main/Pages/Settings/Security/Components/QuickVaultUnlockSection.razor b/apps/server/AliasVault.Client/Main/Pages/Settings/Security/Components/QuickVaultUnlockSection.razor
index 1441340ef..a4467d6b3 100644
--- a/apps/server/AliasVault.Client/Main/Pages/Settings/Security/Components/QuickVaultUnlockSection.razor
+++ b/apps/server/AliasVault.Client/Main/Pages/Settings/Security/Components/QuickVaultUnlockSection.razor
@@ -1,8 +1,12 @@
 @inherits MainBase
 @inject ILogger<QuickVaultUnlockSection> Logger
+@inject IStringLocalizerFactory LocalizerFactory
+@inject IStringLocalizer<SharedResources> SharedLocalizer
+@using Microsoft.Extensions.Localization
+@using AliasVault.Client.Resources
 
 <div class="p-4 mb-4 mx-4 bg-white border border-gray-200 rounded-lg shadow-sm dark:border-gray-700 sm:p-6 dark:bg-gray-800">
-    <h3 class="mb-2 text-lg font-medium text-gray-900 dark:text-white">Quick vault unlock</h3>
+    <h3 class="mb-2 text-lg font-medium text-gray-900 dark:text-white">@Localizer["Title"]</h3>
 
     @if (IsLoading)
     {
@@ -12,23 +16,23 @@
     {
         if (IsWebAuthnEnabled)
         {
-            <div class="mb-3 text-sm text-gray-600 dark:text-gray-400">The vault decryption key is saved via a passkey. This means that when you reload the AliasVault page or tab, you can login with your face, fingerprint or built-in browser security keys.
-                If you with to disable the quick vault unlock, you can do so with the button below.</div>
-            <Button Color="danger" OnClick="DisableWebAuthn">Disable Quick Vault Unlock</Button>
+            <div class="mb-3 text-sm text-gray-600 dark:text-gray-400">@Localizer["EnabledDescription"]</div>
+            <Button Color="danger" OnClick="DisableWebAuthn">@Localizer["DisableButton"]</Button>
         }
         else
         {
-            <div class="mb-3 text-sm text-gray-600 dark:text-gray-400">By default when you reload the AliasVault page or tab, you will be prompted to enter your master password again.
-                Alternatively, you can choose to use a browser passkey (or hardware authenticator such as YubiKey) instead of your master password. This will allow you to unlock your vault with your face, fingerprint or built-in browser security keys. This only applies to the current device and browser.</div>
+            <div class="mb-3 text-sm text-gray-600 dark:text-gray-400">@Localizer["DisabledDescription"]</div>
 
-            <div class="mb-3 text-sm text-gray-600 dark:text-gray-400">Please note that this feature is experimental and may not work on all devices or browsers. Your browser must support WebAuthn and the PRF extension in order for this to work. If you experience any issues, you can disable this feature at any time.</div>
+            <div class="mb-3 text-sm text-gray-600 dark:text-gray-400">@Localizer["ExperimentalWarning"]</div>
 
-            <Button Color="success" OnClick="EnableWebAuthn">Enable Quick Vault Unlock</Button>
+            <Button Color="success" OnClick="EnableWebAuthn">@Localizer["EnableButton"]</Button>
         }
     }
 </div>
 
 @code {
+    private IStringLocalizer Localizer => LocalizerFactory.Create("Components.Main.Settings.Security.QuickVaultUnlockSection", "AliasVault.Client");
+
     /// <summary>
     /// Event callback that is invoked when the Two-Factor Authentication status changes.
     /// </summary>
@@ -63,16 +67,16 @@
         {
             var webauthCredentialDerivedKey = await JsInteropService.CreateWebAuthnCredentialDerivedKey(await GetUsernameAsync());
             await AuthService.SetWebAuthnEnabledAsync(true, webauthCredentialDerivedKey.CredentialId, webauthCredentialDerivedKey.Salt, webauthCredentialDerivedKey.DerivedKey);
-            GlobalNotificationService.AddSuccessMessage("Quick Vault Unlock is successfully enabled. The next time your vault is locked you can unlock it with your created passkey.", true);
+            GlobalNotificationService.AddSuccessMessage(Localizer["SuccessEnabledMessage"], true);
         }
         catch (NotSupportedException)
         {
-            GlobalNotificationService.AddErrorMessage("Your current browser does not support the WebAuthn PRF extension. Please try again with a different browser.", true);
+            GlobalNotificationService.AddErrorMessage(Localizer["WebAuthnNotSupportedError"], true);
             return;
         }
         catch (Exception ex)
         {
-            GlobalNotificationService.AddErrorMessage("An error occurred while trying to enable Quick Vault Unlock. Please try again (later).", true);
+            GlobalNotificationService.AddErrorMessage(Localizer["EnableErrorMessage"], true);
             Logger.LogInformation(ex, "An error occurred while trying to enable WebAuthn.");
             return;
         }
@@ -86,7 +90,7 @@
     public async Task DisableWebAuthn()
     {
         await AuthService.SetWebAuthnEnabledAsync(false);
-        GlobalNotificationService.AddSuccessMessage("Quick Vault Unlock is successfully disabled.", true);
+        GlobalNotificationService.AddSuccessMessage(Localizer["SuccessDisabledMessage"], true);
         await LoadData();
     }
 }
diff --git a/apps/server/AliasVault.Client/Main/Pages/Settings/Security/Components/RecentAuthLogsSection.razor b/apps/server/AliasVault.Client/Main/Pages/Settings/Security/Components/RecentAuthLogsSection.razor
index 6acc47dcd..4cab1d9e4 100644
--- a/apps/server/AliasVault.Client/Main/Pages/Settings/Security/Components/RecentAuthLogsSection.razor
+++ b/apps/server/AliasVault.Client/Main/Pages/Settings/Security/Components/RecentAuthLogsSection.razor
@@ -1,10 +1,13 @@
 @using AliasVault.Shared.Models.WebApi.Security
 @inject HttpClient Http
 @inject GlobalNotificationService GlobalNotificationService
+@inject IStringLocalizerFactory LocalizerFactory
+@using Microsoft.Extensions.Localization
+@using AliasVault.Client.Resources
 
 <div class="p-4 mb-4 mx-4 bg-white border border-gray-200 rounded-lg shadow-sm dark:border-gray-700 sm:p-6 dark:bg-gray-800">
-    <h3 class="mb-2 text-lg font-medium text-gray-900 dark:text-white">Recent Auth Logs</h3>
-    <p class="text-sm text-gray-600 dark:text-gray-400 mb-4">Below you can find an overview of recent login attempts to your account.</p>
+    <h3 class="mb-2 text-lg font-medium text-gray-900 dark:text-white">@Localizer["Title"]</h3>
+    <p class="text-sm text-gray-600 dark:text-gray-400 mb-4">@Localizer["Description"]</p>
 
     @if (IsLoading)
     {
@@ -14,7 +17,7 @@
     {
     @if (!AuthLogs.Any())
     {
-        <p class="text-sm text-gray-600 dark:text-gray-400">No authentication logs found.</p>
+        <p class="text-sm text-gray-600 dark:text-gray-400">@Localizer["NoLogsMessage"]</p>
     }
     else
     {
@@ -22,12 +25,12 @@
             <table class="w-full text-sm text-left text-gray-500 dark:text-gray-400">
                 <thead class="text-xs text-gray-700 uppercase bg-gray-50 dark:bg-gray-700 dark:text-gray-400">
                     <tr>
-                        <th scope="col" class="px-6 py-3">Timestamp</th>
-                        <th scope="col" class="px-6 py-3">Event Type</th>
-                        <th scope="col" class="px-6 py-3">Client</th>
-                        <th scope="col" class="px-6 py-3">IP Address</th>
-                        <th scope="col" class="px-6 py-3">Device</th>
-                        <th scope="col" class="px-6 py-3">Success</th>
+                        <th scope="col" class="px-6 py-3">@Localizer["TimestampColumn"]</th>
+                        <th scope="col" class="px-6 py-3">@Localizer["EventTypeColumn"]</th>
+                        <th scope="col" class="px-6 py-3">@Localizer["ClientColumn"]</th>
+                        <th scope="col" class="px-6 py-3">@Localizer["IpAddressColumn"]</th>
+                        <th scope="col" class="px-6 py-3">@Localizer["DeviceColumn"]</th>
+                        <th scope="col" class="px-6 py-3">@Localizer["SuccessColumn"]</th>
                     </tr>
                 </thead>
                 <tbody>
@@ -39,7 +42,7 @@
                             <td class="px-6 py-4">@authLog.Client</td>
                             <td class="px-6 py-4">@authLog.IpAddress</td>
                             <td class="px-6 py-4">@authLog.UserAgent</td>
-                            <td class="px-4 py-4"><StatusPill Enabled="authLog.IsSuccess" TextTrue="Success" TextFalse="Failed" /></td>
+                            <td class="px-4 py-4"><StatusPill Enabled="authLog.IsSuccess" TextTrue="@Localizer["SuccessStatus"]" TextFalse="@Localizer["FailedStatus"]" /></td>
                         </tr>
                     }
                 </tbody>
@@ -50,6 +53,7 @@
 </div>
 
 @code {
+    private IStringLocalizer Localizer => LocalizerFactory.Create("Components.Main.Settings.Security.RecentAuthLogsSection", "AliasVault.Client");
 
     /// <summary>
     /// Gets or sets the list of active sessions (refresh tokens) for the current user.
diff --git a/apps/server/AliasVault.Client/Main/Pages/Settings/Security/Components/ShowRecoveryCodes.razor b/apps/server/AliasVault.Client/Main/Pages/Settings/Security/Components/ShowRecoveryCodes.razor
index 671ad063a..c42a699da 100644
--- a/apps/server/AliasVault.Client/Main/Pages/Settings/Security/Components/ShowRecoveryCodes.razor
+++ b/apps/server/AliasVault.Client/Main/Pages/Settings/Security/Components/ShowRecoveryCodes.razor
@@ -1,16 +1,18 @@
-<div class="p-4 mb-4 mx-4 bg-white border border-gray-200 rounded-lg shadow-sm dark:border-gray-700 sm:p-6 dark:bg-gray-800">
-    <h3 class="mb-4 text-lg font-medium text-gray-900 dark:text-white">Recovery codes</h3>
+@inject IStringLocalizerFactory LocalizerFactory
+@using Microsoft.Extensions.Localization
+@using AliasVault.Client.Resources
+
+<div class="p-4 mb-4 mx-4 bg-white border border-gray-200 rounded-lg shadow-sm dark:border-gray-700 sm:p-6 dark:bg-gray-800">
+    <h3 class="mb-4 text-lg font-medium text-gray-900 dark:text-white">@Localizer["Title"]</h3>
     <div class="text-sm text-gray-600 dark:text-gray-400 mb-4">
-        The recovery codes below are used to access your account in case you lose access to your authenticator device.
-        Make a photo or write them down and store them in a secure location. Do not share them with anyone.
+        @Localizer["Description"]
     </div>
     <div class="bg-primary-100 border-l-4 border-primary-500 text-primary-700 p-4 mb-4 dark:bg-gray-700 dark:border-primary-500 dark:text-gray-200">
         <p class="font-semibold">
-            Store these recovery codes in a safe place.
+            @Localizer["WarningTitle"]
         </p>
         <p>
-            If you lose your device and don't have the recovery codes you will lose access to your account. These
-            codes are only shown once!
+            @Localizer["WarningDescription"]
         </p>
     </div>
 
@@ -25,6 +27,8 @@
 </div>
 
 @code {
+    private IStringLocalizer Localizer => LocalizerFactory.Create("Components.Main.Settings.Security.ShowRecoveryCodes", "AliasVault.Client");
+
     /// <summary>
     /// The recovery codes to show.
     /// </summary>
diff --git a/apps/server/AliasVault.Client/Main/Pages/Settings/Security/Components/TwoFactorAuthenticationSection.razor b/apps/server/AliasVault.Client/Main/Pages/Settings/Security/Components/TwoFactorAuthenticationSection.razor
index 2496be2d6..047c087a5 100644
--- a/apps/server/AliasVault.Client/Main/Pages/Settings/Security/Components/TwoFactorAuthenticationSection.razor
+++ b/apps/server/AliasVault.Client/Main/Pages/Settings/Security/Components/TwoFactorAuthenticationSection.razor
@@ -1,8 +1,11 @@
 @inject HttpClient Http
 @inject NavigationManager NavigationManager
+@inject IStringLocalizerFactory LocalizerFactory
+@using Microsoft.Extensions.Localization
+@using AliasVault.Client.Resources
 
 <div class="p-4 mb-4 mx-4 bg-white border border-gray-200 rounded-lg shadow-sm dark:border-gray-700 sm:p-6 dark:bg-gray-800">
-    <h3 class="mb-2 text-lg font-medium text-gray-900 dark:text-white">Two-factor authentication</h3>
+    <h3 class="mb-2 text-lg font-medium text-gray-900 dark:text-white">@Localizer["Title"]</h3>
 
     @if (IsLoading)
     {
@@ -12,18 +15,20 @@
     {
         @if (TwoFactorEnabled)
         {
-            <div class="mb-3 text-sm text-gray-600 dark:text-gray-400">Two factor authentication is currently enabled.</div>
-            <Button Color="danger" OnClick="DisableTwoFactor">Disable Two-Factor Authentication</Button>
+            <div class="mb-3 text-sm text-gray-600 dark:text-gray-400">@Localizer["EnabledMessage"]</div>
+            <Button Color="danger" OnClick="DisableTwoFactor">@Localizer["DisableButton"]</Button>
         }
         else
         {
-            <div class="mb-3 text-sm text-gray-600 dark:text-gray-400">Two factor authentication is currently disabled. In order to improve your account security we advise you to enable it.</div>
-            <Button Color="success" OnClick="EnableTwoFactor">Enable Two-Factor Authentication</Button>
+            <div class="mb-3 text-sm text-gray-600 dark:text-gray-400">@Localizer["DisabledMessage"]</div>
+            <Button Color="success" OnClick="EnableTwoFactor">@Localizer["EnableButton"]</Button>
         }
     }
 </div>
 
 @code {
+    private IStringLocalizer Localizer => LocalizerFactory.Create("Components.Main.Settings.Security.TwoFactorAuthenticationSection", "AliasVault.Client");
+
     /// <summary>
     /// Gets or sets a value indicating whether Two-Factor Authentication is enabled.
     /// </summary>
diff --git a/apps/server/AliasVault.Client/Main/Pages/Settings/Security/Security.razor b/apps/server/AliasVault.Client/Main/Pages/Settings/Security/Security.razor
index 3556fa12f..8c53cbf0a 100644
--- a/apps/server/AliasVault.Client/Main/Pages/Settings/Security/Security.razor
+++ b/apps/server/AliasVault.Client/Main/Pages/Settings/Security/Security.razor
@@ -10,10 +10,10 @@
 
 <PageHeader
     BreadcrumbItems="@BreadcrumbItems"
-    Title="@Localizer[\"PageTitle\"]"
-    Description="@Localizer[\"PageDescription\"]">
+    Title="@Localizer["PageTitle"]"
+    Description="@Localizer["PageDescription"]">
     <CustomActions>
-        <RefreshButton OnClick="LoadData" ButtonText="@Localizer[\"RefreshButton\"]" />
+        <RefreshButton OnClick="LoadData" ButtonText="@Localizer["RefreshButton"]" />
     </CustomActions>
 </PageHeader>
 
diff --git a/apps/server/AliasVault.Client/Resources/Components/Main/Settings/PasswordSettingsPopup.en.resx b/apps/server/AliasVault.Client/Resources/Components/Main/Settings/PasswordSettingsPopup.en.resx
new file mode 100644
index 000000000..3b1e77eb8
--- /dev/null
+++ b/apps/server/AliasVault.Client/Resources/Components/Main/Settings/PasswordSettingsPopup.en.resx
@@ -0,0 +1,109 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <data name="Title" xml:space="preserve">
+    <value>Change password generator settings</value>
+    <comment>Modal title</comment>
+  </data>
+  <data name="PasswordLengthLabel" xml:space="preserve">
+    <value>Password Length: {0}</value>
+    <comment>Label for password length slider. {0} is placeholder for current length</comment>
+  </data>
+  <data name="IncludeLowercaseLabel" xml:space="preserve">
+    <value>Include lowercase letters (a-z)</value>
+    <comment>Checkbox label for lowercase letters</comment>
+  </data>
+  <data name="IncludeUppercaseLabel" xml:space="preserve">
+    <value>Include uppercase letters (A-Z)</value>
+    <comment>Checkbox label for uppercase letters</comment>
+  </data>
+  <data name="IncludeNumbersLabel" xml:space="preserve">
+    <value>Include numbers (0-9)</value>
+    <comment>Checkbox label for numbers</comment>
+  </data>
+  <data name="IncludeSpecialCharsLabel" xml:space="preserve">
+    <value>Include special characters (!@#$%^&amp;*)</value>
+    <comment>Checkbox label for special characters</comment>
+  </data>
+  <data name="AvoidAmbiguousCharsLabel" xml:space="preserve">
+    <value>Avoid ambiguous characters (1, l, I, 0, O, etc.)</value>
+    <comment>Checkbox label for avoiding ambiguous characters</comment>
+  </data>
+  <data name="PreviewLabel" xml:space="preserve">
+    <value>Preview</value>
+    <comment>Label for password preview section</comment>
+  </data>
+  <data name="CancelButton" xml:space="preserve">
+    <value>Cancel</value>
+    <comment>Cancel button text</comment>
+  </data>
+  <data name="UseJustOnceButton" xml:space="preserve">
+    <value>Use Just Once</value>
+    <comment>Button to use settings temporarily</comment>
+  </data>
+  <data name="SaveGloballyButton" xml:space="preserve">
+    <value>Save Globally</value>
+    <comment>Button to save settings globally</comment>
+  </data>
+  <data name="SettingsUpdatedMessage" xml:space="preserve">
+    <value>Password generation settings updated globally.</value>
+    <comment>Success message when settings are saved</comment>
+  </data>
+</root>
\ No newline at end of file
diff --git a/apps/server/AliasVault.Client/Resources/Components/Main/Settings/PasswordSettingsPopup.nl.resx b/apps/server/AliasVault.Client/Resources/Components/Main/Settings/PasswordSettingsPopup.nl.resx
new file mode 100644
index 000000000..b98fdeb15
--- /dev/null
+++ b/apps/server/AliasVault.Client/Resources/Components/Main/Settings/PasswordSettingsPopup.nl.resx
@@ -0,0 +1,109 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <data name="Title" xml:space="preserve">
+    <value>Wachtwoordgenerator instellingen wijzigen</value>
+    <comment>Modal title</comment>
+  </data>
+  <data name="PasswordLengthLabel" xml:space="preserve">
+    <value>Wachtwoordlengte: {0}</value>
+    <comment>Label for password length slider. {0} is placeholder for current length</comment>
+  </data>
+  <data name="IncludeLowercaseLabel" xml:space="preserve">
+    <value>Kleine letters opnemen (a-z)</value>
+    <comment>Checkbox label for lowercase letters</comment>
+  </data>
+  <data name="IncludeUppercaseLabel" xml:space="preserve">
+    <value>Hoofdletters opnemen (A-Z)</value>
+    <comment>Checkbox label for uppercase letters</comment>
+  </data>
+  <data name="IncludeNumbersLabel" xml:space="preserve">
+    <value>Cijfers opnemen (0-9)</value>
+    <comment>Checkbox label for numbers</comment>
+  </data>
+  <data name="IncludeSpecialCharsLabel" xml:space="preserve">
+    <value>Speciale tekens opnemen (!@#$%^&amp;*)</value>
+    <comment>Checkbox label for special characters</comment>
+  </data>
+  <data name="AvoidAmbiguousCharsLabel" xml:space="preserve">
+    <value>Onduidelijke tekens vermijden (1, l, I, 0, O, enz.)</value>
+    <comment>Checkbox label for avoiding ambiguous characters</comment>
+  </data>
+  <data name="PreviewLabel" xml:space="preserve">
+    <value>Voorbeeld</value>
+    <comment>Label for password preview section</comment>
+  </data>
+  <data name="CancelButton" xml:space="preserve">
+    <value>Annuleren</value>
+    <comment>Cancel button text</comment>
+  </data>
+  <data name="UseJustOnceButton" xml:space="preserve">
+    <value>Eenmalig gebruiken</value>
+    <comment>Button to use settings temporarily</comment>
+  </data>
+  <data name="SaveGloballyButton" xml:space="preserve">
+    <value>Globaal opslaan</value>
+    <comment>Button to save settings globally</comment>
+  </data>
+  <data name="SettingsUpdatedMessage" xml:space="preserve">
+    <value>Wachtwoordgenerator instellingen zijn globaal bijgewerkt.</value>
+    <comment>Success message when settings are saved</comment>
+  </data>
+</root>
\ No newline at end of file
diff --git a/apps/server/AliasVault.Client/Resources/Components/Main/Settings/Security/ActiveSessionsSection.en.resx b/apps/server/AliasVault.Client/Resources/Components/Main/Settings/Security/ActiveSessionsSection.en.resx
new file mode 100644
index 000000000..625520ed9
--- /dev/null
+++ b/apps/server/AliasVault.Client/Resources/Components/Main/Settings/Security/ActiveSessionsSection.en.resx
@@ -0,0 +1,105 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <data name="Title" xml:space="preserve">
+    <value>Active Sessions</value>
+    <comment>Section title</comment>
+  </data>
+  <data name="Description" xml:space="preserve">
+    <value>Below is a list of devices where your account is currently logged in or has an active session. You can log out from any of these sessions here.</value>
+    <comment>Description of active sessions</comment>
+  </data>
+  <data name="NoSessionsMessage" xml:space="preserve">
+    <value>No active sessions found.</value>
+    <comment>Message when no active sessions are available</comment>
+  </data>
+  <data name="DeviceColumn" xml:space="preserve">
+    <value>Device</value>
+    <comment>Table column header</comment>
+  </data>
+  <data name="LastActiveColumn" xml:space="preserve">
+    <value>Last active</value>
+    <comment>Table column header</comment>
+  </data>
+  <data name="ExpiresColumn" xml:space="preserve">
+    <value>Expires</value>
+    <comment>Table column header</comment>
+  </data>
+  <data name="ActionColumn" xml:space="preserve">
+    <value>Action</value>
+    <comment>Table column header</comment>
+  </data>
+  <data name="RevokeButton" xml:space="preserve">
+    <value>Revoke</value>
+    <comment>Button to revoke session</comment>
+  </data>
+  <data name="RevokeSuccessMessage" xml:space="preserve">
+    <value>Session revoked successfully.</value>
+    <comment>Success message when session is revoked</comment>
+  </data>
+  <data name="RevokeErrorMessage" xml:space="preserve">
+    <value>Failed to revoke session.</value>
+    <comment>Error message when session revocation fails</comment>
+  </data>
+  <data name="RevokeExceptionMessage" xml:space="preserve">
+    <value>Failed to revoke session: {0}.</value>
+    <comment>Exception message when session revocation fails. {0} is placeholder for error details</comment>
+  </data>
+</root>
\ No newline at end of file
diff --git a/apps/server/AliasVault.Client/Resources/Components/Main/Settings/Security/ActiveSessionsSection.nl.resx b/apps/server/AliasVault.Client/Resources/Components/Main/Settings/Security/ActiveSessionsSection.nl.resx
new file mode 100644
index 000000000..1deb46305
--- /dev/null
+++ b/apps/server/AliasVault.Client/Resources/Components/Main/Settings/Security/ActiveSessionsSection.nl.resx
@@ -0,0 +1,105 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <data name="Title" xml:space="preserve">
+    <value>Actieve sessies</value>
+    <comment>Section title</comment>
+  </data>
+  <data name="Description" xml:space="preserve">
+    <value>Hieronder is een lijst van apparaten waar uw account momenteel is ingelogd of een actieve sessie heeft. U kunt vanaf elk van deze sessies uitloggen.</value>
+    <comment>Description of active sessions</comment>
+  </data>
+  <data name="NoSessionsMessage" xml:space="preserve">
+    <value>Geen actieve sessies gevonden.</value>
+    <comment>Message when no active sessions are available</comment>
+  </data>
+  <data name="DeviceColumn" xml:space="preserve">
+    <value>Apparaat</value>
+    <comment>Table column header</comment>
+  </data>
+  <data name="LastActiveColumn" xml:space="preserve">
+    <value>Laatst actief</value>
+    <comment>Table column header</comment>
+  </data>
+  <data name="ExpiresColumn" xml:space="preserve">
+    <value>Verloopt</value>
+    <comment>Table column header</comment>
+  </data>
+  <data name="ActionColumn" xml:space="preserve">
+    <value>Actie</value>
+    <comment>Table column header</comment>
+  </data>
+  <data name="RevokeButton" xml:space="preserve">
+    <value>Intrekken</value>
+    <comment>Button to revoke session</comment>
+  </data>
+  <data name="RevokeSuccessMessage" xml:space="preserve">
+    <value>Sessie succesvol ingetrokken.</value>
+    <comment>Success message when session is revoked</comment>
+  </data>
+  <data name="RevokeErrorMessage" xml:space="preserve">
+    <value>Kan sessie niet intrekken.</value>
+    <comment>Error message when session revocation fails</comment>
+  </data>
+  <data name="RevokeExceptionMessage" xml:space="preserve">
+    <value>Kan sessie niet intrekken: {0}.</value>
+    <comment>Exception message when session revocation fails. {0} is placeholder for error details</comment>
+  </data>
+</root>
\ No newline at end of file
diff --git a/apps/server/AliasVault.Client/Resources/Components/Main/Settings/Security/DeleteAccountSection.en.resx b/apps/server/AliasVault.Client/Resources/Components/Main/Settings/Security/DeleteAccountSection.en.resx
new file mode 100644
index 000000000..a41e2b3d5
--- /dev/null
+++ b/apps/server/AliasVault.Client/Resources/Components/Main/Settings/Security/DeleteAccountSection.en.resx
@@ -0,0 +1,73 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <data name="Title" xml:space="preserve">
+    <value>Delete account</value>
+    <comment>Section title</comment>
+  </data>
+  <data name="Description" xml:space="preserve">
+    <value>Permanently delete your account and all associated data. This action cannot be undone.</value>
+    <comment>Warning description for account deletion</comment>
+  </data>
+  <data name="DeleteButton" xml:space="preserve">
+    <value>Delete Account</value>
+    <comment>Button to delete account</comment>
+  </data>
+</root>
\ No newline at end of file
diff --git a/apps/server/AliasVault.Client/Resources/Components/Main/Settings/Security/DeleteAccountSection.nl.resx b/apps/server/AliasVault.Client/Resources/Components/Main/Settings/Security/DeleteAccountSection.nl.resx
new file mode 100644
index 000000000..c35d63a8f
--- /dev/null
+++ b/apps/server/AliasVault.Client/Resources/Components/Main/Settings/Security/DeleteAccountSection.nl.resx
@@ -0,0 +1,73 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <data name="Title" xml:space="preserve">
+    <value>Account verwijderen</value>
+    <comment>Section title</comment>
+  </data>
+  <data name="Description" xml:space="preserve">
+    <value>Verwijder uw account en alle bijbehorende gegevens permanent. Deze actie kan niet ongedaan worden gemaakt.</value>
+    <comment>Warning description for account deletion</comment>
+  </data>
+  <data name="DeleteButton" xml:space="preserve">
+    <value>Account verwijderen</value>
+    <comment>Button to delete account</comment>
+  </data>
+</root>
\ No newline at end of file
diff --git a/apps/server/AliasVault.Client/Resources/Components/Main/Settings/Security/PasswordChangeSection.en.resx b/apps/server/AliasVault.Client/Resources/Components/Main/Settings/Security/PasswordChangeSection.en.resx
new file mode 100644
index 000000000..26a5f7e0b
--- /dev/null
+++ b/apps/server/AliasVault.Client/Resources/Components/Main/Settings/Security/PasswordChangeSection.en.resx
@@ -0,0 +1,73 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <data name="Title" xml:space="preserve">
+    <value>Change master password</value>
+    <comment>Section title</comment>
+  </data>
+  <data name="Description" xml:space="preserve">
+    <value>Changing your master password also changes the vault encryption keys. It is advised to periodically change your master password to keep your vaults secure.</value>
+    <comment>Description of password change</comment>
+  </data>
+  <data name="ChangePasswordButton" xml:space="preserve">
+    <value>Change Password</value>
+    <comment>Button to change password</comment>
+  </data>
+</root>
\ No newline at end of file
diff --git a/apps/server/AliasVault.Client/Resources/Components/Main/Settings/Security/PasswordChangeSection.nl.resx b/apps/server/AliasVault.Client/Resources/Components/Main/Settings/Security/PasswordChangeSection.nl.resx
new file mode 100644
index 000000000..ee9f7d6c4
--- /dev/null
+++ b/apps/server/AliasVault.Client/Resources/Components/Main/Settings/Security/PasswordChangeSection.nl.resx
@@ -0,0 +1,73 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <data name="Title" xml:space="preserve">
+    <value>Hoofdwachtwoord wijzigen</value>
+    <comment>Section title</comment>
+  </data>
+  <data name="Description" xml:space="preserve">
+    <value>Het wijzigen van uw hoofdwachtwoord wijzigt ook de vault-encryptiesleutels. Het wordt aanbevolen om uw hoofdwachtwoord regelmatig te wijzigen om uw vaults veilig te houden.</value>
+    <comment>Description of password change</comment>
+  </data>
+  <data name="ChangePasswordButton" xml:space="preserve">
+    <value>Wachtwoord wijzigen</value>
+    <comment>Button to change password</comment>
+  </data>
+</root>
\ No newline at end of file
diff --git a/apps/server/AliasVault.Client/Resources/Components/Main/Settings/Security/QuickVaultUnlockSection.en.resx b/apps/server/AliasVault.Client/Resources/Components/Main/Settings/Security/QuickVaultUnlockSection.en.resx
new file mode 100644
index 000000000..9459dbb3d
--- /dev/null
+++ b/apps/server/AliasVault.Client/Resources/Components/Main/Settings/Security/QuickVaultUnlockSection.en.resx
@@ -0,0 +1,101 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <data name="Title" xml:space="preserve">
+    <value>Quick vault unlock</value>
+    <comment>Title for quick vault unlock section</comment>
+  </data>
+  <data name="EnabledDescription" xml:space="preserve">
+    <value>The vault decryption key is saved via a passkey. This means that when you reload the AliasVault page or tab, you can login with your face, fingerprint or built-in browser security keys. If you with to disable the quick vault unlock, you can do so with the button below.</value>
+    <comment>Description when quick unlock is enabled</comment>
+  </data>
+  <data name="DisableButton" xml:space="preserve">
+    <value>Disable Quick Vault Unlock</value>
+    <comment>Button to disable quick vault unlock</comment>
+  </data>
+  <data name="DisabledDescription" xml:space="preserve">
+    <value>By default when you reload the AliasVault page or tab, you will be prompted to enter your master password again. Alternatively, you can choose to use a browser passkey (or hardware authenticator such as YubiKey) instead of your master password. This will allow you to unlock your vault with your face, fingerprint or built-in browser security keys. This only applies to the current device and browser.</value>
+    <comment>Description when quick unlock is disabled</comment>
+  </data>
+  <data name="ExperimentalWarning" xml:space="preserve">
+    <value>Please note that this feature is experimental and may not work on all devices or browsers. Your browser must support WebAuthn and the PRF extension in order for this to work. If you experience any issues, you can disable this feature at any time.</value>
+    <comment>Warning about experimental nature of the feature</comment>
+  </data>
+  <data name="EnableButton" xml:space="preserve">
+    <value>Enable Quick Vault Unlock</value>
+    <comment>Button to enable quick vault unlock</comment>
+  </data>
+  <data name="SuccessEnabledMessage" xml:space="preserve">
+    <value>Quick Vault Unlock is successfully enabled. The next time your vault is locked you can unlock it with your created passkey.</value>
+    <comment>Success message when quick unlock is enabled</comment>
+  </data>
+  <data name="SuccessDisabledMessage" xml:space="preserve">
+    <value>Quick Vault Unlock is successfully disabled.</value>
+    <comment>Success message when quick unlock is disabled</comment>
+  </data>
+  <data name="WebAuthnNotSupportedError" xml:space="preserve">
+    <value>Your current browser does not support the WebAuthn PRF extension. Please try again with a different browser.</value>
+    <comment>Error when WebAuthn is not supported</comment>
+  </data>
+  <data name="EnableErrorMessage" xml:space="preserve">
+    <value>An error occurred while trying to enable Quick Vault Unlock. Please try again (later).</value>
+    <comment>Generic error message when enabling fails</comment>
+  </data>
+</root>
\ No newline at end of file
diff --git a/apps/server/AliasVault.Client/Resources/Components/Main/Settings/Security/QuickVaultUnlockSection.nl.resx b/apps/server/AliasVault.Client/Resources/Components/Main/Settings/Security/QuickVaultUnlockSection.nl.resx
new file mode 100644
index 000000000..e8b140f1d
--- /dev/null
+++ b/apps/server/AliasVault.Client/Resources/Components/Main/Settings/Security/QuickVaultUnlockSection.nl.resx
@@ -0,0 +1,101 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <data name="Title" xml:space="preserve">
+    <value>Snelle kluis ontgrendeling</value>
+    <comment>Title for quick vault unlock section</comment>
+  </data>
+  <data name="EnabledDescription" xml:space="preserve">
+    <value>De kluis ontsleutelingssleutel wordt opgeslagen via een toegangssleutel. Dit betekent dat wanneer je de AliasVault pagina of tab herlaadt, je kunt inloggen met je gezicht, vingerafdruk of ingebouwde browser beveiligingssleutels. Als je de snelle kluis ontgrendeling wilt uitschakelen, kun je dat doen met de knop hieronder.</value>
+    <comment>Description when quick unlock is enabled</comment>
+  </data>
+  <data name="DisableButton" xml:space="preserve">
+    <value>Snelle Kluis Ontgrendeling Uitschakelen</value>
+    <comment>Button to disable quick vault unlock</comment>
+  </data>
+  <data name="DisabledDescription" xml:space="preserve">
+    <value>Standaard wordt je gevraagd om je hoofdwachtwoord opnieuw in te voeren wanneer je de AliasVault pagina of tab herlaadt. Als alternatief kun je ervoor kiezen om een browser toegangssleutel (of hardware authenticator zoals YubiKey) te gebruiken in plaats van je hoofdwachtwoord. Hiermee kun je je kluis ontgrendelen met je gezicht, vingerafdruk of ingebouwde browser beveiligingssleutels. Dit geldt alleen voor het huidige apparaat en browser.</value>
+    <comment>Description when quick unlock is disabled</comment>
+  </data>
+  <data name="ExperimentalWarning" xml:space="preserve">
+    <value>Let op dat deze functie experimenteel is en mogelijk niet werkt op alle apparaten of browsers. Je browser moet WebAuthn en de PRF-extensie ondersteunen om dit te laten werken. Als je problemen ondervindt, kun je deze functie op elk moment uitschakelen.</value>
+    <comment>Warning about experimental nature of the feature</comment>
+  </data>
+  <data name="EnableButton" xml:space="preserve">
+    <value>Snelle Kluis Ontgrendeling Inschakelen</value>
+    <comment>Button to enable quick vault unlock</comment>
+  </data>
+  <data name="SuccessEnabledMessage" xml:space="preserve">
+    <value>Snelle Kluis Ontgrendeling is succesvol ingeschakeld. De volgende keer dat je kluis vergrendeld is, kun je deze ontgrendelen met je aangemaakte toegangssleutel.</value>
+    <comment>Success message when quick unlock is enabled</comment>
+  </data>
+  <data name="SuccessDisabledMessage" xml:space="preserve">
+    <value>Snelle Kluis Ontgrendeling is succesvol uitgeschakeld.</value>
+    <comment>Success message when quick unlock is disabled</comment>
+  </data>
+  <data name="WebAuthnNotSupportedError" xml:space="preserve">
+    <value>Je huidige browser ondersteunt de WebAuthn PRF-extensie niet. Probeer het opnieuw met een andere browser.</value>
+    <comment>Error when WebAuthn is not supported</comment>
+  </data>
+  <data name="EnableErrorMessage" xml:space="preserve">
+    <value>Er is een fout opgetreden bij het inschakelen van Snelle Kluis Ontgrendeling. Probeer het (later) opnieuw.</value>
+    <comment>Generic error message when enabling fails</comment>
+  </data>
+</root>
\ No newline at end of file
diff --git a/apps/server/AliasVault.Client/Resources/Components/Main/Settings/Security/RecentAuthLogsSection.en.resx b/apps/server/AliasVault.Client/Resources/Components/Main/Settings/Security/RecentAuthLogsSection.en.resx
new file mode 100644
index 000000000..ff0f3772e
--- /dev/null
+++ b/apps/server/AliasVault.Client/Resources/Components/Main/Settings/Security/RecentAuthLogsSection.en.resx
@@ -0,0 +1,105 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <data name="Title" xml:space="preserve">
+    <value>Recent Auth Logs</value>
+    <comment>Section title</comment>
+  </data>
+  <data name="Description" xml:space="preserve">
+    <value>Below you can find an overview of recent login attempts to your account.</value>
+    <comment>Description of auth logs section</comment>
+  </data>
+  <data name="NoLogsMessage" xml:space="preserve">
+    <value>No authentication logs found.</value>
+    <comment>Message when no auth logs are available</comment>
+  </data>
+  <data name="TimestampColumn" xml:space="preserve">
+    <value>Timestamp</value>
+    <comment>Table column header</comment>
+  </data>
+  <data name="EventTypeColumn" xml:space="preserve">
+    <value>Event Type</value>
+    <comment>Table column header</comment>
+  </data>
+  <data name="ClientColumn" xml:space="preserve">
+    <value>Client</value>
+    <comment>Table column header</comment>
+  </data>
+  <data name="IpAddressColumn" xml:space="preserve">
+    <value>IP Address</value>
+    <comment>Table column header</comment>
+  </data>
+  <data name="DeviceColumn" xml:space="preserve">
+    <value>Device</value>
+    <comment>Table column header</comment>
+  </data>
+  <data name="SuccessColumn" xml:space="preserve">
+    <value>Success</value>
+    <comment>Table column header</comment>
+  </data>
+  <data name="SuccessStatus" xml:space="preserve">
+    <value>Success</value>
+    <comment>Status indicator for successful login</comment>
+  </data>
+  <data name="FailedStatus" xml:space="preserve">
+    <value>Failed</value>
+    <comment>Status indicator for failed login</comment>
+  </data>
+</root>
\ No newline at end of file
diff --git a/apps/server/AliasVault.Client/Resources/Components/Main/Settings/Security/RecentAuthLogsSection.nl.resx b/apps/server/AliasVault.Client/Resources/Components/Main/Settings/Security/RecentAuthLogsSection.nl.resx
new file mode 100644
index 000000000..14d74ffa0
--- /dev/null
+++ b/apps/server/AliasVault.Client/Resources/Components/Main/Settings/Security/RecentAuthLogsSection.nl.resx
@@ -0,0 +1,105 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <data name="Title" xml:space="preserve">
+    <value>Recente authenticatielogs</value>
+    <comment>Section title</comment>
+  </data>
+  <data name="Description" xml:space="preserve">
+    <value>Hieronder vindt u een overzicht van recente inlogpogingen op uw account.</value>
+    <comment>Description of auth logs section</comment>
+  </data>
+  <data name="NoLogsMessage" xml:space="preserve">
+    <value>Geen authenticatielogs gevonden.</value>
+    <comment>Message when no auth logs are available</comment>
+  </data>
+  <data name="TimestampColumn" xml:space="preserve">
+    <value>Tijdstempel</value>
+    <comment>Table column header</comment>
+  </data>
+  <data name="EventTypeColumn" xml:space="preserve">
+    <value>Gebeurtenistype</value>
+    <comment>Table column header</comment>
+  </data>
+  <data name="ClientColumn" xml:space="preserve">
+    <value>Client</value>
+    <comment>Table column header</comment>
+  </data>
+  <data name="IpAddressColumn" xml:space="preserve">
+    <value>IP-adres</value>
+    <comment>Table column header</comment>
+  </data>
+  <data name="DeviceColumn" xml:space="preserve">
+    <value>Apparaat</value>
+    <comment>Table column header</comment>
+  </data>
+  <data name="SuccessColumn" xml:space="preserve">
+    <value>Succesvol</value>
+    <comment>Table column header</comment>
+  </data>
+  <data name="SuccessStatus" xml:space="preserve">
+    <value>Succesvol</value>
+    <comment>Status indicator for successful login</comment>
+  </data>
+  <data name="FailedStatus" xml:space="preserve">
+    <value>Mislukt</value>
+    <comment>Status indicator for failed login</comment>
+  </data>
+</root>
\ No newline at end of file
diff --git a/apps/server/AliasVault.Client/Resources/Components/Main/Settings/Security/ShowRecoveryCodes.en.resx b/apps/server/AliasVault.Client/Resources/Components/Main/Settings/Security/ShowRecoveryCodes.en.resx
new file mode 100644
index 000000000..27d7b7c14
--- /dev/null
+++ b/apps/server/AliasVault.Client/Resources/Components/Main/Settings/Security/ShowRecoveryCodes.en.resx
@@ -0,0 +1,77 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <data name="Title" xml:space="preserve">
+    <value>Recovery codes</value>
+    <comment>Section title</comment>
+  </data>
+  <data name="Description" xml:space="preserve">
+    <value>The recovery codes below are used to access your account in case you lose access to your authenticator device. Make a photo or write them down and store them in a secure location. Do not share them with anyone.</value>
+    <comment>Description of recovery codes</comment>
+  </data>
+  <data name="WarningTitle" xml:space="preserve">
+    <value>Store these recovery codes in a safe place.</value>
+    <comment>Warning title about storing codes</comment>
+  </data>
+  <data name="WarningDescription" xml:space="preserve">
+    <value>If you lose your device and don't have the recovery codes you will lose access to your account. These codes are only shown once!</value>
+    <comment>Warning description about recovery codes</comment>
+  </data>
+</root>
\ No newline at end of file
diff --git a/apps/server/AliasVault.Client/Resources/Components/Main/Settings/Security/ShowRecoveryCodes.nl.resx b/apps/server/AliasVault.Client/Resources/Components/Main/Settings/Security/ShowRecoveryCodes.nl.resx
new file mode 100644
index 000000000..c40684070
--- /dev/null
+++ b/apps/server/AliasVault.Client/Resources/Components/Main/Settings/Security/ShowRecoveryCodes.nl.resx
@@ -0,0 +1,77 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <data name="Title" xml:space="preserve">
+    <value>Herstelcodes</value>
+    <comment>Section title</comment>
+  </data>
+  <data name="Description" xml:space="preserve">
+    <value>De onderstaande herstelcodes worden gebruikt om toegang te krijgen tot uw account in het geval dat u de toegang tot uw authenticator-apparaat verliest. Maak een foto of noteer ze en bewaar ze op een veilige locatie. Deel ze met niemand.</value>
+    <comment>Description of recovery codes</comment>
+  </data>
+  <data name="WarningTitle" xml:space="preserve">
+    <value>Bewaar deze herstelcodes op een veilige plaats.</value>
+    <comment>Warning title about storing codes</comment>
+  </data>
+  <data name="WarningDescription" xml:space="preserve">
+    <value>Als u uw apparaat verliest en de herstelcodes niet heeft, verliest u de toegang tot uw account. Deze codes worden slechts één keer getoond!</value>
+    <comment>Warning description about recovery codes</comment>
+  </data>
+</root>
\ No newline at end of file
diff --git a/apps/server/AliasVault.Client/Resources/Components/Main/Settings/Security/TwoFactorAuthenticationSection.en.resx b/apps/server/AliasVault.Client/Resources/Components/Main/Settings/Security/TwoFactorAuthenticationSection.en.resx
new file mode 100644
index 000000000..62dc50363
--- /dev/null
+++ b/apps/server/AliasVault.Client/Resources/Components/Main/Settings/Security/TwoFactorAuthenticationSection.en.resx
@@ -0,0 +1,81 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <data name="Title" xml:space="preserve">
+    <value>Two-factor authentication</value>
+    <comment>Section title</comment>
+  </data>
+  <data name="EnabledMessage" xml:space="preserve">
+    <value>Two factor authentication is currently enabled.</value>
+    <comment>Status message when 2FA is enabled</comment>
+  </data>
+  <data name="DisabledMessage" xml:space="preserve">
+    <value>Two factor authentication is currently disabled. In order to improve your account security we advise you to enable it.</value>
+    <comment>Status message when 2FA is disabled</comment>
+  </data>
+  <data name="EnableButton" xml:space="preserve">
+    <value>Enable Two-Factor Authentication</value>
+    <comment>Button to enable 2FA</comment>
+  </data>
+  <data name="DisableButton" xml:space="preserve">
+    <value>Disable Two-Factor Authentication</value>
+    <comment>Button to disable 2FA</comment>
+  </data>
+</root>
\ No newline at end of file
diff --git a/apps/server/AliasVault.Client/Resources/Components/Main/Settings/Security/TwoFactorAuthenticationSection.nl.resx b/apps/server/AliasVault.Client/Resources/Components/Main/Settings/Security/TwoFactorAuthenticationSection.nl.resx
new file mode 100644
index 000000000..74f781e87
--- /dev/null
+++ b/apps/server/AliasVault.Client/Resources/Components/Main/Settings/Security/TwoFactorAuthenticationSection.nl.resx
@@ -0,0 +1,81 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <data name="Title" xml:space="preserve">
+    <value>Tweefactorauthenticatie</value>
+    <comment>Section title</comment>
+  </data>
+  <data name="EnabledMessage" xml:space="preserve">
+    <value>Tweefactorauthenticatie is momenteel ingeschakeld.</value>
+    <comment>Status message when 2FA is enabled</comment>
+  </data>
+  <data name="DisabledMessage" xml:space="preserve">
+    <value>Tweefactorauthenticatie is momenteel uitgeschakeld. Om de beveiliging van uw account te verbeteren raden wij u aan dit in te schakelen.</value>
+    <comment>Status message when 2FA is disabled</comment>
+  </data>
+  <data name="EnableButton" xml:space="preserve">
+    <value>Tweefactorauthenticatie inschakelen</value>
+    <comment>Button to enable 2FA</comment>
+  </data>
+  <data name="DisableButton" xml:space="preserve">
+    <value>Tweefactorauthenticatie uitschakelen</value>
+    <comment>Button to disable 2FA</comment>
+  </data>
+</root>
\ No newline at end of file
diff --git a/apps/server/AliasVault.Client/Resources/Layout/Footer.en.resx b/apps/server/AliasVault.Client/Resources/Layout/Footer.en.resx
new file mode 100644
index 000000000..bc0918479
--- /dev/null
+++ b/apps/server/AliasVault.Client/Resources/Layout/Footer.en.resx
@@ -0,0 +1,81 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <data name="CopyrightText" xml:space="preserve">
+    <value>All rights reserved.</value>
+    <comment>Copyright text in footer</comment>
+  </data>
+  <data name="TipCreateShortcut" xml:space="preserve">
+    <value>Tip: Use the g+c (go create) keyboard shortcut to quickly create a new alias.</value>
+    <comment>Tip about keyboard shortcut for creating aliases</comment>
+  </data>
+  <data name="TipFindShortcut" xml:space="preserve">
+    <value>Tip: Use the g+f (go find) keyboard shortcut to focus the search field.</value>
+    <comment>Tip about keyboard shortcut for search</comment>
+  </data>
+  <data name="TipHomeShortcut" xml:space="preserve">
+    <value>Tip: Use the g+h (go home) keyboard shortcut to go to the homepage.</value>
+    <comment>Tip about keyboard shortcut for home</comment>
+  </data>
+  <data name="TipLockShortcut" xml:space="preserve">
+    <value>Tip: Use the g+l (go lock) keyboard shortcut to lock the vault.</value>
+    <comment>Tip about keyboard shortcut for locking vault</comment>
+  </data>
+</root>
\ No newline at end of file
diff --git a/apps/server/AliasVault.Client/Resources/Layout/Footer.nl.resx b/apps/server/AliasVault.Client/Resources/Layout/Footer.nl.resx
new file mode 100644
index 000000000..09656a7e5
--- /dev/null
+++ b/apps/server/AliasVault.Client/Resources/Layout/Footer.nl.resx
@@ -0,0 +1,81 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <data name="CopyrightText" xml:space="preserve">
+    <value>Alle rechten voorbehouden.</value>
+    <comment>Copyright text in footer</comment>
+  </data>
+  <data name="TipCreateShortcut" xml:space="preserve">
+    <value>Tip: Gebruik de g+c (ga aanmaken) sneltoets om snel een nieuwe alias aan te maken.</value>
+    <comment>Tip about keyboard shortcut for creating aliases</comment>
+  </data>
+  <data name="TipFindShortcut" xml:space="preserve">
+    <value>Tip: Gebruik de g+f (ga zoeken) sneltoets om het zoekveld te focussen.</value>
+    <comment>Tip about keyboard shortcut for search</comment>
+  </data>
+  <data name="TipHomeShortcut" xml:space="preserve">
+    <value>Tip: Gebruik de g+h (ga home) sneltoets om naar de startpagina te gaan.</value>
+    <comment>Tip about keyboard shortcut for home</comment>
+  </data>
+  <data name="TipLockShortcut" xml:space="preserve">
+    <value>Tip: Gebruik de g+l (ga vergrendelen) sneltoets om de kluis te vergrendelen.</value>
+    <comment>Tip about keyboard shortcut for locking vault</comment>
+  </data>
+</root>
\ No newline at end of file
diff --git a/apps/server/AliasVault.Client/Resources/Pages/Main/Emails/Home.en.resx b/apps/server/AliasVault.Client/Resources/Pages/Main/Emails/Home.en.resx
new file mode 100644
index 000000000..1040e8c2b
--- /dev/null
+++ b/apps/server/AliasVault.Client/Resources/Pages/Main/Emails/Home.en.resx
@@ -0,0 +1,105 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <data name="PageTitle" xml:space="preserve">
+    <value>Emails</value>
+    <comment>Page title</comment>
+  </data>
+  <data name="PageDescription" xml:space="preserve">
+    <value>You can view all emails received by your private email addresses below.</value>
+    <comment>Page description</comment>
+  </data>
+  <data name="AutoRefreshEnabledTooltip" xml:space="preserve">
+    <value>Auto-refresh enabled</value>
+    <comment>Tooltip for auto-refresh indicator</comment>
+  </data>
+  <data name="RefreshButton" xml:space="preserve">
+    <value>Refresh</value>
+    <comment>Refresh button text</comment>
+  </data>
+  <data name="NoEmailClaimsMessage" xml:space="preserve">
+    <value>You are not using any private email addresses (yet). Create a new alias and use a private email address supported by AliasVault. All emails received by these private email addresses will show up here.</value>
+    <comment>Message when no email addresses are configured</comment>
+  </data>
+  <data name="NoEmailsReceivedMessage" xml:space="preserve">
+    <value>No emails have been received yet.</value>
+    <comment>Message when no emails are received</comment>
+  </data>
+  <data name="LoadingText" xml:space="preserve">
+    <value>Loading...</value>
+    <comment>Loading indicator text</comment>
+  </data>
+  <data name="LoadMoreButtonText" xml:space="preserve">
+    <value>Load More ({0} remaining)</value>
+    <comment>Load more button text with count. {0} is placeholder for number of remaining emails</comment>
+  </data>
+  <data name="ClaimDoesNotExistError" xml:space="preserve">
+    <value>An error occurred while trying to load the emails. Please try to edit and save any credential entry to synchronize the database, then try again.</value>
+    <comment>Error message when email claim does not exist</comment>
+  </data>
+  <data name="LoadEmailsFailedMessage" xml:space="preserve">
+    <value>Failed to load email: {0}</value>
+    <comment>Error message when loading email fails. {0} is placeholder for error message</comment>
+  </data>
+  <data name="LoadMoreEmailsFailedMessage" xml:space="preserve">
+    <value>Failed to load more emails: {0}</value>
+    <comment>Error message when loading more emails fails. {0} is placeholder for error message</comment>
+  </data>
+</root>
\ No newline at end of file
diff --git a/apps/server/AliasVault.Client/Resources/Pages/Main/Emails/Home.nl.resx b/apps/server/AliasVault.Client/Resources/Pages/Main/Emails/Home.nl.resx
new file mode 100644
index 000000000..5fb92a191
--- /dev/null
+++ b/apps/server/AliasVault.Client/Resources/Pages/Main/Emails/Home.nl.resx
@@ -0,0 +1,105 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <data name="PageTitle" xml:space="preserve">
+    <value>E-mails</value>
+    <comment>Page title</comment>
+  </data>
+  <data name="PageDescription" xml:space="preserve">
+    <value>Je kunt alle e-mails ontvangen op je privé e-mailadressen hieronder bekijken.</value>
+    <comment>Page description</comment>
+  </data>
+  <data name="AutoRefreshEnabledTooltip" xml:space="preserve">
+    <value>Automatisch vernieuwen ingeschakeld</value>
+    <comment>Tooltip for auto-refresh indicator</comment>
+  </data>
+  <data name="RefreshButton" xml:space="preserve">
+    <value>Vernieuwen</value>
+    <comment>Refresh button text</comment>
+  </data>
+  <data name="NoEmailClaimsMessage" xml:space="preserve">
+    <value>Je gebruikt nog geen privé e-mailadressen. Maak een nieuwe alias aan en gebruik een privé e-mailadres dat ondersteund wordt door AliasVault. Alle e-mails ontvangen op deze privé e-mailadressen zullen hier verschijnen.</value>
+    <comment>Message when no email addresses are configured</comment>
+  </data>
+  <data name="NoEmailsReceivedMessage" xml:space="preserve">
+    <value>Nog geen e-mails ontvangen.</value>
+    <comment>Message when no emails are received</comment>
+  </data>
+  <data name="LoadingText" xml:space="preserve">
+    <value>Laden...</value>
+    <comment>Loading indicator text</comment>
+  </data>
+  <data name="LoadMoreButtonText" xml:space="preserve">
+    <value>Meer laden ({0} resterend)</value>
+    <comment>Load more button text with count. {0} is placeholder for number of remaining emails</comment>
+  </data>
+  <data name="ClaimDoesNotExistError" xml:space="preserve">
+    <value>Er is een fout opgetreden bij het laden van de e-mails. Probeer een referentie te bewerken en op te slaan om de database te synchroniseren, en probeer het dan opnieuw.</value>
+    <comment>Error message when email claim does not exist</comment>
+  </data>
+  <data name="LoadEmailsFailedMessage" xml:space="preserve">
+    <value>Laden van e-mail mislukt: {0}</value>
+    <comment>Error message when loading email fails. {0} is placeholder for error message</comment>
+  </data>
+  <data name="LoadMoreEmailsFailedMessage" xml:space="preserve">
+    <value>Laden van meer e-mails mislukt: {0}</value>
+    <comment>Error message when loading more emails fails. {0} is placeholder for error message</comment>
+  </data>
+</root>
\ No newline at end of file
diff --git a/apps/server/AliasVault.Client/Resources/Pages/Main/Settings/ImportExport/ImportExport.en.resx b/apps/server/AliasVault.Client/Resources/Pages/Main/Settings/ImportExport/ImportExport.en.resx
new file mode 100644
index 000000000..6ac1ff6cc
--- /dev/null
+++ b/apps/server/AliasVault.Client/Resources/Pages/Main/Settings/ImportExport/ImportExport.en.resx
@@ -0,0 +1,107 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <data name="PageTitle" xml:space="preserve">
+    <value>Import / Export</value>
+    <comment>Page title</comment>
+  </data>
+  <data name="PageDescription" xml:space="preserve">
+    <value>On this page you can import and export your vault.</value>
+    <comment>Page description</comment>
+  </data>
+  <data name="ImportSectionTitle" xml:space="preserve">
+    <value>Import passwords</value>
+    <comment>Import section title</comment>
+  </data>
+  <data name="ImportSectionDescription" xml:space="preserve">
+    <value>Select a service to import from. If you are using a service that is not listed here and would like to see it supported, please raise an issue on &lt;a href="https://github.com/lanedirt/AliasVault/issues" target="_blank" class="text-primary-500 hover:text-primary-700"&gt;GitHub&lt;/a&gt; or contact us.</value>
+    <comment>Import section description with HTML link</comment>
+  </data>
+  <data name="ExportSectionTitle" xml:space="preserve">
+    <value>Export vault</value>
+    <comment>Export section title</comment>
+  </data>
+  <data name="ExportSectionDescription" xml:space="preserve">
+    <value>If you want to export your AliasVault credentials to another AliasVault server (e.g. from cloud to self-hosted or vice-versa) or to another service altogether, you can export it here. Note that all exports are unencrypted so store it in a safe place and delete it when you no longer need it.</value>
+    <comment>Export section description</comment>
+  </data>
+  <data name="ExportCsvButton" xml:space="preserve">
+    <value>Export vault to unencrypted CSV file</value>
+    <comment>Button to export as CSV</comment>
+  </data>
+  <data name="ExportSqliteButton" xml:space="preserve">
+    <value>Export vault to unencrypted SQLite file</value>
+    <comment>Button to export as SQLite</comment>
+  </data>
+  <data name="ExportConfirmTitle" xml:space="preserve">
+    <value>Export vault</value>
+    <comment>Export confirmation dialog title</comment>
+  </data>
+  <data name="ExportWarningMessage" xml:space="preserve">
+    <value>Warning: Exporting your vault to an unencrypted file will expose all of your passwords and sensitive information in plain text. Only do this on trusted computers and ensure you:
+
+• Store the exported file in a secure location
+• Delete the file when you no longer need it
+• Never share the exported file with others
+
+Are you sure you want to continue with the export?</value>
+    <comment>Export warning confirmation message</comment>
+  </data>
+</root>
\ No newline at end of file
diff --git a/apps/server/AliasVault.Client/Resources/Pages/Main/Settings/ImportExport/ImportExport.nl.resx b/apps/server/AliasVault.Client/Resources/Pages/Main/Settings/ImportExport/ImportExport.nl.resx
new file mode 100644
index 000000000..ce19aec79
--- /dev/null
+++ b/apps/server/AliasVault.Client/Resources/Pages/Main/Settings/ImportExport/ImportExport.nl.resx
@@ -0,0 +1,107 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <data name="PageTitle" xml:space="preserve">
+    <value>Importeren / Exporteren</value>
+    <comment>Page title</comment>
+  </data>
+  <data name="PageDescription" xml:space="preserve">
+    <value>Op deze pagina kunt u uw vault importeren en exporteren.</value>
+    <comment>Page description</comment>
+  </data>
+  <data name="ImportSectionTitle" xml:space="preserve">
+    <value>Wachtwoorden importeren</value>
+    <comment>Import section title</comment>
+  </data>
+  <data name="ImportSectionDescription" xml:space="preserve">
+    <value>Selecteer een service om van te importeren. Als u een service gebruikt die hier niet wordt vermeld en u wilt deze graag ondersteund zien, dien dan een issue in op &lt;a href="https://github.com/lanedirt/AliasVault/issues" target="_blank" class="text-primary-500 hover:text-primary-700"&gt;GitHub&lt;/a&gt; of neem contact met ons op.</value>
+    <comment>Import section description with HTML link</comment>
+  </data>
+  <data name="ExportSectionTitle" xml:space="preserve">
+    <value>Vault exporteren</value>
+    <comment>Export section title</comment>
+  </data>
+  <data name="ExportSectionDescription" xml:space="preserve">
+    <value>Als u uw AliasVault-inloggegevens wilt exporteren naar een andere AliasVault-server (bijv. van cloud naar zelf-gehost of omgekeerd) of naar een andere service, kunt u deze hier exporteren. Let op dat alle exports onversleuteld zijn, dus bewaar ze op een veilige plaats en verwijder ze wanneer u ze niet meer nodig heeft.</value>
+    <comment>Export section description</comment>
+  </data>
+  <data name="ExportCsvButton" xml:space="preserve">
+    <value>Vault exporteren naar onversleuteld CSV-bestand</value>
+    <comment>Button to export as CSV</comment>
+  </data>
+  <data name="ExportSqliteButton" xml:space="preserve">
+    <value>Vault exporteren naar onversleuteld SQLite-bestand</value>
+    <comment>Button to export as SQLite</comment>
+  </data>
+  <data name="ExportConfirmTitle" xml:space="preserve">
+    <value>Vault exporteren</value>
+    <comment>Export confirmation dialog title</comment>
+  </data>
+  <data name="ExportWarningMessage" xml:space="preserve">
+    <value>Waarschuwing: Het exporteren van uw vault naar een onversleuteld bestand zal al uw wachtwoorden en gevoelige informatie in platte tekst blootleggen. Doe dit alleen op vertrouwde computers en zorg ervoor dat u:
+
+• Het geëxporteerde bestand op een veilige locatie opslaat
+• Het bestand verwijdert wanneer u het niet meer nodig heeft
+• Het geëxporteerde bestand nooit met anderen deelt
+
+Weet u zeker dat u wilt doorgaan met de export?</value>
+    <comment>Export warning confirmation message</comment>
+  </data>
+</root>
\ No newline at end of file