diff --git a/apps/desktop/src/locales/af/messages.json b/apps/desktop/src/locales/af/messages.json
index 028ca64d23..584ded79ce 100644
--- a/apps/desktop/src/locales/af/messages.json
+++ b/apps/desktop/src/locales/af/messages.json
@@ -233,13 +233,13 @@
     "message": "Mnr."
   },
   "mrs": {
-    "message": "Mev."
+    "message": "Mev"
   },
   "ms": {
-    "message": "Mej."
+    "message": "Mej"
   },
   "dr": {
-    "message": "Dr."
+    "message": "Dr"
   },
   "expirationMonth": {
     "message": "Vervalmaand"
@@ -532,10 +532,13 @@
   "invalidEmail": {
     "message": "Ongeldige e-posadres."
   },
-  "masterPassRequired": {
-    "message": "Hoofwagwoord word benodig."
+  "masterPasswordRequired": {
+    "message": "Hoofwagwoord word vereis."
   },
-  "masterPassLength": {
+  "confirmMasterPasswordRequired": {
+    "message": "Hoofwagwoord moet weer intevoer word."
+  },
+  "masterPasswordMinLength": {
     "message": "Hoofwagwoord moet ten minste 8 karakters lank wees."
   },
   "masterPassDoesntMatch": {
@@ -895,10 +898,10 @@
     "description": "Clipboard is the operating system thing where you copy/paste data to on your device."
   },
   "enableFavicon": {
-    "message": "Show website icons"
+    "message": "Toon webwerfikone"
   },
   "faviconDesc": {
-    "message": "Show a recognizable image next to each login."
+    "message": "Toon ’n herkenbare beeld langs elke aantekening."
   },
   "enableMinToTray": {
     "message": "Minimaliseer na stelsellaai"
@@ -1382,10 +1385,10 @@
     "message": "ontgrendel u kluis"
   },
   "autoPromptWindowsHello": {
-    "message": "Ask for Windows Hello on launch"
+    "message": "Vra vir Windows Hello by lansering"
   },
   "autoPromptTouchId": {
-    "message": "Ask for Touch ID on launch"
+    "message": "Vra vir Touch ID by lansering"
   },
   "lockWithMasterPassOnRestart": {
     "message": "Vergrendel by herbegin met hoofwagwoord"
@@ -1543,7 +1546,7 @@
   "acceptPolicies": {
     "message": "Deur hierdie kassie af te merk stem u in tot die volgende:"
   },
-  "acceptPoliciesError": {
+  "acceptPoliciesRequired": {
     "message": "Gebruiksvoorwaardes en privaatheidsbeleid is nie erken nie."
   },
   "enableBrowserIntegration": {
@@ -1960,5 +1963,8 @@
   },
   "apiKey": {
     "message": "API-sleutel"
+  },
+  "neverLockWarning": {
+    "message": "Are you sure you want to use the \"Never\" option? Setting your lock options to \"Never\" stores your vault's encryption key on your device. If you use this option you should ensure that you keep your device properly protected."
   }
 }
diff --git a/apps/desktop/src/locales/ar/messages.json b/apps/desktop/src/locales/ar/messages.json
index e245d88730..1cf617f9c5 100644
--- a/apps/desktop/src/locales/ar/messages.json
+++ b/apps/desktop/src/locales/ar/messages.json
@@ -532,10 +532,13 @@
   "invalidEmail": {
     "message": "عنوان البريد الإلكتروني غير صالح."
   },
-  "masterPassRequired": {
+  "masterPasswordRequired": {
     "message": "كلمة المرور الرئيسية مطلوبة."
   },
-  "masterPassLength": {
+  "confirmMasterPasswordRequired": {
+    "message": "مطلوب إعادة كتابة كلمة المرور الرئيسية."
+  },
+  "masterPasswordMinLength": {
     "message": "يجب أن تكون كلمة المرور الرئيسية أكثر من 8 أحرف."
   },
   "masterPassDoesntMatch": {
@@ -895,10 +898,10 @@
     "description": "Clipboard is the operating system thing where you copy/paste data to on your device."
   },
   "enableFavicon": {
-    "message": "Show website icons"
+    "message": "إظهار أيقونات الموقع"
   },
   "faviconDesc": {
-    "message": "Show a recognizable image next to each login."
+    "message": "إظهار صورة قابلة للتعرف بجانب كل تسجيل دخول."
   },
   "enableMinToTray": {
     "message": "تصغير إلى أيقونة شريط المهام"
@@ -937,28 +940,28 @@
     "message": "عندما يبدأ التطبيق لأول مرة، فقط إظهار أيقونة في شريط مهام النظام."
   },
   "startToMenuBar": {
-    "message": "Start to menu bar"
+    "message": "البدء في شريط القائمة"
   },
   "startToMenuBarDesc": {
-    "message": "When the application is first started, only show an icon in the menu bar."
+    "message": "عند بدء تشغيل التطبيق لأول مرة، فقط إظهار أيقونة في شريط القائمة."
   },
   "openAtLogin": {
-    "message": "Start automatically on login"
+    "message": "بدء التشغيل تلقائياً عند تسجيل الدخول"
   },
   "openAtLoginDesc": {
-    "message": "Start the Bitwarden desktop application automatically on login."
+    "message": "بدء تشغيل تطبيق سطح المكتب Bitwarden تلقائياً عند تسجيل الدخول."
   },
   "alwaysShowDock": {
-    "message": "Always show in the Dock"
+    "message": "إظهار دائمًا في القائمة"
   },
   "alwaysShowDockDesc": {
-    "message": "Show the Bitwarden icon in the Dock even when minimized to the menu bar."
+    "message": "إظهار أيقونة Bitwarden في القائمة حتى عند التصغير إلى شريط القائمة."
   },
   "confirmTrayTitle": {
-    "message": "Confirm disable tray"
+    "message": "تأكيد تعطيل الشريط"
   },
   "confirmTrayDesc": {
-    "message": "Disabling this setting will also disable all other tray related settings."
+    "message": "سيؤدي تعطيل هذا الإعداد أيضًا إلى تعطيل كافة الإعدادات الأخرى ذات الصلة بشريط النظام."
   },
   "language": {
     "message": "اللّغة"
@@ -1137,45 +1140,45 @@
     "message": "إعادة تعيين التكبير/التصغير غلى الوضع الافتراضي"
   },
   "toggleFullScreen": {
-    "message": "Toggle Full Screen"
+    "message": "تفعيل وضع ملء الشاشة"
   },
   "reload": {
-    "message": "Reload"
+    "message": "إعادة تحميل"
   },
   "toggleDevTools": {
-    "message": "Toggle Developer Tools"
+    "message": "تبديل إلى أدوات المطور"
   },
   "minimize": {
-    "message": "Minimize",
+    "message": "تصغير",
     "description": "Minimize window"
   },
   "zoom": {
-    "message": "Zoom"
+    "message": "تكبير"
   },
   "bringAllToFront": {
-    "message": "Bring All to Front",
+    "message": "احضار الكل إلى الأمام",
     "description": "Bring all windows to front (foreground)"
   },
   "aboutBitwarden": {
-    "message": "About Bitwarden"
+    "message": "حول Bitwarden"
   },
   "services": {
-    "message": "Services"
+    "message": "الخدمات"
   },
   "hideBitwarden": {
-    "message": "Hide Bitwarden"
+    "message": "إخفاء Bitwarden"
   },
   "hideOthers": {
-    "message": "Hide Others"
+    "message": "إخفاء الآخرين"
   },
   "showAll": {
-    "message": "Show All"
+    "message": "إظهار الكل"
   },
   "quitBitwarden": {
-    "message": "Quit Bitwarden"
+    "message": "غلق Bitwarden"
   },
   "valueCopied": {
-    "message": "$VALUE$ copied",
+    "message": "$VALUE$ تم نسخه",
     "description": "Value has been copied to the clipboard.",
     "placeholders": {
       "value": {
@@ -1185,16 +1188,16 @@
     }
   },
   "help": {
-    "message": "Help"
+    "message": "المساعدة"
   },
   "window": {
-    "message": "Window"
+    "message": "نافذة"
   },
   "checkPassword": {
-    "message": "Check if password has been exposed."
+    "message": "تحقق مما إذا تم الكشف عن كلمة المرور."
   },
   "passwordExposed": {
-    "message": "This password has been exposed $VALUE$ time(s) in data breaches. You should change it.",
+    "message": "تم الكشف عن كلمة المرور هذه $VALUE$ مرّة (ات) في خروقات البيانات. يجب عليك تغييرها.",
     "placeholders": {
       "value": {
         "content": "$1",
@@ -1203,92 +1206,92 @@
     }
   },
   "passwordSafe": {
-    "message": "This password was not found in any known data breaches. It should be safe to use."
+    "message": "لم يتم العثور على كلمة المرور هذه في أي عمليات اختراق معروفة للبيانات. يجب أن تكون آمنة للاستخدام."
   },
   "baseDomain": {
-    "message": "Base domain",
+    "message": "النطاق الأساسي",
     "description": "Domain name. Ex. website.com"
   },
   "domainName": {
-    "message": "Domain Name",
+    "message": "اسم النطاق",
     "description": "Domain name. Ex. website.com"
   },
   "host": {
-    "message": "Host",
+    "message": "المضيف",
     "description": "A URL's host value. For example, the host of https://sub.domain.com:443 is 'sub.domain.com:443'."
   },
   "exact": {
-    "message": "Exact"
+    "message": "بالضبط"
   },
   "startsWith": {
-    "message": "Starts with"
+    "message": "يبدأ بـ"
   },
   "regEx": {
-    "message": "Regular expression",
+    "message": "التعبير الاعتيادي",
     "description": "A programming term, also known as 'RegEx'."
   },
   "matchDetection": {
-    "message": "Match Detection",
+    "message": "كشف المطابقة",
     "description": "URI match detection for auto-fill."
   },
   "defaultMatchDetection": {
-    "message": "Default match detection",
+    "message": "الكشف الافتراضي عن المطابقة",
     "description": "Default URI match detection for auto-fill."
   },
   "toggleOptions": {
-    "message": "Toggle Options"
+    "message": "خيارات التبديل"
   },
   "organization": {
-    "message": "Organization",
+    "message": "المؤسسة",
     "description": "An entity of multiple related people (ex. a team or business organization)."
   },
   "default": {
-    "message": "Default"
+    "message": "الافتراضي"
   },
   "exit": {
-    "message": "Exit"
+    "message": "الخروج"
   },
   "showHide": {
-    "message": "Show / Hide",
+    "message": "عرض / اخفاء",
     "description": "Text for a button that toggles the visibility of the window. Shows the window when it is hidden or hides the window if it is currently open."
   },
   "hideToTray": {
-    "message": "Hide to Tray"
+    "message": "إخفاء إلى الشريط"
   },
   "alwaysOnTop": {
-    "message": "Always on Top",
+    "message": "دائما في الأعلى",
     "description": "Application window should always stay on top of other windows"
   },
   "dateUpdated": {
-    "message": "Updated",
+    "message": "تم التحديث",
     "description": "ex. Date this item was updated"
   },
   "datePasswordUpdated": {
-    "message": "Password Updated",
+    "message": "تم تحديث كلمة المرور",
     "description": "ex. Date this password was updated"
   },
   "exportVault": {
-    "message": "Export Vault"
+    "message": "تصدير الخزنة"
   },
   "fileFormat": {
-    "message": "File Format"
+    "message": "صيغة الملف"
   },
   "hCaptchaUrl": {
-    "message": "hCaptcha Url",
+    "message": "رابط hCaptcha",
     "description": "hCaptcha is the name of a website, should not be translated"
   },
   "loadAccessibilityCookie": {
-    "message": "Load Accessibility Cookie"
+    "message": "تحميل ملف تعريف الارتباط الخاص بإمكانية الوصول"
   },
   "registerAccessibilityUser": {
-    "message": "Register as an accessibility user at",
+    "message": "تسجيل كمستخدم مع إمكانية الوصول في",
     "description": "ex. Register as an accessibility user at hcaptcha.com"
   },
   "copyPasteLink": {
-    "message": "Copy and paste the link sent to your email below"
+    "message": "نسخ وصق الرابط المرسل إلى بريدك الإلكتروني أدناه"
   },
   "enterhCaptchaUrl": {
-    "message": "Enter URL to load accessibility cookie for hCaptcha",
+    "message": "أدخل عنوان URL لتحميل ملف تعريف الارتباط للوصول إلى hCaptcha",
     "description": "hCaptcha is the name of a website, should not be translated"
   },
   "hCaptchaUrlRequired": {
@@ -1382,10 +1385,10 @@
     "message": "فتح خزنتك"
   },
   "autoPromptWindowsHello": {
-    "message": "Ask for Windows Hello on launch"
+    "message": "اسأل عن Windows Hello عند التشغيل"
   },
   "autoPromptTouchId": {
-    "message": "Ask for Touch ID on launch"
+    "message": "اطلب معرف اللمس عند التشغيل"
   },
   "lockWithMasterPassOnRestart": {
     "message": "قفل مع كلمة المرور الرئيسية عند إعادة تشغيل"
@@ -1496,13 +1499,13 @@
     "message": "كلمة المرور الرئيسية الجديدة"
   },
   "confirmNewMasterPass": {
-    "message": "Confirm New Master Password"
+    "message": "تأكيد كلمة المرور الرئيسية الجديدة"
   },
   "masterPasswordPolicyInEffect": {
-    "message": "One or more organization policies require your master password to meet the following requirements:"
+    "message": "1 - تتطلب سياسة واحدة أو أكثر من سياسات المؤسسة كلمة مرورك الرئيسية لتلبية المتطلبات التالية:"
   },
   "policyInEffectMinComplexity": {
-    "message": "Minimum complexity score of $SCORE$",
+    "message": "الحد الأدنى لدرجة التعقيد $SCORE$",
     "placeholders": {
       "score": {
         "content": "$1",
@@ -1511,7 +1514,7 @@
     }
   },
   "policyInEffectMinLength": {
-    "message": "Minimum length of $LENGTH$",
+    "message": "الحد الأدنى لطول $LENGTH$",
     "placeholders": {
       "length": {
         "content": "$1",
@@ -1520,16 +1523,16 @@
     }
   },
   "policyInEffectUppercase": {
-    "message": "Contain one or more uppercase characters"
+    "message": "يحتوي على حرف كبير واحد أو أكثر"
   },
   "policyInEffectLowercase": {
-    "message": "Contain one or more lowercase characters"
+    "message": "يحتوي على واحد أو أكثر من الأحرف الصغيرة"
   },
   "policyInEffectNumbers": {
-    "message": "Contain one or more numbers"
+    "message": "يحتوي على رقم واحد أو أكثر"
   },
   "policyInEffectSpecial": {
-    "message": "Contain one or more of the following special characters $CHARS$",
+    "message": "يحتوي على واحد أو أكثر من الأحرف الخاصة التالية $CHARS$",
     "placeholders": {
       "chars": {
         "content": "$1",
@@ -1538,117 +1541,117 @@
     }
   },
   "masterPasswordPolicyRequirementsNotMet": {
-    "message": "Your new master password does not meet the policy requirements."
+    "message": "كلمة المرور الرئيسية الجديدة لا تفي بمتطلبات السياسة العامة."
   },
   "acceptPolicies": {
-    "message": "By checking this box you agree to the following:"
+    "message": "من خلال تحديد هذا المربع فإنك توافق على ما يلي:"
   },
-  "acceptPoliciesError": {
-    "message": "Terms of Service and Privacy Policy have not been acknowledged."
+  "acceptPoliciesRequired": {
+    "message": "لم يتم الاعتراف بشروط الخدمة وسياسة الخصوصية."
   },
   "enableBrowserIntegration": {
-    "message": "Allow browser integration"
+    "message": "السماح بتكامل المتصفح"
   },
   "enableBrowserIntegrationDesc": {
-    "message": "Browser integration is used for biometrics in browser."
+    "message": "يتم استخدام تكامل المتصفح للقياسات الحيوية في المتصفح."
   },
   "browserIntegrationUnsupportedTitle": {
-    "message": "Browser integration not supported"
+    "message": "تكامل المتصفح غير مدعوم"
   },
   "browserIntegrationMasOnlyDesc": {
-    "message": "Unfortunately browser integration is only supported in the Mac App Store version for now."
+    "message": "للأسف، لا يتم دعم تكامل المتصفح إلا في إصدار متجر تطبيقات ماك في الوقت الحالي."
   },
   "browserIntegrationWindowsStoreDesc": {
-    "message": "Unfortunately browser integration is currently not supported in the Windows Store version."
+    "message": "للأسف، لا يتم دعم تكامل المتصفح في إصدار متجر ويندوز في الوقت الحالي."
   },
   "browserIntegrationLinuxDesc": {
-    "message": "Unfortunately browser integration is currently not supported in the linux version."
+    "message": "للأسف، لا يتم دعم تكامل المتصفح في إصدار لينكس في الوقت الحالي."
   },
   "enableBrowserIntegrationFingerprint": {
-    "message": "Require verification for browser integration"
+    "message": "يتطلب التحقق من تكامل المتصفح"
   },
   "enableBrowserIntegrationFingerprintDesc": {
-    "message": "Add an additional layer of security by requiring fingerprint phrase confirmation when establishing a link between your desktop and browser. This requires user action and verification each time a connection is created."
+    "message": "أضف طبقة أمان إضافية عن طريق طلب تأكيد عبارة بصمة الإصبع عند إنشاء رابط بين سطح المكتب الخاص بك والمتصفح. هذا يتطلب إجراء المستخدم والتحقق في كل مرة يتم فيها إنشاء اتصال."
   },
   "approve": {
-    "message": "Approve"
+    "message": "الموافقة"
   },
   "verifyBrowserTitle": {
-    "message": "Verify browser connection"
+    "message": "التحقق من اتصال المتصفح"
   },
   "verifyBrowserDesc": {
-    "message": "Please ensure the shown fingerprint is identical to the fingerprint showed in the browser extension."
+    "message": "الرجاء التأكد من أن البصمة المعروضة متطابقة مع البصمة المعروضة في ملحق المتصفح."
   },
   "biometricsNotEnabledTitle": {
-    "message": "Biometrics not enabled"
+    "message": "القياسات الحيوية غير مفعلة"
   },
   "biometricsNotEnabledDesc": {
-    "message": "Browser biometrics requires desktop biometrics to be enabled in the settings first."
+    "message": "القياسات الحيوية للمتصفح تتطلب القياسات الحيوية لسطح المكتب ليتم تمكينها في الإعدادات أولاً."
   },
   "personalOwnershipSubmitError": {
-    "message": "Due to an Enterprise Policy, you are restricted from saving items to your personal vault. Change the Ownership option to an organization and choose from available Collections."
+    "message": "بسبب سياسة المؤسسة، يمنع عليك حفظ العناصر في خزانتك الشخصية. غيّر خيار الملكية إلى مؤسسة واختر من المجموعات المتاحة."
   },
   "hintEqualsPassword": {
-    "message": "Your password hint cannot be the same as your password."
+    "message": "لا يمكن أن يكون تلميح كلمة المرور نفس كلمة المرور الخاصة بك."
   },
   "personalOwnershipPolicyInEffect": {
-    "message": "An organization policy is affecting your ownership options."
+    "message": "تؤثر سياسة مؤسسة على خيارات الملكية الخاصة بك."
   },
   "allSends": {
-    "message": "All Sends",
+    "message": "كل الإرسالات",
     "description": "'Sends' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
   },
   "sendTypeFile": {
-    "message": "File"
+    "message": "ملف"
   },
   "sendTypeText": {
-    "message": "Text"
+    "message": "نص"
   },
   "searchSends": {
-    "message": "Search Sends",
+    "message": "بحث عن الإرسالات",
     "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
   },
   "editSend": {
-    "message": "Edit Send",
+    "message": "عدّل الإرسال",
     "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
   },
   "myVault": {
-    "message": "My Vault"
+    "message": "خزنتي"
   },
   "text": {
-    "message": "Text"
+    "message": "نص"
   },
   "deletionDate": {
-    "message": "Deletion Date"
+    "message": "تاريخ الحذف"
   },
   "deletionDateDesc": {
-    "message": "The Send will be permanently deleted on the specified date and time.",
+    "message": "سيتم حذف الإرسال بشكل دائم في التاريخ والوقت المحددين.",
     "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
   },
   "expirationDate": {
-    "message": "Expiration Date"
+    "message": "تاريخ انتهاء الصلاحية"
   },
   "expirationDateDesc": {
-    "message": "If set, access to this Send will expire on the specified date and time.",
+    "message": "في حالة التعيين، ستنتهي صلاحية الوصول إلى هذا الإرسال في التاريخ والوقت المحددين.",
     "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
   },
   "maxAccessCount": {
-    "message": "Maximum Access Count",
+    "message": "الحد الأقصى لعدد الوصول",
     "description": "This text will be displayed after a Send has been accessed the maximum amount of times."
   },
   "maxAccessCountDesc": {
-    "message": "If set, users will no longer be able to access this Send once the maximum access count is reached.",
+    "message": "في حالة التعيين، لن يتمكن المستخدمون من الوصول إلى هذا الإرسال بمجرد الوصول إلى الحد الأقصى لعدد الوصول.",
     "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
   },
   "currentAccessCount": {
-    "message": "Current Access Count"
+    "message": "العد الحالي للوصول"
   },
   "disableSend": {
-    "message": "Disable this Send so that no one can access it.",
+    "message": "تعطيل هذا الإرسال بحيث لا يمكن لأحد الوصول إليه.",
     "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
   },
   "sendPasswordDesc": {
-    "message": "Optionally require a password for users to access this Send.",
+    "message": "بشكل اختياري يتطلب كلمة مرور للمستخدمين للوصول إلى هذا الإرسال.",
     "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
   },
   "sendNotesDesc": {
@@ -1764,28 +1767,28 @@
     "message": "إعادة توجيه كلمة المرور الرئيسية"
   },
   "passwordConfirmation": {
-    "message": "Master password confirmation"
+    "message": "تأكيد كلمة المرور الرئيسية"
   },
   "passwordConfirmationDesc": {
-    "message": "This action is protected. To continue, please re-enter your master password to verify your identity."
+    "message": "هذا الإجراء محمي. للاستمرار، يرجى إعادة إدخال كلمة المرور الرئيسية للتحقق من هويتك."
   },
   "updatedMasterPassword": {
-    "message": "Updated Master Password"
+    "message": "كلمة المرور الرئيسية المحدثة"
   },
   "updateMasterPassword": {
-    "message": "Update Master Password"
+    "message": "تحديث كلمة المرور الرئيسية"
   },
   "updateMasterPasswordWarning": {
-    "message": "Your Master Password was recently changed by an administrator in your organization. In order to access the vault, you must update it now. Proceeding will log you out of your current session, requiring you to log back in. Active sessions on other devices may continue to remain active for up to one hour."
+    "message": "تم تغيير كلمة المرور الرئيسية الخاصة بك مؤخرًا من قبل مسؤول في مؤسستك. من أجل الوصول إلى الخزانة، يجب عليك تحديثها الآن. سيتم تسجيل خروجك من الجلسة الحالية، مما يتطلب منك تسجيل الدخول مرة أخرى. وقد تظل الجلسات النشطة على أجهزة أخرى نشطة لمدة تصل إلى ساعة واحدة."
   },
   "hours": {
-    "message": "Hours"
+    "message": "ساعات"
   },
   "minutes": {
-    "message": "Minutes"
+    "message": "دقائق"
   },
   "vaultTimeoutPolicyInEffect": {
-    "message": "Your organization policies are affecting your vault timeout. Maximum allowed Vault Timeout is $HOURS$ hour(s) and $MINUTES$ minute(s)",
+    "message": "سياسات مؤسستك تؤثر على مهلة خزانتك. الحد الأقصى المسموح به لمهلة الخزنة هو $HOURS$ ساعة و $MINUTES$ دقيقة",
     "placeholders": {
       "hours": {
         "content": "$1",
@@ -1798,31 +1801,31 @@
     }
   },
   "vaultTimeoutTooLarge": {
-    "message": "Your vault timeout exceeds the restrictions set by your organization."
+    "message": "مهلة خزنتك تتجاوز القيود التي تضعها مؤسستك."
   },
   "resetPasswordPolicyAutoEnroll": {
-    "message": "Automatic Enrollment"
+    "message": "التسجيل التلقائي"
   },
   "resetPasswordAutoEnrollInviteWarning": {
-    "message": "This organization has an enterprise policy that will automatically enroll you in password reset. Enrollment will allow organization administrators to change your master password."
+    "message": "هذه المؤسسة لديها سياسة الشركة التي ستقوم تلقائياً بتسجيلك في إعادة تعيين كلمة المرور. التسجيل سيسمح لمسؤولي المؤسسة بتغيير كلمة المرور الرئيسية الخاصة بك."
   },
   "vaultExportDisabled": {
-    "message": "Vault Export Disabled"
+    "message": "تصدير الخزنة معطل"
   },
   "personalVaultExportPolicyInEffect": {
-    "message": "One or more organization policies prevents you from exporting your personal vault."
+    "message": "واحدة أو أكثر من سياسات المؤسسة تمنعك من تصدير خزانتك الشخصية."
   },
   "addAccount": {
-    "message": "Add Account"
+    "message": "إضافة حساب"
   },
   "removeMasterPassword": {
-    "message": "Remove Master Password"
+    "message": "إزالة كلمة المرور الرئيسية"
   },
   "removedMasterPassword": {
-    "message": "Master password removed."
+    "message": "تمت إزالة كلمة المرور الرئيسية."
   },
   "convertOrganizationEncryptionDesc": {
-    "message": "$ORGANIZATION$ is using SSO with a self-hosted key server. A master password is no longer required to log in for members of this organization.",
+    "message": "يستخدم $ORGANIZATION$ SSO مع خادم مفتاح الاستضافة الذاتية. لم تعد هناك حاجة إلى كلمة مرور رئيسية لتسجيل الدخول لأعضاء هذه المؤسسة.",
     "placeholders": {
       "organization": {
         "content": "$1",
@@ -1831,34 +1834,34 @@
     }
   },
   "leaveOrganization": {
-    "message": "Leave Organization"
+    "message": "مغادرة المؤسسة"
   },
   "leaveOrganizationConfirmation": {
-    "message": "Are you sure you want to leave this organization?"
+    "message": "هل أنت متأكد من أنك تريد مغادرة هذه المؤسسة؟"
   },
   "leftOrganization": {
-    "message": "You have left the organization."
+    "message": "لقد غادرت المؤسسة."
   },
   "ssoKeyConnectorError": {
-    "message": "Key Connector error: make sure Key Connector is available and working correctly."
+    "message": "خطأ في موصل المفتاح: تأكد من أن موصل المفتاح متاح ويعمل بشكل صحيح."
   },
   "lockAllVaults": {
-    "message": "Lock All Vaults"
+    "message": "قفل جميع الخزنات"
   },
   "accountLimitReached": {
-    "message": "No more than 5 accounts may be logged in at the same time."
+    "message": "لا يمكن تسجيل دخول أكثر من 5 حسابات في نفس الوقت."
   },
   "accountPreferences": {
-    "message": "Preferences"
+    "message": "التفضيلات"
   },
   "appPreferences": {
-    "message": "App Settings (All Accounts)"
+    "message": "إعدادات التطبيق (جميع الحسابات)"
   },
   "accountSwitcherLimitReached": {
-    "message": "Account limit reached. Log out of an account to add another."
+    "message": "تم الوصول إلى الحد الأقصى للحساب. تسجيل الخروج من حساب لإضافة حساب آخر."
   },
   "settingsTitle": {
-    "message": "App settings for $EMAIL$",
+    "message": "إعدادات التطبيق لـ $EMAIL$",
     "placeholders": {
       "email": {
         "content": "$1",
@@ -1867,19 +1870,19 @@
     }
   },
   "switchAccount": {
-    "message": "Switch Account"
+    "message": "تبديل الحساب"
   },
   "options": {
-    "message": "Options"
+    "message": "الخيارات"
   },
   "sessionTimeout": {
-    "message": "Your session has timed out. Please go back and try logging in again."
+    "message": "انتهت مهلة جلستك. يرجى العودة ومحاولة تسجيل الدخول مرة أخرى."
   },
   "exportingPersonalVaultTitle": {
-    "message": "Exporting Personal Vault"
+    "message": "تصدير الخزنة الشخصية"
   },
   "exportingPersonalVaultDescription": {
-    "message": "Only the personal vault items associated with $EMAIL$ will be exported. Organization vault items will not be included.",
+    "message": "سيتم تصدير فقط عناصر الخزنة الشخصية المرتبطة بـ $EMAIL$. لن يتم إدراج عناصر خزنة المؤسسة.",
     "placeholders": {
       "email": {
         "content": "$1",
@@ -1888,77 +1891,80 @@
     }
   },
   "locked": {
-    "message": "Locked"
+    "message": "مقفل"
   },
   "unlocked": {
-    "message": "Unlocked"
+    "message": "غير مقفل"
   },
   "generator": {
-    "message": "Generator"
+    "message": "المولّد"
   },
   "whatWouldYouLikeToGenerate": {
-    "message": "What would you like to generate?"
+    "message": "ما الذي ترغب في توليده؟"
   },
   "passwordType": {
-    "message": "Password Type"
+    "message": "نوع كلمة المرور"
   },
   "regenerateUsername": {
-    "message": "Regenerate Username"
+    "message": "إعادة إنشاء اسم المستخدم"
   },
   "generateUsername": {
-    "message": "Generate Username"
+    "message": "إنشاء اسم المستخدم"
   },
   "usernameType": {
-    "message": "Username Type"
+    "message": "نوع اسم المستخدم"
   },
   "plusAddressedEmail": {
-    "message": "Plus Addressed Email",
+    "message": "بريد إلكتروني موجه اكثر",
     "description": "Username generator option that appends a random sub-address to the username. For example: address+subaddress@email.com"
   },
   "plusAddressedEmailDesc": {
-    "message": "Use your email provider's sub-addressing capabilities."
+    "message": "استخدم قدرات العنوان الفرعي لموفر البريد الإلكتروني الخاص بك."
   },
   "catchallEmail": {
-    "message": "Catch-all Email"
+    "message": "تجميع كل البريد"
   },
   "catchallEmailDesc": {
-    "message": "Use your domain's configured catch-all inbox."
+    "message": "استخدم علبة البريد الإلكتروني الشاملة التي تم تكوينها في نطاقك."
   },
   "random": {
-    "message": "Random"
+    "message": "عشوائي"
   },
   "randomWord": {
-    "message": "Random Word"
+    "message": "كلمات عشوائية"
   },
   "websiteName": {
-    "message": "Website Name"
+    "message": "اسم الموقع"
   },
   "service": {
-    "message": "Service"
+    "message": "الخدمة"
   },
   "allVaults": {
-    "message": "All Vaults"
+    "message": "جميع الخزنات"
   },
   "searchOrganization": {
-    "message": "Search Organization"
+    "message": "البحث عن مؤسسة"
   },
   "searchMyVault": {
-    "message": "Search My Vault"
+    "message": "البحث عن خزانتي"
   },
   "forwardedEmail": {
-    "message": "Forwarded Email Alias"
+    "message": "إعادة توجيه الاسم المستعار للبريد الإلكتروني"
   },
   "forwardedEmailDesc": {
-    "message": "Generate an email alias with an external forwarding service."
+    "message": "إنشاء بريد إلكتروني مستعار مع خدمة إعادة توجيه خارجية."
   },
   "hostname": {
-    "message": "Hostname",
+    "message": "اسم المضيف",
     "description": "Part of a URL."
   },
   "apiAccessToken": {
-    "message": "API Access Token"
+    "message": "رمز الوصول"
   },
   "apiKey": {
-    "message": "API Key"
+    "message": "مفتاح API"
+  },
+  "neverLockWarning": {
+    "message": "Are you sure you want to use the \"Never\" option? Setting your lock options to \"Never\" stores your vault's encryption key on your device. If you use this option you should ensure that you keep your device properly protected."
   }
 }
diff --git a/apps/desktop/src/locales/az/messages.json b/apps/desktop/src/locales/az/messages.json
index 6ac7b1c865..df87416cd2 100644
--- a/apps/desktop/src/locales/az/messages.json
+++ b/apps/desktop/src/locales/az/messages.json
@@ -532,10 +532,13 @@
   "invalidEmail": {
     "message": "Etibarsız e-poçt ünvanı."
   },
-  "masterPassRequired": {
+  "masterPasswordRequired": {
     "message": "Ana parol lazımdır."
   },
-  "masterPassLength": {
+  "confirmMasterPasswordRequired": {
+    "message": "Ana parolun yenidən yazılması lazımdır."
+  },
+  "masterPasswordMinLength": {
     "message": "Ana parol ən azı 8 simvol uzunluğunda olmalıdır."
   },
   "masterPassDoesntMatch": {
@@ -1543,7 +1546,7 @@
   "acceptPolicies": {
     "message": "Bu qutunu işarələyərək aşağıdakılarla razılaşırsınız:"
   },
-  "acceptPoliciesError": {
+  "acceptPoliciesRequired": {
     "message": "Xidmət Şərtləri və Gizlilik Siyasəti qəbul edilməyib."
   },
   "enableBrowserIntegration": {
@@ -1960,5 +1963,8 @@
   },
   "apiKey": {
     "message": "API açar"
+  },
+  "neverLockWarning": {
+    "message": "Are you sure you want to use the \"Never\" option? Setting your lock options to \"Never\" stores your vault's encryption key on your device. If you use this option you should ensure that you keep your device properly protected."
   }
 }
diff --git a/apps/desktop/src/locales/be/messages.json b/apps/desktop/src/locales/be/messages.json
index 845b8f81b9..c30d25afa6 100644
--- a/apps/desktop/src/locales/be/messages.json
+++ b/apps/desktop/src/locales/be/messages.json
@@ -532,11 +532,14 @@
   "invalidEmail": {
     "message": "Памылковы адрас электроннай пошты."
   },
-  "masterPassRequired": {
-    "message": "Патрабуецца асноўны пароль."
+  "masterPasswordRequired": {
+    "message": "Master password is required."
   },
-  "masterPassLength": {
-    "message": "Асноўны пароль павінен быць даўжынёй не менш за 8 сімвалаў."
+  "confirmMasterPasswordRequired": {
+    "message": "Master password retype is required."
+  },
+  "masterPasswordMinLength": {
+    "message": "Master password must be at least 8 characters long."
   },
   "masterPassDoesntMatch": {
     "message": "Асноўныя паролі не супадаюць."
@@ -1543,8 +1546,8 @@
   "acceptPolicies": {
     "message": "Ставячы гэты сцяжок вы пагаджаецеся з наступным:"
   },
-  "acceptPoliciesError": {
-    "message": "Умовы выкарыстання і Палітыка прыватнасці не былі пацверджаны."
+  "acceptPoliciesRequired": {
+    "message": "Terms of Service and Privacy Policy have not been acknowledged."
   },
   "enableBrowserIntegration": {
     "message": "Allow browser integration"
@@ -1960,5 +1963,8 @@
   },
   "apiKey": {
     "message": "API Key"
+  },
+  "neverLockWarning": {
+    "message": "Are you sure you want to use the \"Never\" option? Setting your lock options to \"Never\" stores your vault's encryption key on your device. If you use this option you should ensure that you keep your device properly protected."
   }
 }
diff --git a/apps/desktop/src/locales/bg/messages.json b/apps/desktop/src/locales/bg/messages.json
index 5af7fa5dbb..5f9ec73956 100644
--- a/apps/desktop/src/locales/bg/messages.json
+++ b/apps/desktop/src/locales/bg/messages.json
@@ -532,11 +532,14 @@
   "invalidEmail": {
     "message": "Грешен адрес на е-поща."
   },
-  "masterPassRequired": {
+  "masterPasswordRequired": {
     "message": "Главната парола е задължителна."
   },
-  "masterPassLength": {
-    "message": "Главната парола трябва да съдържа поне 8 знака."
+  "confirmMasterPasswordRequired": {
+    "message": "Повторното въвеждане на главната парола е задължително."
+  },
+  "masterPasswordMinLength": {
+    "message": "Главната парола трябва да е с дължина поне 8 знака."
   },
   "masterPassDoesntMatch": {
     "message": "Главната парола и потвърждението ѝ не съвпадат."
@@ -1543,7 +1546,7 @@
   "acceptPolicies": {
     "message": "Чрез тази отметка вие се съгласявате със следното:"
   },
-  "acceptPoliciesError": {
+  "acceptPoliciesRequired": {
     "message": "Условията за използване и политиката за поверителност не бяха приети."
   },
   "enableBrowserIntegration": {
@@ -1960,5 +1963,8 @@
   },
   "apiKey": {
     "message": "Ключ за API"
+  },
+  "neverLockWarning": {
+    "message": "Are you sure you want to use the \"Never\" option? Setting your lock options to \"Never\" stores your vault's encryption key on your device. If you use this option you should ensure that you keep your device properly protected."
   }
 }
diff --git a/apps/desktop/src/locales/bn/messages.json b/apps/desktop/src/locales/bn/messages.json
index 43762b66b5..a5dad3ce3a 100644
--- a/apps/desktop/src/locales/bn/messages.json
+++ b/apps/desktop/src/locales/bn/messages.json
@@ -532,11 +532,14 @@
   "invalidEmail": {
     "message": "অকার্যকর ইমেইল ঠিকানা।"
   },
-  "masterPassRequired": {
-    "message": "মূল পাসওয়ার্ড প্রয়োজন।"
+  "masterPasswordRequired": {
+    "message": "Master password is required."
   },
-  "masterPassLength": {
-    "message": "মূল পাসওয়ার্ড কমপক্ষে ৮ অক্ষর দীর্ঘ হওয়া উচিত।"
+  "confirmMasterPasswordRequired": {
+    "message": "Master password retype is required."
+  },
+  "masterPasswordMinLength": {
+    "message": "Master password must be at least 8 characters long."
   },
   "masterPassDoesntMatch": {
     "message": "মূল পাসওয়ার্ড নিশ্চিতকরণ মেলেনি।"
@@ -1543,8 +1546,8 @@
   "acceptPolicies": {
     "message": "এই বাক্সটি টিক করে আপনি নিম্নলিখিতগুলিতে সম্মত হন:"
   },
-  "acceptPoliciesError": {
-    "message": "পরিষেবার শর্তাদি এবং গোপনীয়তা নীতি স্বীকার করা হয়নি।"
+  "acceptPoliciesRequired": {
+    "message": "Terms of Service and Privacy Policy have not been acknowledged."
   },
   "enableBrowserIntegration": {
     "message": "Allow browser integration"
@@ -1960,5 +1963,8 @@
   },
   "apiKey": {
     "message": "API Key"
+  },
+  "neverLockWarning": {
+    "message": "Are you sure you want to use the \"Never\" option? Setting your lock options to \"Never\" stores your vault's encryption key on your device. If you use this option you should ensure that you keep your device properly protected."
   }
 }
diff --git a/apps/desktop/src/locales/bs/messages.json b/apps/desktop/src/locales/bs/messages.json
index b3bf8961c5..6dbb224f18 100644
--- a/apps/desktop/src/locales/bs/messages.json
+++ b/apps/desktop/src/locales/bs/messages.json
@@ -532,11 +532,14 @@
   "invalidEmail": {
     "message": "Neispravna email adresa."
   },
-  "masterPassRequired": {
-    "message": "Potrebna je glavna lozinka."
+  "masterPasswordRequired": {
+    "message": "Master password is required."
   },
-  "masterPassLength": {
-    "message": "Glavna lozinka mora imati najmanje 8 znakova."
+  "confirmMasterPasswordRequired": {
+    "message": "Master password retype is required."
+  },
+  "masterPasswordMinLength": {
+    "message": "Master password must be at least 8 characters long."
   },
   "masterPassDoesntMatch": {
     "message": "Potvrda glavne lozinke se ne podudara."
@@ -1543,7 +1546,7 @@
   "acceptPolicies": {
     "message": "By checking this box you agree to the following:"
   },
-  "acceptPoliciesError": {
+  "acceptPoliciesRequired": {
     "message": "Terms of Service and Privacy Policy have not been acknowledged."
   },
   "enableBrowserIntegration": {
@@ -1960,5 +1963,8 @@
   },
   "apiKey": {
     "message": "API Key"
+  },
+  "neverLockWarning": {
+    "message": "Are you sure you want to use the \"Never\" option? Setting your lock options to \"Never\" stores your vault's encryption key on your device. If you use this option you should ensure that you keep your device properly protected."
   }
 }
diff --git a/apps/desktop/src/locales/ca/messages.json b/apps/desktop/src/locales/ca/messages.json
index d9e00929eb..8df75ca3d6 100644
--- a/apps/desktop/src/locales/ca/messages.json
+++ b/apps/desktop/src/locales/ca/messages.json
@@ -532,11 +532,14 @@
   "invalidEmail": {
     "message": "L’adreça electrònica no és vàlida."
   },
-  "masterPassRequired": {
-    "message": "La contrasenya és obligatòria."
+  "masterPasswordRequired": {
+    "message": "Master password is required."
   },
-  "masterPassLength": {
-    "message": "La contrasenya ha de contenir almenys 8 caràcters."
+  "confirmMasterPasswordRequired": {
+    "message": "Master password retype is required."
+  },
+  "masterPasswordMinLength": {
+    "message": "Master password must be at least 8 characters long."
   },
   "masterPassDoesntMatch": {
     "message": "La confirmació de la contrasenya mestra no coincideix."
@@ -1543,8 +1546,8 @@
   "acceptPolicies": {
     "message": "Si activeu aquesta casella, indiqueu que esteu d’acord amb el següent:"
   },
-  "acceptPoliciesError": {
-    "message": "No s’han reconegut les condicions del servei i la declaració de privadesa."
+  "acceptPoliciesRequired": {
+    "message": "Terms of Service and Privacy Policy have not been acknowledged."
   },
   "enableBrowserIntegration": {
     "message": "Habilita la integració amb el navegador"
@@ -1960,5 +1963,8 @@
   },
   "apiKey": {
     "message": "Clau de l'API"
+  },
+  "neverLockWarning": {
+    "message": "Esteu segur que voleu utilitzar l'opció \"Mai\"? En configurar les opcions de bloqueig a \"Mai\" s'emmagatzema la clau de xifratge de la vostra caixa forta al vostre dispositiu. Si utilitzeu aquesta opció, heu d'assegurar-vos que conserveu el dispositiu degudament protegit."
   }
 }
diff --git a/apps/desktop/src/locales/cs/messages.json b/apps/desktop/src/locales/cs/messages.json
index e02509d502..251f8a90fc 100644
--- a/apps/desktop/src/locales/cs/messages.json
+++ b/apps/desktop/src/locales/cs/messages.json
@@ -532,11 +532,14 @@
   "invalidEmail": {
     "message": "Neplatná e-mailová adresa."
   },
-  "masterPassRequired": {
-    "message": "Hlavní heslo je povinné."
+  "masterPasswordRequired": {
+    "message": "Master password is required."
   },
-  "masterPassLength": {
-    "message": "Hlavní heslo musí obsahovat alespoň 8 znaků."
+  "confirmMasterPasswordRequired": {
+    "message": "Master password retype is required."
+  },
+  "masterPasswordMinLength": {
+    "message": "Master password must be at least 8 characters long."
   },
   "masterPassDoesntMatch": {
     "message": "Potvrzení hlavního hesla se neshoduje."
@@ -1543,8 +1546,8 @@
   "acceptPolicies": {
     "message": "Zaškrtnutím tohoto políčka souhlasím s následujícím:"
   },
-  "acceptPoliciesError": {
-    "message": "Podmínky služby a zásady ochrany osobních údajů nebyly uznány."
+  "acceptPoliciesRequired": {
+    "message": "Terms of Service and Privacy Policy have not been acknowledged."
   },
   "enableBrowserIntegration": {
     "message": "Povolit integraci prohlížeče"
@@ -1960,5 +1963,8 @@
   },
   "apiKey": {
     "message": "API Key"
+  },
+  "neverLockWarning": {
+    "message": "Are you sure you want to use the \"Never\" option? Setting your lock options to \"Never\" stores your vault's encryption key on your device. If you use this option you should ensure that you keep your device properly protected."
   }
 }
diff --git a/apps/desktop/src/locales/da/messages.json b/apps/desktop/src/locales/da/messages.json
index cbf2b163a1..0daca31da2 100644
--- a/apps/desktop/src/locales/da/messages.json
+++ b/apps/desktop/src/locales/da/messages.json
@@ -532,11 +532,14 @@
   "invalidEmail": {
     "message": "Ugyldig e-mailadresse."
   },
-  "masterPassRequired": {
-    "message": "Hovedadgangskode er påkrævet."
+  "masterPasswordRequired": {
+    "message": "Master password is required."
   },
-  "masterPassLength": {
-    "message": "Hovedadgangskoden skal være på mindst 8 tegn."
+  "confirmMasterPasswordRequired": {
+    "message": "Master password retype is required."
+  },
+  "masterPasswordMinLength": {
+    "message": "Master password must be at least 8 characters long."
   },
   "masterPassDoesntMatch": {
     "message": "De to adgangskoder matcher ikke."
@@ -1543,8 +1546,8 @@
   "acceptPolicies": {
     "message": "Ved at markere dette felt accepterer du følgende:"
   },
-  "acceptPoliciesError": {
-    "message": "Servicevilkår og fortrolighedspolitik er ikke blevet bekræftet."
+  "acceptPoliciesRequired": {
+    "message": "Terms of Service and Privacy Policy have not been acknowledged."
   },
   "enableBrowserIntegration": {
     "message": "Tillad browserintegration"
@@ -1960,5 +1963,8 @@
   },
   "apiKey": {
     "message": "API-nøgle"
+  },
+  "neverLockWarning": {
+    "message": "Are you sure you want to use the \"Never\" option? Setting your lock options to \"Never\" stores your vault's encryption key on your device. If you use this option you should ensure that you keep your device properly protected."
   }
 }
diff --git a/apps/desktop/src/locales/de/messages.json b/apps/desktop/src/locales/de/messages.json
index 3643edda8e..0c785b7b39 100644
--- a/apps/desktop/src/locales/de/messages.json
+++ b/apps/desktop/src/locales/de/messages.json
@@ -532,10 +532,13 @@
   "invalidEmail": {
     "message": "Ungültige E-Mail-Adresse."
   },
-  "masterPassRequired": {
+  "masterPasswordRequired": {
     "message": "Das Master-Passwort ist erforderlich."
   },
-  "masterPassLength": {
+  "confirmMasterPasswordRequired": {
+    "message": "Erneute Eingabe des Master-Passworts ist erforderlich."
+  },
+  "masterPasswordMinLength": {
     "message": "Das Master-Passwort muss mindestens 8 Zeichen lang sein."
   },
   "masterPassDoesntMatch": {
@@ -1543,8 +1546,8 @@
   "acceptPolicies": {
     "message": "Durch Anwählen dieses Kästchens erklärst du dich mit folgendem einverstanden:"
   },
-  "acceptPoliciesError": {
-    "message": "Die Nutzungsbedingungen und die Datenschutzerklärung wurden nicht akzeptiert."
+  "acceptPoliciesRequired": {
+    "message": "Die Nutzungsbedingungen und Datenschutzerklärung wurden nicht akzeptiert."
   },
   "enableBrowserIntegration": {
     "message": "Browser-Integration aktivieren"
@@ -1960,5 +1963,8 @@
   },
   "apiKey": {
     "message": "API-Schlüssel"
+  },
+  "neverLockWarning": {
+    "message": "Are you sure you want to use the \"Never\" option? Setting your lock options to \"Never\" stores your vault's encryption key on your device. If you use this option you should ensure that you keep your device properly protected."
   }
 }
diff --git a/apps/desktop/src/locales/el/messages.json b/apps/desktop/src/locales/el/messages.json
index 82b8a386f1..ad6b38280c 100644
--- a/apps/desktop/src/locales/el/messages.json
+++ b/apps/desktop/src/locales/el/messages.json
@@ -532,11 +532,14 @@
   "invalidEmail": {
     "message": "Μη έγκυρη διεύθυνση e-mail."
   },
-  "masterPassRequired": {
-    "message": "Απαιτείται κύριος κωδικός πρόσβασης."
+  "masterPasswordRequired": {
+    "message": "Master password is required."
   },
-  "masterPassLength": {
-    "message": "Ο κύριος κωδικός πρέπει να έχει μήκος τουλάχιστον 8 χαρακτήρες."
+  "confirmMasterPasswordRequired": {
+    "message": "Master password retype is required."
+  },
+  "masterPasswordMinLength": {
+    "message": "Master password must be at least 8 characters long."
   },
   "masterPassDoesntMatch": {
     "message": "Η επιβεβαίωση κύριου κωδικού δεν ταιριάζει."
@@ -1543,8 +1546,8 @@
   "acceptPolicies": {
     "message": "Επιλέγοντας αυτό το πλαίσιο, συμφωνείτε με τα εξής:"
   },
-  "acceptPoliciesError": {
-    "message": "Οι Όροι Παροχής Υπηρεσιών και η Πολιτική Απορρήτου δεν έχουν αναγνωριστεί."
+  "acceptPoliciesRequired": {
+    "message": "Terms of Service and Privacy Policy have not been acknowledged."
   },
   "enableBrowserIntegration": {
     "message": "Ενεργοποίηση ενσωμάτωσης περιηγητή"
@@ -1960,5 +1963,8 @@
   },
   "apiKey": {
     "message": "Kλειδί API"
+  },
+  "neverLockWarning": {
+    "message": "Are you sure you want to use the \"Never\" option? Setting your lock options to \"Never\" stores your vault's encryption key on your device. If you use this option you should ensure that you keep your device properly protected."
   }
 }
diff --git a/apps/desktop/src/locales/en_GB/messages.json b/apps/desktop/src/locales/en_GB/messages.json
index ae918f7eb1..997855bdf8 100644
--- a/apps/desktop/src/locales/en_GB/messages.json
+++ b/apps/desktop/src/locales/en_GB/messages.json
@@ -268,6 +268,9 @@
   "lastName": {
     "message": "Last name"
   },
+  "fullName": {
+    "message": "Full Name"
+  },
   "address1": {
     "message": "Address 1"
   },
@@ -328,6 +331,14 @@
   "cfTypeBoolean": {
     "message": "Boolean"
   },
+  "cfTypeLinked": {
+    "message": "Linked",
+    "description": "This describes a field that is 'linked' (related) to another field."
+  },
+  "linkedValue": {
+    "message": "Linked value",
+    "description": "This describes a value that is 'linked' (related) to another value."
+  },
   "remove": {
     "message": "Remove"
   },
@@ -358,6 +369,12 @@
   "overwritePasswordConfirmation": {
     "message": "Are you sure you want to overwrite the current password?"
   },
+  "overwriteUsername": {
+    "message": "Overwrite Username"
+  },
+  "overwriteUsernameConfirmation": {
+    "message": "Are you sure you want to overwrite the current username?"
+  },
   "noneFolder": {
     "message": "No folder",
     "description": "This is the folder for uncategorized items"
@@ -383,6 +400,18 @@
   "length": {
     "message": "Length"
   },
+  "uppercase": {
+    "message": "Uppercase (A-Z)"
+  },
+  "lowercase": {
+    "message": "Lowercase (a-z)"
+  },
+  "numbers": {
+    "message": "Numbers (0-9)"
+  },
+  "specialCharacters": {
+    "message": "Special Characters (!@#$%^&*)"
+  },
   "numWords": {
     "message": "Number of words"
   },
@@ -446,9 +475,6 @@
   "updateKey": {
     "message": "You cannot use this feature until you update your encryption key."
   },
-  "options": {
-    "message": "Options"
-  },
   "editedFolder": {
     "message": "Edited folder"
   },
@@ -506,10 +532,13 @@
   "invalidEmail": {
     "message": "Invalid email address."
   },
-  "masterPassRequired": {
+  "masterPasswordRequired": {
     "message": "Master password is required."
   },
-  "masterPassLength": {
+  "confirmMasterPasswordRequired": {
+    "message": "Master password retype is required."
+  },
+  "masterPasswordMinLength": {
     "message": "Master password must be at least 8 characters long."
   },
   "masterPassDoesntMatch": {
@@ -530,12 +559,27 @@
   "noItemsInList": {
     "message": "There are no items to list."
   },
+  "sendVerificationCode": {
+    "message": "Send a verification code to your email"
+  },
+  "sendCode": {
+    "message": "Send Code"
+  },
+  "codeSent": {
+    "message": "Code Sent"
+  },
   "verificationCode": {
     "message": "Verification code"
   },
+  "confirmIdentity": {
+    "message": "Confirm your identity to continue."
+  },
   "verificationCodeRequired": {
     "message": "Verification code is required."
   },
+  "invalidVerificationCode": {
+    "message": "Invalid verification code"
+  },
   "continue": {
     "message": "Continue"
   },
@@ -707,17 +751,17 @@
   "loading": {
     "message": "Loading..."
   },
-  "lockNow": {
-    "message": "Lock now"
+  "lockVault": {
+    "message": "Lock Vault"
   },
   "passwordGenerator": {
     "message": "Password generator"
   },
-  "emailUs": {
-    "message": "Email us"
+  "contactUs": {
+    "message": "Contact Us"
   },
-  "visitOurWebsite": {
-    "message": "Visit our website"
+  "getHelp": {
+    "message": "Get Help"
   },
   "fileBugReport": {
     "message": "File a bug report"
@@ -853,11 +897,11 @@
     "message": "Automatically clear copied values from your clipboard.",
     "description": "Clipboard is the operating system thing where you copy/paste data to on your device."
   },
-  "disableFavicon": {
-    "message": "Disable website icons"
+  "enableFavicon": {
+    "message": "Show website icons"
   },
-  "disableFaviconDesc": {
-    "message": "Website icons provide a recognisable image next to each login item in your vault."
+  "faviconDesc": {
+    "message": "Show a recognisable image next to each login."
   },
   "enableMinToTray": {
     "message": "Minimise to tray icon"
@@ -1165,7 +1209,12 @@
     "message": "This password was not found in any known data breaches. It should be safe to use."
   },
   "baseDomain": {
-    "message": "Base domain"
+    "message": "Base domain",
+    "description": "Domain name. Ex. website.com"
+  },
+  "domainName": {
+    "message": "Domain Name",
+    "description": "Domain name. Ex. website.com"
   },
   "host": {
     "message": "Host",
@@ -1227,6 +1276,40 @@
   "fileFormat": {
     "message": "File format"
   },
+  "hCaptchaUrl": {
+    "message": "hCaptcha URL",
+    "description": "hCaptcha is the name of a website, should not be translated"
+  },
+  "loadAccessibilityCookie": {
+    "message": "Load Accessibility Cookie"
+  },
+  "registerAccessibilityUser": {
+    "message": "Register as an accessibility user at",
+    "description": "ex. Register as an accessibility user at hcaptcha.com"
+  },
+  "copyPasteLink": {
+    "message": "Copy and paste the link sent to your email below"
+  },
+  "enterhCaptchaUrl": {
+    "message": "Enter URL to load accessibility cookie for hCaptcha",
+    "description": "hCaptcha is the name of a website, should not be translated"
+  },
+  "hCaptchaUrlRequired": {
+    "message": "hCaptcha URL is required",
+    "description": "hCaptcha is the name of a website, should not be translated"
+  },
+  "invalidUrl": {
+    "message": "Invalid URL"
+  },
+  "done": {
+    "message": "Done"
+  },
+  "accessibilityCookieSaved": {
+    "message": "Accessibility cookie saved!"
+  },
+  "noAccessibilityCookieSaved": {
+    "message": "No accessibility cookie saved"
+  },
   "warning": {
     "message": "WARNING",
     "description": "WARNING (should stay in capitalized letters if the language permits)"
@@ -1243,9 +1326,6 @@
   "encExportAccountWarningDesc": {
     "message": "Account encryption keys are unique to each Bitwarden user account, so you can't import an encrypted export into a different account."
   },
-  "exportMasterPassword": {
-    "message": "Enter your master password to export your vault data."
-  },
   "noOrganizationsList": {
     "message": "You do not belong to any organisations. Organisations allow you to share items securely with other users."
   },
@@ -1292,9 +1372,6 @@
   "invalidPin": {
     "message": "Invalid PIN code."
   },
-  "yourVaultIsLockedPinCode": {
-    "message": "Your vault is locked. Verify your PIN code to continue."
-  },
   "unlockWithWindowsHello": {
     "message": "Unlock with Windows Hello"
   },
@@ -1307,11 +1384,11 @@
   "touchIdConsentMessage": {
     "message": "unlock your vault"
   },
-  "noAutoPromptWindowsHello": {
-    "message": "Do not prompt for Windows Hello on launch."
+  "autoPromptWindowsHello": {
+    "message": "Ask for Windows Hello on launch"
   },
-  "noAutoPromptTouchId": {
-    "message": "Do not prompt for Touch ID on launch."
+  "autoPromptTouchId": {
+    "message": "Ask for Touch ID on launch"
   },
   "lockWithMasterPassOnRestart": {
     "message": "Lock with master password on restart"
@@ -1469,8 +1546,8 @@
   "acceptPolicies": {
     "message": "By checking this box you agree to the following:"
   },
-  "acceptPoliciesError": {
-    "message": "Terms of service and privacy policy have not been acknowledged."
+  "acceptPoliciesRequired": {
+    "message": "Terms of Service and Privacy Policy have not been acknowledged."
   },
   "enableBrowserIntegration": {
     "message": "Enable browser integration"
@@ -1478,18 +1555,18 @@
   "enableBrowserIntegrationDesc": {
     "message": "Browser integration is used for biometrics in browser."
   },
-  "browserIntegrationMasOnlyTitle": {
+  "browserIntegrationUnsupportedTitle": {
     "message": "Browser integration not supported"
   },
   "browserIntegrationMasOnlyDesc": {
     "message": "Unfortunately browser integration is only supported in the Mac App Store version for now."
   },
-  "browserIntegrationWindowsStoreTitle": {
-    "message": "Browser integration not supported"
-  },
   "browserIntegrationWindowsStoreDesc": {
     "message": "Unfortunately browser integration is currently not supported in the Windows Store version."
   },
+  "browserIntegrationLinuxDesc": {
+    "message": "Unfortunately browser integration is currently not supported in the Linux version."
+  },
   "enableBrowserIntegrationFingerprint": {
     "message": "Require verification for browser integration"
   },
@@ -1559,7 +1636,8 @@
     "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
   },
   "maxAccessCount": {
-    "message": "Maximum Access Count"
+    "message": "Maximum Access Count",
+    "description": "This text will be displayed after a Send has been accessed the maximum amount of times."
   },
   "maxAccessCountDesc": {
     "message": "If set, users will no longer be able to access this Send once the maximum access count is reached.",
@@ -1701,7 +1779,7 @@
     "message": "Update Master Password"
   },
   "updateMasterPasswordWarning": {
-    "message": "Your Master Password was recently changed by an administrator in your organization. In order to access the vault, you must update it now. Proceeding will log you out of your current session, requiring you to log back in. Active sessions on other devices may continue to remain active for up to one hour."
+    "message": "Your Master Password was recently changed by an administrator in your organisation. In order to access the vault, you must update it now. Proceeding will log you out of your current session, requiring you to log back in. Active sessions on other devices may continue to remain active for up to one hour."
   },
   "hours": {
     "message": "Hours"
@@ -1710,7 +1788,7 @@
     "message": "Minutes"
   },
   "vaultTimeoutPolicyInEffect": {
-    "message": "Your organization policies are affecting your vault timeout. Maximum allowed Vault Timeout is $HOURS$ hour(s) and $MINUTES$ minute(s)",
+    "message": "Your organisation policies are affecting your vault timeout. Maximum allowed Vault Timeout is $HOURS$ hour(s) and $MINUTES$ minute(s)",
     "placeholders": {
       "hours": {
         "content": "$1",
@@ -1723,18 +1801,170 @@
     }
   },
   "vaultTimeoutTooLarge": {
-    "message": "Your vault timeout exceeds the restrictions set by your organization."
+    "message": "Your vault timeout exceeds the restrictions set by your organisation."
   },
   "resetPasswordPolicyAutoEnroll": {
     "message": "Automatic Enrollment"
   },
   "resetPasswordAutoEnrollInviteWarning": {
-    "message": "This organization has an enterprise policy that will automatically enroll you in password reset. Enrollment will allow organization administrators to change your master password."
+    "message": "This organisation has an enterprise policy that will automatically enroll you in password reset. Enrollment will allow organisation administrators to change your master password."
   },
   "vaultExportDisabled": {
     "message": "Vault Export Disabled"
   },
   "personalVaultExportPolicyInEffect": {
-    "message": "One or more organization policies prevents you from exporting your personal vault."
+    "message": "One or more organisation policies prevents you from exporting your personal vault."
+  },
+  "addAccount": {
+    "message": "Add Account"
+  },
+  "removeMasterPassword": {
+    "message": "Remove Master Password"
+  },
+  "removedMasterPassword": {
+    "message": "Master password removed."
+  },
+  "convertOrganizationEncryptionDesc": {
+    "message": "$ORGANIZATION$ is using SSO with a self-hosted key server. A master password is no longer required to log in for members of this organisation.",
+    "placeholders": {
+      "organization": {
+        "content": "$1",
+        "example": "My Org Name"
+      }
+    }
+  },
+  "leaveOrganization": {
+    "message": "Leave Organisation"
+  },
+  "leaveOrganizationConfirmation": {
+    "message": "Are you sure you want to leave this organisation?"
+  },
+  "leftOrganization": {
+    "message": "You have left the organisation."
+  },
+  "ssoKeyConnectorError": {
+    "message": "Key Connector error: make sure Key Connector is available and working correctly."
+  },
+  "lockAllVaults": {
+    "message": "Lock All Vaults"
+  },
+  "accountLimitReached": {
+    "message": "No more than 5 accounts may be logged in at the same time."
+  },
+  "accountPreferences": {
+    "message": "Preferences"
+  },
+  "appPreferences": {
+    "message": "App Settings (All Accounts)"
+  },
+  "accountSwitcherLimitReached": {
+    "message": "Account limit reached. Log out of an account to add another."
+  },
+  "settingsTitle": {
+    "message": "App settings for $EMAIL$",
+    "placeholders": {
+      "email": {
+        "content": "$1",
+        "example": "jdoe@example.com"
+      }
+    }
+  },
+  "switchAccount": {
+    "message": "Switch Account"
+  },
+  "options": {
+    "message": "Options"
+  },
+  "sessionTimeout": {
+    "message": "Your session has timed out. Please go back and try logging in again."
+  },
+  "exportingPersonalVaultTitle": {
+    "message": "Exporting Personal Vault"
+  },
+  "exportingPersonalVaultDescription": {
+    "message": "Only the personal vault items associated with $EMAIL$ will be exported. Organisation vault items will not be included.",
+    "placeholders": {
+      "email": {
+        "content": "$1",
+        "example": "name@example.com"
+      }
+    }
+  },
+  "locked": {
+    "message": "Locked"
+  },
+  "unlocked": {
+    "message": "Unlocked"
+  },
+  "generator": {
+    "message": "Generator"
+  },
+  "whatWouldYouLikeToGenerate": {
+    "message": "What would you like to generate?"
+  },
+  "passwordType": {
+    "message": "Password Type"
+  },
+  "regenerateUsername": {
+    "message": "Regenerate Username"
+  },
+  "generateUsername": {
+    "message": "Generate Username"
+  },
+  "usernameType": {
+    "message": "Username Type"
+  },
+  "plusAddressedEmail": {
+    "message": "Plus Addressed Email",
+    "description": "Username generator option that appends a random sub-address to the username. For example: address+subaddress@email.com"
+  },
+  "plusAddressedEmailDesc": {
+    "message": "Use your email provider's sub-addressing capabilities."
+  },
+  "catchallEmail": {
+    "message": "Catch-all Email"
+  },
+  "catchallEmailDesc": {
+    "message": "Use your domain's configured catch-all inbox."
+  },
+  "random": {
+    "message": "Random"
+  },
+  "randomWord": {
+    "message": "Random Word"
+  },
+  "websiteName": {
+    "message": "Website Name"
+  },
+  "service": {
+    "message": "Service"
+  },
+  "allVaults": {
+    "message": "All Vaults"
+  },
+  "searchOrganization": {
+    "message": "Search Organisation"
+  },
+  "searchMyVault": {
+    "message": "Search My Vault"
+  },
+  "forwardedEmail": {
+    "message": "Forwarded Email Alias"
+  },
+  "forwardedEmailDesc": {
+    "message": "Generate an email alias with an external forwarding service."
+  },
+  "hostname": {
+    "message": "Hostname",
+    "description": "Part of a URL."
+  },
+  "apiAccessToken": {
+    "message": "API Access Token"
+  },
+  "apiKey": {
+    "message": "API Key"
+  },
+  "neverLockWarning": {
+    "message": "Are you sure you want to use the \"Never\" option? Setting your lock options to \"Never\" stores your vault's encryption key on your device. If you use this option you should ensure that you keep your device properly protected."
   }
 }
diff --git a/apps/desktop/src/locales/en_IN/messages.json b/apps/desktop/src/locales/en_IN/messages.json
index ecaf8c8bd0..c678018242 100644
--- a/apps/desktop/src/locales/en_IN/messages.json
+++ b/apps/desktop/src/locales/en_IN/messages.json
@@ -532,10 +532,13 @@
   "invalidEmail": {
     "message": "Invalid email address."
   },
-  "masterPassRequired": {
+  "masterPasswordRequired": {
     "message": "Master password is required."
   },
-  "masterPassLength": {
+  "confirmMasterPasswordRequired": {
+    "message": "Master password retype is required."
+  },
+  "masterPasswordMinLength": {
     "message": "Master password must be at least 8 characters long."
   },
   "masterPassDoesntMatch": {
@@ -1543,7 +1546,7 @@
   "acceptPolicies": {
     "message": "By checking this box you agree to the following:"
   },
-  "acceptPoliciesError": {
+  "acceptPoliciesRequired": {
     "message": "Terms of Service and Privacy Policy have not been acknowledged."
   },
   "enableBrowserIntegration": {
@@ -1960,5 +1963,8 @@
   },
   "apiKey": {
     "message": "API Key"
+  },
+  "neverLockWarning": {
+    "message": "Are you sure you want to use the \"Never\" option? Setting your lock options to \"Never\" stores your vault's encryption key on your device. If you use this option you should ensure that you keep your device properly protected."
   }
 }
diff --git a/apps/desktop/src/locales/eo/messages.json b/apps/desktop/src/locales/eo/messages.json
index ff3c33a6a8..93a3d65f83 100644
--- a/apps/desktop/src/locales/eo/messages.json
+++ b/apps/desktop/src/locales/eo/messages.json
@@ -532,10 +532,13 @@
   "invalidEmail": {
     "message": "Invalid email address."
   },
-  "masterPassRequired": {
+  "masterPasswordRequired": {
     "message": "Master password is required."
   },
-  "masterPassLength": {
+  "confirmMasterPasswordRequired": {
+    "message": "Master password retype is required."
+  },
+  "masterPasswordMinLength": {
     "message": "Master password must be at least 8 characters long."
   },
   "masterPassDoesntMatch": {
@@ -1543,7 +1546,7 @@
   "acceptPolicies": {
     "message": "By checking this box you agree to the following:"
   },
-  "acceptPoliciesError": {
+  "acceptPoliciesRequired": {
     "message": "Terms of Service and Privacy Policy have not been acknowledged."
   },
   "enableBrowserIntegration": {
@@ -1960,5 +1963,8 @@
   },
   "apiKey": {
     "message": "API Key"
+  },
+  "neverLockWarning": {
+    "message": "Are you sure you want to use the \"Never\" option? Setting your lock options to \"Never\" stores your vault's encryption key on your device. If you use this option you should ensure that you keep your device properly protected."
   }
 }
diff --git a/apps/desktop/src/locales/es/messages.json b/apps/desktop/src/locales/es/messages.json
index d6e8f935f3..2f786312cd 100644
--- a/apps/desktop/src/locales/es/messages.json
+++ b/apps/desktop/src/locales/es/messages.json
@@ -532,10 +532,13 @@
   "invalidEmail": {
     "message": "Correo electrónico no válido."
   },
-  "masterPassRequired": {
-    "message": "Contraseña maestra requerida."
+  "masterPasswordRequired": {
+    "message": "Se requiere una contraseña maestra."
   },
-  "masterPassLength": {
+  "confirmMasterPasswordRequired": {
+    "message": "Se requiere volver a teclear la contraseña maestra."
+  },
+  "masterPasswordMinLength": {
     "message": "La contraseña maestra debe tener al menos 8 caracteres."
   },
   "masterPassDoesntMatch": {
@@ -895,10 +898,10 @@
     "description": "Clipboard is the operating system thing where you copy/paste data to on your device."
   },
   "enableFavicon": {
-    "message": "Show website icons"
+    "message": "Mostrar iconos del sitio web"
   },
   "faviconDesc": {
-    "message": "Show a recognizable image next to each login."
+    "message": "Mostrar una imagen reconocible junto a cada inicio de sesión."
   },
   "enableMinToTray": {
     "message": "Minimizar a icono en la bandeja"
@@ -1278,34 +1281,34 @@
     "description": "hCaptcha is the name of a website, should not be translated"
   },
   "loadAccessibilityCookie": {
-    "message": "Load Accessibility Cookie"
+    "message": "Cargar cookie de accesibilidad"
   },
   "registerAccessibilityUser": {
-    "message": "Register as an accessibility user at",
+    "message": "Registrarse como usuario de accesibilidad en",
     "description": "ex. Register as an accessibility user at hcaptcha.com"
   },
   "copyPasteLink": {
-    "message": "Copy and paste the link sent to your email below"
+    "message": "Copia y pega el enlace enviado a tu correo electrónico"
   },
   "enterhCaptchaUrl": {
-    "message": "Enter URL to load accessibility cookie for hCaptcha",
+    "message": "Introduzca la URL para cargar la cookie de accesibilidad de hCaptcha",
     "description": "hCaptcha is the name of a website, should not be translated"
   },
   "hCaptchaUrlRequired": {
-    "message": "hCaptcha Url is required",
+    "message": "hCaptcha Url es obligatorio",
     "description": "hCaptcha is the name of a website, should not be translated"
   },
   "invalidUrl": {
-    "message": "Invalid Url"
+    "message": "Url inválida"
   },
   "done": {
-    "message": "Done"
+    "message": "Hecho"
   },
   "accessibilityCookieSaved": {
-    "message": "Accessibility cookie saved!"
+    "message": "¡Cookie de accesibilidad guardada!"
   },
   "noAccessibilityCookieSaved": {
-    "message": "No accessibility cookie saved"
+    "message": "No hay ninguna cookie de accesibilidad guardada"
   },
   "warning": {
     "message": "ADVERTENCIA",
@@ -1382,10 +1385,10 @@
     "message": "Verificar para Bitwarden."
   },
   "autoPromptWindowsHello": {
-    "message": "Ask for Windows Hello on launch"
+    "message": "Solicicitar Windows Hello al iniciar"
   },
   "autoPromptTouchId": {
-    "message": "Ask for Touch ID on launch"
+    "message": "Solicitar Touch ID al iniciar"
   },
   "lockWithMasterPassOnRestart": {
     "message": "Bloquear con contraseña maestra al reiniciar"
@@ -1543,8 +1546,8 @@
   "acceptPolicies": {
     "message": "Al seleccionar esta casilla, acepto lo siguiente:"
   },
-  "acceptPoliciesError": {
-    "message": "Todavía no has aceptado los términos del servicio y la política de privacidad."
+  "acceptPoliciesRequired": {
+    "message": "No ha aceptado los términos del servicio y la política de privacidad."
   },
   "enableBrowserIntegration": {
     "message": "Habilitar integración con el navegador"
@@ -1553,7 +1556,7 @@
     "message": "La integración del navegador se usa para la biometría en el mismo."
   },
   "browserIntegrationUnsupportedTitle": {
-    "message": "Browser integration not supported"
+    "message": "La integración con el navegador no está soportada"
   },
   "browserIntegrationMasOnlyDesc": {
     "message": "Por desgracia la integración del navegador sólo está soportada por ahora en la versión de la Mac App Store."
@@ -1562,7 +1565,7 @@
     "message": "Por desgracia la integración del navegador sólo está soportada por ahora en la versión de Microsoft Store."
   },
   "browserIntegrationLinuxDesc": {
-    "message": "Unfortunately browser integration is currently not supported in the linux version."
+    "message": "Por desgracia la integración con el navegador actualmente sólo está soportada en la versión de Microsoft Store."
   },
   "enableBrowserIntegrationFingerprint": {
     "message": "Requiere verificación para la integración del navegador"
@@ -1840,7 +1843,7 @@
     "message": "Has abandonado la organización."
   },
   "ssoKeyConnectorError": {
-    "message": "Key Connector error: make sure Key Connector is available and working correctly."
+    "message": "Error en el conector de claves: asegúrate de que el conector de claves está disponible y que funciona correctamente."
   },
   "lockAllVaults": {
     "message": "Bloquear todas las cajas fuertes"
@@ -1937,28 +1940,31 @@
     "message": "Servicio"
   },
   "allVaults": {
-    "message": "All Vaults"
+    "message": "Todas las cajas fuertes"
   },
   "searchOrganization": {
-    "message": "Search Organization"
+    "message": "Buscar organizaciones"
   },
   "searchMyVault": {
-    "message": "Search My Vault"
+    "message": "Buscar en mi caja fuerte"
   },
   "forwardedEmail": {
-    "message": "Forwarded Email Alias"
+    "message": "Alias de correo"
   },
   "forwardedEmailDesc": {
-    "message": "Generate an email alias with an external forwarding service."
+    "message": "Generar un alias de correo electrónico con un servicio de reenvío externo."
   },
   "hostname": {
-    "message": "Hostname",
+    "message": "Nombre del host",
     "description": "Part of a URL."
   },
   "apiAccessToken": {
-    "message": "API Access Token"
+    "message": "Token de acceso API"
   },
   "apiKey": {
-    "message": "API Key"
+    "message": "Clave API"
+  },
+  "neverLockWarning": {
+    "message": "Are you sure you want to use the \"Never\" option? Setting your lock options to \"Never\" stores your vault's encryption key on your device. If you use this option you should ensure that you keep your device properly protected."
   }
 }
diff --git a/apps/desktop/src/locales/et/messages.json b/apps/desktop/src/locales/et/messages.json
index bff1505562..eceeea0933 100644
--- a/apps/desktop/src/locales/et/messages.json
+++ b/apps/desktop/src/locales/et/messages.json
@@ -532,11 +532,14 @@
   "invalidEmail": {
     "message": "Vigane e-posti aadress."
   },
-  "masterPassRequired": {
-    "message": "Vajalik on ülemparooli sisestamine."
+  "masterPasswordRequired": {
+    "message": "Master password is required."
   },
-  "masterPassLength": {
-    "message": "Ülemparool peab olema vähemalt 8 tähemärgi pikkune."
+  "confirmMasterPasswordRequired": {
+    "message": "Master password retype is required."
+  },
+  "masterPasswordMinLength": {
+    "message": "Master password must be at least 8 characters long."
   },
   "masterPassDoesntMatch": {
     "message": "Ülemparoolid ei ühti."
@@ -1543,8 +1546,8 @@
   "acceptPolicies": {
     "message": "Märkeruudu markeerimisel nõustud järgnevaga:"
   },
-  "acceptPoliciesError": {
-    "message": "Kasutustingimuste ja Privaatsuspoliitikaga pole nõustutud."
+  "acceptPoliciesRequired": {
+    "message": "Terms of Service and Privacy Policy have not been acknowledged."
   },
   "enableBrowserIntegration": {
     "message": "Lülita sisse brauseri integratsioon"
@@ -1960,5 +1963,8 @@
   },
   "apiKey": {
     "message": "API võti"
+  },
+  "neverLockWarning": {
+    "message": "Are you sure you want to use the \"Never\" option? Setting your lock options to \"Never\" stores your vault's encryption key on your device. If you use this option you should ensure that you keep your device properly protected."
   }
 }
diff --git a/apps/desktop/src/locales/eu/messages.json b/apps/desktop/src/locales/eu/messages.json
index 8ab1d61861..90681f641e 100644
--- a/apps/desktop/src/locales/eu/messages.json
+++ b/apps/desktop/src/locales/eu/messages.json
@@ -3,10 +3,10 @@
     "message": "Bitwarden"
   },
   "filters": {
-    "message": "Filters"
+    "message": "Iragazkiak"
   },
   "allItems": {
-    "message": "All Items"
+    "message": "Elementu guztiak"
   },
   "favorites": {
     "message": "Favorites"
@@ -532,10 +532,13 @@
   "invalidEmail": {
     "message": "Invalid email address."
   },
-  "masterPassRequired": {
+  "masterPasswordRequired": {
     "message": "Master password is required."
   },
-  "masterPassLength": {
+  "confirmMasterPasswordRequired": {
+    "message": "Master password retype is required."
+  },
+  "masterPasswordMinLength": {
     "message": "Master password must be at least 8 characters long."
   },
   "masterPassDoesntMatch": {
@@ -1543,7 +1546,7 @@
   "acceptPolicies": {
     "message": "By checking this box you agree to the following:"
   },
-  "acceptPoliciesError": {
+  "acceptPoliciesRequired": {
     "message": "Terms of Service and Privacy Policy have not been acknowledged."
   },
   "enableBrowserIntegration": {
@@ -1960,5 +1963,8 @@
   },
   "apiKey": {
     "message": "API Key"
+  },
+  "neverLockWarning": {
+    "message": "Are you sure you want to use the \"Never\" option? Setting your lock options to \"Never\" stores your vault's encryption key on your device. If you use this option you should ensure that you keep your device properly protected."
   }
 }
diff --git a/apps/desktop/src/locales/fa/messages.json b/apps/desktop/src/locales/fa/messages.json
index 0c281762e0..181ffb40d7 100644
--- a/apps/desktop/src/locales/fa/messages.json
+++ b/apps/desktop/src/locales/fa/messages.json
@@ -532,10 +532,13 @@
   "invalidEmail": {
     "message": "نشانی رایانامه نامعتبر است."
   },
-  "masterPassRequired": {
-    "message": "کلمه عبور اصلی ضروری است."
+  "masterPasswordRequired": {
+    "message": "گذرواژه اصلی ضروری است."
   },
-  "masterPassLength": {
+  "confirmMasterPasswordRequired": {
+    "message": "تایپ مجدد گذرواژه اصلی نیاز است."
+  },
+  "masterPasswordMinLength": {
     "message": "طول کلمه عبور اصلی باید حداقل ۸ کاراکتر باشد."
   },
   "masterPassDoesntMatch": {
@@ -1543,7 +1546,7 @@
   "acceptPolicies": {
     "message": "با علامت زدن این کادر با موارد زیر موافقت می کنید:"
   },
-  "acceptPoliciesError": {
+  "acceptPoliciesRequired": {
     "message": "شرایط خدمات و سیاست حفظ حریم خصوصی تأیید نشده است."
   },
   "enableBrowserIntegration": {
@@ -1960,5 +1963,8 @@
   },
   "apiKey": {
     "message": "کلید API"
+  },
+  "neverLockWarning": {
+    "message": "Are you sure you want to use the \"Never\" option? Setting your lock options to \"Never\" stores your vault's encryption key on your device. If you use this option you should ensure that you keep your device properly protected."
   }
 }
diff --git a/apps/desktop/src/locales/fi/messages.json b/apps/desktop/src/locales/fi/messages.json
index cf147dd938..620dec2e2b 100644
--- a/apps/desktop/src/locales/fi/messages.json
+++ b/apps/desktop/src/locales/fi/messages.json
@@ -532,11 +532,14 @@
   "invalidEmail": {
     "message": "Virheellinen sähköpostiosoite."
   },
-  "masterPassRequired": {
+  "masterPasswordRequired": {
     "message": "Pääsalasana vaaditaan."
   },
-  "masterPassLength": {
-    "message": "Pääsalasanan on oltava vähintään 8 merkkiä pitkä."
+  "confirmMasterPasswordRequired": {
+    "message": "Pääsalasanan uudelleensyöttö vaaditaan."
+  },
+  "masterPasswordMinLength": {
+    "message": "Pääsalasanan tulee sisältää ainakin 8 merkkiä."
   },
   "masterPassDoesntMatch": {
     "message": "Pääsalasanan vahvistus ei täsmää."
@@ -1543,7 +1546,7 @@
   "acceptPolicies": {
     "message": "Valitsemalla tämän ruudun hyväksyt seuraavat:"
   },
-  "acceptPoliciesError": {
+  "acceptPoliciesRequired": {
     "message": "Käyttöehtoja ja tietosuojakäytäntöä ei ole vahvistettu."
   },
   "enableBrowserIntegration": {
@@ -1960,5 +1963,8 @@
   },
   "apiKey": {
     "message": "API-avain"
+  },
+  "neverLockWarning": {
+    "message": "Haluatko varmasti käyttää asetusta \"Ei koskaan\"? Se tallentaa holvisi salausavaimen laitteellesi. Jos käytät asetusta, varmista, että laite on suojattu hyvin."
   }
 }
diff --git a/apps/desktop/src/locales/fil/messages.json b/apps/desktop/src/locales/fil/messages.json
index 8ab1d61861..87757b9b52 100644
--- a/apps/desktop/src/locales/fil/messages.json
+++ b/apps/desktop/src/locales/fil/messages.json
@@ -532,10 +532,13 @@
   "invalidEmail": {
     "message": "Invalid email address."
   },
-  "masterPassRequired": {
+  "masterPasswordRequired": {
     "message": "Master password is required."
   },
-  "masterPassLength": {
+  "confirmMasterPasswordRequired": {
+    "message": "Master password retype is required."
+  },
+  "masterPasswordMinLength": {
     "message": "Master password must be at least 8 characters long."
   },
   "masterPassDoesntMatch": {
@@ -1543,7 +1546,7 @@
   "acceptPolicies": {
     "message": "By checking this box you agree to the following:"
   },
-  "acceptPoliciesError": {
+  "acceptPoliciesRequired": {
     "message": "Terms of Service and Privacy Policy have not been acknowledged."
   },
   "enableBrowserIntegration": {
@@ -1960,5 +1963,8 @@
   },
   "apiKey": {
     "message": "API Key"
+  },
+  "neverLockWarning": {
+    "message": "Are you sure you want to use the \"Never\" option? Setting your lock options to \"Never\" stores your vault's encryption key on your device. If you use this option you should ensure that you keep your device properly protected."
   }
 }
diff --git a/apps/desktop/src/locales/fr/messages.json b/apps/desktop/src/locales/fr/messages.json
index c0f4d38eb0..b8f62673ca 100644
--- a/apps/desktop/src/locales/fr/messages.json
+++ b/apps/desktop/src/locales/fr/messages.json
@@ -532,11 +532,14 @@
   "invalidEmail": {
     "message": "Adresse e-mail invalide."
   },
-  "masterPassRequired": {
-    "message": "Le mot de passe maître est requis."
+  "masterPasswordRequired": {
+    "message": "Master password is required."
   },
-  "masterPassLength": {
-    "message": "Le mot de passe maître doit au moins contenir 8 caractères."
+  "confirmMasterPasswordRequired": {
+    "message": "Master password retype is required."
+  },
+  "masterPasswordMinLength": {
+    "message": "Master password must be at least 8 characters long."
   },
   "masterPassDoesntMatch": {
     "message": "La confirmation du mot de passe maître ne correspond pas."
@@ -1543,8 +1546,8 @@
   "acceptPolicies": {
     "message": "En cochant cette case, vous acceptez les éléments suivants :"
   },
-  "acceptPoliciesError": {
-    "message": "Les conditions d'utilisation et la politique de confidentialité n'ont pas été acceptées."
+  "acceptPoliciesRequired": {
+    "message": "Terms of Service and Privacy Policy have not been acknowledged."
   },
   "enableBrowserIntegration": {
     "message": "Activer l'intégration avec le navigateur"
@@ -1960,5 +1963,8 @@
   },
   "apiKey": {
     "message": "Clé d'IPA"
+  },
+  "neverLockWarning": {
+    "message": "Are you sure you want to use the \"Never\" option? Setting your lock options to \"Never\" stores your vault's encryption key on your device. If you use this option you should ensure that you keep your device properly protected."
   }
 }
diff --git a/apps/desktop/src/locales/he/messages.json b/apps/desktop/src/locales/he/messages.json
index b41c046326..dab46237dc 100644
--- a/apps/desktop/src/locales/he/messages.json
+++ b/apps/desktop/src/locales/he/messages.json
@@ -532,11 +532,14 @@
   "invalidEmail": {
     "message": "כתובת אימייל לא תקינה."
   },
-  "masterPassRequired": {
-    "message": "יש להזין את הסיסמה הראשית."
+  "masterPasswordRequired": {
+    "message": "הסיסמה הראשית נדרשת."
   },
-  "masterPassLength": {
-    "message": "הסיסמה הראשית חייבת להיות לפחות באורך 8 תווים."
+  "confirmMasterPasswordRequired": {
+    "message": "נדרשת חזרה על הסיסמה הראשית."
+  },
+  "masterPasswordMinLength": {
+    "message": "הסיסמה הראשית חייבת להכיל לפחות אורך של 8 תווים."
   },
   "masterPassDoesntMatch": {
     "message": "אימות סיסמה ראשית אינו תואם."
@@ -1543,8 +1546,8 @@
   "acceptPolicies": {
     "message": "סימון תיבה זו מהווה את הסכמתך לתנאים הבאים:"
   },
-  "acceptPoliciesError": {
-    "message": "לא הסכמת לתנאי השירות ומדיניות הפרטיות."
+  "acceptPoliciesRequired": {
+    "message": "תנאי השירות ומדיניות הפרטיות לא אושרו."
   },
   "enableBrowserIntegration": {
     "message": "אפשר אינטגרציה עם הדפדפן"
@@ -1960,5 +1963,8 @@
   },
   "apiKey": {
     "message": "API Key"
+  },
+  "neverLockWarning": {
+    "message": "Are you sure you want to use the \"Never\" option? Setting your lock options to \"Never\" stores your vault's encryption key on your device. If you use this option you should ensure that you keep your device properly protected."
   }
 }
diff --git a/apps/desktop/src/locales/hi/messages.json b/apps/desktop/src/locales/hi/messages.json
index 1ce8980516..6d17a6ae9a 100644
--- a/apps/desktop/src/locales/hi/messages.json
+++ b/apps/desktop/src/locales/hi/messages.json
@@ -532,10 +532,13 @@
   "invalidEmail": {
     "message": "Invalid email address."
   },
-  "masterPassRequired": {
+  "masterPasswordRequired": {
     "message": "Master password is required."
   },
-  "masterPassLength": {
+  "confirmMasterPasswordRequired": {
+    "message": "Master password retype is required."
+  },
+  "masterPasswordMinLength": {
     "message": "Master password must be at least 8 characters long."
   },
   "masterPassDoesntMatch": {
@@ -1543,7 +1546,7 @@
   "acceptPolicies": {
     "message": "By checking this box you agree to the following:"
   },
-  "acceptPoliciesError": {
+  "acceptPoliciesRequired": {
     "message": "Terms of Service and Privacy Policy have not been acknowledged."
   },
   "enableBrowserIntegration": {
@@ -1960,5 +1963,8 @@
   },
   "apiKey": {
     "message": "API Key"
+  },
+  "neverLockWarning": {
+    "message": "Are you sure you want to use the \"Never\" option? Setting your lock options to \"Never\" stores your vault's encryption key on your device. If you use this option you should ensure that you keep your device properly protected."
   }
 }
diff --git a/apps/desktop/src/locales/hr/messages.json b/apps/desktop/src/locales/hr/messages.json
index e6fdd959ed..d7d312be38 100644
--- a/apps/desktop/src/locales/hr/messages.json
+++ b/apps/desktop/src/locales/hr/messages.json
@@ -532,11 +532,14 @@
   "invalidEmail": {
     "message": "Nevažeća adresa e-pošte."
   },
-  "masterPassRequired": {
-    "message": "Potrebna je glavna lozinka."
+  "masterPasswordRequired": {
+    "message": "Master password is required."
   },
-  "masterPassLength": {
-    "message": "Glavna lozinka mora imati najmanje 8 znakova."
+  "confirmMasterPasswordRequired": {
+    "message": "Master password retype is required."
+  },
+  "masterPasswordMinLength": {
+    "message": "Master password must be at least 8 characters long."
   },
   "masterPassDoesntMatch": {
     "message": "Potvrda glavne lozinke se ne podudara."
@@ -1543,8 +1546,8 @@
   "acceptPolicies": {
     "message": "Označavanjem ove kućice slažete se sa sljedećim:"
   },
-  "acceptPoliciesError": {
-    "message": "Uvjeti korištenja i Pravila privatnosti nisu prihvaćeni."
+  "acceptPoliciesRequired": {
+    "message": "Terms of Service and Privacy Policy have not been acknowledged."
   },
   "enableBrowserIntegration": {
     "message": "Uključi integraciju s web preglednikom"
@@ -1960,5 +1963,8 @@
   },
   "apiKey": {
     "message": "API ključ"
+  },
+  "neverLockWarning": {
+    "message": "Are you sure you want to use the \"Never\" option? Setting your lock options to \"Never\" stores your vault's encryption key on your device. If you use this option you should ensure that you keep your device properly protected."
   }
 }
diff --git a/apps/desktop/src/locales/hu/messages.json b/apps/desktop/src/locales/hu/messages.json
index bf9b0bd313..137b60bcb1 100644
--- a/apps/desktop/src/locales/hu/messages.json
+++ b/apps/desktop/src/locales/hu/messages.json
@@ -532,10 +532,13 @@
   "invalidEmail": {
     "message": "Az email cím érvénytelen."
   },
-  "masterPassRequired": {
+  "masterPasswordRequired": {
     "message": "A mesterjelszó megadása kötelező."
   },
-  "masterPassLength": {
+  "confirmMasterPasswordRequired": {
+    "message": "A mesterjelszó ismételt megadása kötelező."
+  },
+  "masterPasswordMinLength": {
     "message": "A mesterjelszó legyen legalább 8 karakter hosszú."
   },
   "masterPassDoesntMatch": {
@@ -1543,7 +1546,7 @@
   "acceptPolicies": {
     "message": "A kapcsoló bekapcsolásával egyetértünk a következőkkel:"
   },
-  "acceptPoliciesError": {
+  "acceptPoliciesRequired": {
     "message": "A szolgáltatási feltételeket és az adatvédelmi irányelveket nem vették figyelembe."
   },
   "enableBrowserIntegration": {
@@ -1960,5 +1963,8 @@
   },
   "apiKey": {
     "message": "API kulcs"
+  },
+  "neverLockWarning": {
+    "message": "Biztosan szeretnénk használni a \"Soha\" opciót? A zárolási opciók \"Soha\" értékre állítása a széf titkosítási kulcsát az eszközön tárolja. Ennek az opciónak a használatakor célszerű az eszköz megfelelő védettségét biztosítani."
   }
 }
diff --git a/apps/desktop/src/locales/id/messages.json b/apps/desktop/src/locales/id/messages.json
index fb2ead1100..2e318f865b 100644
--- a/apps/desktop/src/locales/id/messages.json
+++ b/apps/desktop/src/locales/id/messages.json
@@ -532,11 +532,14 @@
   "invalidEmail": {
     "message": "Alamat email tidak valid."
   },
-  "masterPassRequired": {
-    "message": "Sandi utama diperlukan."
+  "masterPasswordRequired": {
+    "message": "Master password is required."
   },
-  "masterPassLength": {
-    "message": "Kata sandi utama sedikitnya harus 8 karakter."
+  "confirmMasterPasswordRequired": {
+    "message": "Master password retype is required."
+  },
+  "masterPasswordMinLength": {
+    "message": "Master password must be at least 8 characters long."
   },
   "masterPassDoesntMatch": {
     "message": "Konfirmasi sandi utama tidak cocok."
@@ -1543,8 +1546,8 @@
   "acceptPolicies": {
     "message": "Dengan mencentang kotak ini, anda menyetujui yang berikut:"
   },
-  "acceptPoliciesError": {
-    "message": "Persyaratan Layanan dan Kebijakan Privasi belum diakui."
+  "acceptPoliciesRequired": {
+    "message": "Terms of Service and Privacy Policy have not been acknowledged."
   },
   "enableBrowserIntegration": {
     "message": "Aktifkan integrasi browser"
@@ -1960,5 +1963,8 @@
   },
   "apiKey": {
     "message": "API Key"
+  },
+  "neverLockWarning": {
+    "message": "Are you sure you want to use the \"Never\" option? Setting your lock options to \"Never\" stores your vault's encryption key on your device. If you use this option you should ensure that you keep your device properly protected."
   }
 }
diff --git a/apps/desktop/src/locales/it/messages.json b/apps/desktop/src/locales/it/messages.json
index e94a6faff0..3befecfdbd 100644
--- a/apps/desktop/src/locales/it/messages.json
+++ b/apps/desktop/src/locales/it/messages.json
@@ -532,11 +532,14 @@
   "invalidEmail": {
     "message": "L'indirizzo email non è valido."
   },
-  "masterPassRequired": {
-    "message": "La password principale è obbligatoria."
+  "masterPasswordRequired": {
+    "message": "Master password is required."
   },
-  "masterPassLength": {
-    "message": "La password principale deve avere almeno 8 caratteri."
+  "confirmMasterPasswordRequired": {
+    "message": "Master password retype is required."
+  },
+  "masterPasswordMinLength": {
+    "message": "Master password must be at least 8 characters long."
   },
   "masterPassDoesntMatch": {
     "message": "La conferma della password principale non corrisponde."
@@ -1543,8 +1546,8 @@
   "acceptPolicies": {
     "message": "Marcando la casella accetti quanto segue:"
   },
-  "acceptPoliciesError": {
-    "message": "I termini di servizio e l'informativa sulla privacy non sono stati accettati."
+  "acceptPoliciesRequired": {
+    "message": "Terms of Service and Privacy Policy have not been acknowledged."
   },
   "enableBrowserIntegration": {
     "message": "Abilita l'integrazione con il browser"
@@ -1960,5 +1963,8 @@
   },
   "apiKey": {
     "message": "Chiave API"
+  },
+  "neverLockWarning": {
+    "message": "Are you sure you want to use the \"Never\" option? Setting your lock options to \"Never\" stores your vault's encryption key on your device. If you use this option you should ensure that you keep your device properly protected."
   }
 }
diff --git a/apps/desktop/src/locales/ja/messages.json b/apps/desktop/src/locales/ja/messages.json
index 6cf07bcb88..cb2ca0fd51 100644
--- a/apps/desktop/src/locales/ja/messages.json
+++ b/apps/desktop/src/locales/ja/messages.json
@@ -532,10 +532,13 @@
   "invalidEmail": {
     "message": "無効なメールアドレスです。"
   },
-  "masterPassRequired": {
-    "message": "マスターパスワードは必須です。"
+  "masterPasswordRequired": {
+    "message": "マスターパスワードが必要です。"
   },
-  "masterPassLength": {
+  "confirmMasterPasswordRequired": {
+    "message": "マスターパスワードの再入力が必要です。"
+  },
+  "masterPasswordMinLength": {
     "message": "マスターパスワードは、少なくとも8文字以上で設定してください。"
   },
   "masterPassDoesntMatch": {
@@ -1543,7 +1546,7 @@
   "acceptPolicies": {
     "message": "以下に同意しチェックします:"
   },
-  "acceptPoliciesError": {
+  "acceptPoliciesRequired": {
     "message": "利用規約とプライバシーポリシーを確認してください。"
   },
   "enableBrowserIntegration": {
@@ -1960,5 +1963,8 @@
   },
   "apiKey": {
     "message": "API キー"
+  },
+  "neverLockWarning": {
+    "message": "Are you sure you want to use the \"Never\" option? Setting your lock options to \"Never\" stores your vault's encryption key on your device. If you use this option you should ensure that you keep your device properly protected."
   }
 }
diff --git a/apps/desktop/src/locales/ka/messages.json b/apps/desktop/src/locales/ka/messages.json
index 8ab1d61861..87757b9b52 100644
--- a/apps/desktop/src/locales/ka/messages.json
+++ b/apps/desktop/src/locales/ka/messages.json
@@ -532,10 +532,13 @@
   "invalidEmail": {
     "message": "Invalid email address."
   },
-  "masterPassRequired": {
+  "masterPasswordRequired": {
     "message": "Master password is required."
   },
-  "masterPassLength": {
+  "confirmMasterPasswordRequired": {
+    "message": "Master password retype is required."
+  },
+  "masterPasswordMinLength": {
     "message": "Master password must be at least 8 characters long."
   },
   "masterPassDoesntMatch": {
@@ -1543,7 +1546,7 @@
   "acceptPolicies": {
     "message": "By checking this box you agree to the following:"
   },
-  "acceptPoliciesError": {
+  "acceptPoliciesRequired": {
     "message": "Terms of Service and Privacy Policy have not been acknowledged."
   },
   "enableBrowserIntegration": {
@@ -1960,5 +1963,8 @@
   },
   "apiKey": {
     "message": "API Key"
+  },
+  "neverLockWarning": {
+    "message": "Are you sure you want to use the \"Never\" option? Setting your lock options to \"Never\" stores your vault's encryption key on your device. If you use this option you should ensure that you keep your device properly protected."
   }
 }
diff --git a/apps/desktop/src/locales/km/messages.json b/apps/desktop/src/locales/km/messages.json
index 8ab1d61861..87757b9b52 100644
--- a/apps/desktop/src/locales/km/messages.json
+++ b/apps/desktop/src/locales/km/messages.json
@@ -532,10 +532,13 @@
   "invalidEmail": {
     "message": "Invalid email address."
   },
-  "masterPassRequired": {
+  "masterPasswordRequired": {
     "message": "Master password is required."
   },
-  "masterPassLength": {
+  "confirmMasterPasswordRequired": {
+    "message": "Master password retype is required."
+  },
+  "masterPasswordMinLength": {
     "message": "Master password must be at least 8 characters long."
   },
   "masterPassDoesntMatch": {
@@ -1543,7 +1546,7 @@
   "acceptPolicies": {
     "message": "By checking this box you agree to the following:"
   },
-  "acceptPoliciesError": {
+  "acceptPoliciesRequired": {
     "message": "Terms of Service and Privacy Policy have not been acknowledged."
   },
   "enableBrowserIntegration": {
@@ -1960,5 +1963,8 @@
   },
   "apiKey": {
     "message": "API Key"
+  },
+  "neverLockWarning": {
+    "message": "Are you sure you want to use the \"Never\" option? Setting your lock options to \"Never\" stores your vault's encryption key on your device. If you use this option you should ensure that you keep your device properly protected."
   }
 }
diff --git a/apps/desktop/src/locales/kn/messages.json b/apps/desktop/src/locales/kn/messages.json
index 746a59f29e..65fe54da6e 100644
--- a/apps/desktop/src/locales/kn/messages.json
+++ b/apps/desktop/src/locales/kn/messages.json
@@ -532,11 +532,14 @@
   "invalidEmail": {
     "message": "ಅಮಾನ್ಯ ಇಮೇಲ್ ವಿಳಾಸ."
   },
-  "masterPassRequired": {
-    "message": "ಮಾಸ್ಟರ್ ಪಾಸ್ವರ್ಡ್ ಅಗತ್ಯವಿದೆ."
+  "masterPasswordRequired": {
+    "message": "Master password is required."
   },
-  "masterPassLength": {
-    "message": "ಮಾಸ್ಟರ್ ಪಾಸ್‌ವರ್ಡ್ ಕನಿಷ್ಠ 8 ಅಕ್ಷರಗಳಷ್ಟು ಉದ್ದವಾಗಿರಬೇಕು."
+  "confirmMasterPasswordRequired": {
+    "message": "Master password retype is required."
+  },
+  "masterPasswordMinLength": {
+    "message": "Master password must be at least 8 characters long."
   },
   "masterPassDoesntMatch": {
     "message": "ಮಾಸ್ಟರ್ ಪಾಸ್‌ವರ್ಡ್ ದೃಢೀಕರಣವು ಹೊಂದಿಕೆಯಾಗುವುದಿಲ್ಲ."
@@ -1543,8 +1546,8 @@
   "acceptPolicies": {
     "message": "ಈ ಪೆಟ್ಟಿಗೆಯನ್ನು ಪರಿಶೀಲಿಸುವ ಮೂಲಕ ನೀವು ಈ ಕೆಳಗಿನವುಗಳನ್ನು ಒಪ್ಪುತ್ತೀರಿ:"
   },
-  "acceptPoliciesError": {
-    "message": "ಸೇವಾ ನಿಯಮಗಳು ಮತ್ತು ಗೌಪ್ಯತೆ ನೀತಿಯನ್ನು ಅಂಗೀಕರಿಸಲಾಗಿಲ್ಲ."
+  "acceptPoliciesRequired": {
+    "message": "Terms of Service and Privacy Policy have not been acknowledged."
   },
   "enableBrowserIntegration": {
     "message": "ಬ್ರೌಸರ್ ಏಕೀಕರಣವನ್ನು ಸಕ್ರಿಯಗೊಳಿಸಿ"
@@ -1960,5 +1963,8 @@
   },
   "apiKey": {
     "message": "API Key"
+  },
+  "neverLockWarning": {
+    "message": "Are you sure you want to use the \"Never\" option? Setting your lock options to \"Never\" stores your vault's encryption key on your device. If you use this option you should ensure that you keep your device properly protected."
   }
 }
diff --git a/apps/desktop/src/locales/ko/messages.json b/apps/desktop/src/locales/ko/messages.json
index 54b411719b..cadf428a4c 100644
--- a/apps/desktop/src/locales/ko/messages.json
+++ b/apps/desktop/src/locales/ko/messages.json
@@ -532,11 +532,14 @@
   "invalidEmail": {
     "message": "잘못된 이메일 주소입니다."
   },
-  "masterPassRequired": {
-    "message": "마스터 비밀번호는 반드시 입력해야 합니다."
+  "masterPasswordRequired": {
+    "message": "Master password is required."
   },
-  "masterPassLength": {
-    "message": "마스터 비밀번호는 최소 8자 이상이어야 합니다."
+  "confirmMasterPasswordRequired": {
+    "message": "Master password retype is required."
+  },
+  "masterPasswordMinLength": {
+    "message": "Master password must be at least 8 characters long."
   },
   "masterPassDoesntMatch": {
     "message": "마스터 비밀번호 확인과 마스터 비밀번호가 일치하지 않습니다."
@@ -1543,8 +1546,8 @@
   "acceptPolicies": {
     "message": "이 박스를 체크하면 다음에 동의하는 것으로 간주됩니다:"
   },
-  "acceptPoliciesError": {
-    "message": "서비스 약관 및 개인 정보 보호 정책을 확인하지 않았습니다."
+  "acceptPoliciesRequired": {
+    "message": "Terms of Service and Privacy Policy have not been acknowledged."
   },
   "enableBrowserIntegration": {
     "message": "브라우저와 연결 활성화"
@@ -1960,5 +1963,8 @@
   },
   "apiKey": {
     "message": "API 키"
+  },
+  "neverLockWarning": {
+    "message": "Are you sure you want to use the \"Never\" option? Setting your lock options to \"Never\" stores your vault's encryption key on your device. If you use this option you should ensure that you keep your device properly protected."
   }
 }
diff --git a/apps/desktop/src/locales/lv/messages.json b/apps/desktop/src/locales/lv/messages.json
index 22e0d207d2..1ad255768c 100644
--- a/apps/desktop/src/locales/lv/messages.json
+++ b/apps/desktop/src/locales/lv/messages.json
@@ -532,11 +532,14 @@
   "invalidEmail": {
     "message": "Nederīga e-pasta adrese."
   },
-  "masterPassRequired": {
-    "message": "Ir jānorāda galvenā parole."
+  "masterPasswordRequired": {
+    "message": "Master password is required."
   },
-  "masterPassLength": {
-    "message": "Galvenajai parolei ir jābūt vismaz 8 rakstzīmes garai."
+  "confirmMasterPasswordRequired": {
+    "message": "Master password retype is required."
+  },
+  "masterPasswordMinLength": {
+    "message": "Master password must be at least 8 characters long."
   },
   "masterPassDoesntMatch": {
     "message": "Galvenās paroles apstiprinājums nesakrīt."
@@ -1543,8 +1546,8 @@
   "acceptPolicies": {
     "message": "Atzīmējot šo rūtiņu, Tu piekrīti sekojošajam:"
   },
-  "acceptPoliciesError": {
-    "message": "Nav pieņemti izmantošanas nosacījumi un privātuma politika."
+  "acceptPoliciesRequired": {
+    "message": "Terms of Service and Privacy Policy have not been acknowledged."
   },
   "enableBrowserIntegration": {
     "message": "Iespējot pārlūka saistīšanu"
@@ -1960,5 +1963,8 @@
   },
   "apiKey": {
     "message": "API atslēga"
+  },
+  "neverLockWarning": {
+    "message": "Are you sure you want to use the \"Never\" option? Setting your lock options to \"Never\" stores your vault's encryption key on your device. If you use this option you should ensure that you keep your device properly protected."
   }
 }
diff --git a/apps/desktop/src/locales/me/messages.json b/apps/desktop/src/locales/me/messages.json
index 609bdb1e10..5015346a93 100644
--- a/apps/desktop/src/locales/me/messages.json
+++ b/apps/desktop/src/locales/me/messages.json
@@ -532,11 +532,14 @@
   "invalidEmail": {
     "message": "Nepravilna email adresa."
   },
-  "masterPassRequired": {
-    "message": "Potrebna je glavna lozinka."
+  "masterPasswordRequired": {
+    "message": "Master password is required."
   },
-  "masterPassLength": {
-    "message": "Glavna lozinka mora imati najmanje 8 karaktera."
+  "confirmMasterPasswordRequired": {
+    "message": "Master password retype is required."
+  },
+  "masterPasswordMinLength": {
+    "message": "Master password must be at least 8 characters long."
   },
   "masterPassDoesntMatch": {
     "message": "Potvrda glavne lozinke ne odgovara."
@@ -1543,8 +1546,8 @@
   "acceptPolicies": {
     "message": "Označavanjem ovog polja pristajete na sledeće:"
   },
-  "acceptPoliciesError": {
-    "message": "Uslovi usluge i Politika privatnosti nisu prihvaćeni."
+  "acceptPoliciesRequired": {
+    "message": "Terms of Service and Privacy Policy have not been acknowledged."
   },
   "enableBrowserIntegration": {
     "message": "Allow browser integration"
@@ -1960,5 +1963,8 @@
   },
   "apiKey": {
     "message": "API Key"
+  },
+  "neverLockWarning": {
+    "message": "Are you sure you want to use the \"Never\" option? Setting your lock options to \"Never\" stores your vault's encryption key on your device. If you use this option you should ensure that you keep your device properly protected."
   }
 }
diff --git a/apps/desktop/src/locales/ml/messages.json b/apps/desktop/src/locales/ml/messages.json
index 636afbe250..2a519f2c57 100644
--- a/apps/desktop/src/locales/ml/messages.json
+++ b/apps/desktop/src/locales/ml/messages.json
@@ -532,11 +532,14 @@
   "invalidEmail": {
     "message": "അസാധുവായ ഇമെയിൽ."
   },
-  "masterPassRequired": {
-    "message": "പ്രാഥമിക പാസ്‌വേഡ് നിർബന്ധമാണ്‌."
+  "masterPasswordRequired": {
+    "message": "Master password is required."
   },
-  "masterPassLength": {
-    "message": "പ്രാഥമിക പാസ്‌വേഡിന് കുറഞ്ഞത് 8 പ്രതീകങ്ങളെങ്കിലും ദൈർഘ്യമുണ്ടായിരിക്കണം."
+  "confirmMasterPasswordRequired": {
+    "message": "Master password retype is required."
+  },
+  "masterPasswordMinLength": {
+    "message": "Master password must be at least 8 characters long."
   },
   "masterPassDoesntMatch": {
     "message": "പ്രാഥമിക പാസ്‌വേഡ് സ്ഥിരീകരണം പൊരുത്തപ്പെടുന്നില്ല."
@@ -1543,8 +1546,8 @@
   "acceptPolicies": {
     "message": "ഈ ബോക്സ് ചെക്കുചെയ്യുന്നതിലൂടെ നിങ്ങൾ ഇനിപ്പറയുന്നവ അംഗീകരിക്കുന്നു:"
   },
-  "acceptPoliciesError": {
-    "message": "സേവന നിബന്ധനകളും സ്വകാര്യതാ നയവും അംഗീകരിച്ചിട്ടില്ല."
+  "acceptPoliciesRequired": {
+    "message": "Terms of Service and Privacy Policy have not been acknowledged."
   },
   "enableBrowserIntegration": {
     "message": "Allow browser integration"
@@ -1960,5 +1963,8 @@
   },
   "apiKey": {
     "message": "API Key"
+  },
+  "neverLockWarning": {
+    "message": "Are you sure you want to use the \"Never\" option? Setting your lock options to \"Never\" stores your vault's encryption key on your device. If you use this option you should ensure that you keep your device properly protected."
   }
 }
diff --git a/apps/desktop/src/locales/nb/messages.json b/apps/desktop/src/locales/nb/messages.json
index 5f3be62910..1c049ce8fc 100644
--- a/apps/desktop/src/locales/nb/messages.json
+++ b/apps/desktop/src/locales/nb/messages.json
@@ -532,11 +532,14 @@
   "invalidEmail": {
     "message": "Ugyldig E-postadresse."
   },
-  "masterPassRequired": {
-    "message": "Superpassordet er påkrevd."
+  "masterPasswordRequired": {
+    "message": "Master password is required."
   },
-  "masterPassLength": {
-    "message": "Superpassordet må være ≥8 tegn lang."
+  "confirmMasterPasswordRequired": {
+    "message": "Master password retype is required."
+  },
+  "masterPasswordMinLength": {
+    "message": "Master password must be at least 8 characters long."
   },
   "masterPassDoesntMatch": {
     "message": "Superpassord-bekreftelsen er ikke samsvarende."
@@ -1543,8 +1546,8 @@
   "acceptPolicies": {
     "message": "Ved å huke av i denne boksen sier du deg enig i følgende:"
   },
-  "acceptPoliciesError": {
-    "message": "Bruksvilkårene og personvernerklæring er ikke godkjent."
+  "acceptPoliciesRequired": {
+    "message": "Terms of Service and Privacy Policy have not been acknowledged."
   },
   "enableBrowserIntegration": {
     "message": "Aktiver nettleserintegrasjon"
@@ -1960,5 +1963,8 @@
   },
   "apiKey": {
     "message": "API-nøkkel"
+  },
+  "neverLockWarning": {
+    "message": "Are you sure you want to use the \"Never\" option? Setting your lock options to \"Never\" stores your vault's encryption key on your device. If you use this option you should ensure that you keep your device properly protected."
   }
 }
diff --git a/apps/desktop/src/locales/nl/messages.json b/apps/desktop/src/locales/nl/messages.json
index 63772ecb07..d80251cf4f 100644
--- a/apps/desktop/src/locales/nl/messages.json
+++ b/apps/desktop/src/locales/nl/messages.json
@@ -532,11 +532,14 @@
   "invalidEmail": {
     "message": "Ongeldig e-mailadres."
   },
-  "masterPassRequired": {
+  "masterPasswordRequired": {
     "message": "Hoofdwachtwoord vereist."
   },
-  "masterPassLength": {
-    "message": "Het hoofdwachtwoord moet minimaal 8 tekens lang zijn."
+  "confirmMasterPasswordRequired": {
+    "message": "Type je hoofdwachtwoord opnieuw in."
+  },
+  "masterPasswordMinLength": {
+    "message": "Hoofdwachtwoord moet minimaal 8 tekens lang zijn."
   },
   "masterPassDoesntMatch": {
     "message": "De hoofdwachtwoorden komen niet overeen."
@@ -1543,8 +1546,8 @@
   "acceptPolicies": {
     "message": "Door dit vakje aan te vinken, ga je akkoord met het volgende:"
   },
-  "acceptPoliciesError": {
-    "message": "Algemene voorwaarden en privacybeleid zijn nog niet erkend."
+  "acceptPoliciesRequired": {
+    "message": "Je hebt de algemene voorwaarden en het privacybeleid nog niet erkend."
   },
   "enableBrowserIntegration": {
     "message": "Browserintegratie inschakelen"
@@ -1960,5 +1963,8 @@
   },
   "apiKey": {
     "message": "API Key"
+  },
+  "neverLockWarning": {
+    "message": "Weet je zeker dat je de optie \"Nooit\" wilt gebruiken? De vergrendelingsoptie \"Nooit\" bewaart de sleutel van je kluis op je apparaat. Als je deze optie gebruikt, moet je ervoor zorgen dat je je apparaat naar behoren beschermt."
   }
 }
diff --git a/apps/desktop/src/locales/nn/messages.json b/apps/desktop/src/locales/nn/messages.json
index 50b1f546ff..bacbbb9a9b 100644
--- a/apps/desktop/src/locales/nn/messages.json
+++ b/apps/desktop/src/locales/nn/messages.json
@@ -532,10 +532,13 @@
   "invalidEmail": {
     "message": "Invalid email address."
   },
-  "masterPassRequired": {
+  "masterPasswordRequired": {
     "message": "Master password is required."
   },
-  "masterPassLength": {
+  "confirmMasterPasswordRequired": {
+    "message": "Master password retype is required."
+  },
+  "masterPasswordMinLength": {
     "message": "Master password must be at least 8 characters long."
   },
   "masterPassDoesntMatch": {
@@ -1543,7 +1546,7 @@
   "acceptPolicies": {
     "message": "By checking this box you agree to the following:"
   },
-  "acceptPoliciesError": {
+  "acceptPoliciesRequired": {
     "message": "Terms of Service and Privacy Policy have not been acknowledged."
   },
   "enableBrowserIntegration": {
@@ -1960,5 +1963,8 @@
   },
   "apiKey": {
     "message": "API Key"
+  },
+  "neverLockWarning": {
+    "message": "Are you sure you want to use the \"Never\" option? Setting your lock options to \"Never\" stores your vault's encryption key on your device. If you use this option you should ensure that you keep your device properly protected."
   }
 }
diff --git a/apps/desktop/src/locales/pl/messages.json b/apps/desktop/src/locales/pl/messages.json
index ec79db55d8..45e6ecbdde 100644
--- a/apps/desktop/src/locales/pl/messages.json
+++ b/apps/desktop/src/locales/pl/messages.json
@@ -532,10 +532,13 @@
   "invalidEmail": {
     "message": "Adres e-mail jest nieprawidłowy."
   },
-  "masterPassRequired": {
+  "masterPasswordRequired": {
     "message": "Hasło główne jest wymagane."
   },
-  "masterPassLength": {
+  "confirmMasterPasswordRequired": {
+    "message": "Wymagane jest ponowne wpisanie hasła głównego."
+  },
+  "masterPasswordMinLength": {
     "message": "Hasło główne musi zawierać co najmniej 8 znaków."
   },
   "masterPassDoesntMatch": {
@@ -1543,8 +1546,8 @@
   "acceptPolicies": {
     "message": "Zaznaczając tę opcję, akceptujesz:"
   },
-  "acceptPoliciesError": {
-    "message": "Nie zaakceptowałeś regulaminu i polityki prywatności."
+  "acceptPoliciesRequired": {
+    "message": "Warunki użytkowania i polityka prywatności nie zostały zaakceptowane."
   },
   "enableBrowserIntegration": {
     "message": "Włącz połączenie z przeglądarką"
@@ -1960,5 +1963,8 @@
   },
   "apiKey": {
     "message": "Klucz interfejsu API"
+  },
+  "neverLockWarning": {
+    "message": "Czy na pewno chcesz użyć opcji „Nigdy”? Ustawienie opcji blokady na „Nigdy” powoduje zapisanie klucza szyfrowania sejfu na urządzeniu. Jeśli korzystasz z tej opcji, upewnij się, że urządzenie jest odpowiednio chronione."
   }
 }
diff --git a/apps/desktop/src/locales/pt_BR/messages.json b/apps/desktop/src/locales/pt_BR/messages.json
index 586e1e2998..85a9c8db34 100644
--- a/apps/desktop/src/locales/pt_BR/messages.json
+++ b/apps/desktop/src/locales/pt_BR/messages.json
@@ -532,11 +532,14 @@
   "invalidEmail": {
     "message": "Endereço de e-mail inválido."
   },
-  "masterPassRequired": {
-    "message": "A senha mestra é obrigatória."
+  "masterPasswordRequired": {
+    "message": "Master password is required."
   },
-  "masterPassLength": {
-    "message": "A senha mestra deve ter pelo menos 8 caracteres."
+  "confirmMasterPasswordRequired": {
+    "message": "Master password retype is required."
+  },
+  "masterPasswordMinLength": {
+    "message": "Master password must be at least 8 characters long."
   },
   "masterPassDoesntMatch": {
     "message": "A confirmação da senha mestra não corresponde."
@@ -1543,8 +1546,8 @@
   "acceptPolicies": {
     "message": "Ao marcar esta caixa, você concorda com o seguinte:"
   },
-  "acceptPoliciesError": {
-    "message": "Os Termos de Serviço e a Política de Privacidade não foram reconhecidos."
+  "acceptPoliciesRequired": {
+    "message": "Terms of Service and Privacy Policy have not been acknowledged."
   },
   "enableBrowserIntegration": {
     "message": "Ativar integração com o navegador"
@@ -1960,5 +1963,8 @@
   },
   "apiKey": {
     "message": "API Key"
+  },
+  "neverLockWarning": {
+    "message": "Are you sure you want to use the \"Never\" option? Setting your lock options to \"Never\" stores your vault's encryption key on your device. If you use this option you should ensure that you keep your device properly protected."
   }
 }
diff --git a/apps/desktop/src/locales/pt_PT/messages.json b/apps/desktop/src/locales/pt_PT/messages.json
index 346685749b..e3b235d526 100644
--- a/apps/desktop/src/locales/pt_PT/messages.json
+++ b/apps/desktop/src/locales/pt_PT/messages.json
@@ -268,6 +268,9 @@
   "lastName": {
     "message": "Último nome"
   },
+  "fullName": {
+    "message": "Nome Completo"
+  },
   "address1": {
     "message": "Endereço 1"
   },
@@ -328,6 +331,14 @@
   "cfTypeBoolean": {
     "message": "Booleano"
   },
+  "cfTypeLinked": {
+    "message": "Linked",
+    "description": "This describes a field that is 'linked' (related) to another field."
+  },
+  "linkedValue": {
+    "message": "Linked value",
+    "description": "This describes a value that is 'linked' (related) to another value."
+  },
   "remove": {
     "message": "Remover"
   },
@@ -350,7 +361,7 @@
     "message": "Eliminar anexo"
   },
   "deleteItemConfirmation": {
-    "message": "Tem a certeza de que pretende eliminar este item?"
+    "message": "Tem a certeza de que pretende eliminar?"
   },
   "deletedItem": {
     "message": "Item enviado para o lixo"
@@ -358,6 +369,12 @@
   "overwritePasswordConfirmation": {
     "message": "Tem a certeza de que pretende sobreescrever a palavra-passe atual?"
   },
+  "overwriteUsername": {
+    "message": "Overwrite Username"
+  },
+  "overwriteUsernameConfirmation": {
+    "message": "Are you sure you want to overwrite the current username?"
+  },
   "noneFolder": {
     "message": "Nenhuma pasta",
     "description": "This is the folder for uncategorized items"
@@ -383,6 +400,18 @@
   "length": {
     "message": "Comprimento"
   },
+  "uppercase": {
+    "message": "Maiúsculas (A-Z)"
+  },
+  "lowercase": {
+    "message": "Minúsculas (a-z)"
+  },
+  "numbers": {
+    "message": "Números (0-9)"
+  },
+  "specialCharacters": {
+    "message": "Caracteres Especiais (!@#$%^&*)"
+  },
   "numWords": {
     "message": "Número de palavras"
   },
@@ -446,9 +475,6 @@
   "updateKey": {
     "message": "Não pode utilizar esta funcionalidade até atualizar a sua chave de encriptação."
   },
-  "options": {
-    "message": "Opções"
-  },
   "editedFolder": {
     "message": "Pasta editada"
   },
@@ -506,11 +532,14 @@
   "invalidEmail": {
     "message": "Endereço de email inválido."
   },
-  "masterPassRequired": {
-    "message": "A palavra-passe mestra é requerida."
+  "masterPasswordRequired": {
+    "message": "Master password is required."
   },
-  "masterPassLength": {
-    "message": "A palavra-passe mestra tem de ter pelo menos 8 caracteres."
+  "confirmMasterPasswordRequired": {
+    "message": "Master password retype is required."
+  },
+  "masterPasswordMinLength": {
+    "message": "Master password must be at least 8 characters long."
   },
   "masterPassDoesntMatch": {
     "message": "A confirmação da palavra-passe mestra não corresponde."
@@ -530,12 +559,27 @@
   "noItemsInList": {
     "message": "Não existem itens para listar."
   },
+  "sendVerificationCode": {
+    "message": "Envie um código de verificação para o seu e-mail"
+  },
+  "sendCode": {
+    "message": "Enviar o código"
+  },
+  "codeSent": {
+    "message": "Código enviado"
+  },
   "verificationCode": {
     "message": "Código de verificação"
   },
+  "confirmIdentity": {
+    "message": "Confirme a sua identidade para continuar."
+  },
   "verificationCodeRequired": {
     "message": "O código de verificação é requerido."
   },
+  "invalidVerificationCode": {
+    "message": "Código de verificação inválido"
+  },
   "continue": {
     "message": "Continuar"
   },
@@ -606,7 +650,7 @@
     "message": "FIDO2 WebAuthn"
   },
   "webAuthnDesc": {
-    "message": "Use any WebAuthn enabled security key to access your account."
+    "message": "Utilize qualquer chave de segurança ativada pela WebAuthn para aceder à sua conta."
   },
   "emailTitle": {
     "message": "Email"
@@ -707,17 +751,17 @@
   "loading": {
     "message": "A carregar..."
   },
-  "lockNow": {
-    "message": "Bloquear agora"
+  "lockVault": {
+    "message": "Bloquear Cofre"
   },
   "passwordGenerator": {
     "message": "Gerador de palavras-passe"
   },
-  "emailUs": {
-    "message": "Enviar-nos um email"
+  "contactUs": {
+    "message": "Contacte-nos"
   },
-  "visitOurWebsite": {
-    "message": "Visitar o nosso website"
+  "getHelp": {
+    "message": "Obter Ajuda"
   },
   "fileBugReport": {
     "message": "Submeter um relatório de bug"
@@ -853,11 +897,11 @@
     "message": "Limpar automaticamente valores copiados da sua área de transferência.",
     "description": "Clipboard is the operating system thing where you copy/paste data to on your device."
   },
-  "disableFavicon": {
-    "message": "Desativar ícones de websites"
+  "enableFavicon": {
+    "message": "Show website icons"
   },
-  "disableFaviconDesc": {
-    "message": "Os ícones de websites providenciam uma imagem reconhecível ao lado de cada item de credencial no seu cofre."
+  "faviconDesc": {
+    "message": "Show a recognizable image next to each login."
   },
   "enableMinToTray": {
     "message": "Minimizar para ícone de bandeja"
@@ -866,10 +910,10 @@
     "message": "Ao minimizar a janela, mostrar um ícone na bandeja do sistema em alternativa."
   },
   "enableMinToMenuBar": {
-    "message": "Minimize to menu bar"
+    "message": "Minimizar para a barra do menu"
   },
   "enableMinToMenuBarDesc": {
-    "message": "When minimizing the window, show an icon in the menu bar instead."
+    "message": "Ao minimizar a janela, mostrar em alternativa um ícone na barra do menu."
   },
   "enableCloseToTray": {
     "message": "Fechar para ícone de bandeja"
@@ -878,10 +922,10 @@
     "message": "Ao fechar a janela, mostrar um ícone na bandeja do sistema em alternativa."
   },
   "enableCloseToMenuBar": {
-    "message": "Close to menu bar"
+    "message": "Próximo da barra do menu"
   },
   "enableCloseToMenuBarDesc": {
-    "message": "When closing the window, show an icon in the menu bar instead."
+    "message": "Ao fechar a janela, mostrar em alternativa um ícone na barra do menu."
   },
   "enableTray": {
     "message": "Ativar ícone de bandeja"
@@ -905,7 +949,7 @@
     "message": "Start automatically on login"
   },
   "openAtLoginDesc": {
-    "message": "Start the Bitwarden Desktop application automatically on login."
+    "message": "Start the Bitwarden desktop application automatically on login."
   },
   "alwaysShowDock": {
     "message": "Always show in the Dock"
@@ -1165,7 +1209,12 @@
     "message": "Esta palavra-passe não foi encontrada em nenhuma brecha de dados conhecida. Esta deve ser segura de utilizar."
   },
   "baseDomain": {
-    "message": "Domínio base"
+    "message": "Domínio base",
+    "description": "Domain name. Ex. website.com"
+  },
+  "domainName": {
+    "message": "Domain Name",
+    "description": "Domain name. Ex. website.com"
   },
   "host": {
     "message": "Servidor",
@@ -1218,7 +1267,7 @@
     "description": "ex. Date this item was updated"
   },
   "datePasswordUpdated": {
-    "message": "Palavra passe atualizada",
+    "message": "Palavra-passe atualizada",
     "description": "ex. Date this password was updated"
   },
   "exportVault": {
@@ -1227,6 +1276,40 @@
   "fileFormat": {
     "message": "Formato do ficheiro"
   },
+  "hCaptchaUrl": {
+    "message": "hCaptcha Url",
+    "description": "hCaptcha is the name of a website, should not be translated"
+  },
+  "loadAccessibilityCookie": {
+    "message": "Load Accessibility Cookie"
+  },
+  "registerAccessibilityUser": {
+    "message": "Register as an accessibility user at",
+    "description": "ex. Register as an accessibility user at hcaptcha.com"
+  },
+  "copyPasteLink": {
+    "message": "Copy and paste the link sent to your email below"
+  },
+  "enterhCaptchaUrl": {
+    "message": "Enter URL to load accessibility cookie for hCaptcha",
+    "description": "hCaptcha is the name of a website, should not be translated"
+  },
+  "hCaptchaUrlRequired": {
+    "message": "hCaptcha Url is required",
+    "description": "hCaptcha is the name of a website, should not be translated"
+  },
+  "invalidUrl": {
+    "message": "Invalid Url"
+  },
+  "done": {
+    "message": "Done"
+  },
+  "accessibilityCookieSaved": {
+    "message": "Accessibility cookie saved!"
+  },
+  "noAccessibilityCookieSaved": {
+    "message": "No accessibility cookie saved"
+  },
   "warning": {
     "message": "AVISO",
     "description": "WARNING (should stay in capitalized letters if the language permits)"
@@ -1243,9 +1326,6 @@
   "encExportAccountWarningDesc": {
     "message": "Account encryption keys are unique to each Bitwarden user account, so you can't import an encrypted export into a different account."
   },
-  "exportMasterPassword": {
-    "message": "Introduza a sua palavra-passe mestra para exportar os dados do seu cofre."
-  },
   "noOrganizationsList": {
     "message": "Você não pertence a nenhuma organização. Organizações permitem-lhe partilhar itens em segurança com outros utilizadores."
   },
@@ -1292,9 +1372,6 @@
   "invalidPin": {
     "message": "Código PIN inválido."
   },
-  "yourVaultIsLockedPinCode": {
-    "message": "O seu cofre está bloqueado. Verifique o seu PIN para continuar."
-  },
   "unlockWithWindowsHello": {
     "message": "Desbloquear com Windows Hello"
   },
@@ -1307,11 +1384,11 @@
   "touchIdConsentMessage": {
     "message": "Verificar para Bitwarden."
   },
-  "noAutoPromptWindowsHello": {
-    "message": "Do not prompt for Windows Hello on launch."
+  "autoPromptWindowsHello": {
+    "message": "Ask for Windows Hello on launch"
   },
-  "noAutoPromptTouchId": {
-    "message": "Do not prompt for Touch ID on launch."
+  "autoPromptTouchId": {
+    "message": "Ask for Touch ID on launch"
   },
   "lockWithMasterPassOnRestart": {
     "message": "Bloquear com palavra-passe mestra ao reiniciar"
@@ -1469,32 +1546,32 @@
   "acceptPolicies": {
     "message": "Ao marcar esta caixa concorda com o seguinte:"
   },
-  "acceptPoliciesError": {
-    "message": "Os Termos de Serviço e a Política de Privacidade não foram aceites."
+  "acceptPoliciesRequired": {
+    "message": "Terms of Service and Privacy Policy have not been acknowledged."
   },
   "enableBrowserIntegration": {
-    "message": "Enable browser integration"
+    "message": "Allow browser integration"
   },
   "enableBrowserIntegrationDesc": {
     "message": "Browser integration is used for biometrics in browser."
   },
-  "browserIntegrationMasOnlyTitle": {
-    "message": "Browser integration not supported"
+  "browserIntegrationUnsupportedTitle": {
+    "message": "Integração com o navegador não suportada"
   },
   "browserIntegrationMasOnlyDesc": {
     "message": "Unfortunately browser integration is only supported in the Mac App Store version for now."
   },
-  "browserIntegrationWindowsStoreTitle": {
-    "message": "Browser integration not supported"
-  },
   "browserIntegrationWindowsStoreDesc": {
     "message": "Unfortunately browser integration is currently not supported in the Windows Store version."
   },
+  "browserIntegrationLinuxDesc": {
+    "message": "Infelizmente, a integração com o navegador não é, atualmente, suportada para a versão linux."
+  },
   "enableBrowserIntegrationFingerprint": {
     "message": "Require verification for browser integration"
   },
   "enableBrowserIntegrationFingerprintDesc": {
-    "message": "Enable an additional layer of security by requiring fingerprint phrase validation when establishing a link between your desktop and browser. When enabled, this requires user intervention and verification each time a connection is established."
+    "message": "Add an additional layer of security by requiring fingerprint phrase confirmation when establishing a link between your desktop and browser. This requires user action and verification each time a connection is created."
   },
   "approve": {
     "message": "Approve"
@@ -1521,45 +1598,46 @@
     "message": "An organization policy is affecting your ownership options."
   },
   "allSends": {
-    "message": "All Sends",
+    "message": "Tudo o que foi enviado",
     "description": "'Sends' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
   },
   "sendTypeFile": {
-    "message": "File"
+    "message": "Ficheiro"
   },
   "sendTypeText": {
-    "message": "Text"
+    "message": "Texto"
   },
   "searchSends": {
-    "message": "Search Sends",
+    "message": "Pesquisar 'Sends'",
     "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
   },
   "editSend": {
-    "message": "Edit Send",
+    "message": "Editar Envio",
     "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
   },
   "myVault": {
-    "message": "My Vault"
+    "message": "O meu Cofre"
   },
   "text": {
-    "message": "Text"
+    "message": "Texto"
   },
   "deletionDate": {
-    "message": "Deletion Date"
+    "message": "Data da eliminação"
   },
   "deletionDateDesc": {
     "message": "The Send will be permanently deleted on the specified date and time.",
     "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
   },
   "expirationDate": {
-    "message": "Expiration Date"
+    "message": "Data de Expiração"
   },
   "expirationDateDesc": {
     "message": "If set, access to this Send will expire on the specified date and time.",
     "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
   },
   "maxAccessCount": {
-    "message": "Maximum Access Count"
+    "message": "Maximum Access Count",
+    "description": "This text will be displayed after a Send has been accessed the maximum amount of times."
   },
   "maxAccessCountDesc": {
     "message": "If set, users will no longer be able to access this Send once the maximum access count is reached.",
@@ -1581,11 +1659,11 @@
     "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
   },
   "sendLink": {
-    "message": "Send link",
+    "message": "Enviar ligação",
     "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
   },
   "sendLinkLabel": {
-    "message": "Send Link",
+    "message": "Enviar Ligação",
     "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
   },
   "textHiddenByDefault": {
@@ -1605,24 +1683,24 @@
     "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
   },
   "newPassword": {
-    "message": "New Password"
+    "message": "Nova palavra-passe"
   },
   "whatTypeOfSend": {
-    "message": "What type of Send is this?",
+    "message": "Qual será o tipo de envio?",
     "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
   },
   "createSend": {
-    "message": "Create Send",
+    "message": "Criar envio",
     "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
   },
   "sendTextDesc": {
-    "message": "The text you want to send."
+    "message": "O que deseja enviar."
   },
   "sendFileDesc": {
-    "message": "The file you want to send."
+    "message": "O ficheiro que deseja enviar."
   },
   "days": {
-    "message": "$DAYS$ days",
+    "message": "$DAYS$ Dias",
     "placeholders": {
       "days": {
         "content": "$1",
@@ -1631,83 +1709,83 @@
     }
   },
   "oneDay": {
-    "message": "1 day"
+    "message": "1 dia"
   },
   "custom": {
-    "message": "Custom"
+    "message": "Personalizado"
   },
   "deleteSendConfirmation": {
-    "message": "Are you sure you want to delete this Send?",
+    "message": "Tem a certeza que quer eliminar?",
     "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
   },
   "copySendLinkToClipboard": {
-    "message": "Copy Send link to clipboard",
+    "message": "Copiar link para a área de transferências",
     "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
   },
   "copySendLinkOnSave": {
-    "message": "Copy the link to share this Send to my clipboard upon save."
+    "message": "Copie o link para o partilhar para a área de transferências ao guardar."
   },
   "sendDisabled": {
-    "message": "Send disabled",
+    "message": "Envio desativado",
     "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
   },
   "sendDisabledWarning": {
-    "message": "Due to an enterprise policy, you are only able to delete an existing Send.",
+    "message": "Devido a uma política corporativa, apenas é possível eliminar um envio já existente.",
     "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
   },
   "copyLink": {
-    "message": "Copy link"
+    "message": "Copiar link"
   },
   "disabled": {
-    "message": "Disabled"
+    "message": "Desativado"
   },
   "maxAccessCountReached": {
     "message": "Max access count reached"
   },
   "expired": {
-    "message": "Expired"
+    "message": "Expirou"
   },
   "pendingDeletion": {
-    "message": "Pending deletion"
+    "message": "Data pendente"
   },
   "webAuthnAuthenticate": {
-    "message": "Authenticate WebAuthn"
+    "message": "Autenticar WebAuthn"
   },
   "hideEmail": {
-    "message": "Hide my email address from recipients."
+    "message": "Ocultar meu endereço de e-mail aos destinatários."
   },
   "sendOptionsPolicyInEffect": {
-    "message": "One or more organization policies are affecting your Send options."
+    "message": "Uma ou mais políticas da organização estão a afetar as suas opções de envio."
   },
   "emailVerificationRequired": {
-    "message": "Email Verification Required"
+    "message": "Verificação de Email Necessária"
   },
   "emailVerificationRequiredDesc": {
-    "message": "You must verify your email to use this feature."
+    "message": "É necessário verificar o seu e-mail para usar esta funcionalidade."
   },
   "passwordPrompt": {
-    "message": "Master password re-prompt"
+    "message": "Redefinir palavra-passe mestra"
   },
   "passwordConfirmation": {
-    "message": "Master password confirmation"
+    "message": "Confirmação da palavra-passe mestra"
   },
   "passwordConfirmationDesc": {
-    "message": "This action is protected. To continue, please re-enter your master password to verify your identity."
+    "message": "Esta ação está protegida. Para continuar, por favor reinsira a sua palavra-passe mestra para verificarmos a sua identidade."
   },
   "updatedMasterPassword": {
-    "message": "Updated Master Password"
+    "message": "Palavra-passe Mestra Atualizada"
   },
   "updateMasterPassword": {
-    "message": "Update Master Password"
+    "message": "Atualizar palavra-passe mestra"
   },
   "updateMasterPasswordWarning": {
     "message": "Your Master Password was recently changed by an administrator in your organization. In order to access the vault, you must update it now. Proceeding will log you out of your current session, requiring you to log back in. Active sessions on other devices may continue to remain active for up to one hour."
   },
   "hours": {
-    "message": "Hours"
+    "message": "Horas"
   },
   "minutes": {
-    "message": "Minutes"
+    "message": "Minutos"
   },
   "vaultTimeoutPolicyInEffect": {
     "message": "Your organization policies are affecting your vault timeout. Maximum allowed Vault Timeout is $HOURS$ hour(s) and $MINUTES$ minute(s)",
@@ -1723,18 +1801,170 @@
     }
   },
   "vaultTimeoutTooLarge": {
-    "message": "Your vault timeout exceeds the restrictions set by your organization."
+    "message": "O tempo limite do seu cofre excede as restrições definidas pela sua organização."
   },
   "resetPasswordPolicyAutoEnroll": {
-    "message": "Automatic Enrollment"
+    "message": "Registo automático"
   },
   "resetPasswordAutoEnrollInviteWarning": {
     "message": "This organization has an enterprise policy that will automatically enroll you in password reset. Enrollment will allow organization administrators to change your master password."
   },
   "vaultExportDisabled": {
-    "message": "Vault Export Disabled"
+    "message": "Exportação de cofre inválida"
   },
   "personalVaultExportPolicyInEffect": {
-    "message": "One or more organization policies prevents you from exporting your personal vault."
+    "message": "Uma ou mais políticas da organização impedem que exporte o seu cofre pessoal."
+  },
+  "addAccount": {
+    "message": "Adicionar Conta"
+  },
+  "removeMasterPassword": {
+    "message": "Remover palavra-passe mestra"
+  },
+  "removedMasterPassword": {
+    "message": "Palavra-passe mestra removida."
+  },
+  "convertOrganizationEncryptionDesc": {
+    "message": "$ORGANIZATION$ is using SSO with a self-hosted key server. A master password is no longer required to log in for members of this organization.",
+    "placeholders": {
+      "organization": {
+        "content": "$1",
+        "example": "My Org Name"
+      }
+    }
+  },
+  "leaveOrganization": {
+    "message": "Deixar a organização"
+  },
+  "leaveOrganizationConfirmation": {
+    "message": "Tem a certeza que quer deixar a organização?"
+  },
+  "leftOrganization": {
+    "message": "Saiu da organização."
+  },
+  "ssoKeyConnectorError": {
+    "message": "Key Connector error: make sure Key Connector is available and working correctly."
+  },
+  "lockAllVaults": {
+    "message": "Bloquear Todos os Cofres"
+  },
+  "accountLimitReached": {
+    "message": "Não é possível iniciar sessão com mais de 5 contas ao mesmo tempo."
+  },
+  "accountPreferences": {
+    "message": "Preferências"
+  },
+  "appPreferences": {
+    "message": "Definições da Aplicação (Todas as Contas)"
+  },
+  "accountSwitcherLimitReached": {
+    "message": "Limite de contas atingido. Termine a sessão de uma das contas para adicionar outra."
+  },
+  "settingsTitle": {
+    "message": "Definições da aplicação para $EMAIL$",
+    "placeholders": {
+      "email": {
+        "content": "$1",
+        "example": "jdoe@example.com"
+      }
+    }
+  },
+  "switchAccount": {
+    "message": "Mudar de Conta"
+  },
+  "options": {
+    "message": "Opções"
+  },
+  "sessionTimeout": {
+    "message": "A sua sessão expirou. Por favor, volte atrás e tente iniciar sessão novamente."
+  },
+  "exportingPersonalVaultTitle": {
+    "message": "A Exportar Cofre Pessoal"
+  },
+  "exportingPersonalVaultDescription": {
+    "message": "Apenas os itens do cofre pessoal associado ao $EMAIL$ serão exportados. Os itens do cofre da organização não serão incluídos.",
+    "placeholders": {
+      "email": {
+        "content": "$1",
+        "example": "name@example.com"
+      }
+    }
+  },
+  "locked": {
+    "message": "Bloqueado"
+  },
+  "unlocked": {
+    "message": "Desbloqueado"
+  },
+  "generator": {
+    "message": "Generator"
+  },
+  "whatWouldYouLikeToGenerate": {
+    "message": "What would you like to generate?"
+  },
+  "passwordType": {
+    "message": "Password Type"
+  },
+  "regenerateUsername": {
+    "message": "Regenerate Username"
+  },
+  "generateUsername": {
+    "message": "Generate Username"
+  },
+  "usernameType": {
+    "message": "Username Type"
+  },
+  "plusAddressedEmail": {
+    "message": "Plus Addressed Email",
+    "description": "Username generator option that appends a random sub-address to the username. For example: address+subaddress@email.com"
+  },
+  "plusAddressedEmailDesc": {
+    "message": "Use your email provider's sub-addressing capabilities."
+  },
+  "catchallEmail": {
+    "message": "Catch-all Email"
+  },
+  "catchallEmailDesc": {
+    "message": "Use your domain's configured catch-all inbox."
+  },
+  "random": {
+    "message": "Random"
+  },
+  "randomWord": {
+    "message": "Random Word"
+  },
+  "websiteName": {
+    "message": "Website Name"
+  },
+  "service": {
+    "message": "Service"
+  },
+  "allVaults": {
+    "message": "Todos os Cofres"
+  },
+  "searchOrganization": {
+    "message": "Procurar Organização"
+  },
+  "searchMyVault": {
+    "message": "Procurar no meu Cofre"
+  },
+  "forwardedEmail": {
+    "message": "Forwarded Email Alias"
+  },
+  "forwardedEmailDesc": {
+    "message": "Generate an email alias with an external forwarding service."
+  },
+  "hostname": {
+    "message": "Hostname",
+    "description": "Part of a URL."
+  },
+  "apiAccessToken": {
+    "message": "API Access Token"
+  },
+  "apiKey": {
+    "message": "API Key"
+  },
+  "neverLockWarning": {
+    "message": "Are you sure you want to use the \"Never\" option? Setting your lock options to \"Never\" stores your vault's encryption key on your device. If you use this option you should ensure that you keep your device properly protected."
   }
 }
diff --git a/apps/desktop/src/locales/ro/messages.json b/apps/desktop/src/locales/ro/messages.json
index e03051713a..131044f847 100644
--- a/apps/desktop/src/locales/ro/messages.json
+++ b/apps/desktop/src/locales/ro/messages.json
@@ -532,11 +532,14 @@
   "invalidEmail": {
     "message": "Adresă de e-mail greșită."
   },
-  "masterPassRequired": {
-    "message": "Este parola principală este necesară."
+  "masterPasswordRequired": {
+    "message": "Este necesară o parolă principală."
   },
-  "masterPassLength": {
-    "message": "Parola principală trebuie să conțină minimum 8 caractere."
+  "confirmMasterPasswordRequired": {
+    "message": "Este necesară rescrierea parolei principale."
+  },
+  "masterPasswordMinLength": {
+    "message": "Parola principală trebuie să aibă cel puțin 8 caractere."
   },
   "masterPassDoesntMatch": {
     "message": "Parola principală și confirmarea ei nu coincid!"
@@ -1543,7 +1546,7 @@
   "acceptPolicies": {
     "message": "Dacă bifați această casetă sunteți de acord cu următoarele:"
   },
-  "acceptPoliciesError": {
+  "acceptPoliciesRequired": {
     "message": "Termeni de utilizare și Politica de confidențialitate nu au fost recunoscute."
   },
   "enableBrowserIntegration": {
@@ -1960,5 +1963,8 @@
   },
   "apiKey": {
     "message": "Cheie API"
+  },
+  "neverLockWarning": {
+    "message": "Sunteți sigur că doriți să folosiți opțiunea „Niciodată”? Setarea opțiunilor de blocare la „Niciodată” stochează cheia de criptare a seifului pe dispozitivul dumneavoastră. Dacă utilizați această opțiune, trebuie să vă asigurați că vă păstrați dispozitivul protejat corespunzător."
   }
 }
diff --git a/apps/desktop/src/locales/ru/messages.json b/apps/desktop/src/locales/ru/messages.json
index 9ccca295e3..6e3d9eb6b2 100644
--- a/apps/desktop/src/locales/ru/messages.json
+++ b/apps/desktop/src/locales/ru/messages.json
@@ -532,10 +532,13 @@
   "invalidEmail": {
     "message": "Неверный адрес email."
   },
-  "masterPassRequired": {
+  "masterPasswordRequired": {
     "message": "Требуется мастер-пароль."
   },
-  "masterPassLength": {
+  "confirmMasterPasswordRequired": {
+    "message": "Необходимо повторно ввести мастер-пароль."
+  },
+  "masterPasswordMinLength": {
     "message": "Мастер-пароль должен содержать не менее 8 символов."
   },
   "masterPassDoesntMatch": {
@@ -1543,7 +1546,7 @@
   "acceptPolicies": {
     "message": "Отметив этот флажок, вы соглашаетесь со следующим:"
   },
-  "acceptPoliciesError": {
+  "acceptPoliciesRequired": {
     "message": "Условия предоставления услуг и Политика конфиденциальности не были подтверждены."
   },
   "enableBrowserIntegration": {
@@ -1960,5 +1963,8 @@
   },
   "apiKey": {
     "message": "Ключ API"
+  },
+  "neverLockWarning": {
+    "message": "Вы действительно хотите отключить блокировку хранилища? В этом случае ключ шифрования вашего хранилища будет сохранен на вашем устройстве. Отключая блокировку, вы должны убедиться, что ваше устройство надежно защищено."
   }
 }
diff --git a/apps/desktop/src/locales/si/messages.json b/apps/desktop/src/locales/si/messages.json
index 16df6d15ab..69b08405f6 100644
--- a/apps/desktop/src/locales/si/messages.json
+++ b/apps/desktop/src/locales/si/messages.json
@@ -532,10 +532,13 @@
   "invalidEmail": {
     "message": "වලංගු නොවන වි-තැපැල් ලිපිනයකි."
   },
-  "masterPassRequired": {
+  "masterPasswordRequired": {
     "message": "Master password is required."
   },
-  "masterPassLength": {
+  "confirmMasterPasswordRequired": {
+    "message": "Master password retype is required."
+  },
+  "masterPasswordMinLength": {
     "message": "Master password must be at least 8 characters long."
   },
   "masterPassDoesntMatch": {
@@ -1543,7 +1546,7 @@
   "acceptPolicies": {
     "message": "By checking this box you agree to the following:"
   },
-  "acceptPoliciesError": {
+  "acceptPoliciesRequired": {
     "message": "Terms of Service and Privacy Policy have not been acknowledged."
   },
   "enableBrowserIntegration": {
@@ -1960,5 +1963,8 @@
   },
   "apiKey": {
     "message": "API Key"
+  },
+  "neverLockWarning": {
+    "message": "Are you sure you want to use the \"Never\" option? Setting your lock options to \"Never\" stores your vault's encryption key on your device. If you use this option you should ensure that you keep your device properly protected."
   }
 }
diff --git a/apps/desktop/src/locales/sk/messages.json b/apps/desktop/src/locales/sk/messages.json
index 5fe922b407..ca76b59273 100644
--- a/apps/desktop/src/locales/sk/messages.json
+++ b/apps/desktop/src/locales/sk/messages.json
@@ -532,11 +532,14 @@
   "invalidEmail": {
     "message": "Neplatná emailová adresa."
   },
-  "masterPassRequired": {
+  "masterPasswordRequired": {
     "message": "Hlavné heslo je povinné."
   },
-  "masterPassLength": {
-    "message": "Hlavné heslo musí obsahovať aspoň 8 znakov."
+  "confirmMasterPasswordRequired": {
+    "message": "Vyžaduje sa opätovné zadanie hlavného hesla."
+  },
+  "masterPasswordMinLength": {
+    "message": "Hlavné heslo musí mať aspoň 8 znakov."
   },
   "masterPassDoesntMatch": {
     "message": "Potvrdenie hlavného hesla sa nezhoduje."
@@ -1543,7 +1546,7 @@
   "acceptPolicies": {
     "message": "Označením tohto políčka súhlasíte s nasledovným:"
   },
-  "acceptPoliciesError": {
+  "acceptPoliciesRequired": {
     "message": "Neboli akceptované Podmienky používania a zásady Ochrany osobných údajov."
   },
   "enableBrowserIntegration": {
@@ -1960,5 +1963,8 @@
   },
   "apiKey": {
     "message": "API kľúč"
+  },
+  "neverLockWarning": {
+    "message": "Ste si istí, že chcete použiť možnosť \"Nikdy\"? Táto predvoľba ukladá šifrovací kľúč od trezora priamo na zariadení. Ak použijete túto možnosť, mali by ste svoje zariadenie náležite zabezpečiť."
   }
 }
diff --git a/apps/desktop/src/locales/sl/messages.json b/apps/desktop/src/locales/sl/messages.json
index 8c3264668a..d3d9a84f9c 100644
--- a/apps/desktop/src/locales/sl/messages.json
+++ b/apps/desktop/src/locales/sl/messages.json
@@ -532,10 +532,13 @@
   "invalidEmail": {
     "message": "Neveljaven epoštni naslov."
   },
-  "masterPassRequired": {
+  "masterPasswordRequired": {
     "message": "Master password is required."
   },
-  "masterPassLength": {
+  "confirmMasterPasswordRequired": {
+    "message": "Master password retype is required."
+  },
+  "masterPasswordMinLength": {
     "message": "Master password must be at least 8 characters long."
   },
   "masterPassDoesntMatch": {
@@ -1543,7 +1546,7 @@
   "acceptPolicies": {
     "message": "By checking this box you agree to the following:"
   },
-  "acceptPoliciesError": {
+  "acceptPoliciesRequired": {
     "message": "Terms of Service and Privacy Policy have not been acknowledged."
   },
   "enableBrowserIntegration": {
@@ -1960,5 +1963,8 @@
   },
   "apiKey": {
     "message": "API Key"
+  },
+  "neverLockWarning": {
+    "message": "Are you sure you want to use the \"Never\" option? Setting your lock options to \"Never\" stores your vault's encryption key on your device. If you use this option you should ensure that you keep your device properly protected."
   }
 }
diff --git a/apps/desktop/src/locales/sr/messages.json b/apps/desktop/src/locales/sr/messages.json
index 8d6eff428f..7f9711d8d4 100644
--- a/apps/desktop/src/locales/sr/messages.json
+++ b/apps/desktop/src/locales/sr/messages.json
@@ -532,11 +532,14 @@
   "invalidEmail": {
     "message": "Неисправан имејл."
   },
-  "masterPassRequired": {
-    "message": "Главна Лозинка је неопходна."
+  "masterPasswordRequired": {
+    "message": "Master password is required."
   },
-  "masterPassLength": {
-    "message": "Главна Лозинка треба имати бар 8 знака."
+  "confirmMasterPasswordRequired": {
+    "message": "Master password retype is required."
+  },
+  "masterPasswordMinLength": {
+    "message": "Master password must be at least 8 characters long."
   },
   "masterPassDoesntMatch": {
     "message": "Потврђена Главна Лозинка се не подудара."
@@ -1543,8 +1546,8 @@
   "acceptPolicies": {
     "message": "Означавањем овог поља пристајете на следеће:"
   },
-  "acceptPoliciesError": {
-    "message": "Услови услуге и Политика приватности нису прихваћени."
+  "acceptPoliciesRequired": {
+    "message": "Terms of Service and Privacy Policy have not been acknowledged."
   },
   "enableBrowserIntegration": {
     "message": "Укључи интеграцију са претраживачем"
@@ -1960,5 +1963,8 @@
   },
   "apiKey": {
     "message": "АПИ Кључ"
+  },
+  "neverLockWarning": {
+    "message": "Are you sure you want to use the \"Never\" option? Setting your lock options to \"Never\" stores your vault's encryption key on your device. If you use this option you should ensure that you keep your device properly protected."
   }
 }
diff --git a/apps/desktop/src/locales/sv/messages.json b/apps/desktop/src/locales/sv/messages.json
index 9cbca24856..d6444fb974 100644
--- a/apps/desktop/src/locales/sv/messages.json
+++ b/apps/desktop/src/locales/sv/messages.json
@@ -532,11 +532,14 @@
   "invalidEmail": {
     "message": "Ogiltig e-postadress."
   },
-  "masterPassRequired": {
-    "message": "Huvudlösenord krävs."
+  "masterPasswordRequired": {
+    "message": "Master password is required."
   },
-  "masterPassLength": {
-    "message": "Huvudlösenordet måste vara minst 8 tecken långt."
+  "confirmMasterPasswordRequired": {
+    "message": "Master password retype is required."
+  },
+  "masterPasswordMinLength": {
+    "message": "Master password must be at least 8 characters long."
   },
   "masterPassDoesntMatch": {
     "message": "Huvudlösenorden stämmer inte överens."
@@ -1543,8 +1546,8 @@
   "acceptPolicies": {
     "message": "Genom att markera denna ruta godkänner du följande:"
   },
-  "acceptPoliciesError": {
-    "message": "Användarvillkoren och Integritetspolicyn har inte accepterats."
+  "acceptPoliciesRequired": {
+    "message": "Terms of Service and Privacy Policy have not been acknowledged."
   },
   "enableBrowserIntegration": {
     "message": "Aktivera webbläsarintegration"
@@ -1960,5 +1963,8 @@
   },
   "apiKey": {
     "message": "API-nyckel"
+  },
+  "neverLockWarning": {
+    "message": "Are you sure you want to use the \"Never\" option? Setting your lock options to \"Never\" stores your vault's encryption key on your device. If you use this option you should ensure that you keep your device properly protected."
   }
 }
diff --git a/apps/desktop/src/locales/th/messages.json b/apps/desktop/src/locales/th/messages.json
index 4807cc0dde..c938879608 100644
--- a/apps/desktop/src/locales/th/messages.json
+++ b/apps/desktop/src/locales/th/messages.json
@@ -532,10 +532,13 @@
   "invalidEmail": {
     "message": "ที่อยู่อีเมลไม่ถูกต้อง"
   },
-  "masterPassRequired": {
-    "message": "จำเป็นต้องมีรหัสผ่านหลัก"
+  "masterPasswordRequired": {
+    "message": "Master password is required."
   },
-  "masterPassLength": {
+  "confirmMasterPasswordRequired": {
+    "message": "Master password retype is required."
+  },
+  "masterPasswordMinLength": {
     "message": "Master password must be at least 8 characters long."
   },
   "masterPassDoesntMatch": {
@@ -1543,7 +1546,7 @@
   "acceptPolicies": {
     "message": "By checking this box you agree to the following:"
   },
-  "acceptPoliciesError": {
+  "acceptPoliciesRequired": {
     "message": "Terms of Service and Privacy Policy have not been acknowledged."
   },
   "enableBrowserIntegration": {
@@ -1960,5 +1963,8 @@
   },
   "apiKey": {
     "message": "API Key"
+  },
+  "neverLockWarning": {
+    "message": "Are you sure you want to use the \"Never\" option? Setting your lock options to \"Never\" stores your vault's encryption key on your device. If you use this option you should ensure that you keep your device properly protected."
   }
 }
diff --git a/apps/desktop/src/locales/tr/messages.json b/apps/desktop/src/locales/tr/messages.json
index d269529e5d..bd38b0f560 100644
--- a/apps/desktop/src/locales/tr/messages.json
+++ b/apps/desktop/src/locales/tr/messages.json
@@ -532,10 +532,13 @@
   "invalidEmail": {
     "message": "Geçersiz e-posta adresi."
   },
-  "masterPassRequired": {
+  "masterPasswordRequired": {
     "message": "Ana parola gereklidir."
   },
-  "masterPassLength": {
+  "confirmMasterPasswordRequired": {
+    "message": "Ana parolayı yeniden yazmalısınız."
+  },
+  "masterPasswordMinLength": {
     "message": "Ana parola en az 8 karakter uzunluğunda olmalıdır."
   },
   "masterPassDoesntMatch": {
@@ -1543,7 +1546,7 @@
   "acceptPolicies": {
     "message": "Bu kutuyu işaretleyerek aşağıdakileri kabul etmiş olursunuz:"
   },
-  "acceptPoliciesError": {
+  "acceptPoliciesRequired": {
     "message": "Hizmet Koşulları ve Gizlilik Politikası kabul edilmemiş."
   },
   "enableBrowserIntegration": {
@@ -1960,5 +1963,8 @@
   },
   "apiKey": {
     "message": "API anahtarı"
+  },
+  "neverLockWarning": {
+    "message": "Are you sure you want to use the \"Never\" option? Setting your lock options to \"Never\" stores your vault's encryption key on your device. If you use this option you should ensure that you keep your device properly protected."
   }
 }
diff --git a/apps/desktop/src/locales/uk/messages.json b/apps/desktop/src/locales/uk/messages.json
index cd1665e48f..fe93cae694 100644
--- a/apps/desktop/src/locales/uk/messages.json
+++ b/apps/desktop/src/locales/uk/messages.json
@@ -532,11 +532,14 @@
   "invalidEmail": {
     "message": "Неправильна адреса е-пошти."
   },
-  "masterPassRequired": {
-    "message": "Потрібен головний пароль."
+  "masterPasswordRequired": {
+    "message": "Необхідно ввести головний пароль."
   },
-  "masterPassLength": {
-    "message": "Довжина головного пароля повинна бути не менше 8 символів."
+  "confirmMasterPasswordRequired": {
+    "message": "Необхідно повторно ввести головний пароль."
+  },
+  "masterPasswordMinLength": {
+    "message": "Довжина головного пароля має бути принаймні 8 символів."
   },
   "masterPassDoesntMatch": {
     "message": "Підтвердження головного пароля не збігається."
@@ -1000,7 +1003,7 @@
     "message": "Перезапустити для оновлення"
   },
   "restartToUpdateDesc": {
-    "message": "Версія $VERSION_NUM$ готова до встановлення. Для завершення встановлення ви повинні перезапустити програму. Хочете зробити це зараз?",
+    "message": "Версія $VERSION_NUM$ готова до встановлення. Для завершення встановлення необхідно перезапустити програму. Хочете зробити це зараз?",
     "placeholders": {
       "version_num": {
         "content": "$1",
@@ -1318,7 +1321,7 @@
     "message": "Експортовані дані вашого сховища знаходяться в незашифрованому вигляді. Вам не слід зберігати чи надсилати їх через незахищені канали (наприклад, е-поштою). Після використання негайно видаліть їх."
   },
   "encExportKeyWarningDesc": {
-    "message": "Цей експорт шифрує ваші дані за допомогою ключа шифрування облікового запису. Якщо ви коли-небудь оновите ключ шифрування облікового запису, ви повинні виконати експорт знову, оскільки не зможете розшифрувати цей файл експорту."
+    "message": "Цей експорт шифрує ваші дані за допомогою ключа шифрування облікового запису. Якщо ви коли-небудь оновите ключ шифрування облікового запису, необхідно виконати експорт знову, оскільки не зможете розшифрувати цей файл експорту."
   },
   "encExportAccountWarningDesc": {
     "message": "Ключі шифрування унікальні для кожного облікового запису користувача Bitwarden, тому ви не можете імпортувати зашифрований експорт до іншого облікового запису."
@@ -1403,7 +1406,7 @@
     "message": "Приховувати до панелі завдань"
   },
   "selectOneCollection": {
-    "message": "Ви повинні обрати принаймні одну збірку."
+    "message": "Необхідно вибрати принаймні одну збірку."
   },
   "premiumUpdated": {
     "message": "Ви оновилися до версії premium."
@@ -1543,8 +1546,8 @@
   "acceptPolicies": {
     "message": "Позначивши цей прапорець, ви погоджуєтеся з:"
   },
-  "acceptPoliciesError": {
-    "message": "Умови користування та політика приватності не погоджені."
+  "acceptPoliciesRequired": {
+    "message": "Ви не погодилися з умовами користування та політикою приватності."
   },
   "enableBrowserIntegration": {
     "message": "Дозволити інтеграцію з браузером"
@@ -1776,7 +1779,7 @@
     "message": "Оновити головний пароль"
   },
   "updateMasterPasswordWarning": {
-    "message": "Ваш головний пароль нещодавно був змінений адміністратором організації. Щоб отримати доступ до сховища, ви повинні оновити його зараз. Продовживши, ви вийдете з поточного сеансу, після чого необхідно буде повторно виконати вхід. Сеанси на інших пристроях можуть залишатися активними протягом однієї години."
+    "message": "Ваш головний пароль нещодавно був змінений адміністратором організації. Щоб отримати доступ до сховища, вам необхідно оновити його зараз. Продовживши, ви вийдете з поточного сеансу, після чого потрібно буде повторно виконати вхід. Сеанси на інших пристроях можуть залишатися активними протягом однієї години."
   },
   "hours": {
     "message": "Годин"
@@ -1960,5 +1963,8 @@
   },
   "apiKey": {
     "message": "Ключ API"
+  },
+  "neverLockWarning": {
+    "message": "Ви впевнені, що ніколи не хочете блокувати? Встановивши параметр блокування \"Ніколи\", ключ шифрування сховища зберігатиметься на вашому пристрої. Користуючись цим параметром, ви маєте бути впевнені в тому, що ваш пристрій надійно захищений."
   }
 }
diff --git a/apps/desktop/src/locales/vi/messages.json b/apps/desktop/src/locales/vi/messages.json
index e0d2d729c5..53570e3900 100644
--- a/apps/desktop/src/locales/vi/messages.json
+++ b/apps/desktop/src/locales/vi/messages.json
@@ -532,11 +532,14 @@
   "invalidEmail": {
     "message": "Địa chỉ email không hợp lệ."
   },
-  "masterPassRequired": {
-    "message": "Mật khẩu chính là bắt buộc."
+  "masterPasswordRequired": {
+    "message": "Master password is required."
   },
-  "masterPassLength": {
-    "message": "Mật khẩu chính phải có ít nhất 8 kí tự."
+  "confirmMasterPasswordRequired": {
+    "message": "Master password retype is required."
+  },
+  "masterPasswordMinLength": {
+    "message": "Master password must be at least 8 characters long."
   },
   "masterPassDoesntMatch": {
     "message": "Xác nhận mật khẩu chính không khớp."
@@ -1543,7 +1546,7 @@
   "acceptPolicies": {
     "message": "By checking this box you agree to the following:"
   },
-  "acceptPoliciesError": {
+  "acceptPoliciesRequired": {
     "message": "Terms of Service and Privacy Policy have not been acknowledged."
   },
   "enableBrowserIntegration": {
@@ -1960,5 +1963,8 @@
   },
   "apiKey": {
     "message": "Khóa API"
+  },
+  "neverLockWarning": {
+    "message": "Are you sure you want to use the \"Never\" option? Setting your lock options to \"Never\" stores your vault's encryption key on your device. If you use this option you should ensure that you keep your device properly protected."
   }
 }
diff --git a/apps/desktop/src/locales/zh_CN/messages.json b/apps/desktop/src/locales/zh_CN/messages.json
index f4a1443cff..b62efe2325 100644
--- a/apps/desktop/src/locales/zh_CN/messages.json
+++ b/apps/desktop/src/locales/zh_CN/messages.json
@@ -116,7 +116,7 @@
     "message": "自定义字段"
   },
   "launch": {
-    "message": "启动"
+    "message": "前往"
   },
   "copyValue": {
     "message": "复制值",
@@ -126,7 +126,7 @@
     "message": "复制到剪贴板时最小化"
   },
   "minimizeOnCopyToClipboardDesc": {
-    "message": "复制项目数据到剪贴板时最小化。"
+    "message": "复制项目数据到剪贴板后最小化应用程序。"
   },
   "toggleVisibility": {
     "message": "切换可见性"
@@ -268,6 +268,9 @@
   "lastName": {
     "message": "姓"
   },
+  "fullName": {
+    "message": "全名"
+  },
   "address1": {
     "message": "地址 1"
   },
@@ -320,13 +323,21 @@
     "message": "拖动排序"
   },
   "cfTypeText": {
-    "message": "文本"
+    "message": "文本型"
   },
   "cfTypeHidden": {
-    "message": "隐藏的"
+    "message": "隐藏型"
   },
   "cfTypeBoolean": {
-    "message": "布尔值"
+    "message": "布尔型"
+  },
+  "cfTypeLinked": {
+    "message": "链接型",
+    "description": "This describes a field that is 'linked' (related) to another field."
+  },
+  "linkedValue": {
+    "message": "链接的值",
+    "description": "This describes a value that is 'linked' (related) to another value."
   },
   "remove": {
     "message": "移除"
@@ -358,6 +369,12 @@
   "overwritePasswordConfirmation": {
     "message": "您确定要覆盖当前密码吗？"
   },
+  "overwriteUsername": {
+    "message": "覆盖用户名"
+  },
+  "overwriteUsernameConfirmation": {
+    "message": "您确定要覆盖当前用户名吗？"
+  },
   "noneFolder": {
     "message": "默认文件夹",
     "description": "This is the folder for uncategorized items"
@@ -383,6 +400,18 @@
   "length": {
     "message": "长度"
   },
+  "uppercase": {
+    "message": "大写 (A-Z)"
+  },
+  "lowercase": {
+    "message": "小写 (a-z)"
+  },
+  "numbers": {
+    "message": "数字 (0-9)"
+  },
+  "specialCharacters": {
+    "message": "特殊字符 (!@#$%^&*)"
+  },
   "numWords": {
     "message": "单词数"
   },
@@ -446,9 +475,6 @@
   "updateKey": {
     "message": "在您更新加密密钥前，您不能使用此功能。"
   },
-  "options": {
-    "message": "选项"
-  },
   "editedFolder": {
     "message": "文件夹已编辑"
   },
@@ -462,10 +488,10 @@
     "message": "文件夹已删除"
   },
   "loginOrCreateNewAccount": {
-    "message": "登录或者创建一个账号来访问您的安全密码库。"
+    "message": "登录或者创建一个账户来访问您的安全密码库。"
   },
   "createAccount": {
-    "message": "创建账号"
+    "message": "创建账户"
   },
   "logIn": {
     "message": "登录"
@@ -495,7 +521,7 @@
     "message": "密码提示"
   },
   "enterEmailToGetHint": {
-    "message": "请输入您账号的电子邮件地址来接收密码提示。"
+    "message": "请输入您账户的电子邮件地址来接收密码提示。"
   },
   "getMasterPasswordHint": {
     "message": "获取主密码提示"
@@ -506,10 +532,13 @@
   "invalidEmail": {
     "message": "无效的电子邮件地址。"
   },
-  "masterPassRequired": {
+  "masterPasswordRequired": {
     "message": "必须填写主密码。"
   },
-  "masterPassLength": {
+  "confirmMasterPasswordRequired": {
+    "message": "必须填写确认主密码。"
+  },
+  "masterPasswordMinLength": {
     "message": "主密码至少需要 8 个字符。"
   },
   "masterPassDoesntMatch": {
@@ -530,12 +559,27 @@
   "noItemsInList": {
     "message": "没有可列出的项目。"
   },
+  "sendVerificationCode": {
+    "message": "发送验证码到您的电子邮箱"
+  },
+  "sendCode": {
+    "message": "发送验证码"
+  },
+  "codeSent": {
+    "message": "验证码已发送"
+  },
   "verificationCode": {
     "message": "验证码"
   },
+  "confirmIdentity": {
+    "message": "确认后继续。"
+  },
   "verificationCodeRequired": {
     "message": "必须填写验证码。"
   },
+  "invalidVerificationCode": {
+    "message": "无效的验证码"
+  },
   "continue": {
     "message": "继续"
   },
@@ -573,7 +617,7 @@
     "message": "将您的 YubiKey 插入计算机的 USB 端口，然后按下按钮。"
   },
   "insertU2f": {
-    "message": "将您的安全钥匙插入计算机的 USB 端口。如果它有一个按钮，按下它。"
+    "message": "将您的安全钥匙插入计算机的 USB 端口。如果它有按钮，请按下它。"
   },
   "recoveryCodeDesc": {
     "message": "失去访问您所有的双重身份验证设备？请使用您的恢复代码来禁用您账户中所有的两步登录提供程序。"
@@ -606,7 +650,7 @@
     "message": "FIDO2 WebAuthn"
   },
   "webAuthnDesc": {
-    "message": "使用任何 WebAuthn 安全密钥访问您的帐户。"
+    "message": "使用任何具有 WebAuthn 功能的安全密钥来访问您的账户。"
   },
   "emailTitle": {
     "message": "电子邮件地址"
@@ -672,7 +716,7 @@
     "message": "覆盖密码"
   },
   "learnMore": {
-    "message": "进一步了解"
+    "message": "了解更多"
   },
   "featureUnavailable": {
     "message": "功能不可用"
@@ -707,17 +751,17 @@
   "loading": {
     "message": "正在加载..."
   },
-  "lockNow": {
-    "message": "立即锁定"
+  "lockVault": {
+    "message": "锁定密码库"
   },
   "passwordGenerator": {
     "message": "密码生成器"
   },
-  "emailUs": {
-    "message": "给我们发邮件"
+  "contactUs": {
+    "message": "联系我们"
   },
-  "visitOurWebsite": {
-    "message": "访问我们的网站"
+  "getHelp": {
+    "message": "获取帮助"
   },
   "fileBugReport": {
     "message": "发送错误报告"
@@ -761,7 +805,7 @@
     "message": "同步失败"
   },
   "yourVaultIsLocked": {
-    "message": "您的密码库已锁定，请验证您的主密码以继续。"
+    "message": "您的密码库已锁定。请先验证您的身份。"
   },
   "unlock": {
     "message": "解锁​​​​"
@@ -789,10 +833,10 @@
     "message": "两步登录"
   },
   "vaultTimeout": {
-    "message": "密码库超时"
+    "message": "密码库超时时间"
   },
   "vaultTimeoutDesc": {
-    "message": "选择您的密码库何时超时并执行所选的动作。"
+    "message": "选择您的密码库何时执行密码库超时动作。"
   },
   "immediately": {
     "message": "立即"
@@ -846,24 +890,24 @@
     "message": "安全"
   },
   "clearClipboard": {
-    "message": "清除剪贴板",
+    "message": "清空剪贴板",
     "description": "Clipboard is the operating system thing where you copy/paste data to on your device."
   },
   "clearClipboardDesc": {
     "message": "自动清除复制到剪贴板的值。",
     "description": "Clipboard is the operating system thing where you copy/paste data to on your device."
   },
-  "disableFavicon": {
-    "message": "禁用网站图标"
+  "enableFavicon": {
+    "message": "显示网站图标"
   },
-  "disableFaviconDesc": {
-    "message": "在您的密码库的每个登录项旁显示一个可识别的图标。"
+  "faviconDesc": {
+    "message": "在每个登录旁显示一个可识别的图像。"
   },
   "enableMinToTray": {
     "message": "最小化到托盘图标"
   },
   "enableMinToTrayDesc": {
-    "message": "最小化窗口后，改为在系统托盘中显示一个图标。"
+    "message": "最小化窗口后，在系统托盘中显示一个图标。"
   },
   "enableMinToMenuBar": {
     "message": "最小化到菜单栏"
@@ -875,7 +919,7 @@
     "message": "关闭到托盘图标"
   },
   "enableCloseToTrayDesc": {
-    "message": "关闭窗口后，改为在系统托盘中显示一个图标。"
+    "message": "关闭窗口后，在系统托盘中显示一个图标。"
   },
   "enableCloseToMenuBar": {
     "message": "关闭到菜单栏"
@@ -923,7 +967,7 @@
     "message": "语言"
   },
   "languageDesc": {
-    "message": "更改本应用程序使用的语言。需要重新启动才能生效。"
+    "message": "更改应用程序所使用的语言。重新启动后生效。"
   },
   "theme": {
     "message": "主题"
@@ -932,11 +976,11 @@
     "message": "更改本应用程序的颜色主题。"
   },
   "dark": {
-    "message": "暗",
+    "message": "深色",
     "description": "Dark color"
   },
   "light": {
-    "message": "亮",
+    "message": "浅色",
     "description": "Light color"
   },
   "copy": {
@@ -1027,7 +1071,7 @@
     "message": "密码健康、账户体检以及数据泄露报告，保障您的密码库安全。"
   },
   "premiumSignUpTotp": {
-    "message": "用于密码库中登录项目的 TOTP 验证码（2FA）生成器。"
+    "message": "用于密码库中登录项目的 TOTP 验证码 (2FA) 生成器。"
   },
   "premiumSignUpSupport": {
     "message": "优先客户支持。"
@@ -1042,7 +1086,7 @@
     "message": "您可以在 bitwarden.com 网页版密码库购买高级会员。现在要访问吗？"
   },
   "premiumCurrentMember": {
-    "message": "您是高级会员！"
+    "message": "您目前是高级会员！"
   },
   "premiumCurrentMemberThanks": {
     "message": "感谢您支持 Bitwarden。"
@@ -1165,7 +1209,12 @@
     "message": "没有在已知的数据泄露中发现此密码，它暂时比较安全。"
   },
   "baseDomain": {
-    "message": "基础域"
+    "message": "基础域",
+    "description": "Domain name. Ex. website.com"
+  },
+  "domainName": {
+    "message": "域名",
+    "description": "Domain name. Ex. website.com"
   },
   "host": {
     "message": "主机",
@@ -1227,6 +1276,40 @@
   "fileFormat": {
     "message": "文件格式"
   },
+  "hCaptchaUrl": {
+    "message": "hCaptcha URL",
+    "description": "hCaptcha is the name of a website, should not be translated"
+  },
+  "loadAccessibilityCookie": {
+    "message": "加载无障碍 Cookie"
+  },
+  "registerAccessibilityUser": {
+    "message": "注册为无障碍用户到",
+    "description": "ex. Register as an accessibility user at hcaptcha.com"
+  },
+  "copyPasteLink": {
+    "message": "复制链接并粘贴在下方以便发送到你的电子邮箱"
+  },
+  "enterhCaptchaUrl": {
+    "message": "输入 URL 以加载 hCaptcha 的无障碍 Cookie",
+    "description": "hCaptcha is the name of a website, should not be translated"
+  },
+  "hCaptchaUrlRequired": {
+    "message": "hCaptcha URL 必填",
+    "description": "hCaptcha is the name of a website, should not be translated"
+  },
+  "invalidUrl": {
+    "message": "无效的 URL"
+  },
+  "done": {
+    "message": "完成"
+  },
+  "accessibilityCookieSaved": {
+    "message": "无障碍 Cookie 已保存！"
+  },
+  "noAccessibilityCookieSaved": {
+    "message": "无障碍 Cookie 未保存！"
+  },
   "warning": {
     "message": "警告",
     "description": "WARNING (should stay in capitalized letters if the language permits)"
@@ -1238,14 +1321,11 @@
     "message": "导出的密码库数据包含未加密格式。您不应该通过不安全的渠道（例如电子邮件）来存储或发送导出的文件。用完后请立即将其删除。"
   },
   "encExportKeyWarningDesc": {
-    "message": "此导出将使用您账户的加密密钥来加密您的数据。 如果您曾经轮换过账户的加密密钥，您应将其重新导出，否则您将无法解密导出的文件。"
+    "message": "此导出将使用您账户的加密密钥来加密您的数据。如果您曾经轮换过账户的加密密钥，您应将其重新导出，否则您将无法解密导出的文件。"
   },
   "encExportAccountWarningDesc": {
     "message": "账户加密密钥对每个 Bitwarden 用户账户都是唯一的，所以您不能将加密的导出导入到另一个账户。"
   },
-  "exportMasterPassword": {
-    "message": "输入主密码来导出你的密码库。"
-  },
   "noOrganizationsList": {
     "message": "您没有加入任何组织。同一组织的用户可以安全地与其他用户共享项目。"
   },
@@ -1290,10 +1370,7 @@
     "message": "需要 PIN 码。"
   },
   "invalidPin": {
-    "message": "无效 PIN 码。"
-  },
-  "yourVaultIsLockedPinCode": {
-    "message": "您的密码库已锁定。请验证您的 PIN 码以继续。"
+    "message": "无效的 PIN 码。"
   },
   "unlockWithWindowsHello": {
     "message": "使用 Windows Hello 解锁"
@@ -1307,20 +1384,20 @@
   "touchIdConsentMessage": {
     "message": "解锁您的密码库"
   },
-  "noAutoPromptWindowsHello": {
-    "message": "启动时不提示 Windows Hello。"
+  "autoPromptWindowsHello": {
+    "message": "启动时要求 Windows Hello"
   },
-  "noAutoPromptTouchId": {
-    "message": "启动时不提示 Touch ID。"
+  "autoPromptTouchId": {
+    "message": "启动时要求触控 ID"
   },
   "lockWithMasterPassOnRestart": {
     "message": "重启后使用主密码锁定"
   },
   "preferences": {
-    "message": "设置"
+    "message": "偏好设置"
   },
   "enableMenuBar": {
-    "message": "启用菜单栏图标"
+    "message": "显示菜单栏图标"
   },
   "enableMenuBarDesc": {
     "message": "始终显示菜单栏图标。"
@@ -1366,10 +1443,10 @@
     "message": "密码库超时动作"
   },
   "vaultTimeoutActionLockDesc": {
-    "message": "已锁定的密码库需要重新输入主密码才能再次访问。"
+    "message": "需要主密码或其他解锁方式才能再次访问您的密码库。"
   },
   "vaultTimeoutActionLogOutDesc": {
-    "message": "已注销的密码库需要重新验证才能再次访问。"
+    "message": "需要重新验证才能再次访问您的密码库。"
   },
   "lock": {
     "message": "锁定",
@@ -1404,13 +1481,13 @@
     "message": "永久删除"
   },
   "vaultTimeoutLogOutConfirmation": {
-    "message": "超时后注销将解除对密码库的所有访问权限，并需要进行在线验证。确定使用此设置吗？"
+    "message": "超时后注销将解除对密码库的所有访问权限，并需要进行在线身份验证。确定使用此设置吗？"
   },
   "vaultTimeoutLogOutConfirmationTitle": {
     "message": "超时动作确认"
   },
   "enterpriseSingleSignOn": {
-    "message": "企业单点登录（SSO）"
+    "message": "企业单点登录"
   },
   "setMasterPassword": {
     "message": "设置主密码"
@@ -1469,32 +1546,32 @@
   "acceptPolicies": {
     "message": "选中此框表示您同意："
   },
-  "acceptPoliciesError": {
+  "acceptPoliciesRequired": {
     "message": "尚未同意服务条款和隐私政策。"
   },
   "enableBrowserIntegration": {
-    "message": "启用浏览器整合"
+    "message": "允许浏览器集成"
   },
   "enableBrowserIntegrationDesc": {
-    "message": "浏览器整合用于在浏览器中提供生物识别。"
+    "message": "浏览器集成用于在浏览器中提供生物识别。"
   },
-  "browserIntegrationMasOnlyTitle": {
-    "message": "不支持浏览器整合"
+  "browserIntegrationUnsupportedTitle": {
+    "message": "不支持浏览器集成"
   },
   "browserIntegrationMasOnlyDesc": {
-    "message": "很遗憾，目前仅 Mac App Store 版本支持浏览器整合。"
-  },
-  "browserIntegrationWindowsStoreTitle": {
-    "message": "不支持浏览器整合"
+    "message": "很遗憾，目前仅 Mac App Store 版本支持浏览器集成。"
   },
   "browserIntegrationWindowsStoreDesc": {
-    "message": "很不幸，当前 Windows Store 版本不支持浏览器整合。"
+    "message": "很遗憾，Windows Store 版本目前不支持浏览器整合。"
+  },
+  "browserIntegrationLinuxDesc": {
+    "message": "很遗憾，Linux 版本目前不支持浏览器集成。"
   },
   "enableBrowserIntegrationFingerprint": {
-    "message": "要求浏览器整合验证"
+    "message": "要求浏览器集成验证"
   },
   "enableBrowserIntegrationFingerprintDesc": {
-    "message": "在您的桌面与浏览器间建立连接时，要求验证指纹短语以实现一个额外安全层。此选项启用后，每次建立连接都需要用户干预和验证。"
+    "message": "在您的桌面与浏览器间建立连接时，通过要求指纹短语确认，来增加一个额外的安全层。每次建立连接都需要用户操作和验证。"
   },
   "approve": {
     "message": "批准"
@@ -1555,14 +1632,15 @@
     "message": "过期日期"
   },
   "expirationDateDesc": {
-    "message": "如果设定，此 Send 将在指定的日期和时间后过期。",
+    "message": "设置后，对此 Send 的访问将在指定的日期和时间后过期。",
     "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
   },
   "maxAccessCount": {
-    "message": "最大访问次数"
+    "message": "最大访问次数",
+    "description": "This text will be displayed after a Send has been accessed the maximum amount of times."
   },
   "maxAccessCountDesc": {
-    "message": "如果设定，达到最大访问次数后用户将无法访问此 Send。",
+    "message": "设置后，当达到最大访问次数时用户将不再能够访问此 Send。",
     "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
   },
   "currentAccessCount": {
@@ -1589,7 +1667,7 @@
     "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
   },
   "textHiddenByDefault": {
-    "message": "访问 Send 时，默认将隐藏文本",
+    "message": "访问 Send 时，默认隐藏文字内容",
     "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
   },
   "createdSend": {
@@ -1695,22 +1773,22 @@
     "message": "此操作受到保护。若要继续，请重新输入您的主密码以验证您的身份。"
   },
   "updatedMasterPassword": {
-    "message": "Updated Master Password"
+    "message": "已更新主密码"
   },
   "updateMasterPassword": {
-    "message": "Update Master Password"
+    "message": "更新主密码"
   },
   "updateMasterPasswordWarning": {
-    "message": "Your Master Password was recently changed by an administrator in your organization. In order to access the vault, you must update it now. Proceeding will log you out of your current session, requiring you to log back in. Active sessions on other devices may continue to remain active for up to one hour."
+    "message": "您的主密码最近被您组织的管理员更改过。要访问密码库，您必须立即更新它。继续操作将使您退出当前会话，要求您重新登录。其他设备上的活动会话可能会继续保持活动状态长达一小时。"
   },
   "hours": {
-    "message": "Hours"
+    "message": "小时"
   },
   "minutes": {
-    "message": "Minutes"
+    "message": "分钟"
   },
   "vaultTimeoutPolicyInEffect": {
-    "message": "Your organization policies are affecting your vault timeout. Maximum allowed Vault Timeout is $HOURS$ hour(s) and $MINUTES$ minute(s)",
+    "message": "您的组织策略正在影响您的密码库超时时间。最大允许的密码库超时时间是 $HOURS$ 小时 $MINUTES$ 分钟。",
     "placeholders": {
       "hours": {
         "content": "$1",
@@ -1723,18 +1801,170 @@
     }
   },
   "vaultTimeoutTooLarge": {
-    "message": "Your vault timeout exceeds the restrictions set by your organization."
+    "message": "您的密码库超时时间超出了组织设置的限制。"
   },
   "resetPasswordPolicyAutoEnroll": {
-    "message": "Automatic Enrollment"
+    "message": "自动注册"
   },
   "resetPasswordAutoEnrollInviteWarning": {
-    "message": "This organization has an enterprise policy that will automatically enroll you in password reset. Enrollment will allow organization administrators to change your master password."
+    "message": "此组织有一个企业策略，将自动为你注册密码重置。注册后将允许组织管理员更改您的主密码。"
   },
   "vaultExportDisabled": {
-    "message": "Vault Export Disabled"
+    "message": "密码库导出已禁用"
   },
   "personalVaultExportPolicyInEffect": {
-    "message": "One or more organization policies prevents you from exporting your personal vault."
+    "message": "一个或多个组织策略阻止您导出个人密码库。"
+  },
+  "addAccount": {
+    "message": "添加账户"
+  },
+  "removeMasterPassword": {
+    "message": "移除主密码"
+  },
+  "removedMasterPassword": {
+    "message": "主密码已移除。"
+  },
+  "convertOrganizationEncryptionDesc": {
+    "message": "$ORGANIZATION$ 使用自托管密钥服务器 SSO。这个组织的成员登录时将不再需要主密码。",
+    "placeholders": {
+      "organization": {
+        "content": "$1",
+        "example": "My Org Name"
+      }
+    }
+  },
+  "leaveOrganization": {
+    "message": "离开组织"
+  },
+  "leaveOrganizationConfirmation": {
+    "message": "您确定要离开这个组织吗？"
+  },
+  "leftOrganization": {
+    "message": "您已经离开该组织。"
+  },
+  "ssoKeyConnectorError": {
+    "message": "Key Connector 错误：请确保 Key Connector 可用且工作正常。"
+  },
+  "lockAllVaults": {
+    "message": "锁定所有密码库"
+  },
+  "accountLimitReached": {
+    "message": "最多只能同时登录 5 个账户。"
+  },
+  "accountPreferences": {
+    "message": "偏好设置"
+  },
+  "appPreferences": {
+    "message": "应用设置（所有账户）"
+  },
+  "accountSwitcherLimitReached": {
+    "message": "已达到账户上限。请注销一个账户后再添加其他账户。"
+  },
+  "settingsTitle": {
+    "message": "$EMAIL$ 的应用程序设置",
+    "placeholders": {
+      "email": {
+        "content": "$1",
+        "example": "jdoe@example.com"
+      }
+    }
+  },
+  "switchAccount": {
+    "message": "切换账户"
+  },
+  "options": {
+    "message": "选项"
+  },
+  "sessionTimeout": {
+    "message": "您的会话已超时。请返回并尝试重新登录。"
+  },
+  "exportingPersonalVaultTitle": {
+    "message": "正在导出个人密码库"
+  },
+  "exportingPersonalVaultDescription": {
+    "message": "仅会导出与 $EMAIL$ 关联的个人密码库。组织密码库的项目不会导出。",
+    "placeholders": {
+      "email": {
+        "content": "$1",
+        "example": "name@example.com"
+      }
+    }
+  },
+  "locked": {
+    "message": "已锁定"
+  },
+  "unlocked": {
+    "message": "已解锁"
+  },
+  "generator": {
+    "message": "生成器"
+  },
+  "whatWouldYouLikeToGenerate": {
+    "message": "您想要生成什么？"
+  },
+  "passwordType": {
+    "message": "密码类型"
+  },
+  "regenerateUsername": {
+    "message": "重新生成用户名"
+  },
+  "generateUsername": {
+    "message": "生成用户名"
+  },
+  "usernameType": {
+    "message": "用户名类型"
+  },
+  "plusAddressedEmail": {
+    "message": "附加地址电子邮件",
+    "description": "Username generator option that appends a random sub-address to the username. For example: address+subaddress@email.com"
+  },
+  "plusAddressedEmailDesc": {
+    "message": "使用您的电子邮件供应商的子地址功能。"
+  },
+  "catchallEmail": {
+    "message": "Catch-all 电子邮件"
+  },
+  "catchallEmailDesc": {
+    "message": "使用您的域名配置的 Catch-all 收件箱。"
+  },
+  "random": {
+    "message": "随机"
+  },
+  "randomWord": {
+    "message": "随机单词"
+  },
+  "websiteName": {
+    "message": "网站名"
+  },
+  "service": {
+    "message": "服务"
+  },
+  "allVaults": {
+    "message": "所有密码库"
+  },
+  "searchOrganization": {
+    "message": "搜索组织"
+  },
+  "searchMyVault": {
+    "message": "搜索我的密码库"
+  },
+  "forwardedEmail": {
+    "message": "转发的电子邮件别名"
+  },
+  "forwardedEmailDesc": {
+    "message": "使用外部转发服务生成一个电子邮件别名。"
+  },
+  "hostname": {
+    "message": "主机名",
+    "description": "Part of a URL."
+  },
+  "apiAccessToken": {
+    "message": "API 访问令牌"
+  },
+  "apiKey": {
+    "message": "API 密钥"
+  },
+  "neverLockWarning": {
+    "message": "您确定要使用「从不」选项吗？将锁定选项设置为「从不」会将密码库的加密密钥存储在您的设备上。如果使用此选项，您必须确保您的设备安全。"
   }
 }
diff --git a/apps/desktop/src/locales/zh_TW/messages.json b/apps/desktop/src/locales/zh_TW/messages.json
index d65e43ef69..c191f7e205 100644
--- a/apps/desktop/src/locales/zh_TW/messages.json
+++ b/apps/desktop/src/locales/zh_TW/messages.json
@@ -532,10 +532,13 @@
   "invalidEmail": {
     "message": "無效的電子郵件地址。"
   },
-  "masterPassRequired": {
-    "message": "必須填入主密碼。"
+  "masterPasswordRequired": {
+    "message": "必須填寫主密碼。"
   },
-  "masterPassLength": {
+  "confirmMasterPasswordRequired": {
+    "message": "必須再次輸入主密碼。"
+  },
+  "masterPasswordMinLength": {
     "message": "主密碼需要至少 8 個字元。"
   },
   "masterPassDoesntMatch": {
@@ -1543,8 +1546,8 @@
   "acceptPolicies": {
     "message": "選中此選取框，代表您同意下列項目："
   },
-  "acceptPoliciesError": {
-    "message": "尚未接受服務條款與隱私權保護政策。"
+  "acceptPoliciesRequired": {
+    "message": "尚未接受服務條款與隱私權政策。"
   },
   "enableBrowserIntegration": {
     "message": "允許瀏覽器整合"
@@ -1960,5 +1963,8 @@
   },
   "apiKey": {
     "message": "API 金鑰"
+  },
+  "neverLockWarning": {
+    "message": "您確定要使用「永不」選項嗎？將鎖定選項設定為「永不」會將密碼庫的加密金鑰儲存在您的裝置上。如果使用此選項，應確保您的裝置是安全的。"
   }
 }