diff --git a/src/_locales/bg/messages.json b/src/_locales/bg/messages.json
index 81fe1a9348..1049ead567 100644
--- a/src/_locales/bg/messages.json
+++ b/src/_locales/bg/messages.json
@@ -273,10 +273,10 @@
     "message": "Оценяване на разширението"
   },
   "rateExtensionDesc": {
-    "message": "Please consider helping us out with a good review!"
+    "message": "Моля, помогнете ни, като оставите положителен отзив!"
   },
   "browserNotSupportClipboard": {
-    "message": "Your web browser does not support easy clipboard copying. Copy it manually instead."
+    "message": "Четецът ви не поддържа копиране в буфера, затова го копирайте на ръка."
   },
   "verifyMasterPassword": {
     "message": "Потвърждаване на главната парола"
@@ -495,7 +495,7 @@
     "message": "Do you want to update this password in Bitwarden?"
   },
   "notificationChangeSave": {
-    "message": "Yes, Update Now"
+    "message": "Да, нека се обнови сега"
   },
   "disableContextMenuItem": {
     "message": "Disable Context Menu Options"
@@ -585,7 +585,7 @@
     "message": "Функцията е недостъпна"
   },
   "updateKey": {
-    "message": "You cannot use this feature until you update your encryption key."
+    "message": "Не можете да използвате функцията, докато не обновите шифровъчния си ключ."
   },
   "premiumMembership": {
     "message": "Премийно членство"
@@ -630,7 +630,7 @@
     "message": "Имате премийно членство!"
   },
   "premiumCurrentMemberThanks": {
-    "message": "Thank you for supporting Bitwarden."
+    "message": "Благодарим ви за подкрепата на програмата."
   },
   "premiumPrice": {
     "message": "All for just %price% \/year!",
@@ -657,10 +657,10 @@
     "message": "A premium membership is required to use this feature."
   },
   "enterVerificationCodeApp": {
-    "message": "Enter the 6 digit verification code from your authenticator app."
+    "message": "Въведете шест-цифреният код за потвърждение от приложението за удостоверяване."
   },
   "enterVerificationCodeEmail": {
-    "message": "Enter the 6 digit verification code that was emailed to",
+    "message": "Въведете шест-цифреният код за потвърждение, който е бил изпратен на $EMAIL$.",
     "placeholders": {
       "email": {
         "content": "$1",
@@ -762,13 +762,13 @@
     "message": "Адрес на ППИ-сървъра"
   },
   "webVaultUrl": {
-    "message": "Адрес на сървъра за уеб трезора"
+    "message": "Адрес на сървъра за интернетния трезор"
   },
   "identityUrl": {
     "message": "Адрес на сървъра със самоличности"
   },
   "notificationsUrl": {
-    "message": "Notifications Server URL"
+    "message": "Адрес на сървъра за уведомления"
   },
   "iconsUrl": {
     "message": "Адрес на сървъра с иконки"
@@ -777,7 +777,7 @@
     "message": "The environment URLs have been saved."
   },
   "enableAutoFillOnPageLoad": {
-    "message": "Enable Auto-fill On Page Load"
+    "message": "Включване на автоматичното попълване"
   },
   "enableAutoFillOnPageLoadDesc": {
     "message": "If a login form is detected, automatically perform an auto-fill when the web page loads."
@@ -789,7 +789,7 @@
     "message": "Автоматично попълване на последно използвания запис в текущия сайт."
   },
   "commandGeneratePasswordDesc": {
-    "message": "Generate and copy a new random password to the clipboard."
+    "message": "Създаване и копиране на нова случайна парола в буфера."
   },
   "privateModeMessage": {
     "message": "Unfortunately this window is not available in private mode for this browser."
@@ -1005,13 +1005,13 @@
     "message": "Изчистване"
   },
   "twoStepNewWindowMessage": {
-    "message": "Complete your two-step login request using the new tab."
+    "message": "Завършете двустепенното удостоверяване в новия раздел."
   },
   "checkPassword": {
-    "message": "Check if password has been exposed."
+    "message": "Проверка дали паролата е разкрита."
   },
   "passwordExposed": {
-    "message": "This password has been exposed in data breaches. You should change it.",
+    "message": "Паролата е била разкрита $VALUE$ път\/и в пробиви. Непременно я сменете.",
     "placeholders": {
       "value": {
         "content": "$1",
@@ -1020,7 +1020,7 @@
     }
   },
   "passwordSafe": {
-    "message": "This password was not found in any known data breaches. It should be safe to use."
+    "message": "Паролата не е била разкрита в известните пробиви. Можете да продължите да я използвате."
   },
   "baseDomain": {
     "message": "Основен домейн"
@@ -1070,11 +1070,14 @@
     "message": "По подразбиране"
   },
   "dateUpdated": {
-    "message": "Updated",
+    "message": "Обновено",
     "description": "ex. Date this item was updated"
   },
   "datePasswordUpdated": {
-    "message": "Password Updated",
+    "message": "Паролата е обновена",
     "description": "ex. Date this password was updated"
+  },
+  "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."
   }
 }
\ No newline at end of file
diff --git a/src/_locales/cs/messages.json b/src/_locales/cs/messages.json
index d0a7ba8fa3..db46fd7e8b 100644
--- a/src/_locales/cs/messages.json
+++ b/src/_locales/cs/messages.json
@@ -1076,5 +1076,8 @@
   "datePasswordUpdated": {
     "message": "Heslo bylo změněno",
     "description": "ex. Date this password was updated"
+  },
+  "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."
   }
 }
\ No newline at end of file
diff --git a/src/_locales/da/messages.json b/src/_locales/da/messages.json
index 739ae3bb83..06e279209a 100644
--- a/src/_locales/da/messages.json
+++ b/src/_locales/da/messages.json
@@ -768,7 +768,7 @@
     "message": "Identitets-server URL"
   },
   "notificationsUrl": {
-    "message": "Notifications Server URL"
+    "message": "Meddelelsesserver URL"
   },
   "iconsUrl": {
     "message": "Ikonserver URL"
@@ -1076,5 +1076,8 @@
   "datePasswordUpdated": {
     "message": "Adgangskode opdateret",
     "description": "ex. Date this password was updated"
+  },
+  "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."
   }
 }
\ No newline at end of file
diff --git a/src/_locales/de/messages.json b/src/_locales/de/messages.json
index 08aed1440b..816c32be03 100644
--- a/src/_locales/de/messages.json
+++ b/src/_locales/de/messages.json
@@ -768,7 +768,7 @@
     "message": "URL des Identitätsservers"
   },
   "notificationsUrl": {
-    "message": "Notifications Server URL"
+    "message": "Benachrichtigungs Server URL"
   },
   "iconsUrl": {
     "message": "Icons Server URL"
@@ -1076,5 +1076,8 @@
   "datePasswordUpdated": {
     "message": "Passwort aktualisiert",
     "description": "ex. Date this password was updated"
+  },
+  "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."
   }
 }
\ No newline at end of file
diff --git a/src/_locales/es/messages.json b/src/_locales/es/messages.json
index 10d46bcfb8..e41498b4c4 100644
--- a/src/_locales/es/messages.json
+++ b/src/_locales/es/messages.json
@@ -768,7 +768,7 @@
     "message": "URL del servidor de identidad"
   },
   "notificationsUrl": {
-    "message": "Notifications Server URL"
+    "message": "URL del servidor de notificaciones"
   },
   "iconsUrl": {
     "message": "URL del servidor de iconos"
@@ -1076,5 +1076,8 @@
   "datePasswordUpdated": {
     "message": "Contraseña actualizada",
     "description": "ex. Date this password was updated"
+  },
+  "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."
   }
 }
\ No newline at end of file
diff --git a/src/_locales/et/messages.json b/src/_locales/et/messages.json
index 5dde892977..c778576b4f 100644
--- a/src/_locales/et/messages.json
+++ b/src/_locales/et/messages.json
@@ -768,7 +768,7 @@
     "message": "Identity Server URL"
   },
   "notificationsUrl": {
-    "message": "Notifications Server URL"
+    "message": "Teavitus serveri URL"
   },
   "iconsUrl": {
     "message": "Ikoonide serveri URL"
@@ -1076,5 +1076,8 @@
   "datePasswordUpdated": {
     "message": "Parool on uuendatud",
     "description": "ex. Date this password was updated"
+  },
+  "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."
   }
 }
\ No newline at end of file
diff --git a/src/_locales/fa/messages.json b/src/_locales/fa/messages.json
index 4dd97024c2..463b7578ee 100644
--- a/src/_locales/fa/messages.json
+++ b/src/_locales/fa/messages.json
@@ -489,7 +489,7 @@
     "message": "غیر فعال کردن اعلان تغییر رمز عبور"
   },
   "disableChangedPasswordNotificationDesc": {
-    "message": "The \"Changed Password Notification\" automatically prompts you to update a login's password in your vault whenever it detects that you have changed it on a website."
+    "message": "\"اعلانیه رمزعبور تغییر کرده\" بصورت خودکار شما را از بروزرسانی رمزعبور در گاوصندوق مطلع میکند هر زمان که شما آن را در یک وبسایت تغییر داده باشید."
   },
   "notificationChangeDesc": {
     "message": "آیا مایل به بروزرسانی این پسورد در Bitwarden هستید؟"
@@ -768,7 +768,7 @@
     "message": "آدرس سرور شناسایی"
   },
   "notificationsUrl": {
-    "message": "Notifications Server URL"
+    "message": "اعلانهای آدرس سرور"
   },
   "iconsUrl": {
     "message": "آدرس سرور آیکون ها"
@@ -1076,5 +1076,8 @@
   "datePasswordUpdated": {
     "message": "گذرواژه بروز رسانی شد",
     "description": "ex. Date this password was updated"
+  },
+  "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."
   }
 }
\ No newline at end of file
diff --git a/src/_locales/fi/messages.json b/src/_locales/fi/messages.json
index 555ee79fd4..e54d8e646c 100644
--- a/src/_locales/fi/messages.json
+++ b/src/_locales/fi/messages.json
@@ -768,7 +768,7 @@
     "message": "Identiteettipalvelimen URL"
   },
   "notificationsUrl": {
-    "message": "Notifications Server URL"
+    "message": "Ilmoituspalvelimen URL"
   },
   "iconsUrl": {
     "message": "Kuvakepalvelimen URL"
@@ -1076,5 +1076,8 @@
   "datePasswordUpdated": {
     "message": "Salasana päivitetty",
     "description": "ex. Date this password was updated"
+  },
+  "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."
   }
 }
\ No newline at end of file
diff --git a/src/_locales/fr/messages.json b/src/_locales/fr/messages.json
index 9bd174af0a..38a90af14f 100644
--- a/src/_locales/fr/messages.json
+++ b/src/_locales/fr/messages.json
@@ -768,7 +768,7 @@
     "message": "URL du serveur d'identification"
   },
   "notificationsUrl": {
-    "message": "Notifications Server URL"
+    "message": "URL du serveur de notifications"
   },
   "iconsUrl": {
     "message": "URL du serveur d’icônes"
@@ -1076,5 +1076,8 @@
   "datePasswordUpdated": {
     "message": "Mot de passe mis à jour",
     "description": "ex. Date this password was updated"
+  },
+  "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."
   }
 }
\ No newline at end of file
diff --git a/src/_locales/hi/messages.json b/src/_locales/hi/messages.json
index 0c0a2cb8f7..10b0a7823d 100644
--- a/src/_locales/hi/messages.json
+++ b/src/_locales/hi/messages.json
@@ -1076,5 +1076,8 @@
   "datePasswordUpdated": {
     "message": "Password Updated",
     "description": "ex. Date this password was updated"
+  },
+  "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."
   }
 }
\ No newline at end of file
diff --git a/src/_locales/hr/messages.json b/src/_locales/hr/messages.json
index 0f8cfbbb1e..2789971062 100644
--- a/src/_locales/hr/messages.json
+++ b/src/_locales/hr/messages.json
@@ -768,7 +768,7 @@
     "message": "URL identiteta poslužitelja"
   },
   "notificationsUrl": {
-    "message": "Notifications Server URL"
+    "message": "URL poslužitelja obavijesti"
   },
   "iconsUrl": {
     "message": "URL poslužitelja ikona"
@@ -1076,5 +1076,8 @@
   "datePasswordUpdated": {
     "message": "Lozinka ažurirana",
     "description": "ex. Date this password was updated"
+  },
+  "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."
   }
 }
\ No newline at end of file
diff --git a/src/_locales/hu/messages.json b/src/_locales/hu/messages.json
index 3f84b7b053..3e5a9450d3 100644
--- a/src/_locales/hu/messages.json
+++ b/src/_locales/hu/messages.json
@@ -1076,5 +1076,8 @@
   "datePasswordUpdated": {
     "message": "Jelszó frissítve",
     "description": "ex. Date this password was updated"
+  },
+  "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."
   }
 }
\ No newline at end of file
diff --git a/src/_locales/id/messages.json b/src/_locales/id/messages.json
index c87b0ed918..018854bf94 100644
--- a/src/_locales/id/messages.json
+++ b/src/_locales/id/messages.json
@@ -1076,5 +1076,8 @@
   "datePasswordUpdated": {
     "message": "Password Updated",
     "description": "ex. Date this password was updated"
+  },
+  "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."
   }
 }
\ No newline at end of file
diff --git a/src/_locales/it/messages.json b/src/_locales/it/messages.json
index 70d126e857..cbb6f2db39 100644
--- a/src/_locales/it/messages.json
+++ b/src/_locales/it/messages.json
@@ -768,7 +768,7 @@
     "message": "URL del Server di Identità"
   },
   "notificationsUrl": {
-    "message": "Notifications Server URL"
+    "message": "URL del Server di Notifica"
   },
   "iconsUrl": {
     "message": "URL del Server di Icone"
@@ -1076,5 +1076,8 @@
   "datePasswordUpdated": {
     "message": "Password Aggiornata",
     "description": "ex. Date this password was updated"
+  },
+  "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."
   }
 }
\ No newline at end of file
diff --git a/src/_locales/ja/messages.json b/src/_locales/ja/messages.json
index a9ab15656e..33fdca65cf 100644
--- a/src/_locales/ja/messages.json
+++ b/src/_locales/ja/messages.json
@@ -768,7 +768,7 @@
     "message": "ID サーバー URL"
   },
   "notificationsUrl": {
-    "message": "Notifications Server URL"
+    "message": "通知サーバー URL"
   },
   "iconsUrl": {
     "message": "アイコンのサーバー URL"
@@ -1076,5 +1076,8 @@
   "datePasswordUpdated": {
     "message": "パスワード更新日",
     "description": "ex. Date this password was updated"
+  },
+  "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."
   }
 }
\ No newline at end of file
diff --git a/src/_locales/ko/messages.json b/src/_locales/ko/messages.json
index 1cea5189a9..cfbb021e26 100644
--- a/src/_locales/ko/messages.json
+++ b/src/_locales/ko/messages.json
@@ -768,7 +768,7 @@
     "message": "ID 서버 URL"
   },
   "notificationsUrl": {
-    "message": "Notifications Server URL"
+    "message": "알림 서버 URL"
   },
   "iconsUrl": {
     "message": "아이콘 서버 URL"
@@ -1076,5 +1076,8 @@
   "datePasswordUpdated": {
     "message": "비밀번호 업데이트됨",
     "description": "ex. Date this password was updated"
+  },
+  "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."
   }
 }
\ No newline at end of file
diff --git a/src/_locales/nb/messages.json b/src/_locales/nb/messages.json
index 91aaa06967..b538be081d 100644
--- a/src/_locales/nb/messages.json
+++ b/src/_locales/nb/messages.json
@@ -486,16 +486,16 @@
     "message": "Aldri for dette nettstedet"
   },
   "disableChangedPasswordNotification": {
-    "message": "Disable Changed Password Notification"
+    "message": "Deaktiver endret passordvarsling"
   },
   "disableChangedPasswordNotificationDesc": {
-    "message": "The \"Changed Password Notification\" automatically prompts you to update a login's password in your vault whenever it detects that you have changed it on a website."
+    "message": "\"Endret passord meldingen\" automatisk ber deg om å oppdatere et påloggingspassord i hvelvet din når den oppdager at du har endret det på et webområde."
   },
   "notificationChangeDesc": {
-    "message": "Do you want to update this password in Bitwarden?"
+    "message": "Vil du oppdatere dette passordet i Bitwarden?"
   },
   "notificationChangeSave": {
-    "message": "Yes, Update Now"
+    "message": "Ja, Oppdater nå"
   },
   "disableContextMenuItem": {
     "message": "Deaktiver sammenhengsmeny-innstillinger"
@@ -768,7 +768,7 @@
     "message": "Identitetstjenerens nettadresse"
   },
   "notificationsUrl": {
-    "message": "Notifications Server URL"
+    "message": "Varsler Server URL"
   },
   "iconsUrl": {
     "message": "Ikonenes tjenernettadresse"
@@ -1076,5 +1076,8 @@
   "datePasswordUpdated": {
     "message": "Passordet ble oppdatert den",
     "description": "ex. Date this password was updated"
+  },
+  "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."
   }
 }
\ No newline at end of file
diff --git a/src/_locales/nl/messages.json b/src/_locales/nl/messages.json
index c1c428fbf7..42c75821f1 100644
--- a/src/_locales/nl/messages.json
+++ b/src/_locales/nl/messages.json
@@ -768,7 +768,7 @@
     "message": "Gebruikersbeheer server-URL"
   },
   "notificationsUrl": {
-    "message": "Notifications Server URL"
+    "message": "Meldingenserver-URL"
   },
   "iconsUrl": {
     "message": "Pictogrammen server-URL"
@@ -1076,5 +1076,8 @@
   "datePasswordUpdated": {
     "message": "Wachtwoord bijgewerkt",
     "description": "ex. Date this password was updated"
+  },
+  "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."
   }
 }
\ No newline at end of file
diff --git a/src/_locales/pl/messages.json b/src/_locales/pl/messages.json
index be38a5b145..469d765bd4 100644
--- a/src/_locales/pl/messages.json
+++ b/src/_locales/pl/messages.json
@@ -768,7 +768,7 @@
     "message": "URL serwera tożsamości"
   },
   "notificationsUrl": {
-    "message": "Notifications Server URL"
+    "message": "Adres URL serwera powiadomień"
   },
   "iconsUrl": {
     "message": "URL serwera ikon"
@@ -1076,5 +1076,8 @@
   "datePasswordUpdated": {
     "message": "Hasło zaktualizowane",
     "description": "ex. Date this password was updated"
+  },
+  "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."
   }
 }
\ No newline at end of file
diff --git a/src/_locales/pt_BR/messages.json b/src/_locales/pt_BR/messages.json
index d4b54f5ce7..1233484f86 100644
--- a/src/_locales/pt_BR/messages.json
+++ b/src/_locales/pt_BR/messages.json
@@ -768,7 +768,7 @@
     "message": "URL do Servidor de Identidade"
   },
   "notificationsUrl": {
-    "message": "Notifications Server URL"
+    "message": "URL do Servidor de Notificações"
   },
   "iconsUrl": {
     "message": "URL do Servidor de Ícones"
@@ -1076,5 +1076,8 @@
   "datePasswordUpdated": {
     "message": "Senha Atualizada",
     "description": "ex. Date this password was updated"
+  },
+  "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."
   }
 }
\ No newline at end of file
diff --git a/src/_locales/pt_PT/messages.json b/src/_locales/pt_PT/messages.json
index 36d78f7ccd..2007e147dc 100644
--- a/src/_locales/pt_PT/messages.json
+++ b/src/_locales/pt_PT/messages.json
@@ -768,7 +768,7 @@
     "message": "URL do servidor de identidade"
   },
   "notificationsUrl": {
-    "message": "Notifications Server URL"
+    "message": "URL do servidor de notificações"
   },
   "iconsUrl": {
     "message": "URL do servidor de ícones"
@@ -1076,5 +1076,8 @@
   "datePasswordUpdated": {
     "message": "Palavra passe atualizada",
     "description": "ex. Date this password was updated"
+  },
+  "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."
   }
 }
\ No newline at end of file
diff --git a/src/_locales/ro/messages.json b/src/_locales/ro/messages.json
index 257e5f2de7..094138775f 100644
--- a/src/_locales/ro/messages.json
+++ b/src/_locales/ro/messages.json
@@ -1076,5 +1076,8 @@
   "datePasswordUpdated": {
     "message": "Password Updated",
     "description": "ex. Date this password was updated"
+  },
+  "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."
   }
 }
\ No newline at end of file
diff --git a/src/_locales/ru/messages.json b/src/_locales/ru/messages.json
index 959a788c10..073f1d39ce 100644
--- a/src/_locales/ru/messages.json
+++ b/src/_locales/ru/messages.json
@@ -768,7 +768,7 @@
     "message": "URL-адрес сервера идентификации"
   },
   "notificationsUrl": {
-    "message": "Notifications Server URL"
+    "message": "URL-адрес сервера уведомлений"
   },
   "iconsUrl": {
     "message": "URL-адрес сервера значков"
@@ -1076,5 +1076,8 @@
   "datePasswordUpdated": {
     "message": "Пароль обновлен",
     "description": "ex. Date this password was updated"
+  },
+  "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."
   }
 }
\ No newline at end of file
diff --git a/src/_locales/sk/messages.json b/src/_locales/sk/messages.json
index 350c30a287..dbf7d6474f 100644
--- a/src/_locales/sk/messages.json
+++ b/src/_locales/sk/messages.json
@@ -768,7 +768,7 @@
     "message": "URL servera identít"
   },
   "notificationsUrl": {
-    "message": "Notifications Server URL"
+    "message": "URL adresa servera pre oznámenia"
   },
   "iconsUrl": {
     "message": "URL servera ikôn"
@@ -1076,5 +1076,8 @@
   "datePasswordUpdated": {
     "message": "Heslo bolo aktualizované",
     "description": "ex. Date this password was updated"
+  },
+  "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."
   }
 }
\ No newline at end of file
diff --git a/src/_locales/sv/messages.json b/src/_locales/sv/messages.json
index 042c5c51ca..33810e3df3 100644
--- a/src/_locales/sv/messages.json
+++ b/src/_locales/sv/messages.json
@@ -768,7 +768,7 @@
     "message": "Identitetsserver-URL"
   },
   "notificationsUrl": {
-    "message": "Notifications Server URL"
+    "message": "URL för notifieringsserver"
   },
   "iconsUrl": {
     "message": "Ikoner Server-URL"
@@ -1076,5 +1076,8 @@
   "datePasswordUpdated": {
     "message": "Lösenord uppdaterat",
     "description": "ex. Date this password was updated"
+  },
+  "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."
   }
 }
\ No newline at end of file
diff --git a/src/_locales/th/messages.json b/src/_locales/th/messages.json
index 3d1f811f04..b252aa0c08 100644
--- a/src/_locales/th/messages.json
+++ b/src/_locales/th/messages.json
@@ -1076,5 +1076,8 @@
   "datePasswordUpdated": {
     "message": "Password Updated",
     "description": "ex. Date this password was updated"
+  },
+  "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."
   }
 }
\ No newline at end of file
diff --git a/src/_locales/tr/messages.json b/src/_locales/tr/messages.json
index 07ce8a7214..afb9fd1fe5 100644
--- a/src/_locales/tr/messages.json
+++ b/src/_locales/tr/messages.json
@@ -1076,5 +1076,8 @@
   "datePasswordUpdated": {
     "message": "Password Updated",
     "description": "ex. Date this password was updated"
+  },
+  "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."
   }
 }
\ No newline at end of file
diff --git a/src/_locales/uk/messages.json b/src/_locales/uk/messages.json
index 27e6260475..50809a9cad 100644
--- a/src/_locales/uk/messages.json
+++ b/src/_locales/uk/messages.json
@@ -125,7 +125,7 @@
     "message": "Змінити адресу е-пошти"
   },
   "twoStepLogin": {
-    "message": "Двохетапна авторизація"
+    "message": "Двохетапна перевірка"
   },
   "logOut": {
     "message": "Вихід"
@@ -394,7 +394,7 @@
     "message": "Ви можете змінити головний пароль в сховищі на bitwarden.com. Хочете перейти на веб-сайт зараз?"
   },
   "twoStepLoginConfirmation": {
-    "message": "Двохетапна авторизація робить ваш обліковий запис більш захищеним, вимагаючи підтвердження вашого входу з використанням іншого пристрою, наприклад, за допомогою коду безпеки, програми авторизації, SMS, телефонного виклику, або е-пошти. Ви можете увімкнути двохетапну авторизацію в сховищі на bitwarden.com. Хочете перейти на веб-сайт зараз?"
+    "message": "Двохетапна перевірка робить ваш обліковий запис більш захищеним, вимагаючи підтвердження входу з використанням іншого пристрою, наприклад, за допомогою коду безпеки, програми авторизації, SMS, телефонного виклику, або е-пошти. Ви можете увімкнути двохетапну перевірку в сховищі на bitwarden.com. Хочете перейти на веб-сайт зараз?"
   },
   "editedFolder": {
     "message": "Тека змінена"
@@ -609,7 +609,7 @@
     "message": "1 ГБ зашифрованого сховища для файлів."
   },
   "ppremiumSignUpTwoStep": {
-    "message": "Додаткові можливості двохетапної авторизації, наприклад, YubiKey, FIDO U2F та Duo."
+    "message": "Додаткові можливості двохетапної перевірки, наприклад, YubiKey, FIDO U2F та Duo."
   },
   "ppremiumSignUpTotp": {
     "message": "Генератор коду авторизації TOTP (2FA) для входу в сховище."
@@ -684,7 +684,7 @@
     "message": "Надіслати код підтвердження ще раз"
   },
   "useAnotherTwoStepMethod": {
-    "message": "Використати інший спосіб двохетапної авторизації"
+    "message": "Використати інший спосіб двохетапної перевірки"
   },
   "insertYubiKey": {
     "message": "Вставте свій YubiKey в USB порт комп'ютера, потім торкніться цієї кнопки."
@@ -696,16 +696,16 @@
     "message": "Вхід недоступний"
   },
   "noTwoStepProviders": {
-    "message": "Для цього облікового запису увімкнено двохетапну авторизацію. Однак, жоден з налаштованих провайдерів двохетапної авторизації не підтримується цим веб-браузером."
+    "message": "Для цього облікового запису увімкнено двохетапну перевірку. Однак, жоден з налаштованих провайдерів двохетапної перевірки не підтримується цим веб-браузером."
   },
   "noTwoStepProviders2": {
     "message": "Будь ласка, скористайтеся підтримуваним веб-браузером (наприклад, Chrome) та\/або іншими провайдерами, що краще підтримуються веб-браузерами (наприклад, програма авторизації)."
   },
   "twoStepOptions": {
-    "message": "Налаштування двохетапної авторизації"
+    "message": "Налаштування двохетапної перевірки"
   },
   "recoveryCodeDesc": {
-    "message": "Втратили доступ до всіх провайдерів двохетапної авторизації? Скористайтеся кодом відновлення, щоб вимкнути двохетапну авторизацію для свого облікового запису."
+    "message": "Втратили доступ до всіх провайдерів двохетапної перевірки? Скористайтеся кодом відновлення, щоб вимкнути двохетапну перевірку для свого облікового запису."
   },
   "recoveryCodeTitle": {
     "message": "Код відновлення"
@@ -768,7 +768,7 @@
     "message": "URL-адреса сервера ідентифікації"
   },
   "notificationsUrl": {
-    "message": "Notifications Server URL"
+    "message": "URL сервера сповіщень"
   },
   "iconsUrl": {
     "message": "URL-адреса сервера піктограм"
@@ -1005,7 +1005,7 @@
     "message": "Стерти"
   },
   "twoStepNewWindowMessage": {
-    "message": "Завершіть запит двохетапної авторизації на новій вкладці."
+    "message": "Завершіть запит двохетапної перевірки на новій вкладці."
   },
   "checkPassword": {
     "message": "Перевірити чи пароль було викрито."
@@ -1076,5 +1076,8 @@
   "datePasswordUpdated": {
     "message": "Пароль оновлено",
     "description": "ex. Date this password was updated"
+  },
+  "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."
   }
 }
\ No newline at end of file
diff --git a/src/_locales/vi/messages.json b/src/_locales/vi/messages.json
index a009f71cdd..c622edd671 100644
--- a/src/_locales/vi/messages.json
+++ b/src/_locales/vi/messages.json
@@ -1076,5 +1076,8 @@
   "datePasswordUpdated": {
     "message": "Password Updated",
     "description": "ex. Date this password was updated"
+  },
+  "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."
   }
 }
\ No newline at end of file
diff --git a/src/_locales/zh_CN/messages.json b/src/_locales/zh_CN/messages.json
index 4f8f4e8736..5ac10b584c 100644
--- a/src/_locales/zh_CN/messages.json
+++ b/src/_locales/zh_CN/messages.json
@@ -768,7 +768,7 @@
     "message": "身份服务器 URL"
   },
   "notificationsUrl": {
-    "message": "Notifications Server URL"
+    "message": "通知服务器 URL"
   },
   "iconsUrl": {
     "message": "图标服务器 URL"
@@ -1076,5 +1076,8 @@
   "datePasswordUpdated": {
     "message": "密码更新于",
     "description": "ex. Date this password was updated"
+  },
+  "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."
   }
 }
\ No newline at end of file
diff --git a/src/_locales/zh_TW/messages.json b/src/_locales/zh_TW/messages.json
index 7d4059dca1..6d311345d8 100644
--- a/src/_locales/zh_TW/messages.json
+++ b/src/_locales/zh_TW/messages.json
@@ -768,7 +768,7 @@
     "message": "身分伺服器 URL"
   },
   "notificationsUrl": {
-    "message": "Notifications Server URL"
+    "message": "通知伺服器 URL"
   },
   "iconsUrl": {
     "message": "圖示伺服器 URL"
@@ -1076,5 +1076,8 @@
   "datePasswordUpdated": {
     "message": "密碼已更新",
     "description": "ex. Date this password was updated"
+  },
+  "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."
   }
 }
\ No newline at end of file