diff --git a/src/locales/de/messages.json b/src/locales/de/messages.json
index 939ddd54..2404cf3a 100644
--- a/src/locales/de/messages.json
+++ b/src/locales/de/messages.json
@@ -438,7 +438,7 @@
     "message": "Das Master-Passwort muss mindestens 8 Zeichen lang sein."
   },
   "masterPassDoesntMatch": {
-    "message": "Master password confirmation does not match."
+    "message": "Die Passwortbestätigung stimmt nicht mit dem Passwort überein."
   },
   "newAccountCreated": {
     "message": "Der Account wurde erstellt! Du kannst dich jetzt anmelden."
@@ -453,7 +453,7 @@
     "message": "Eintrags-Information"
   },
   "noItemsInList": {
-    "message": "There are no items to list."
+    "message": "Keine Einträge zum Anzeigen vorhanden."
   },
   "verificationCode": {
     "message": "Verifizierungscode"
@@ -468,7 +468,7 @@
     "message": "Gib den 6-stelligen Verifizierungscode aus deiner Authenticator App ein."
   },
   "enterVerificationCodeEmail": {
-    "message": "Enter the 6 digit verification code that was emailed to $EMAIL$.",
+    "message": "Gib den 6-stelligen Bestätigungscode ein, der per E-Mail an $EMAIL$ gesendet wurde.",
     "placeholders": {
       "email": {
         "content": "$1",
diff --git a/src/locales/es/messages.json b/src/locales/es/messages.json
index d87b1ee1..5e4ca478 100644
--- a/src/locales/es/messages.json
+++ b/src/locales/es/messages.json
@@ -501,98 +501,98 @@
     "message": "Inserta tu llave de seguridad en el puerto USB de tu equipo. Si tiene un botón, púlsalo."
   },
   "recoveryCodeDesc": {
-    "message": "¿Has perdido el acceso a todos tus métodos de autenticación en dos pasos? Utiliza tu código de recuperación para deshabilitar todos lo mótodos de autenticación en dos pasos de tu cuenta."
+    "message": "¿Has perdido el acceso a todos tus métodos de autenticación en dos pasos? Utiliza tu código de recuperación para deshabilitar todos lo métodos de autenticación en dos pasos de tu cuenta."
   },
   "recoveryCodeTitle": {
-    "message": "Recovery Code"
+    "message": "Código de recuperación"
   },
   "authenticatorAppTitle": {
-    "message": "Authenticator App"
+    "message": "Aplicación de autenticación"
   },
   "authenticatorAppDesc": {
-    "message": "Use an authenticator app (such as Authy or Google Authenticator) to generate time-based verification codes.",
+    "message": "Utiliza una aplicación de autenticación (como Authy o Google Authenticator) para generar código de verificación basados en tiempo.",
     "description": "'Authy' and 'Google Authenticator' are product names and should not be translated."
   },
   "yubiKeyTitle": {
-    "message": "YubiKey OTP Security Key"
+    "message": "Llave de seguridad YubiKey OTP"
   },
   "yubiKeyDesc": {
-    "message": "Use a YubiKey to access your account. Works with YubiKey 4, 4 Nano, 4C, and NEO devices."
+    "message": "Usa un Yubikey para acceder a tu cuenta. Funciona con YubiKey 4, 4 Nano, 4C y dispositivos NEO."
   },
   "duoDesc": {
-    "message": "Verify with Duo Security using the Duo Mobile app, SMS, phone call, or U2F security key.",
+    "message": "Verificar con Duo Security usando la aplicación Duo Mobile, SMS, llamada telefónica o llave de seguridad U2F.",
     "description": "'Duo Security' and 'Duo Mobile' are product names and should not be translated."
   },
   "u2fDesc": {
-    "message": "Use any FIDO U2F enabled security key to access your account."
+    "message": "Usa cualquier llave de seguridad FIDO U2F habilitada para acceder a tu cuenta."
   },
   "u2fTitle": {
-    "message": "FIDO U2F Security Key"
+    "message": "Llave de seguridad FIDO U2F"
   },
   "emailTitle": {
-    "message": "Email"
+    "message": "Correo electrónico"
   },
   "emailDesc": {
-    "message": "Verification codes will be emailed to you."
+    "message": "Los códigos de verificación te serán enviados por correo electrónico."
   },
   "loginUnavailable": {
-    "message": "Login Unavailable"
+    "message": "Entrada no disponible"
   },
   "noTwoStepProviders": {
-    "message": "This account has two-step login enabled, however, none of the configured two-step providers are supported by this device."
+    "message": "Esta cuenta tiene autenticación en dos pasos habilitada, pero ninguno de los métodos configurados son soportados por este dispositivo."
   },
   "noTwoStepProviders2": {
-    "message": "Please add additional providers that are better supported across devices (such as an authenticator app)."
+    "message": "Por favor, añade proveedores que estén mejor soportados entre dispositivos (como una aplicación autenticadora)."
   },
   "twoStepOptions": {
-    "message": "Two-step Login Options"
+    "message": "Opciones de la autenticación en dos pasos"
   },
   "selfHostedEnvironment": {
-    "message": "Self-hosted Environment"
+    "message": "Entorno de alojamiento propio"
   },
   "selfHostedEnvironmentFooter": {
-    "message": "Specify the base URL of your on-premise hosted bitwarden installation."
+    "message": "Especifica la URL base de tu instalación de bitwarden de alojamiento propio."
   },
   "customEnvironment": {
-    "message": "Custom Environment"
+    "message": "Entorno personalizado"
   },
   "customEnvironmentFooter": {
-    "message": "For advanced users. You can specify the base URL of each service independently."
+    "message": "Para usuarios avanzados. Puedes especificar la URL base de cada servicio de forma independiente."
   },
   "baseUrl": {
-    "message": "Server URL"
+    "message": "URL del servidor"
   },
   "apiUrl": {
-    "message": "API Server URL"
+    "message": "URL del servidor de la API"
   },
   "webVaultUrl": {
-    "message": "Web Vault Server URL"
+    "message": "URL del servidor de la caja fuerte web"
   },
   "identityUrl": {
-    "message": "Identity Server URL"
+    "message": "URL del servidor de identidad"
   },
   "iconsUrl": {
-    "message": "Icons Server URL"
+    "message": "URL del servidor de iconos"
   },
   "environmentSaved": {
-    "message": "The environment URLs have been saved."
+    "message": "Las URLs del entorno han sido guardadas."
   },
   "ok": {
-    "message": "Ok"
+    "message": "Aceptar"
   },
   "yes": {
-    "message": "Yes"
+    "message": "Si"
   },
   "no": {
     "message": "No"
   },
   "overwritePassword": {
-    "message": "Overwrite Password"
+    "message": "Sobreescribir contraseña"
   },
   "learnMore": {
-    "message": "Learn more"
+    "message": "Más información"
   },
   "featureUnavailable": {
-    "message": "Feature Unavailable"
+    "message": "Característica no disponible"
   }
 }
\ No newline at end of file
diff --git a/src/locales/zh_TW/messages.json b/src/locales/zh_TW/messages.json
index 0a1094f5..61c69276 100644
--- a/src/locales/zh_TW/messages.json
+++ b/src/locales/zh_TW/messages.json
@@ -237,49 +237,49 @@
     "message": "國家"
   },
   "save": {
-    "message": "Save"
+    "message": "儲存"
   },
   "cancel": {
-    "message": "Cancel"
+    "message": "取消"
   },
   "delete": {
-    "message": "Delete"
+    "message": "刪除"
   },
   "favorite": {
-    "message": "Favorite"
+    "message": "我的最愛"
   },
   "edit": {
-    "message": "Edit"
+    "message": "編輯"
   },
   "authenticatorKeyTotp": {
-    "message": "Authenticator Key (TOTP)"
+    "message": "驗證器金鑰 (TOTP)"
   },
   "folder": {
-    "message": "Folder"
+    "message": "資料夾"
   },
   "newCustomField": {
-    "message": "New Custom Field"
+    "message": "新增自訂欄位"
   },
   "value": {
-    "message": "Value"
+    "message": "值"
   },
   "cfTypeText": {
-    "message": "Text"
+    "message": "文字"
   },
   "cfTypeHidden": {
-    "message": "Hidden"
+    "message": "隱藏"
   },
   "cfTypeBoolean": {
-    "message": "Boolean"
+    "message": "布林值"
   },
   "remove": {
-    "message": "Remove"
+    "message": "移除"
   },
   "nameRequired": {
     "message": "Name is required."
   },
   "addedItem": {
-    "message": "Added item"
+    "message": "新增項目"
   },
   "editedItem": {
     "message": "已編輯項目"
@@ -316,10 +316,10 @@
     "message": "重新產生密碼"
   },
   "copyPassword": {
-    "message": "Copy Password"
+    "message": "複製密碼"
   },
   "length": {
-    "message": "Length"
+    "message": "長度"
   },
   "close": {
     "message": "關閉"
@@ -338,7 +338,7 @@
     "message": "Search collection"
   },
   "searchFolder": {
-    "message": "Search folder"
+    "message": "搜尋資料夾"
   },
   "searchFavorites": {
     "message": "搜尋我的最愛"
@@ -507,33 +507,33 @@
     "message": "Recovery Code"
   },
   "authenticatorAppTitle": {
-    "message": "Authenticator App"
+    "message": "驗證器應用程式"
   },
   "authenticatorAppDesc": {
-    "message": "Use an authenticator app (such as Authy or Google Authenticator) to generate time-based verification codes.",
+    "message": "使用驗證器應用程式 （如 Authy 或 Google Authenticator） 產生基於時間的驗證碼。",
     "description": "'Authy' and 'Google Authenticator' are product names and should not be translated."
   },
   "yubiKeyTitle": {
-    "message": "YubiKey OTP Security Key"
+    "message": "YubiKey OTP 安全鑰匙"
   },
   "yubiKeyDesc": {
-    "message": "Use a YubiKey to access your account. Works with YubiKey 4, 4 Nano, 4C, and NEO devices."
+    "message": "使用 YubiKey 存取你的帳戶。相容於 YubiKey 4, 4 Nano, 4C, 和 NEO 裝置。"
   },
   "duoDesc": {
-    "message": "Verify with Duo Security using the Duo Mobile app, SMS, phone call, or U2F security key.",
+    "message": "與 Duo Security 驗證，可使用 Duo Mobile 程式， SMS ，致電或 U2F 安全鑰匙。",
     "description": "'Duo Security' and 'Duo Mobile' are product names and should not be translated."
   },
   "u2fDesc": {
-    "message": "Use any FIDO U2F enabled security key to access your account."
+    "message": "使用任何啟用了 FIDO U2F 的安全鑰匙來存取你的帳戶。"
   },
   "u2fTitle": {
-    "message": "FIDO U2F Security Key"
+    "message": "FIDO U2F 安全鑰匙"
   },
   "emailTitle": {
-    "message": "Email"
+    "message": "電子郵件"
   },
   "emailDesc": {
-    "message": "Verification codes will be emailed to you."
+    "message": "驗證碼將使用電子郵件傳送給你。"
   },
   "loginUnavailable": {
     "message": "無法登入"