diff --git a/rainloop/v/0.0.0/app/localization/admin/en_US.yml b/rainloop/v/0.0.0/app/localization/admin/en_US.yml
index 9e4a799b6..8e701e5c4 100644
--- a/rainloop/v/0.0.0/app/localization/admin/en_US.yml
+++ b/rainloop/v/0.0.0/app/localization/admin/en_US.yml
@@ -89,6 +89,7 @@ en_US:
   TAB_DOMAINS:
     LEGEND_DOMAINS: "Domains"
     BUTTON_ADD_DOMAIN: "Add Domain"
+    BUTTON_ADD_ALIAS: "Add Alias"
     DELETE_ARE_YOU_SURE: "Are you sure?"
     HTML_DOMAINS_HELPER: |
       List of domains webmail is allowed to access.
@@ -186,6 +187,12 @@ en_US:
       Note that subscription key can be activated for a single domain only.
       <br /><br />
       Once started, the process of activation cannot be aborted or cancelled.
+  POPUPS_DOMAIN_ALIAS:
+    TITLE_ADD_DOMAIN_ALIAS: "Add Alias"
+    LABEL_ALIAS: "Alias"
+    LABEL_DOMAIN: "Domain"
+    BUTTON_CLOSE: "Close"
+    BUTTON_ADD: "Add"
   POPUPS_DOMAIN:
     TITLE_ADD_DOMAIN: "Add Domain"
     TITLE_ADD_DOMAIN_WITH_NAME: "Add Domain \"%NAME%\""
diff --git a/rainloop/v/0.0.0/app/localization/admin/hu_HU.yml b/rainloop/v/0.0.0/app/localization/admin/hu_HU.yml
index 72857f81a..826544885 100644
--- a/rainloop/v/0.0.0/app/localization/admin/hu_HU.yml
+++ b/rainloop/v/0.0.0/app/localization/admin/hu_HU.yml
@@ -89,6 +89,7 @@ hu_HU:
   TAB_DOMAINS:
     LEGEND_DOMAINS: "Domainek"
     BUTTON_ADD_DOMAIN: "Domain hozzáadás"
+    BUTTON_ADD_ALIAS: "Álnév hozzáadás"
     DELETE_ARE_YOU_SURE: "Biztos vagy benne?"
     HTML_DOMAINS_HELPER: |
       Hozzáféréshez engedélyezett domainek listája:
@@ -185,6 +186,12 @@ hu_HU:
       Egy előfizetési kulcs csak egy domainhez aktiválható.
       <br /><br />
       Miután elindult, az aktiválási folyamat nem szakítható meg vagy vonható vissza.
+  POPUPS_DOMAIN_ALIAS:
+    TITLE_ADD_DOMAIN_ALIAS: "Álnév hozzáadás"
+    LABEL_ALIAS: "Álnév"
+    LABEL_DOMAIN: "Domain"
+    BUTTON_CLOSE: "Bezár"
+    BUTTON_ADD: "Hozzáad"
   POPUPS_DOMAIN:
     TITLE_ADD_DOMAIN: "Domain hozzáadás"
     TITLE_ADD_DOMAIN_WITH_NAME: "\"%NAME%\" domain hozzáadása"
diff --git a/rainloop/v/0.0.0/app/localization/admin/nl_NL.yml b/rainloop/v/0.0.0/app/localization/admin/nl_NL.yml
index 815ba8fed..1580d2c8b 100644
--- a/rainloop/v/0.0.0/app/localization/admin/nl_NL.yml
+++ b/rainloop/v/0.0.0/app/localization/admin/nl_NL.yml
@@ -163,7 +163,7 @@ nl_NL:
     LABEL_ALL_RIGHTS_RESERVED: "Alle rechten gereserveerd."
     HINT_READ_CHANGE_LOG: "Lees a.u.b. het veranderingen logboek alvorens te updaten."
     HINT_IS_UP_TO_DATE: "De laatste versie van RainLoop is geïnstalleerd."
-    HTML_NEW_VERSION: "Een nieuwe versie <b>%VERSIE%</b> is beschikbaar."
+    HTML_NEW_VERSION: "Een nieuwe versie <b>%VERSION%</b> is beschikbaar."
     LABEL_UPDATING: "Bezig met updaten"
     LABEL_CHECKING: "Controleren op updates"
     BUTTON_UPDATE: "Bijwerken"
diff --git a/rainloop/v/0.0.0/app/localization/admin/pl_PL.yml b/rainloop/v/0.0.0/app/localization/admin/pl_PL.yml
index 6f8d1c220..19d818b73 100644
--- a/rainloop/v/0.0.0/app/localization/admin/pl_PL.yml
+++ b/rainloop/v/0.0.0/app/localization/admin/pl_PL.yml
@@ -89,6 +89,7 @@ pl_PL:
   TAB_DOMAINS:
     LEGEND_DOMAINS: "Domeny"
     BUTTON_ADD_DOMAIN: "Dodaj domenę"
+    BUTTON_ADD_ALIAS: "Dodaj Alias"
     DELETE_ARE_YOU_SURE: "Czy na pewno?"
     HTML_DOMAINS_HELPER: |
       Lista domen, do których można uzyskać dostęp poprzez tego klienta.
@@ -186,6 +187,12 @@ pl_PL:
       Zwróc uwagę, że klucz subskrypcji może być aktywowany tylko dla jednej domeny.
       <br /><br />
       Po uruchomieniu aktywacji, nie można jej przerwac lub anulować.
+  POPUPS_DOMAIN_ALIAS:
+    TITLE_ADD_DOMAIN_ALIAS: "Dodaj Alias"
+    LABEL_ALIAS: "Alias"
+    LABEL_DOMAIN: "Domena"
+    BUTTON_CLOSE: "Zamknij"
+    BUTTON_ADD: "Dodaj"
   POPUPS_DOMAIN:
     TITLE_ADD_DOMAIN: "Dodawanie domeny"
     TITLE_ADD_DOMAIN_WITH_NAME: "Dodawanie domeny: \"%NAME%\""
diff --git a/rainloop/v/0.0.0/app/localization/admin/ru_RU.yml b/rainloop/v/0.0.0/app/localization/admin/ru_RU.yml
index 74c844ae2..be7f1c305 100644
--- a/rainloop/v/0.0.0/app/localization/admin/ru_RU.yml
+++ b/rainloop/v/0.0.0/app/localization/admin/ru_RU.yml
@@ -88,6 +88,7 @@ ru_RU:
   TAB_DOMAINS:
     LEGEND_DOMAINS: "Домены"
     BUTTON_ADD_DOMAIN: "Добавить домен"
+    BUTTON_ADD_ALIAS: "Добавить Алиас"
     DELETE_ARE_YOU_SURE: "Вы уверены?"
     HTML_DOMAINS_HELPER: |
       Список доменов к которым разрешен доступ.
@@ -185,6 +186,12 @@ ru_RU:
       Обратите внимание, что ключ может быть активирован только один раз.
       <br /><br />
       После запуска процесс активации не может быть прерван или отменен.
+  POPUPS_DOMAIN_ALIAS:
+    TITLE_ADD_DOMAIN_ALIAS: "Добавить Алиас"
+    LABEL_ALIAS: "Алиас"
+    LABEL_DOMAIN: "Домен"
+    BUTTON_CLOSE: "Закрыть"
+    BUTTON_ADD: "Добавить"
   POPUPS_DOMAIN:
     TITLE_ADD_DOMAIN: "Добавить домен"
     TITLE_ADD_DOMAIN_WITH_NAME: "Добавить домен \"%NAME%\""
diff --git a/rainloop/v/0.0.0/app/localization/admin/sl_SI.yml b/rainloop/v/0.0.0/app/localization/admin/sl_SI.yml
index 3c1febcfd..21cb09094 100644
--- a/rainloop/v/0.0.0/app/localization/admin/sl_SI.yml
+++ b/rainloop/v/0.0.0/app/localization/admin/sl_SI.yml
@@ -89,6 +89,7 @@ sl_SI:
   TAB_DOMAINS:
     LEGEND_DOMAINS: "Domene"
     BUTTON_ADD_DOMAIN: "Dodaj domeno"
+    BUTTON_ADD_ALIAS: "Dodaj vzdevek"
     DELETE_ARE_YOU_SURE: "Ste prepričani?"
     HTML_DOMAINS_HELPER: |
       Seznam domen, do katerih je omogočen dostop.
@@ -186,6 +187,12 @@ sl_SI:
       Naročniški ključ je lahko uporabljen zgolj za eno domeno.
       <br /><br />
       Po začetku procesa aktivacije ni mogoče prekiniti ali preklicati.
+  POPUPS_DOMAIN_ALIAS:
+    TITLE_ADD_DOMAIN_ALIAS: "Dodajanje domene"
+    LABEL_ALIAS: "Vzdevek"
+    LABEL_DOMAIN: "Domena"
+    BUTTON_CLOSE: "Zapri"
+    BUTTON_ADD: "Dodaj"
   POPUPS_DOMAIN:
     TITLE_ADD_DOMAIN: "Dodajanje domene"
     TITLE_ADD_DOMAIN_WITH_NAME: "Dodajanje domene \"%NAME%\""
diff --git a/rainloop/v/0.0.0/app/localization/webmail/ar_SA.yml b/rainloop/v/0.0.0/app/localization/webmail/ar_SA.yml
index cddd9dfab..18b4b366a 100644
--- a/rainloop/v/0.0.0/app/localization/webmail/ar_SA.yml
+++ b/rainloop/v/0.0.0/app/localization/webmail/ar_SA.yml
@@ -450,7 +450,7 @@ ar_SA:
     LABEL_ADD_SIGNATURE_TO_ALL: "قم بإضافة توقيعك على جميع الرسائل الصادرة"
   SETTINGS_SECURITY:
     LEGEND_SECURITY: "الأمان"
-    LABEL_CONFIGURATE_TWO_FACTOR: "تكوين عملية التأكد ثنائية المراحل"
+    LABEL_CONFIGURE_TWO_FACTOR: "تكوين عملية التأكد ثنائية المراحل"
     LABEL_AUTOLOGOUT: "تسجيل الخروج التلقائي"
     AUTOLOGIN_NEVER_OPTION_NAME: "أبداَ"
     AUTOLOGIN_MINUTES_OPTION_NAME: "%MINUTES% دقيقة"
diff --git a/rainloop/v/0.0.0/app/localization/webmail/bg_BG.yml b/rainloop/v/0.0.0/app/localization/webmail/bg_BG.yml
index 56dc81365..d8d744dfb 100644
--- a/rainloop/v/0.0.0/app/localization/webmail/bg_BG.yml
+++ b/rainloop/v/0.0.0/app/localization/webmail/bg_BG.yml
@@ -331,8 +331,8 @@ bg_BG:
     SELECT_FIELD_SIZE: "Размер"
     SELECT_TYPE_CONTAINS: "Съдържа"
     SELECT_TYPE_NOT_CONTAINS: "Не съдържа"
-    SELECT_TYPE_MATCHES: "Съвпада (поддържат се ? и *)"
-    SELECT_TYPE_NOT_MATCHES: "Не съвпада (поддържат се ? и *)"
+    SELECT_TYPE_MATCHES: "Съвпада с (поддържат се ? и *)"
+    SELECT_TYPE_NOT_MATCHES: "Не съвпада с (поддържат се ? и *)"
     SELECT_TYPE_REGEXP: "Регулярен израз"
     SELECT_TYPE_NOT_REGEXP: "Не регулярен израз"
     SELECT_TYPE_EQUAL_TO: "Равно на"
@@ -416,7 +416,7 @@ bg_BG:
     ERROR_UNKNOWN: "Възникна неизвестна грешка при качването на файла"
   EDITOR:
     TEXT_SWITCHER_PLAINT_TEXT: "Обикновен текст"
-    TEXT_SWITCHER_RICH_FORMATTING: "Богат формат"
+    TEXT_SWITCHER_RICH_FORMATTING: "Форматиран текст"
     TEXT_SWITCHER_CONFIRM: "Форматирането и изображенията ще бъдат изгубени. Сигурни ли сте, че желаете да продължите?"
   SETTINGS_LABELS:
     LABEL_PERSONAL_NAME: "Лични"
@@ -448,7 +448,7 @@ bg_BG:
     SUBNAME_DISCARD: "Отхвърли"
     CAPABILITY_LABEL: "Способности"
     LOADING_PROCESS: "Обнови списъка с филтри"
-    DELETING_ASK: "Сигурен ли си?"
+    DELETING_ASK: "Сигурни ли си?"
     CHACHES_NEED_TO_BE_SAVED_DESC: "Промените трябва да се запаметят на сървъра."
   SETTINGS_IDENTITY:
     LEGEND_IDENTITY: "Идентичност"
@@ -458,10 +458,11 @@ bg_BG:
     LABEL_ADD_SIGNATURE_TO_ALL: "Добави подпис към всички изходящи съобщения"
   SETTINGS_SECURITY:
     LEGEND_SECURITY: "Сигурност"
-    LABEL_CONFIGURATE_TWO_FACTOR: "Конфигурирай двустъпкова проверка"
+    LABEL_CONFIGURE_TWO_FACTOR: "Конфигурирай двустъпкова проверка"
     LABEL_AUTOLOGOUT: "Автоматично излизане"
     AUTOLOGIN_NEVER_OPTION_NAME: "Никога"
     AUTOLOGIN_MINUTES_OPTION_NAME: "%MINUTES% минута(и)"
+    AUTOLOGIN_HOURS_OPTION_NAME: "%HOURS% час(а)"
   SETTINGS_GENERAL:
     LEGEND_GENERAL: "Общи"
     LABEL_LANGUAGE: "Език"
@@ -471,10 +472,10 @@ bg_BG:
     LABEL_LAYOUT_VERTICAL_SPLIT: "Вертикално разделяне"
     LABEL_LAYOUT_HORIZONTAL_SPLIT: "Хоризонтално разделяне"
     LABEL_EDITOR: "Текстов редактор по подразбиране"
-    LABEL_EDITOR_HTML: "Html"
-    LABEL_EDITOR_PLAIN: "Обикновен"
-    LABEL_EDITOR_HTML_FORCED: "Html (задължително)"
-    LABEL_EDITOR_PLAIN_FORCED: "Plain (задължително)"
+    LABEL_EDITOR_HTML: "HTML"
+    LABEL_EDITOR_PLAIN: "Чист текст"
+    LABEL_EDITOR_HTML_FORCED: "HTML (задължително)"
+    LABEL_EDITOR_PLAIN_FORCED: "Чист текст (задължително)"
     LABEL_ANIMATION: "Анимация в интерфейса"
     LABEL_ANIMATION_FULL: "Пълна"
     LABEL_ANIMATION_NORMAL: "Нормална"
diff --git a/rainloop/v/0.0.0/app/localization/webmail/cs_CZ.yml b/rainloop/v/0.0.0/app/localization/webmail/cs_CZ.yml
index b8c09ec82..b5f0c0551 100644
--- a/rainloop/v/0.0.0/app/localization/webmail/cs_CZ.yml
+++ b/rainloop/v/0.0.0/app/localization/webmail/cs_CZ.yml
@@ -456,7 +456,7 @@ cs_CZ:
     LABEL_ADD_SIGNATURE_TO_ALL: "Připojit podpis ke všem odchozím zprávám"
   SETTINGS_SECURITY:
     LEGEND_SECURITY: "Zapezpečení"
-    LABEL_CONFIGURATE_TWO_FACTOR: "Nastavení dvoufázového ověření"
+    LABEL_CONFIGURE_TWO_FACTOR: "Nastavení dvoufázového ověření"
     LABEL_AUTOLOGOUT: "Automatické odhlášení"
     AUTOLOGIN_NEVER_OPTION_NAME: "Nikdy"
     AUTOLOGIN_MINUTES_OPTION_NAME: "%MINUTES% minut"
diff --git a/rainloop/v/0.0.0/app/localization/webmail/de_DE.yml b/rainloop/v/0.0.0/app/localization/webmail/de_DE.yml
index 0d445fad1..21f7edaf2 100644
--- a/rainloop/v/0.0.0/app/localization/webmail/de_DE.yml
+++ b/rainloop/v/0.0.0/app/localization/webmail/de_DE.yml
@@ -459,7 +459,7 @@ de_DE:
     LABEL_ADD_SIGNATURE_TO_ALL: "Signatur zu allen ausgehenden Nachrichten hinzufügen"
   SETTINGS_SECURITY:
     LEGEND_SECURITY: "Sicherheit"
-    LABEL_CONFIGURATE_TWO_FACTOR: "Zwei-Faktor-Authentifizierung konfigurieren"
+    LABEL_CONFIGURE_TWO_FACTOR: "Zwei-Faktor-Authentifizierung konfigurieren"
     LABEL_AUTOLOGOUT: "Automatische Abmeldung"
     AUTOLOGIN_NEVER_OPTION_NAME: "Nie"
     AUTOLOGIN_MINUTES_OPTION_NAME: "%MINUTES% Minute(n)"
diff --git a/rainloop/v/0.0.0/app/localization/webmail/el_GR.yml b/rainloop/v/0.0.0/app/localization/webmail/el_GR.yml
index 135dc186a..3b14593ad 100644
--- a/rainloop/v/0.0.0/app/localization/webmail/el_GR.yml
+++ b/rainloop/v/0.0.0/app/localization/webmail/el_GR.yml
@@ -455,7 +455,7 @@ el_GR:
     LABEL_ADD_SIGNATURE_TO_ALL: "Προσθήκη της υπογραφής σας σε όλα τα εξερχόμενα μηνύματα"
   SETTINGS_SECURITY:
     LEGEND_SECURITY: "Ασφάλεια"
-    LABEL_CONFIGURATE_TWO_FACTOR: "Διαμόρφωση της επαλήθευσης 2 επιπέδων"
+    LABEL_CONFIGURE_TWO_FACTOR: "Διαμόρφωση της επαλήθευσης 2 επιπέδων"
     LABEL_AUTOLOGOUT: "Αυτόματη αποσύνδεση"
     AUTOLOGIN_NEVER_OPTION_NAME: "Ποτέ"
     AUTOLOGIN_MINUTES_OPTION_NAME: "%MINUTES% λεπτό(α)"
diff --git a/rainloop/v/0.0.0/app/localization/webmail/en_US.yml b/rainloop/v/0.0.0/app/localization/webmail/en_US.yml
index 8d98f7ff5..83001ac05 100644
--- a/rainloop/v/0.0.0/app/localization/webmail/en_US.yml
+++ b/rainloop/v/0.0.0/app/localization/webmail/en_US.yml
@@ -458,7 +458,7 @@ en_US:
     LABEL_ADD_SIGNATURE_TO_ALL: "Add your signature to all the outgoing messages"
   SETTINGS_SECURITY:
     LEGEND_SECURITY: "Security"
-    LABEL_CONFIGURATE_TWO_FACTOR: "Configurate 2-Step verification"
+    LABEL_CONFIGURE_TWO_FACTOR: "Configure 2-Step verification"
     LABEL_AUTOLOGOUT: "Auto Logout"
     AUTOLOGIN_NEVER_OPTION_NAME: "Never"
     AUTOLOGIN_MINUTES_OPTION_NAME: "%MINUTES% minute(s)"
diff --git a/rainloop/v/0.0.0/app/localization/webmail/es_ES.yml b/rainloop/v/0.0.0/app/localization/webmail/es_ES.yml
index bc2d90c8c..8a0decdfb 100644
--- a/rainloop/v/0.0.0/app/localization/webmail/es_ES.yml
+++ b/rainloop/v/0.0.0/app/localization/webmail/es_ES.yml
@@ -6,10 +6,10 @@ es_ES:
     LABEL_SIGN_ME: "Recuérdame"
     LABEL_VERIFICATION_CODE: "Código de verificación"
     LABEL_DONT_ASK_VERIFICATION_CODE: "No solicitar el código de verificación durante 2 semanas"
-    BUTTON_SIGN_IN: "Ingresar"
-    TITLE_SIGN_IN_GOOGLE: "Ingresar usando Google"
-    TITLE_SIGN_IN_FACEBOOK: "Ingresar usando Facebook"
-    TITLE_SIGN_IN_TWITTER: "Ingresar usando Twitter"
+    BUTTON_SIGN_IN: "Acceder"
+    TITLE_SIGN_IN_GOOGLE: "Acceder usando Google"
+    TITLE_SIGN_IN_FACEBOOK: "Acceder usando Facebook"
+    TITLE_SIGN_IN_TWITTER: "Acceder usando Twitter"
     LABEL_FORGOT_PASSWORD: "Olvidé mi contraseña"
     LABEL_REGISTRATION: "Registro"
   TOP_TOOLBAR:
@@ -17,6 +17,9 @@ es_ES:
     BUTTON_SETTINGS: "Configuración"
     BUTTON_HELP: "Ayuda"
     BUTTON_LOGOUT: "Cerrar sesión"
+  MOBILE:
+    BUTTON_MOBILE_VERSION: "Versión móvil"
+    BUTTON_DESKTOP_VERSION: "Versión escritorio"
   SEARCH:
     MAIN_INPUT_PLACEHOLDER: "Buscar"
     TITLE_ADV: "Búsqueda avanzada"
@@ -26,10 +29,10 @@ es_ES:
     LABEL_ADV_TEXT: "Texto"
     LABEL_ADV_HAS_ATTACHMENT: "Tiene adjunto"
     LABEL_ADV_HAS_ATTACHMENTS: "Tiene adjuntos"
-    LABEL_ADV_FLAGGED: "Marcado"
-    LABEL_ADV_UNSEEN: "No visto"
+    LABEL_ADV_FLAGGED: "Seleccionado"
+    LABEL_ADV_UNSEEN: "No leído"
     LABEL_ADV_DATE: "Fecha"
-    LABEL_ADV_DATE_ALL: "Cualquier fecha"
+    LABEL_ADV_DATE_ALL: "Todo"
     LABEL_ADV_DATE_3_DAYS: "Hasta 3 días de antiguedad"
     LABEL_ADV_DATE_7_DAYS: "Hasta una semana de antiguedad"
     LABEL_ADV_DATE_MONTH: "Hasta 1 mes de antiguedad"
@@ -41,32 +44,33 @@ es_ES:
     FULLSCREEN: "Cambiar a pantalla completa"
     ZOOM: "Acercar / Alejar"
     CLOSE: "Cerrar (Esc)"
-    LOADING: "Cargando"
-    GALLERY_PREV: "Anteriores (Flecha Izquierda)"
+    LOADING: "Cargando..."
+    GALLERY_PREV: "Anterior (Flecha Izquierda)"
     GALLERY_NEXT: "Siguiente (Flecha Derecha)"
     GALLERY_COUNTER: "%curr% de %total%"
-    IMAGE_ERROR: "La <a href=\"%url%\" target=\"_blank\">imágen</a> no pudo ser cargada."
-    AJAX_ERROR: "El <a href=\"%url%\" target=\"_blank\">contenido</a> no pudo ser cargado."
+    IMAGE_ERROR: "La <a href=\"%url%\" target=\"_blank\">imagen</a> no se pudo cargar."
+    AJAX_ERROR: "El <a href=\"%url%\" target=\"_blank\">contenido</a> no se pudo cargar."
   FOLDER_LIST:
     BUTTON_COMPOSE: "Redactar"
     BUTTON_CONTACTS: "Contactos"
+    BUTTON_NEW_MESSAGE: "Nuevo mensaje"
     INBOX_NAME: "Bandeja de Entrada"
     SENT_NAME: "Enviados"
     DRAFTS_NAME: "Borradores"
-    SPAM_NAME: "Spam (Basura)"
+    SPAM_NAME: "Correo electrónico no deseado"
     TRASH_NAME: "Papelera"
     ARCHIVE_NAME: "Archivo"
   QUOTA:
     TITLE: "Cuota"
   MESSAGE_LIST:
     BUTTON_RELOAD: "Actualizar lista de mensajes"
-    BUTTON_MOVE_TO: "Mover a..."
+    BUTTON_MOVE_TO: "Mover"
     BUTTON_DELETE: "Eliminar"
-    BUTTON_ARCHIVE: "Archivo"
-    BUTTON_SPAM: "Marcar como Spam (Basura)"
-    BUTTON_NOT_SPAM: "No es Spam"
+    BUTTON_ARCHIVE: "Archivar"
+    BUTTON_SPAM: "Correo no deseado"
+    BUTTON_NOT_SPAM: "Es correo deseado"
     BUTTON_EMPTY_FOLDER: "Vaciar carpeta"
-    BUTTON_MULTY_FORWARD: "Reenviar mensajes"
+    BUTTON_MULTY_FORWARD: "Reenviar como adjunto(s)"
     BUTTON_DELETE_WITHOUT_MOVE: "Eliminar permanentemente"
     BUTTON_MORE: "Más"
     MENU_SET_SEEN: "Marcar como leído"
@@ -91,30 +95,30 @@ es_ES:
     TODAY_AT: "hoy a las %TIME%"
     YESTERDAY_AT: "ayer a las %TIME%"
     SEARCH_PLACEHOLDER: "Buscar"
-    NEW_MESSAGE_NOTIFICATION: "¡Usted tiene %COUNT% nuevos mensajes!"
+    NEW_MESSAGE_NOTIFICATION: "Tiene %COUNT% nuevos mensajes."
     QUOTA_SIZE: "Usando <strong>%SIZE% (%PROC%%)</strong> de sus <strong>%LIMIT%</strong>"
   MESSAGE:
     BUTTON_EDIT: "Editar"
     BUTTON_BACK: "Atrás"
     BUTTON_CLOSE: "Cerrar"
     BUTTON_DELETE: "Eliminar"
-    BUTTON_ARCHIVE: "Archive"
-    BUTTON_SPAM: "Spam (Basura)"
-    BUTTON_NOT_SPAM: "No es Spam"
-    BUTTON_MOVE_TO: "Mover a"
+    BUTTON_ARCHIVE: "Archivar"
+    BUTTON_SPAM: "Correo electrónico no deseado"
+    BUTTON_NOT_SPAM: "Es correo deseado"
+    BUTTON_MOVE_TO: "Mover"
     BUTTON_MORE: "Más"
     BUTTON_REPLY: "Responder"
-    BUTTON_REPLY_ALL: "Responder todos"
+    BUTTON_REPLY_ALL: "Responder a todos"
     BUTTON_FORWARD: "Reenviar"
-    BUTTON_FORWARD_AS_ATTACHMENT: "Reenviar con adjuntos"
-    BUTTON_EDIT_AS_NEW: "Editar como nuevo"
-    BUTTON_SHOW_IMAGES: "Mostrar imágenes"
-    BUTTON_NOTIFY_READ_RECEIPT: "El remitente ha pedido que se le notifique cuando usted lea este mensaje."
+    BUTTON_FORWARD_AS_ATTACHMENT: "Reenviar como adjunto"
+    BUTTON_EDIT_AS_NEW: "Editar como Nuevo"
+    BUTTON_SHOW_IMAGES: "Mostrar imágenes externas"
+    BUTTON_NOTIFY_READ_RECEIPT: "El remitente ha pedido que se le notifique cuando lea este mensaje."
     BUTTON_IN_NEW_WINDOW: "Ver en una ventana nueva"
     BUTTON_THREAD_LIST: "Thread list"
     BUTTON_THREAD_PREV: "Anterior"
     BUTTON_THREAD_NEXT: "Siguiente"
-    BUTTON_THREAD_MORE: "Más Mensajes"
+    BUTTON_THREAD_MORE: "Más mensajes"
     MENU_HEADERS: "Mostrar los encabezados del mensaje"
     MENU_VIEW_ORIGINAL: "Mostrar original"
     MENU_DOWNLOAD_ORIGINAL: "Descargar como archivo .eml"
@@ -129,12 +133,12 @@ es_ES:
     LABEL_TO_SHORT: "para"
     LABEL_CC: "CC"
     LABEL_BCC: "CCO (BCC)"
-    LABEL_REPLY_TO: "Reply-To"
+    LABEL_REPLY_TO: "Responder"
     PRINT_LABEL_FROM: "De"
     PRINT_LABEL_TO: "Para"
     PRINT_LABEL_CC: "CC"
     PRINT_LABEL_BCC: "CCO (BCC)"
-    PRINT_LABEL_REPLY_TO: "Responder a"
+    PRINT_LABEL_REPLY_TO: "Responder"
     PRINT_LABEL_DATE: "Fecha"
     PRINT_LABEL_SUBJECT: "Asunto"
     PRINT_LABEL_ATTACHMENTS: "Adjuntos"
@@ -173,21 +177,21 @@ es_ES:
     LABEL_DISPLAY_NAME: "Nombre a visualizar"
     LABEL_EMAIL: "Correo Electrónico"
     LABEL_PHONE: "Teléfono"
-    LABEL_WEB: "Sitio Web"
+    LABEL_WEB: "Web"
     LABEL_BIRTHDAY: "Cumpleaños"
     LINK_ADD_EMAIL: "Agregar una dirección de correo electrónico"
     LINK_ADD_PHONE: "Agregar un teléfono"
     LINK_BIRTHDAY: "Cumpleaños"
-    PLACEHOLDER_ENTER_DISPLAY_NAME: "Ingese nombre a visualizar"
-    PLACEHOLDER_ENTER_LAST_NAME: "Ingrese apellidos"
-    PLACEHOLDER_ENTER_FIRST_NAME: "Ingrese nombre"
-    PLACEHOLDER_ENTER_NICK_NAME: "Ingresar un alias"
+    PLACEHOLDER_ENTER_DISPLAY_NAME: "Introduzca el nombre a visualizar"
+    PLACEHOLDER_ENTER_LAST_NAME: "Introduzca los apellidos"
+    PLACEHOLDER_ENTER_FIRST_NAME: "Introduzca el nombre"
+    PLACEHOLDER_ENTER_NICK_NAME: "Introduzca un alias"
     LABEL_READ_ONLY: "Solo lectura"
     LABEL_SHARE: "Compartir"
-    ADD_MENU_LABEL: "Agregar"
+    ADD_MENU_LABEL: "Añadir"
     ADD_MENU_NICKNAME: "Alias"
     ADD_MENU_NOTES: "Notas"
-    ADD_MENU_EMAIL: "Correo Electrónico"
+    ADD_MENU_EMAIL: "Correo electrónico"
     ADD_MENU_PHONE: "Teléfono"
     ADD_MENU_URL: "URL"
     ADD_MENU_ADDRESS: "Dirección"
@@ -201,7 +205,7 @@ es_ES:
     TITLE_TO: "Para"
     TITLE_CC: "CC"
     TITLE_BCC: "CCO (BCC)"
-    TITLE_REPLY_TO: "Responder a"
+    TITLE_REPLY_TO: "Responder"
     TITLE_SUBJECT: "Asunto"
     LINK_SHOW_INPUTS: "mostrar todos los campos"
     BUTTON_SEND: "Enviar"
@@ -210,8 +214,8 @@ es_ES:
     BUTTON_CANCEL: "Cancelar"
     BUTTON_MINIMIZE: "Minimizar"
     SAVED_TIME: "Guardado a las %TIME%"
-    SAVED_ERROR_ON_SEND: "El Mensaje se envió pero no se guardó en la carpeta de Enviados"
-    DISCARD_UNSAVED_DATA: "Discard unsaved data?"
+    SAVED_ERROR_ON_SEND: "El mensaje se envió, pero no se guardó en la carpeta de enviados"
+    DISCARD_UNSAVED_DATA: "¿Descartar cambios?"
     ATTACH_FILES: "Añadir archivos"
     ATTACH_DROP_FILES_DESC: "Arrastre los archivos aquí"
     ATTACH_ITEM_CANCEL: "Cancelar"
@@ -224,21 +228,21 @@ es_ES:
     FORWARD_MESSAGE_TOP_CC: "CC"
     FORWARD_MESSAGE_TOP_SENT: "Enviado"
     FORWARD_MESSAGE_TOP_SUBJECT: "Asunto"
-    EMPTY_TO_ERROR_DESC: "Por favor especifique al menos un destinatario"
-    NO_ATTACHMENTS_HERE_DESC: "No attachments here."
+    EMPTY_TO_ERROR_DESC: "Por favor, especifique al menos un destinatario"
+    NO_ATTACHMENTS_HERE_DESC: "No hay adjuntos aquí."
     ATTACHMENTS_ERROR_DESC: "¡Atención! No se han subido todos los archivos adjuntos."
     ATTACHMENTS_UPLOAD_ERROR_DESC: "No se han subido todos los archivos adjuntos."
     BUTTON_REQUEST_READ_RECEIPT: "Solicitar confirmación de lectura"
-    BUTTON_MARK_AS_IMPORTANT: "Marcar como Importante"
+    BUTTON_MARK_AS_IMPORTANT: "Marcar como importante"
     BUTTON_OPEN_PGP: "OpenPGP (solo texto plano)"
-    BUTTON_REQUEST_DSN: "Request a delivery receipt"
+    BUTTON_REQUEST_DSN: "Solicitar una confirmación de entrega"
   POPUPS_WELCOME_PAGE:
     BUTTON_CLOSE: "Cerrar"
   POPUPS_ASK:
     BUTTON_YES: "Sí"
     BUTTON_NO: "No"
-    DESC_WANT_CLOSE_THIS_WINDOW: "¿Está seguro que desea cerrar esta ventana?"
-    DESC_WANT_DELETE_MESSAGES: "¿Está seguro que desea eliminar los mensajes?"
+    DESC_WANT_CLOSE_THIS_WINDOW: "¿Está seguro de que desea cerrar esta ventana?"
+    DESC_WANT_DELETE_MESSAGES: "¿Está seguro de que desea eliminar los mensajes?"
   POPUPS_LANGUAGES:
     TITLE_LANGUAGES: "Seleccionar idioma"
   POPUPS_ADD_ACCOUNT:
@@ -249,45 +253,45 @@ es_ES:
   POPUPS_IDENTITY:
     TITLE_ADD_IDENTITY: "¿Añadir Identidad?"
     TITLE_UPDATE_IDENTITY: "¿Actualizar identidad?"
-    BUTTON_ADD_IDENTITY: "Agregar"
+    BUTTON_ADD_IDENTITY: "Añadir"
     BUTTON_UPDATE_IDENTITY: "Actualizar"
-    LABEL_EMAIL: "Correo Electrónico"
+    LABEL_EMAIL: "Correo electrónico"
     LABEL_NAME: "Nombre"
-    LABEL_REPLY_TO: "Responder a"
+    LABEL_REPLY_TO: "Responder"
     LABEL_SIGNATURE: "Firma"
-    LABEL_CC: "Cc"
-    LABEL_BCC: "Cco (Bcc)"
-    LABEL_SIGNATURE_INSERT_BEFORE: "Insert this signature before quoted text in replies"
+    LABEL_CC: "CC"
+    LABEL_BCC: "CCO"
+    LABEL_SIGNATURE_INSERT_BEFORE: "Insertar esta firma antes de el texto entre comillas en las respuestas"
   POPUPS_CREATE_FOLDER:
     TITLE_CREATE_FOLDER: "Crear una carpeta"
     LABEL_NAME: "Nombre de la carpeta"
-    LABEL_PARENT: "Carpeta Superior"
+    LABEL_PARENT: "Carpeta superior"
     BUTTON_CREATE: "Crear"
     BUTTON_CANCEL: "Cancelar"
     BUTTON_CLOSE: "Cerrar"
     TITLE_CREATING_PROCESS: "Creando carpeta"
   POPUPS_CLEAR_FOLDER:
-    TITLE_CLEAR_FOLDER: "¿Limpiar todos los mensajes de la carpeta?"
+    TITLE_CLEAR_FOLDER: "¿Purgar todos los mensajes de la carpeta?"
     BUTTON_CLEAR: "Limpiar"
     BUTTON_CANCEL: "Cancelar"
     BUTTON_CLOSE: "Cerrar"
     DANGER_DESC_WARNING: "¡Atención!"
     DANGER_DESC_HTML_1: "Con esta acción usted puede borrar todos los emails de la carpeta <strong>%FOLDER%</strong> completamente."
-    DANGER_DESC_HTML_2: "Una vez comenzado, el proceso no puede ser abortado ni cancelado."
-    TITLE_CLEARING_PROCESS: "Limpiando carpeta..."
+    DANGER_DESC_HTML_2: "Una vez comenzado el proceso no se puede abortar ni cancelar."
+    TITLE_CLEARING_PROCESS: "Purgando carpeta..."
   POPUPS_IMPORT_OPEN_PGP_KEY:
-    TITLE_IMPORT_OPEN_PGP_KEY: "Importar llave OpenPGP"
+    TITLE_IMPORT_OPEN_PGP_KEY: "Importar clave OpenPGP"
     BUTTON_IMPORT_OPEN_PGP_KEY: "Importar"
   POPUPS_VIEW_OPEN_PGP_KEY:
-    TITLE_VIEW_OPEN_PGP_KEY: "Ver llave OpenPGP"
+    TITLE_VIEW_OPEN_PGP_KEY: "Ver clave OpenPGP"
     BUTTON_SELECT: "Seleccionar"
     BUTTON_CLOSE: "Cerrar"
   POPUPS_GENERATE_OPEN_PGP_KEYS:
-    TITLE_GENERATE_OPEN_PGP_KEYS: "Generar llave OpenPGP"
-    LABEL_EMAIL: "Email"
+    TITLE_GENERATE_OPEN_PGP_KEYS: "Generar clave OpenPGP"
+    LABEL_EMAIL: "Correo electrónico"
     LABEL_NAME: "Nombre"
     LABEL_PASSWORD: "Contraseña"
-    LABEL_KEY_BIT_LENGTH: "Longitud de la llave"
+    LABEL_KEY_BIT_LENGTH: "Longitud de la clave"
     BUTTON_GENERATE_OPEN_PGP_KEYS: "Generar"
   POPUPS_COMPOSE_OPEN_PGP:
     TITLE_COMPOSE_OPEN_PGP: "Firmar/Cifrar con OpenPGP"
@@ -298,33 +302,33 @@ es_ES:
     BUTTON_ENCRYPT: "Encriptar"
     BUTTON_SIGN_AND_ENCRYPT: "Firmar and encriptar"
   POPUPS_MESSAGE_OPEN_PGP:
-    TITLE_MESSAGE_OPEN_PGP: "OpenPGP Decrypt"
-    LABEL_KEY: "Private Key"
-    LABEL_PASSWORD: "Password"
-    BUTTON_DECRYPT: "Decrypt"
+    TITLE_MESSAGE_OPEN_PGP: "Descifrar OpenPGP"
+    LABEL_KEY: "Clave privada"
+    LABEL_PASSWORD: "Contraseña"
+    BUTTON_DECRYPT: "Descifrar"
   POPUPS_TWO_FACTOR_TEST:
     TITLE_TEST_CODE: "Prueba de verificación de 2 pasos"
     LABEL_CODE: "Código"
     BUTTON_TEST: "Probar"
   POPUPS_FILTER:
-    TITLE_CREATE_FILTER: "Create a filter?"
-    TITLE_EDIT_FILTER: "Update filter?"
-    FILTER_NAME: "Name"
-    LEGEND_CONDITIONS: "Conditions"
-    LEGEND_ACTIONS: "Actions"
-    BUTTON_DONE: "Done"
-    BUTTON_ADD_CONDITION: "Add a Condition"
-    SELECT_ACTION_NONE: "None"
-    SELECT_ACTION_MOVE_TO: "Move to"
-    SELECT_ACTION_FORWARD_TO: "Forward to"
-    SELECT_ACTION_REJECT: "Reject"
-    SELECT_ACTION_VACATION_MESSAGE: "Vacation message"
-    SELECT_ACTION_DISCARD: "Discard"
-    SELECT_FIELD_FROM: "From"
-    SELECT_FIELD_RECIPIENTS: "Recipients (To or CC)"
-    SELECT_FIELD_SUBJECT: "Subject"
-    SELECT_FIELD_HEADER: "Header"
-    SELECT_FIELD_SIZE: "Size"
+    TITLE_CREATE_FILTER: "¿Crear un filtro?"
+    TITLE_EDIT_FILTER: "¿Actualizar un filtro?"
+    FILTER_NAME: "Nombre"
+    LEGEND_CONDITIONS: "Condiciones"
+    LEGEND_ACTIONS: "Acciones"
+    BUTTON_DONE: "Hecho"
+    BUTTON_ADD_CONDITION: "Añadir condición"
+    SELECT_ACTION_NONE: "Ninguna"
+    SELECT_ACTION_MOVE_TO: "Mover"
+    SELECT_ACTION_FORWARD_TO: "Reenviar"
+    SELECT_ACTION_REJECT: "Rechazar"
+    SELECT_ACTION_VACATION_MESSAGE: "Mensaje fuera de línea"
+    SELECT_ACTION_DISCARD: "Descartar"
+    SELECT_FIELD_FROM: "De"
+    SELECT_FIELD_RECIPIENTS: "Destinatarios (A o CC)"
+    SELECT_FIELD_SUBJECT: "Asunto"
+    SELECT_FIELD_HEADER: "Encabezado"
+    SELECT_FIELD_SIZE: "Tamaño"
     SELECT_TYPE_CONTAINS: "Contains"
     SELECT_TYPE_NOT_CONTAINS: "Not Contains"
     SELECT_TYPE_MATCHES: "Matches (* and ? supported)"
@@ -353,7 +357,7 @@ es_ES:
     SELECT_UNUSE_NAME: "No usar"
     LABEL_SENT: "Enviados"
     LABEL_DRAFTS: "Borradores"
-    LABEL_SPAM: "Spam (Basura)"
+    LABEL_SPAM: "Correo no deseado"
     LABEL_TRASH: "Papelera"
     LABEL_ARCHIVE: "Archivo"
     BUTTON_CANCEL: "Cancelar"
@@ -455,10 +459,10 @@ es_ES:
     LABEL_ADD_SIGNATURE_TO_ALL: "Agregar su firma a todos los mensajes salientes"
   SETTINGS_SECURITY:
     LEGEND_SECURITY: "Security"
-    LABEL_CONFIGURATE_TWO_FACTOR: "Configurate 2-Step verification"
     LABEL_AUTOLOGOUT: "Auto Logout"
     AUTOLOGIN_NEVER_OPTION_NAME: "Never"
     AUTOLOGIN_MINUTES_OPTION_NAME: "%MINUTES% minute(s)"
+    AUTOLOGIN_HOURS_OPTION_NAME: "%HOURS% hora(s)"
   SETTINGS_GENERAL:
     LEGEND_GENERAL: "General"
     LABEL_LANGUAGE: "Idioma"
@@ -594,6 +598,7 @@ es_ES:
     LABEL_MOVE: "Mover"
     LABEL_READ: "Marcar los mensajes seleccionados como leídos"
     LABEL_UNREAD: "Marcar los mensajes seleccionados como no leídos"
+    LABEL_IMPORTANT: "Importante, marcar mensajes seleccionados"
     LABEL_SEARCH: "Buscar"
     LABEL_CANCEL_SEARCH: "Cancelar la búsqueda"
     LABEL_FULLSCREEN_ENTER: "Pantalla completa (panel de vista previa)"
@@ -620,6 +625,7 @@ es_ES:
     NO_PRIVATE_KEY_FOUND: "No se encontró la clave privada"
     NO_PRIVATE_KEY_FOUND_FOR: "No hay una clave privada para el email %EMAIL%"
     ADD_A_PUBLICK_KEY: "Add a public key"
+    SELECT_A_PRIVATE_KEY: "Seleccionar una clave privada"
     UNVERIFIRED_SIGNATURE: "Firma no verificada"
     DECRYPTION_ERROR: "Error de descifrado OpenPGP"
     GOOD_SIGNATURE: "Buena firma de %USER%"
diff --git a/rainloop/v/0.0.0/app/localization/webmail/et_EE.yml b/rainloop/v/0.0.0/app/localization/webmail/et_EE.yml
index 093a5b602..a89965210 100644
--- a/rainloop/v/0.0.0/app/localization/webmail/et_EE.yml
+++ b/rainloop/v/0.0.0/app/localization/webmail/et_EE.yml
@@ -458,7 +458,7 @@ et_EE:
     LABEL_ADD_SIGNATURE_TO_ALL: "Lisa oma signatuur kõikidele väljuvatele kirjadele"
   SETTINGS_SECURITY:
     LEGEND_SECURITY: "Turvalisus"
-    LABEL_CONFIGURATE_TWO_FACTOR: "Seadista 2. faktoriga autentimine"
+    LABEL_CONFIGURE_TWO_FACTOR: "Seadista 2. faktoriga autentimine"
     LABEL_AUTOLOGOUT: "Automaatne välja logimine"
     AUTOLOGIN_NEVER_OPTION_NAME: "Mitte kunagi"
     AUTOLOGIN_MINUTES_OPTION_NAME: "%MINUTES% minutit"
diff --git a/rainloop/v/0.0.0/app/localization/webmail/fr_FR.yml b/rainloop/v/0.0.0/app/localization/webmail/fr_FR.yml
index a94b63292..d135eb709 100644
--- a/rainloop/v/0.0.0/app/localization/webmail/fr_FR.yml
+++ b/rainloop/v/0.0.0/app/localization/webmail/fr_FR.yml
@@ -459,7 +459,7 @@ fr_FR:
     LABEL_ADD_SIGNATURE_TO_ALL: "Ajouter votre signature à tous les messages sortants"
   SETTINGS_SECURITY:
     LEGEND_SECURITY: "Sécurité"
-    LABEL_CONFIGURATE_TWO_FACTOR: "Configurer l'authentification en deux étapes"
+    LABEL_CONFIGURE_TWO_FACTOR: "Configurer l'authentification en deux étapes"
     LABEL_AUTOLOGOUT: "Déconnexion automatique"
     AUTOLOGIN_NEVER_OPTION_NAME: "Jamais"
     AUTOLOGIN_MINUTES_OPTION_NAME: "%MINUTES% minute(s)"
diff --git a/rainloop/v/0.0.0/app/localization/webmail/hu_HU.yml b/rainloop/v/0.0.0/app/localization/webmail/hu_HU.yml
index 0b94eeb25..8d6f1ff79 100644
--- a/rainloop/v/0.0.0/app/localization/webmail/hu_HU.yml
+++ b/rainloop/v/0.0.0/app/localization/webmail/hu_HU.yml
@@ -459,7 +459,7 @@ hu_HU:
     LABEL_ADD_SIGNATURE_TO_ALL: "Az aláírásod hozzáadása a kimenő üzenetekhez"
   SETTINGS_SECURITY:
     LEGEND_SECURITY: "Biztonság"
-    LABEL_CONFIGURATE_TWO_FACTOR: "2 lépcsős hitelesítés beállítása"
+    LABEL_CONFIGURE_TWO_FACTOR: "2 lépcsős hitelesítés beállítása"
     LABEL_AUTOLOGOUT: "Automatikus kijelentkezés"
     AUTOLOGIN_NEVER_OPTION_NAME: "Soha"
     AUTOLOGIN_MINUTES_OPTION_NAME: "%MINUTES% perc"
diff --git a/rainloop/v/0.0.0/app/localization/webmail/is_IS.yml b/rainloop/v/0.0.0/app/localization/webmail/is_IS.yml
index f86630e48..7f5469f0d 100644
--- a/rainloop/v/0.0.0/app/localization/webmail/is_IS.yml
+++ b/rainloop/v/0.0.0/app/localization/webmail/is_IS.yml
@@ -451,7 +451,6 @@ is_IS:
     LABEL_ADD_SIGNATURE_TO_ALL: "Add your signature to all the outgoing messages"
   SETTINGS_SECURITY:
     LEGEND_SECURITY: "Security"
-    LABEL_CONFIGURATE_TWO_FACTOR: "Configurate 2-Step verification"
     LABEL_AUTOLOGOUT: "Auto Logout"
     AUTOLOGIN_NEVER_OPTION_NAME: "Never"
     AUTOLOGIN_MINUTES_OPTION_NAME: "%MINUTES% minute(s)"
diff --git a/rainloop/v/0.0.0/app/localization/webmail/it_IT.yml b/rainloop/v/0.0.0/app/localization/webmail/it_IT.yml
index 33d31559d..ad8027353 100644
--- a/rainloop/v/0.0.0/app/localization/webmail/it_IT.yml
+++ b/rainloop/v/0.0.0/app/localization/webmail/it_IT.yml
@@ -455,7 +455,7 @@ it_IT:
     LABEL_ADD_SIGNATURE_TO_ALL: "Aggiungi la firma a tutti i messaggi in uscita"
   SETTINGS_SECURITY:
     LEGEND_SECURITY: "Sicurezza"
-    LABEL_CONFIGURATE_TWO_FACTOR: "Configura autenticazione a due fattori"
+    LABEL_CONFIGURE_TWO_FACTOR: "Configura autenticazione a due fattori"
     LABEL_AUTOLOGOUT: "Disconnessione automatica"
     AUTOLOGIN_NEVER_OPTION_NAME: "Mai"
     AUTOLOGIN_MINUTES_OPTION_NAME: "%MINUTES% minuti"
diff --git a/rainloop/v/0.0.0/app/localization/webmail/ja_JP.yml b/rainloop/v/0.0.0/app/localization/webmail/ja_JP.yml
index b06df450d..7b516174c 100644
--- a/rainloop/v/0.0.0/app/localization/webmail/ja_JP.yml
+++ b/rainloop/v/0.0.0/app/localization/webmail/ja_JP.yml
@@ -457,7 +457,7 @@ ja_JP:
     LABEL_ADD_SIGNATURE_TO_ALL: "すべての送信メッセージに署名を追加する"
   SETTINGS_SECURITY:
     LEGEND_SECURITY: "セキュリティ"
-    LABEL_CONFIGURATE_TWO_FACTOR: "2段階認証の設定"
+    LABEL_CONFIGURE_TWO_FACTOR: "2段階認証の設定"
     LABEL_AUTOLOGOUT: "自動ログアウト"
     AUTOLOGIN_NEVER_OPTION_NAME: "しない"
     AUTOLOGIN_MINUTES_OPTION_NAME: "%MINUTES% 分"
diff --git a/rainloop/v/0.0.0/app/localization/webmail/ko_KR.yml b/rainloop/v/0.0.0/app/localization/webmail/ko_KR.yml
index 1222a5e2f..633c0bf4a 100644
--- a/rainloop/v/0.0.0/app/localization/webmail/ko_KR.yml
+++ b/rainloop/v/0.0.0/app/localization/webmail/ko_KR.yml
@@ -448,7 +448,6 @@ ko_KR:
     LABEL_ADD_SIGNATURE_TO_ALL: "Add your signature to all the outgoing messages"
   SETTINGS_SECURITY:
     LEGEND_SECURITY: "Security"
-    LABEL_CONFIGURATE_TWO_FACTOR: "Configurate 2-Step verification"
     LABEL_AUTOLOGOUT: "Auto Logout"
     AUTOLOGIN_NEVER_OPTION_NAME: "Never"
     AUTOLOGIN_MINUTES_OPTION_NAME: "%MINUTES% minute(s)"
diff --git a/rainloop/v/0.0.0/app/localization/webmail/lt_LT.yml b/rainloop/v/0.0.0/app/localization/webmail/lt_LT.yml
index 64e0ec46c..ecd650d75 100644
--- a/rainloop/v/0.0.0/app/localization/webmail/lt_LT.yml
+++ b/rainloop/v/0.0.0/app/localization/webmail/lt_LT.yml
@@ -458,7 +458,7 @@ lt_LT:
     LABEL_ADD_SIGNATURE_TO_ALL: "Pridėti parašą visiems rašomiems laiškams"
   SETTINGS_SECURITY:
     LEGEND_SECURITY: "Sauga"
-    LABEL_CONFIGURATE_TWO_FACTOR: "Konfiguruoti 2-žingsnių patikrinimą"
+    LABEL_CONFIGURE_TWO_FACTOR: "Konfiguruoti 2-žingsnių patikrinimą"
     LABEL_AUTOLOGOUT: "Automatinis atsijungimas"
     AUTOLOGIN_NEVER_OPTION_NAME: "Niekada"
     AUTOLOGIN_MINUTES_OPTION_NAME: "po %MINUTES% minučių"
diff --git a/rainloop/v/0.0.0/app/localization/webmail/lv_LV.yml b/rainloop/v/0.0.0/app/localization/webmail/lv_LV.yml
index e77470b09..529c60b06 100644
--- a/rainloop/v/0.0.0/app/localization/webmail/lv_LV.yml
+++ b/rainloop/v/0.0.0/app/localization/webmail/lv_LV.yml
@@ -451,7 +451,6 @@ lv_LV:
     LABEL_ADD_SIGNATURE_TO_ALL: "Add your signature to all the outgoing messages"
   SETTINGS_SECURITY:
     LEGEND_SECURITY: "Security"
-    LABEL_CONFIGURATE_TWO_FACTOR: "Configurate 2-Step verification"
     LABEL_AUTOLOGOUT: "Auto Logout"
     AUTOLOGIN_NEVER_OPTION_NAME: "Never"
     AUTOLOGIN_MINUTES_OPTION_NAME: "%MINUTES% minute(s)"
diff --git a/rainloop/v/0.0.0/app/localization/webmail/nb_NO.yml b/rainloop/v/0.0.0/app/localization/webmail/nb_NO.yml
index 14c0a0838..fdd39202c 100644
--- a/rainloop/v/0.0.0/app/localization/webmail/nb_NO.yml
+++ b/rainloop/v/0.0.0/app/localization/webmail/nb_NO.yml
@@ -457,10 +457,11 @@ nb_NO:
     LABEL_ADD_SIGNATURE_TO_ALL: "Vil du legge til signatur i alle utgående meldinger?"
   SETTINGS_SECURITY:
     LEGEND_SECURITY: "Sikkerhet"
-    LABEL_CONFIGURATE_TWO_FACTOR: "Sett opp to-stegsbekreftelse"
+    LABEL_CONFIGURE_TWO_FACTOR: "Sett opp to-stegsbekreftelse"
     LABEL_AUTOLOGOUT: "Logg ut automatisk etter"
     AUTOLOGIN_NEVER_OPTION_NAME: "Aldri"
     AUTOLOGIN_MINUTES_OPTION_NAME: "%MINUTES% minutt(er)"
+    AUTOLOGIN_HOURS_OPTION_NAME: "%HOURS% time(r)"
   SETTINGS_GENERAL:
     LEGEND_GENERAL: "Generelt"
     LABEL_LANGUAGE: "Språk"
diff --git a/rainloop/v/0.0.0/app/localization/webmail/nl_NL.yml b/rainloop/v/0.0.0/app/localization/webmail/nl_NL.yml
index 2f1ada2a5..949b3e36c 100644
--- a/rainloop/v/0.0.0/app/localization/webmail/nl_NL.yml
+++ b/rainloop/v/0.0.0/app/localization/webmail/nl_NL.yml
@@ -458,7 +458,6 @@ nl_NL:
     LABEL_ADD_SIGNATURE_TO_ALL: "Handtekening standaard toevoegen aan bericht"
   SETTINGS_SECURITY:
     LEGEND_SECURITY: "Beveiliging"
-    LABEL_CONFIGURATE_TWO_FACTOR: "Configurate 2-Step verification"
     LABEL_AUTOLOGOUT: "Automatisch uitloggen"
     AUTOLOGIN_NEVER_OPTION_NAME: "Nooit"
     AUTOLOGIN_MINUTES_OPTION_NAME: "%MINUTES% minuten"
diff --git a/rainloop/v/0.0.0/app/localization/webmail/pl_PL.yml b/rainloop/v/0.0.0/app/localization/webmail/pl_PL.yml
index e2dbb5958..d874afb77 100644
--- a/rainloop/v/0.0.0/app/localization/webmail/pl_PL.yml
+++ b/rainloop/v/0.0.0/app/localization/webmail/pl_PL.yml
@@ -457,10 +457,11 @@ pl_PL:
     LABEL_ADD_SIGNATURE_TO_ALL: "Dadawaj podpis do wszystkich wiadomości"
   SETTINGS_SECURITY:
     LEGEND_SECURITY: "Bezpieczeństwo"
-    LABEL_CONFIGURATE_TWO_FACTOR: "Konfiguracja dwuskładnikowej autoryzacji"
+    LABEL_CONFIGURE_TWO_FACTOR: "Konfiguracja dwuskładnikowej autoryzacji"
     LABEL_AUTOLOGOUT: "Auto. wylogowanie:"
     AUTOLOGIN_NEVER_OPTION_NAME: "Nidgy"
     AUTOLOGIN_MINUTES_OPTION_NAME: "%MINUTES% minut"
+    AUTOLOGIN_HOURS_OPTION_NAME: "%HOURS% godzina(-y)"
   SETTINGS_GENERAL:
     LEGEND_GENERAL: "Ogólne"
     LABEL_LANGUAGE: "Język:"
diff --git a/rainloop/v/0.0.0/app/localization/webmail/pt_BR.yml b/rainloop/v/0.0.0/app/localization/webmail/pt_BR.yml
index 0899ecae4..ba21e97c8 100644
--- a/rainloop/v/0.0.0/app/localization/webmail/pt_BR.yml
+++ b/rainloop/v/0.0.0/app/localization/webmail/pt_BR.yml
@@ -458,7 +458,7 @@ pt_BR:
     LABEL_ADD_SIGNATURE_TO_ALL: "Adicionar sua assinatura em todas as mensagens de saída"
   SETTINGS_SECURITY:
     LEGEND_SECURITY: "Segurança"
-    LABEL_CONFIGURATE_TWO_FACTOR: "Configurar verificação de 2 etapas"
+    LABEL_CONFIGURE_TWO_FACTOR: "Configurar verificação de 2 etapas"
     LABEL_AUTOLOGOUT: "Deslogar Automaticamente"
     AUTOLOGIN_NEVER_OPTION_NAME: "Nunca"
     AUTOLOGIN_MINUTES_OPTION_NAME: "%MINUTES% minutos"
diff --git a/rainloop/v/0.0.0/app/localization/webmail/pt_PT.yml b/rainloop/v/0.0.0/app/localization/webmail/pt_PT.yml
index 3e770bf64..fed0c3b64 100644
--- a/rainloop/v/0.0.0/app/localization/webmail/pt_PT.yml
+++ b/rainloop/v/0.0.0/app/localization/webmail/pt_PT.yml
@@ -454,7 +454,7 @@ pt_PT:
     LABEL_ADD_SIGNATURE_TO_ALL: "Adicionar a sua assinatura a todas as mensagens de saída"
   SETTINGS_SECURITY:
     LEGEND_SECURITY: "Segurança"
-    LABEL_CONFIGURATE_TWO_FACTOR: "Configurate 2-Step verification"
+    LABEL_CONFIGURE_TWO_FACTOR: "Configurar verificação de 2 etapas"
     LABEL_AUTOLOGOUT: "Terminar sessão auto."
     AUTOLOGIN_NEVER_OPTION_NAME: "Nunca"
     AUTOLOGIN_MINUTES_OPTION_NAME: "%MINUTES% minuto(s)"
diff --git a/rainloop/v/0.0.0/app/localization/webmail/ro_RO.yml b/rainloop/v/0.0.0/app/localization/webmail/ro_RO.yml
index a97f701d0..6b00e7aa9 100644
--- a/rainloop/v/0.0.0/app/localization/webmail/ro_RO.yml
+++ b/rainloop/v/0.0.0/app/localization/webmail/ro_RO.yml
@@ -452,7 +452,6 @@ ro_RO:
     LABEL_ADD_SIGNATURE_TO_ALL: "Adăugă semnătura la toate mesajele trimise"
   SETTINGS_SECURITY:
     LEGEND_SECURITY: "Security"
-    LABEL_CONFIGURATE_TWO_FACTOR: "Configurate 2-Step verification"
     LABEL_AUTOLOGOUT: "Auto Logout"
     AUTOLOGIN_NEVER_OPTION_NAME: "Never"
     AUTOLOGIN_MINUTES_OPTION_NAME: "%MINUTES% minute(s)"
diff --git a/rainloop/v/0.0.0/app/localization/webmail/ru_RU.yml b/rainloop/v/0.0.0/app/localization/webmail/ru_RU.yml
index e28b77572..6cdc4243b 100644
--- a/rainloop/v/0.0.0/app/localization/webmail/ru_RU.yml
+++ b/rainloop/v/0.0.0/app/localization/webmail/ru_RU.yml
@@ -133,12 +133,12 @@ ru_RU:
     LABEL_TO_SHORT: "кому"
     LABEL_CC: "Копия"
     LABEL_BCC: "Скрытая"
-    LABEL_REPLY_TO: "Reply-To"
+    LABEL_REPLY_TO: "Ответить-на"
     PRINT_LABEL_FROM: "От"
     PRINT_LABEL_TO: "Кому"
     PRINT_LABEL_CC: "Копия"
     PRINT_LABEL_BCC: "Скрытая"
-    PRINT_LABEL_REPLY_TO: "Reply-To"
+    PRINT_LABEL_REPLY_TO: "Ответить-на"
     PRINT_LABEL_DATE: "Дата"
     PRINT_LABEL_SUBJECT: "Тема"
     PRINT_LABEL_ATTACHMENTS: "Файлы"
@@ -181,7 +181,7 @@ ru_RU:
     LABEL_BIRTHDAY: "День рождения"
     LINK_ADD_EMAIL: "Добавьте адрес электронной почты"
     LINK_ADD_PHONE: "Добавьте телефон"
-    LINK_BIRTHDAY: "Birthday"
+    LINK_BIRTHDAY: "День рождения"
     PLACEHOLDER_ENTER_DISPLAY_NAME: "Введите полное имя"
     PLACEHOLDER_ENTER_LAST_NAME: "Введите имя"
     PLACEHOLDER_ENTER_FIRST_NAME: "Введите фамилию"
@@ -302,10 +302,10 @@ ru_RU:
     BUTTON_ENCRYPT: "Шифрование"
     BUTTON_SIGN_AND_ENCRYPT: "Подпись и шифрование"
   POPUPS_MESSAGE_OPEN_PGP:
-    TITLE_MESSAGE_OPEN_PGP: "OpenPGP Decrypt"
-    LABEL_KEY: "Private Key"
-    LABEL_PASSWORD: "Password"
-    BUTTON_DECRYPT: "Decrypt"
+    TITLE_MESSAGE_OPEN_PGP: "Расшифровать (OpenPGP)"
+    LABEL_KEY: "Приватный ключ"
+    LABEL_PASSWORD: "Пароль"
+    BUTTON_DECRYPT: "Расшифровать"
   POPUPS_TWO_FACTOR_TEST:
     TITLE_TEST_CODE: "Тест двухфакторной верификации"
     LABEL_CODE: "Код"
@@ -337,8 +337,8 @@ ru_RU:
     SELECT_TYPE_NOT_REGEXP: "Не Regexp"
     SELECT_TYPE_EQUAL_TO: "Совпадает с"
     SELECT_TYPE_NOT_EQUAL_TO: "Не совпадает с"
-    SELECT_TYPE_OVER: "Over"
-    SELECT_TYPE_UNDER: "Under"
+    SELECT_TYPE_OVER: "Больше"
+    SELECT_TYPE_UNDER: "Меньше"
     SELECT_MATCH_ANY: "Подходит под хотя бы одно из нижеперечисленных правил"
     SELECT_MATCH_ALL: "Подходит под все нижеперечисленные правила"
     MARK_AS_READ_LABEL: "Отметить как прочитанное"
@@ -348,7 +348,7 @@ ru_RU:
     EMAIL_LABEL: "Почтка"
     VACATION_SUBJECT_LABEL: "Тема (необязательно)"
     VACATION_MESSAGE_LABEL: "Сообщение"
-    VACATION_RECIPIENTS_LABEL: "Recipients (comma separated)"
+    VACATION_RECIPIENTS_LABEL: "Получатели (через запятую)"
     REJECT_MESSAGE_LABEL: "Причина (будет послана отправителю)"
     ALL_INCOMING_MESSAGES_DESC: "Все входящие сообщения"
   POPUPS_SYSTEM_FOLDERS:
@@ -381,15 +381,15 @@ ru_RU:
     LABEL_TWO_FACTOR_SECRET: "Секретный ключ"
     LABEL_TWO_FACTOR_BACKUP_CODES: "Резервные коды"
     BUTTON_CREATE: "Создать новый секретный ключ"
-    BUTTON_ACTIVATE: "Activate"
+    BUTTON_ACTIVATE: "Активировать"
     BUTTON_CLEAR: "Очистить"
-    BUTTON_LOGOUT: "Logout"
-    BUTTON_DONE: "Done"
+    BUTTON_LOGOUT: "Выйти"
+    BUTTON_DONE: "Закончить"
     BUTTON_TEST: "Тест"
     LINK_TEST: "test"
     BUTTON_SHOW_SECRET: "Показать секретный ключ"
     BUTTON_HIDE_SECRET: "Скрыть секретный ключ"
-    TWO_FACTOR_REQUIRE_DESC: "Your account requires 2-Step verification configuration."
+    TWO_FACTOR_REQUIRE_DESC: "Ваш аккаунт требует двухфакторную настройку."
     TWO_FACTOR_SECRET_CONFIGURED_DESC: "Настроен"
     TWO_FACTOR_SECRET_NOT_CONFIGURED_DESC: "Не настроен"
     TWO_FACTOR_SECRET_DESC: >
@@ -446,7 +446,7 @@ ru_RU:
     SUBNAME_REJECT: "Не принимать"
     SUBNAME_VACATION_MESSAGE: "Сообщение автоответчика"
     SUBNAME_DISCARD: "Уничтожить"
-    CAPABILITY_LABEL: "Capability"
+    CAPABILITY_LABEL: "Возможность"
     LOADING_PROCESS: "Обновление списка фильтров"
     DELETING_ASK: "Точно?"
     CHACHES_NEED_TO_BE_SAVED_DESC: "Изменения ещё не сохранены на сервер."
@@ -458,10 +458,11 @@ ru_RU:
     LABEL_ADD_SIGNATURE_TO_ALL: "Добавлять подпись ко всем исходящим сообщениям"
   SETTINGS_SECURITY:
     LEGEND_SECURITY: "Безопасность"
-    LABEL_CONFIGURATE_TWO_FACTOR: "Configurate 2-Step verification"
+    LABEL_CONFIGURE_TWO_FACTOR: "Настроить двухфакторную верификацию"
     LABEL_AUTOLOGOUT: "Автоматический выход"
     AUTOLOGIN_NEVER_OPTION_NAME: "Никогда"
     AUTOLOGIN_MINUTES_OPTION_NAME: "%MINUTES% минут(ы)"
+    AUTOLOGIN_HOURS_OPTION_NAME: "%HOURS% час(ы)"
   SETTINGS_GENERAL:
     LEGEND_GENERAL: "Основные Настройки"
     LABEL_LANGUAGE: "Язык"
@@ -550,11 +551,11 @@ ru_RU:
     BUTTON_DELETE: "Удалить"
     LOADING_PROCESS: "Обновление списка аккаунтов"
     DELETING_ASK: "Точно?"
-    DEFAULT_IDENTITY_LABEL: "default"
+    DEFAULT_IDENTITY_LABEL: "основной"
   SETTINGS_IDENTITIES:
     LEGEND_IDENTITY: "Настройки основного профиля"
     LEGEND_IDENTITIES: "Дополнительные профили"
-    LABEL_DEFAULT: "Default"
+    LABEL_DEFAULT: "Основной"
     LABEL_DISPLAY_NAME: "Имя"
     LABEL_REPLY_TO: "Отвечать на"
     LABEL_SIGNATURE: "Подпись"
@@ -613,7 +614,7 @@ ru_RU:
     LABEL_CLOSE_MESSAGE: "Закрыть сообщение"
     LABEL_SWITCH_TO_LIST: "Переключить фокус на список писем"
     LABEL_OPEN_COMPOSE_POPUP: "Написать письмо"
-    LABEL_MINIMIZE_COMPOSE_POPUP: "Minimize compose popup"
+    LABEL_MINIMIZE_COMPOSE_POPUP: "Минимизировать окно"
     LABEL_OPEN_IDENTITIES_DROPDOWN: "Выбрать отправителя"
     LABEL_SAVE_MESSAGE: "Сохранить сообщение"
     LABEL_SEND_MESSAGE: "Отправить сообщение"
@@ -623,7 +624,7 @@ ru_RU:
     NO_PUBLIC_KEYS_FOUND_FOR: "Публичные ключи для \"%EMAIL%\" не найдены"
     NO_PRIVATE_KEY_FOUND: "Приватный ключ не найден"
     NO_PRIVATE_KEY_FOUND_FOR: "Приватный ключ для \"%EMAIL%\" не найден"
-    ADD_A_PUBLICK_KEY: "Add a public key"
+    ADD_A_PUBLICK_KEY: "Добавить публичный ключ"
     SELECT_A_PRIVATE_KEY: "Выберите секретный ключ"
     UNVERIFIRED_SIGNATURE: "Неподтвержденная сигнатура"
     DECRYPTION_ERROR: "OpenPGP ошибка расшифровки"
diff --git a/rainloop/v/0.0.0/app/localization/webmail/sk_SK.yml b/rainloop/v/0.0.0/app/localization/webmail/sk_SK.yml
index 1d2cf7759..d228bbee2 100644
--- a/rainloop/v/0.0.0/app/localization/webmail/sk_SK.yml
+++ b/rainloop/v/0.0.0/app/localization/webmail/sk_SK.yml
@@ -453,7 +453,6 @@ sk_SK:
     LABEL_ADD_SIGNATURE_TO_ALL: "Pripojiť podpis k všetkých odchádzajúcim správam"
   SETTINGS_SECURITY:
     LEGEND_SECURITY: "Security"
-    LABEL_CONFIGURATE_TWO_FACTOR: "Configurate 2-Step verification"
     LABEL_AUTOLOGOUT: "Auto Logout"
     AUTOLOGIN_NEVER_OPTION_NAME: "Never"
     AUTOLOGIN_MINUTES_OPTION_NAME: "%MINUTES% minute(s)"
diff --git a/rainloop/v/0.0.0/app/localization/webmail/sl_SI.yml b/rainloop/v/0.0.0/app/localization/webmail/sl_SI.yml
index e86220d43..08360e393 100644
--- a/rainloop/v/0.0.0/app/localization/webmail/sl_SI.yml
+++ b/rainloop/v/0.0.0/app/localization/webmail/sl_SI.yml
@@ -457,10 +457,11 @@ sl_SI:
     LABEL_ADD_SIGNATURE_TO_ALL: "Dodaj podpis vsem odhodnim sporočilom"
   SETTINGS_SECURITY:
     LEGEND_SECURITY: "Varnost"
-    LABEL_CONFIGURATE_TWO_FACTOR: "Nastavljanje 2-stopenjskega overjanja"
+    LABEL_CONFIGURE_TWO_FACTOR: "Nastavljanje 2-stopenjskega overjanja"
     LABEL_AUTOLOGOUT: "Samodejna odjava"
     AUTOLOGIN_NEVER_OPTION_NAME: "Nikoli"
     AUTOLOGIN_MINUTES_OPTION_NAME: "%MINUTES% minut"
+    AUTOLOGIN_HOURS_OPTION_NAME: "%HOURS% ur"
   SETTINGS_GENERAL:
     LEGEND_GENERAL: "Splošno"
     LABEL_LANGUAGE: "Jezik"
diff --git a/rainloop/v/0.0.0/app/localization/webmail/sv_SE.yml b/rainloop/v/0.0.0/app/localization/webmail/sv_SE.yml
index 63dff1629..2dfffa5e5 100644
--- a/rainloop/v/0.0.0/app/localization/webmail/sv_SE.yml
+++ b/rainloop/v/0.0.0/app/localization/webmail/sv_SE.yml
@@ -453,7 +453,6 @@ sv_SE:
     LABEL_ADD_SIGNATURE_TO_ALL: "Lägg till din signatur på alla utgående meddelanden."
   SETTINGS_SECURITY:
     LEGEND_SECURITY: "Security"
-    LABEL_CONFIGURATE_TWO_FACTOR: "Configurate 2-Step verification"
     LABEL_AUTOLOGOUT: "Auto Logout"
     AUTOLOGIN_NEVER_OPTION_NAME: "Never"
     AUTOLOGIN_MINUTES_OPTION_NAME: "%MINUTES% minute(s)"
diff --git a/rainloop/v/0.0.0/app/localization/webmail/tr_TR.yml b/rainloop/v/0.0.0/app/localization/webmail/tr_TR.yml
index b9e2dbdb5..743c950f0 100644
--- a/rainloop/v/0.0.0/app/localization/webmail/tr_TR.yml
+++ b/rainloop/v/0.0.0/app/localization/webmail/tr_TR.yml
@@ -451,7 +451,6 @@ tr_TR:
     LABEL_ADD_SIGNATURE_TO_ALL: "Tüm giden iletilere imza ekle"
   SETTINGS_SECURITY:
     LEGEND_SECURITY: "Security"
-    LABEL_CONFIGURATE_TWO_FACTOR: "Configurate 2-Step verification"
     LABEL_AUTOLOGOUT: "Auto Logout"
     AUTOLOGIN_NEVER_OPTION_NAME: "Never"
     AUTOLOGIN_MINUTES_OPTION_NAME: "%MINUTES% minute(s)"
diff --git a/rainloop/v/0.0.0/app/localization/webmail/uk_UA.yml b/rainloop/v/0.0.0/app/localization/webmail/uk_UA.yml
index f4cc6c617..8d1dc1ac6 100644
--- a/rainloop/v/0.0.0/app/localization/webmail/uk_UA.yml
+++ b/rainloop/v/0.0.0/app/localization/webmail/uk_UA.yml
@@ -457,7 +457,7 @@ uk_UA:
     LABEL_ADD_SIGNATURE_TO_ALL: "Додавати Ваш підпис до всіх вихідних повідомлень"
   SETTINGS_SECURITY:
     LEGEND_SECURITY: "Безпека"
-    LABEL_CONFIGURATE_TWO_FACTOR: "Налаштувати 2-факторну верифікацію"
+    LABEL_CONFIGURE_TWO_FACTOR: "Налаштувати 2-факторну верифікацію"
     LABEL_AUTOLOGOUT: "Автовихід"
     AUTOLOGIN_NEVER_OPTION_NAME: "Ніколи"
     AUTOLOGIN_MINUTES_OPTION_NAME: "%MINUTES% minute(s)"
diff --git a/rainloop/v/0.0.0/app/localization/webmail/zh_CN.yml b/rainloop/v/0.0.0/app/localization/webmail/zh_CN.yml
index 2b0aebf61..a1a1e83e5 100644
--- a/rainloop/v/0.0.0/app/localization/webmail/zh_CN.yml
+++ b/rainloop/v/0.0.0/app/localization/webmail/zh_CN.yml
@@ -453,7 +453,6 @@ zh_CN:
     LABEL_ADD_SIGNATURE_TO_ALL: "Add your signature to all the outgoing messages"
   SETTINGS_SECURITY:
     LEGEND_SECURITY: "Security"
-    LABEL_CONFIGURATE_TWO_FACTOR: "Configurate 2-Step verification"
     LABEL_AUTOLOGOUT: "Auto Logout"
     AUTOLOGIN_NEVER_OPTION_NAME: "Never"
     AUTOLOGIN_MINUTES_OPTION_NAME: "%MINUTES% minute(s)"
diff --git a/rainloop/v/0.0.0/app/localization/webmail/zh_TW.yml b/rainloop/v/0.0.0/app/localization/webmail/zh_TW.yml
index 2d123b2dc..d005cf0a1 100644
--- a/rainloop/v/0.0.0/app/localization/webmail/zh_TW.yml
+++ b/rainloop/v/0.0.0/app/localization/webmail/zh_TW.yml
@@ -453,7 +453,6 @@ zh_TW:
     LABEL_ADD_SIGNATURE_TO_ALL: "Add your signature to all the outgoing messages"
   SETTINGS_SECURITY:
     LEGEND_SECURITY: "Security"
-    LABEL_CONFIGURATE_TWO_FACTOR: "Configurate 2-Step verification"
     LABEL_AUTOLOGOUT: "Auto Logout"
     AUTOLOGIN_NEVER_OPTION_NAME: "Never"
     AUTOLOGIN_MINUTES_OPTION_NAME: "%MINUTES% minute(s)"