From 970ff11689ea075bf869e7bdad987e5e4f405498 Mon Sep 17 00:00:00 2001
From: Baligh Uddin <baligh@google.com>
Date: Wed, 23 Apr 2014 15:30:45 -0700
Subject: [PATCH] Import translations. DO NOT MERGE

Change-Id: I2e1aea8e6e9ae1ecee943ce1f0104d8f1260c52d
Auto-generated-cl: translation import
---
 res/values-af/strings.xml     | 32 ++++++++++++------------
 res/values-am/strings.xml     | 32 ++++++++++++------------
 res/values-ar/strings.xml     | 32 ++++++++++++------------
 res/values-bg/strings.xml     | 32 ++++++++++++------------
 res/values-ca/strings.xml     | 32 ++++++++++++------------
 res/values-cs/strings.xml     | 32 ++++++++++++------------
 res/values-da/strings.xml     | 32 ++++++++++++------------
 res/values-de/strings.xml     | 32 ++++++++++++------------
 res/values-el/strings.xml     | 32 ++++++++++++------------
 res/values-en-rGB/strings.xml | 32 ++++++++++++------------
 res/values-en-rIN/strings.xml | 32 ++++++++++++------------
 res/values-es-rUS/strings.xml | 32 ++++++++++++------------
 res/values-es/strings.xml     | 32 ++++++++++++------------
 res/values-et-rEE/strings.xml | 32 ++++++++++++------------
 res/values-fa/strings.xml     | 32 ++++++++++++------------
 res/values-fi/strings.xml     | 47 +++++++++++++++++++++++------------
 res/values-fr-rCA/strings.xml | 32 ++++++++++++------------
 res/values-fr/strings.xml     | 32 ++++++++++++------------
 res/values-hi/strings.xml     | 32 ++++++++++++------------
 res/values-hr/strings.xml     | 32 ++++++++++++------------
 res/values-hu/strings.xml     | 32 ++++++++++++------------
 res/values-hy-rAM/strings.xml | 47 +++++++++++++++++++++++------------
 res/values-in/strings.xml     | 32 ++++++++++++------------
 res/values-it/strings.xml     | 32 ++++++++++++------------
 res/values-iw/strings.xml     | 32 ++++++++++++------------
 res/values-ja/strings.xml     | 47 +++++++++++++++++++++++------------
 res/values-ka-rGE/strings.xml | 32 ++++++++++++------------
 res/values-km-rKH/strings.xml | 32 ++++++++++++------------
 res/values-ko/strings.xml     | 47 +++++++++++++++++++++++------------
 res/values-lo-rLA/strings.xml | 47 +++++++++++++++++++++++------------
 res/values-lt/strings.xml     | 32 ++++++++++++------------
 res/values-lv/strings.xml     | 32 ++++++++++++------------
 res/values-mn-rMN/strings.xml | 32 ++++++++++++------------
 res/values-ms-rMY/strings.xml | 47 +++++++++++++++++++++++------------
 res/values-nb/strings.xml     | 32 ++++++++++++------------
 res/values-nl/strings.xml     | 32 ++++++++++++------------
 res/values-pl/strings.xml     | 32 ++++++++++++------------
 res/values-pt-rPT/strings.xml | 32 ++++++++++++------------
 res/values-pt/strings.xml     | 47 +++++++++++++++++++++++------------
 res/values-rm/strings.xml     | 43 +++++++++++++++++++-------------
 res/values-ro/strings.xml     | 47 +++++++++++++++++++++++------------
 res/values-ru/strings.xml     | 47 +++++++++++++++++++++++------------
 res/values-sk/strings.xml     | 32 ++++++++++++------------
 res/values-sl/strings.xml     | 32 ++++++++++++------------
 res/values-sr/strings.xml     | 38 ++++++++++++++--------------
 res/values-sv/strings.xml     | 32 ++++++++++++------------
 res/values-sw/strings.xml     | 32 ++++++++++++------------
 res/values-th/strings.xml     | 32 ++++++++++++------------
 res/values-tl/strings.xml     | 47 +++++++++++++++++++++++------------
 res/values-tr/strings.xml     | 47 +++++++++++++++++++++++------------
 res/values-uk/strings.xml     | 32 ++++++++++++------------
 res/values-vi/strings.xml     | 47 +++++++++++++++++++++++------------
 res/values-zh-rCN/strings.xml | 47 +++++++++++++++++++++++------------
 res/values-zh-rHK/strings.xml | 47 +++++++++++++++++++++++------------
 res/values-zh-rTW/strings.xml | 47 +++++++++++++++++++++++------------
 res/values-zu/strings.xml     | 32 ++++++++++++------------
 56 files changed, 1134 insertions(+), 900 deletions(-)

diff --git a/res/values-af/strings.xml b/res/values-af/strings.xml
index 6e97da180..fa81dbb9a 100644
--- a/res/values-af/strings.xml
+++ b/res/values-af/strings.xml
@@ -87,13 +87,13 @@
     <string name="account_setup_basics_email_label" msgid="3454164053624112047">"E-posadres"</string>
     <string name="or_label" msgid="2207403489755254427">"OF"</string>
     <string name="sign_in_with_google" msgid="9051489501495503976">"Meld aan met Google"</string>
-    <string name="account_setup_basics_password_label" msgid="9133549799291519298">"Wagwoord"</string>
-    <string name="password_label" msgid="5228754278985667134">"Wagwoord"</string>
+    <string name="account_setup_basics_password_label" msgid="3402762431598148148">"WAGWOORD"</string>
+    <string name="password_hint" msgid="8835390747504721561">"Wagwoord"</string>
     <string name="signed_in_with_service_label" msgid="4909910797357155961">"Aangemeld met %s"</string>
-    <string name="authentication_label" msgid="5210804218348191833">"Stawing"</string>
+    <string name="authentication_label" msgid="6917956186120234602">"STAWING"</string>
     <string name="add_authentication_label" msgid="865206092644419804">"Voeg stawing by"</string>
     <string name="clear_authentication_label" msgid="8113966442068335059">"Vee stawing uit"</string>
-    <string name="account_setup_basics_manual_setup_action" msgid="6640115171889882878"><u>"Handmatige opstelling"</u></string>
+    <string name="account_setup_basics_manual_setup_action" msgid="8053852205391155912">"Handmatige opstelling"</string>
     <string name="account_setup_username_password_toast" msgid="3968270274727947460">"Voer asseblief \'n geldige e-posadres en wagwoord in."</string>
     <string name="account_duplicate_dlg_title" msgid="8089732986912704425">"Duplikaatrekening"</string>
     <string name="account_duplicate_dlg_message_fmt" msgid="6447629283679935840">"Jy gebruik reeds hierdie gebruikernaam vir die rekening \"<xliff:g id="DUPLICATE">%s</xliff:g>\"."</string>
@@ -114,11 +114,11 @@
     <string name="account_setup_account_type_instructions" msgid="114515540798408760">"Watter soort rekening is dit?"</string>
     <string name="account_setup_incoming_title" msgid="6796626791039136005">"Rekening-opstelling"</string>
     <string name="account_setup_incoming_headline" msgid="6183711037633407184">"Inkomende bedienerinstellings"</string>
-    <string name="account_setup_incoming_username_label" msgid="5700581386104070302">"Gebruikernaam"</string>
-    <string name="account_setup_incoming_password_label" msgid="6365327603172559859">"Wagwoord"</string>
-    <string name="account_setup_incoming_server_label" msgid="1480342966630002638">"Bediener"</string>
-    <string name="account_setup_incoming_port_label" msgid="8214738923690447796">"Poort"</string>
-    <string name="account_setup_incoming_security_label" msgid="2110260791086007424">"Sekuriteitstipe"</string>
+    <string name="account_setup_incoming_username_label" msgid="406939983633223354">"GEBRUIKERNAAM"</string>
+    <string name="account_setup_incoming_password_label" msgid="634540235479188709">"WAGWOORD"</string>
+    <string name="account_setup_incoming_server_label" msgid="3528558488000638420">"BEDIENER"</string>
+    <string name="account_setup_incoming_port_label" msgid="5311652277990186704">"POORT"</string>
+    <string name="account_setup_incoming_security_label" msgid="1175710992470593691">"SEKURITEITTIPE"</string>
     <string name="account_setup_incoming_security_none_label" msgid="8300169413118264895">"Geen"</string>
     <string name="account_setup_incoming_security_ssl_trust_certificates_label" msgid="6151855090123117538">"SSL/TLS (Aanvaar alle sertifikate)"</string>
     <string name="account_setup_incoming_security_ssl_label" msgid="2798501138420163861">"SSL/TLS"</string>
@@ -131,18 +131,18 @@
     <string name="account_setup_incoming_imap_path_prefix_hint" msgid="9190845919067906033">"Opsioneel"</string>
     <string name="account_setup_outgoing_title" msgid="7208495965665711539">"Rekening-opstelling"</string>
     <string name="account_setup_outgoing_headline" msgid="2025001060935366394">"Instellings vir uitgaande bediener"</string>
-    <string name="account_setup_outgoing_smtp_server_label" msgid="6035137446691195177">"SMTP-bediener"</string>
-    <string name="account_setup_outgoing_port_label" msgid="7573207437835827876">"Poort"</string>
-    <string name="account_setup_outgoing_security_label" msgid="911398071120720589">"Sekuriteitstipe"</string>
+    <string name="account_setup_outgoing_smtp_server_label" msgid="1164004960070541473">"SMTP-BEDIENER"</string>
+    <string name="account_setup_outgoing_port_label" msgid="4670120792135566784">"POORT"</string>
+    <string name="account_setup_outgoing_security_label" msgid="9200220309360082664">"SEKURITEITTIPE"</string>
     <string name="account_setup_outgoing_require_login_label" msgid="7779484127897397562">"Vereis aanmelding"</string>
-    <string name="account_setup_outgoing_username_label" msgid="3309680794731596981">"Gebruikernaam"</string>
-    <string name="account_setup_outgoing_password_label" msgid="227844585493317550">"Wagwoord"</string>
-    <string name="account_setup_exchange_certificate_title" msgid="8473793588405277962">"Kliëntsertifikaat"</string>
+    <string name="account_setup_outgoing_username_label" msgid="7239411429115525841">"GEBRUIKERNAAM"</string>
+    <string name="account_setup_outgoing_password_label" msgid="3720429254654722208">"WAGWOORD"</string>
+    <string name="account_setup_exchange_certificate_title" msgid="1635140303999054002">"KLIËNTSERTIFIKAAT"</string>
     <string name="account_setup_exchange_select_certificate" msgid="1536103662037268683">"Kies"</string>
     <string name="account_setup_exchange_use_certificate" msgid="8690682770083161349">"Gebruik kliëntsertifikaat"</string>
     <string name="account_setup_exchange_remove_certificate" msgid="5633249155510301766">"Verwyder"</string>
     <string name="account_setup_exchange_no_certificate" msgid="1119542961954780872">"Geen"</string>
-    <string name="account_setup_exchange_device_id_label" msgid="1646827333223157658">"Mobiele toestel se ID"</string>
+    <string name="account_setup_exchange_device_id_label" msgid="5105898844003459657">"MOBIELE TOESTEL SE ID"</string>
     <string name="account_setup_options_title" msgid="9016600767888846051">"Rekeninginstellings"</string>
     <string name="account_setup_options_headline" msgid="4181274232835368085">"Rekeningopsies"</string>
     <string name="account_setup_options_mail_check_frequency_label" msgid="4824859792882810053">"Kontroleer inkassie elke"</string>
diff --git a/res/values-am/strings.xml b/res/values-am/strings.xml
index 8519094a9..c60f9d296 100644
--- a/res/values-am/strings.xml
+++ b/res/values-am/strings.xml
@@ -87,13 +87,13 @@
     <string name="account_setup_basics_email_label" msgid="3454164053624112047">"ኢሜይል አድራሻ"</string>
     <string name="or_label" msgid="2207403489755254427">"ወይም"</string>
     <string name="sign_in_with_google" msgid="9051489501495503976">"በGoogle ይግቡ"</string>
-    <string name="account_setup_basics_password_label" msgid="9133549799291519298">"የይለፍ ቃል፡"</string>
-    <string name="password_label" msgid="5228754278985667134">"የይለፍ ቃል"</string>
+    <string name="account_setup_basics_password_label" msgid="3402762431598148148">"የይለፍ ቃል"</string>
+    <string name="password_hint" msgid="8835390747504721561">"የይለፍ ቃል"</string>
     <string name="signed_in_with_service_label" msgid="4909910797357155961">"በ%s ወደ መለያ ተገብቷል"</string>
-    <string name="authentication_label" msgid="5210804218348191833">"ማረጋገጥ"</string>
+    <string name="authentication_label" msgid="6917956186120234602">"ማረጋገጫ"</string>
     <string name="add_authentication_label" msgid="865206092644419804">"ማረጋገጫ አክል"</string>
     <string name="clear_authentication_label" msgid="8113966442068335059">"ማረጋገጫን አጽዳ"</string>
-    <string name="account_setup_basics_manual_setup_action" msgid="6640115171889882878"><u>"በእጅ ማዋቀር"</u></string>
+    <string name="account_setup_basics_manual_setup_action" msgid="8053852205391155912">"በእጅ አዘጋጅ"</string>
     <string name="account_setup_username_password_toast" msgid="3968270274727947460">"እባክህ ትክክለኛ ኢሜይል አድራሻ እና ይለፍ ቃል ፃፍ።"</string>
     <string name="account_duplicate_dlg_title" msgid="8089732986912704425">"ተመሳሳይ መለያ"</string>
     <string name="account_duplicate_dlg_message_fmt" msgid="6447629283679935840">"ለመለያ \"<xliff:g id="DUPLICATE">%s</xliff:g>\" ይህን ተጠቃሚ ስም ቀደም ሲል እየተጠቀምክበት ነው::"</string>
@@ -114,11 +114,11 @@
     <string name="account_setup_account_type_instructions" msgid="114515540798408760">"ይህምንአይነት መለያ ነው?"</string>
     <string name="account_setup_incoming_title" msgid="6796626791039136005">"መለያ አዘጋጅ"</string>
     <string name="account_setup_incoming_headline" msgid="6183711037633407184">"የገቢ አገልጋይ ቅንብሮች"</string>
-    <string name="account_setup_incoming_username_label" msgid="5700581386104070302">"የተጠቃሚ ስም"</string>
-    <string name="account_setup_incoming_password_label" msgid="6365327603172559859">"የይለፍ ቃል"</string>
-    <string name="account_setup_incoming_server_label" msgid="1480342966630002638">"አገልጋይ"</string>
-    <string name="account_setup_incoming_port_label" msgid="8214738923690447796">"ወደብ"</string>
-    <string name="account_setup_incoming_security_label" msgid="2110260791086007424">"የደህንነትአይነት"</string>
+    <string name="account_setup_incoming_username_label" msgid="406939983633223354">"የተጠቃሚ ስም"</string>
+    <string name="account_setup_incoming_password_label" msgid="634540235479188709">"የይለፍ ቃል"</string>
+    <string name="account_setup_incoming_server_label" msgid="3528558488000638420">"አገልጋይ"</string>
+    <string name="account_setup_incoming_port_label" msgid="5311652277990186704">"ወደብ"</string>
+    <string name="account_setup_incoming_security_label" msgid="1175710992470593691">"የደህንነት አይነት"</string>
     <string name="account_setup_incoming_security_none_label" msgid="8300169413118264895">"አንዱም"</string>
     <string name="account_setup_incoming_security_ssl_trust_certificates_label" msgid="6151855090123117538">"SSL/TLS (ሁሉንም ምስክሮች ተቀበል)"</string>
     <string name="account_setup_incoming_security_ssl_label" msgid="2798501138420163861">"SSL/TLS"</string>
@@ -131,18 +131,18 @@
     <string name="account_setup_incoming_imap_path_prefix_hint" msgid="9190845919067906033">"አማራጭ"</string>
     <string name="account_setup_outgoing_title" msgid="7208495965665711539">"መለያ አዘጋጅ"</string>
     <string name="account_setup_outgoing_headline" msgid="2025001060935366394">"የወጪ አገልጋይ ቅንብሮች"</string>
-    <string name="account_setup_outgoing_smtp_server_label" msgid="6035137446691195177">"የSMTP አገልጋይ"</string>
-    <string name="account_setup_outgoing_port_label" msgid="7573207437835827876">"ወደብ"</string>
-    <string name="account_setup_outgoing_security_label" msgid="911398071120720589">"የደህንነትአይነት"</string>
+    <string name="account_setup_outgoing_smtp_server_label" msgid="1164004960070541473">"SMTP አገልጋይ"</string>
+    <string name="account_setup_outgoing_port_label" msgid="4670120792135566784">"ወደብ"</string>
+    <string name="account_setup_outgoing_security_label" msgid="9200220309360082664">"የደህንነት አይነት"</string>
     <string name="account_setup_outgoing_require_login_label" msgid="7779484127897397562">"ከፍቶ መግባት ይፈልጋል"</string>
-    <string name="account_setup_outgoing_username_label" msgid="3309680794731596981">"የተጠቃሚ ስም"</string>
-    <string name="account_setup_outgoing_password_label" msgid="227844585493317550">"የይለፍ ቃል"</string>
-    <string name="account_setup_exchange_certificate_title" msgid="8473793588405277962">"የደንበኛ ምስክር ወረቀት"</string>
+    <string name="account_setup_outgoing_username_label" msgid="7239411429115525841">"የተጠቃሚ ስም"</string>
+    <string name="account_setup_outgoing_password_label" msgid="3720429254654722208">"የይለፍ ቃል"</string>
+    <string name="account_setup_exchange_certificate_title" msgid="1635140303999054002">"የደንበኛ ምስክር ወረቀት"</string>
     <string name="account_setup_exchange_select_certificate" msgid="1536103662037268683">"ምረጥ"</string>
     <string name="account_setup_exchange_use_certificate" msgid="8690682770083161349">"የደንበኛ ዕውቅና ማረጋገጫ  ተጠቀም"</string>
     <string name="account_setup_exchange_remove_certificate" msgid="5633249155510301766">"አስወግድ"</string>
     <string name="account_setup_exchange_no_certificate" msgid="1119542961954780872">"የለም"</string>
-    <string name="account_setup_exchange_device_id_label" msgid="1646827333223157658">"የተንቀሳቃሽ መሣሪያ መታወቂያ"</string>
+    <string name="account_setup_exchange_device_id_label" msgid="5105898844003459657">"የተንቀሳቃሽ መሣሪያ መታወቂያ"</string>
     <string name="account_setup_options_title" msgid="9016600767888846051">"መለያ ቅንብሮች"</string>
     <string name="account_setup_options_headline" msgid="4181274232835368085">"የመለያ አማራጮች"</string>
     <string name="account_setup_options_mail_check_frequency_label" msgid="4824859792882810053">"የገቢ መልዕክት ምልከታ ድግግሞሽ"</string>
diff --git a/res/values-ar/strings.xml b/res/values-ar/strings.xml
index 523490f9f..f6cedc67f 100644
--- a/res/values-ar/strings.xml
+++ b/res/values-ar/strings.xml
@@ -87,13 +87,13 @@
     <string name="account_setup_basics_email_label" msgid="3454164053624112047">"عنوان البريد الإلكتروني"</string>
     <string name="or_label" msgid="2207403489755254427">"أو"</string>
     <string name="sign_in_with_google" msgid="9051489501495503976">"‏تسجيل الدخول بحساب Google"</string>
-    <string name="account_setup_basics_password_label" msgid="9133549799291519298">"كلمة المرور"</string>
-    <string name="password_label" msgid="5228754278985667134">"كلمة المرور"</string>
+    <string name="account_setup_basics_password_label" msgid="3402762431598148148">"كلمة المرور"</string>
+    <string name="password_hint" msgid="8835390747504721561">"كلمة المرور"</string>
     <string name="signed_in_with_service_label" msgid="4909910797357155961">"‏تم تسجيل الدخول باستخدام %s"</string>
-    <string name="authentication_label" msgid="5210804218348191833">"المصادقة"</string>
+    <string name="authentication_label" msgid="6917956186120234602">"المصادقة"</string>
     <string name="add_authentication_label" msgid="865206092644419804">"إضافة مصادقة"</string>
     <string name="clear_authentication_label" msgid="8113966442068335059">"محو المصادقة"</string>
-    <string name="account_setup_basics_manual_setup_action" msgid="6640115171889882878"><u>"الإعداد اليدوي"</u></string>
+    <string name="account_setup_basics_manual_setup_action" msgid="8053852205391155912">"إعداد يدوي"</string>
     <string name="account_setup_username_password_toast" msgid="3968270274727947460">"اكتب عنوان بريد إلكتروني وكلمة مرور صالحين."</string>
     <string name="account_duplicate_dlg_title" msgid="8089732986912704425">"حساب متكرر"</string>
     <string name="account_duplicate_dlg_message_fmt" msgid="6447629283679935840">"إنك تستخدم اسم المستخدم هذا للحساب \"<xliff:g id="DUPLICATE">%s</xliff:g>\" فعلاً."</string>
@@ -114,11 +114,11 @@
     <string name="account_setup_account_type_instructions" msgid="114515540798408760">"ما نوع هذا الحساب؟"</string>
     <string name="account_setup_incoming_title" msgid="6796626791039136005">"إعداد الحساب"</string>
     <string name="account_setup_incoming_headline" msgid="6183711037633407184">"إعدادات خادم البريد الوارد"</string>
-    <string name="account_setup_incoming_username_label" msgid="5700581386104070302">"اسم المستخدم"</string>
-    <string name="account_setup_incoming_password_label" msgid="6365327603172559859">"كلمة المرور"</string>
-    <string name="account_setup_incoming_server_label" msgid="1480342966630002638">"الخادم"</string>
-    <string name="account_setup_incoming_port_label" msgid="8214738923690447796">"المنفذ"</string>
-    <string name="account_setup_incoming_security_label" msgid="2110260791086007424">"نوع الأمان"</string>
+    <string name="account_setup_incoming_username_label" msgid="406939983633223354">"اسم المستخدم"</string>
+    <string name="account_setup_incoming_password_label" msgid="634540235479188709">"كلمة المرور"</string>
+    <string name="account_setup_incoming_server_label" msgid="3528558488000638420">"الخادم"</string>
+    <string name="account_setup_incoming_port_label" msgid="5311652277990186704">"المنفذ"</string>
+    <string name="account_setup_incoming_security_label" msgid="1175710992470593691">"نوع الأمان"</string>
     <string name="account_setup_incoming_security_none_label" msgid="8300169413118264895">"لا شيء"</string>
     <string name="account_setup_incoming_security_ssl_trust_certificates_label" msgid="6151855090123117538">"طبقة المقابس الآمنة/طبقة النقل الآمنة (قبول جميع الشهادات)"</string>
     <string name="account_setup_incoming_security_ssl_label" msgid="2798501138420163861">"طبقة المقابس الآمنة/طبقة النقل الآمنة"</string>
@@ -131,18 +131,18 @@
     <string name="account_setup_incoming_imap_path_prefix_hint" msgid="9190845919067906033">"اختياري"</string>
     <string name="account_setup_outgoing_title" msgid="7208495965665711539">"إعداد الحساب"</string>
     <string name="account_setup_outgoing_headline" msgid="2025001060935366394">"إعدادات خادم البريد الصادر"</string>
-    <string name="account_setup_outgoing_smtp_server_label" msgid="6035137446691195177">"‏خادم SMTP"</string>
-    <string name="account_setup_outgoing_port_label" msgid="7573207437835827876">"المنفذ"</string>
-    <string name="account_setup_outgoing_security_label" msgid="911398071120720589">"نوع الأمان"</string>
+    <string name="account_setup_outgoing_smtp_server_label" msgid="1164004960070541473">"‏خادم SMTP"</string>
+    <string name="account_setup_outgoing_port_label" msgid="4670120792135566784">"المنفذ"</string>
+    <string name="account_setup_outgoing_security_label" msgid="9200220309360082664">"نوع الأمان"</string>
     <string name="account_setup_outgoing_require_login_label" msgid="7779484127897397562">"طلب تسجيل الدخول"</string>
-    <string name="account_setup_outgoing_username_label" msgid="3309680794731596981">"اسم المستخدم"</string>
-    <string name="account_setup_outgoing_password_label" msgid="227844585493317550">"كلمة المرور"</string>
-    <string name="account_setup_exchange_certificate_title" msgid="8473793588405277962">"شهادة العميل"</string>
+    <string name="account_setup_outgoing_username_label" msgid="7239411429115525841">"اسم المستخدم"</string>
+    <string name="account_setup_outgoing_password_label" msgid="3720429254654722208">"كلمة المرور"</string>
+    <string name="account_setup_exchange_certificate_title" msgid="1635140303999054002">"شهادة العميل"</string>
     <string name="account_setup_exchange_select_certificate" msgid="1536103662037268683">"تحديد"</string>
     <string name="account_setup_exchange_use_certificate" msgid="8690682770083161349">"استخدام شهادة العميل"</string>
     <string name="account_setup_exchange_remove_certificate" msgid="5633249155510301766">"إزالة"</string>
     <string name="account_setup_exchange_no_certificate" msgid="1119542961954780872">"بلا"</string>
-    <string name="account_setup_exchange_device_id_label" msgid="1646827333223157658">"معرّف جهاز الجوال"</string>
+    <string name="account_setup_exchange_device_id_label" msgid="5105898844003459657">"معرّف جهاز الجوّال"</string>
     <string name="account_setup_options_title" msgid="9016600767888846051">"إعدادات الحساب"</string>
     <string name="account_setup_options_headline" msgid="4181274232835368085">"خيارات الحساب"</string>
     <string name="account_setup_options_mail_check_frequency_label" msgid="4824859792882810053">"معدل الإطلاع على البريد الوارد"</string>
diff --git a/res/values-bg/strings.xml b/res/values-bg/strings.xml
index 5286984c1..fb3f96862 100644
--- a/res/values-bg/strings.xml
+++ b/res/values-bg/strings.xml
@@ -87,13 +87,13 @@
     <string name="account_setup_basics_email_label" msgid="3454164053624112047">"Имейл адрес"</string>
     <string name="or_label" msgid="2207403489755254427">"ИЛИ"</string>
     <string name="sign_in_with_google" msgid="9051489501495503976">"Вход с Google"</string>
-    <string name="account_setup_basics_password_label" msgid="9133549799291519298">"Парола"</string>
-    <string name="password_label" msgid="5228754278985667134">"Парола"</string>
+    <string name="account_setup_basics_password_label" msgid="3402762431598148148">"ПАРОЛА"</string>
+    <string name="password_hint" msgid="8835390747504721561">"Парола"</string>
     <string name="signed_in_with_service_label" msgid="4909910797357155961">"Влезли сте със: %s"</string>
-    <string name="authentication_label" msgid="5210804218348191833">"Удостоверяване"</string>
+    <string name="authentication_label" msgid="6917956186120234602">"УДОСТОВЕРЯВАНЕ"</string>
     <string name="add_authentication_label" msgid="865206092644419804">"Добавяне на удостоверяване"</string>
     <string name="clear_authentication_label" msgid="8113966442068335059">"Изчистване на удостоверяването"</string>
-    <string name="account_setup_basics_manual_setup_action" msgid="6640115171889882878"><u>"Ръчно настройване"</u></string>
+    <string name="account_setup_basics_manual_setup_action" msgid="8053852205391155912">"Ръчна настройка"</string>
     <string name="account_setup_username_password_toast" msgid="3968270274727947460">"Въведете валиден имейл адрес и парола."</string>
     <string name="account_duplicate_dlg_title" msgid="8089732986912704425">"Дублиращ профил"</string>
     <string name="account_duplicate_dlg_message_fmt" msgid="6447629283679935840">"Вече използвате това потребителско име за профила „<xliff:g id="DUPLICATE">%s</xliff:g>“."</string>
@@ -114,11 +114,11 @@
     <string name="account_setup_account_type_instructions" msgid="114515540798408760">"Какъв вид профил е това?"</string>
     <string name="account_setup_incoming_title" msgid="6796626791039136005">"Настройка на профила"</string>
     <string name="account_setup_incoming_headline" msgid="6183711037633407184">"Настройки на входящия сървър"</string>
-    <string name="account_setup_incoming_username_label" msgid="5700581386104070302">"Потребителско име"</string>
-    <string name="account_setup_incoming_password_label" msgid="6365327603172559859">"Парола"</string>
-    <string name="account_setup_incoming_server_label" msgid="1480342966630002638">"Сървър"</string>
-    <string name="account_setup_incoming_port_label" msgid="8214738923690447796">"Порт"</string>
-    <string name="account_setup_incoming_security_label" msgid="2110260791086007424">"Вид защита"</string>
+    <string name="account_setup_incoming_username_label" msgid="406939983633223354">"ПОТРЕБИТЕЛСКО ИМЕ"</string>
+    <string name="account_setup_incoming_password_label" msgid="634540235479188709">"ПАРОЛА"</string>
+    <string name="account_setup_incoming_server_label" msgid="3528558488000638420">"СЪРВЪР"</string>
+    <string name="account_setup_incoming_port_label" msgid="5311652277990186704">"ПОРТ"</string>
+    <string name="account_setup_incoming_security_label" msgid="1175710992470593691">"ТИП СИГУРНОСТ"</string>
     <string name="account_setup_incoming_security_none_label" msgid="8300169413118264895">"Няма"</string>
     <string name="account_setup_incoming_security_ssl_trust_certificates_label" msgid="6151855090123117538">"SSL/TLS (Приемане на всички сертификати)"</string>
     <string name="account_setup_incoming_security_ssl_label" msgid="2798501138420163861">"SSL/TLS"</string>
@@ -131,18 +131,18 @@
     <string name="account_setup_incoming_imap_path_prefix_hint" msgid="9190845919067906033">"По избор"</string>
     <string name="account_setup_outgoing_title" msgid="7208495965665711539">"Настройка на профила"</string>
     <string name="account_setup_outgoing_headline" msgid="2025001060935366394">"Настройки на изходящия сървър"</string>
-    <string name="account_setup_outgoing_smtp_server_label" msgid="6035137446691195177">"SMTP сървър"</string>
-    <string name="account_setup_outgoing_port_label" msgid="7573207437835827876">"Порт"</string>
-    <string name="account_setup_outgoing_security_label" msgid="911398071120720589">"Вид защита"</string>
+    <string name="account_setup_outgoing_smtp_server_label" msgid="1164004960070541473">"SMTP СЪРВЪР"</string>
+    <string name="account_setup_outgoing_port_label" msgid="4670120792135566784">"ПОРТ"</string>
+    <string name="account_setup_outgoing_security_label" msgid="9200220309360082664">"ТИП СИГУРНОСТ"</string>
     <string name="account_setup_outgoing_require_login_label" msgid="7779484127897397562">"Изисква влизане в профил"</string>
-    <string name="account_setup_outgoing_username_label" msgid="3309680794731596981">"Потребителско име"</string>
-    <string name="account_setup_outgoing_password_label" msgid="227844585493317550">"Парола"</string>
-    <string name="account_setup_exchange_certificate_title" msgid="8473793588405277962">"Сертификат за клиентска програма"</string>
+    <string name="account_setup_outgoing_username_label" msgid="7239411429115525841">"ПОТРЕБИТЕЛСКО ИМЕ"</string>
+    <string name="account_setup_outgoing_password_label" msgid="3720429254654722208">"ПАРОЛА"</string>
+    <string name="account_setup_exchange_certificate_title" msgid="1635140303999054002">"СЕРТИФИКАТ ЗА КЛИЕНТСКА ПРОГРАМА"</string>
     <string name="account_setup_exchange_select_certificate" msgid="1536103662037268683">"Избиране"</string>
     <string name="account_setup_exchange_use_certificate" msgid="8690682770083161349">"Със сертификат за клиентска прогр."</string>
     <string name="account_setup_exchange_remove_certificate" msgid="5633249155510301766">"Премахване"</string>
     <string name="account_setup_exchange_no_certificate" msgid="1119542961954780872">"Нито един"</string>
-    <string name="account_setup_exchange_device_id_label" msgid="1646827333223157658">"Идент. № на мобилното у-во"</string>
+    <string name="account_setup_exchange_device_id_label" msgid="5105898844003459657">"ИДЕНТ. № НА МОБИЛНОТО У-ВО"</string>
     <string name="account_setup_options_title" msgid="9016600767888846051">"Настройки на профила"</string>
     <string name="account_setup_options_headline" msgid="4181274232835368085">"Опции за профила"</string>
     <string name="account_setup_options_mail_check_frequency_label" msgid="4824859792882810053">"Честота на проверяване за входяща поща"</string>
diff --git a/res/values-ca/strings.xml b/res/values-ca/strings.xml
index ba2d57187..01b6b155c 100644
--- a/res/values-ca/strings.xml
+++ b/res/values-ca/strings.xml
@@ -87,13 +87,13 @@
     <string name="account_setup_basics_email_label" msgid="3454164053624112047">"Adreça electrònica"</string>
     <string name="or_label" msgid="2207403489755254427">"O BÉ"</string>
     <string name="sign_in_with_google" msgid="9051489501495503976">"Inicia la sessió amb Google"</string>
-    <string name="account_setup_basics_password_label" msgid="9133549799291519298">"Contrasenya"</string>
-    <string name="password_label" msgid="5228754278985667134">"Contrasenya"</string>
+    <string name="account_setup_basics_password_label" msgid="3402762431598148148">"CONTRASENYA"</string>
+    <string name="password_hint" msgid="8835390747504721561">"Contrasenya"</string>
     <string name="signed_in_with_service_label" msgid="4909910797357155961">"Sessió iniciada amb %s"</string>
-    <string name="authentication_label" msgid="5210804218348191833">"Autenticació"</string>
+    <string name="authentication_label" msgid="6917956186120234602">"AUTENTICACIÓ"</string>
     <string name="add_authentication_label" msgid="865206092644419804">"Afegeix l\'autenticació"</string>
     <string name="clear_authentication_label" msgid="8113966442068335059">"Esborra l\'autenticació"</string>
-    <string name="account_setup_basics_manual_setup_action" msgid="6640115171889882878"><u>"Configuració manual"</u></string>
+    <string name="account_setup_basics_manual_setup_action" msgid="8053852205391155912">"Configuració manual"</string>
     <string name="account_setup_username_password_toast" msgid="3968270274727947460">"Escriu una adreça electrònica i una contrasenya vàlides."</string>
     <string name="account_duplicate_dlg_title" msgid="8089732986912704425">"Compte duplicat"</string>
     <string name="account_duplicate_dlg_message_fmt" msgid="6447629283679935840">"Ja estàs fent servir aquest nom d\'usuari per al compte \"<xliff:g id="DUPLICATE">%s</xliff:g>\"."</string>
@@ -114,11 +114,11 @@
     <string name="account_setup_account_type_instructions" msgid="114515540798408760">"Quin tipus de compte és?"</string>
     <string name="account_setup_incoming_title" msgid="6796626791039136005">"Configuració del compte"</string>
     <string name="account_setup_incoming_headline" msgid="6183711037633407184">"Configuració del servidor d\'entrada"</string>
-    <string name="account_setup_incoming_username_label" msgid="5700581386104070302">"Nom d\'usuari"</string>
-    <string name="account_setup_incoming_password_label" msgid="6365327603172559859">"Contrasenya"</string>
-    <string name="account_setup_incoming_server_label" msgid="1480342966630002638">"Servidor"</string>
-    <string name="account_setup_incoming_port_label" msgid="8214738923690447796">"Port"</string>
-    <string name="account_setup_incoming_security_label" msgid="2110260791086007424">"Tipus de seguretat"</string>
+    <string name="account_setup_incoming_username_label" msgid="406939983633223354">"NOM D\'USUARI"</string>
+    <string name="account_setup_incoming_password_label" msgid="634540235479188709">"CONTRASENYA"</string>
+    <string name="account_setup_incoming_server_label" msgid="3528558488000638420">"SERVIDOR"</string>
+    <string name="account_setup_incoming_port_label" msgid="5311652277990186704">"PORT"</string>
+    <string name="account_setup_incoming_security_label" msgid="1175710992470593691">"TIPUS DE SEGURETAT"</string>
     <string name="account_setup_incoming_security_none_label" msgid="8300169413118264895">"Cap"</string>
     <string name="account_setup_incoming_security_ssl_trust_certificates_label" msgid="6151855090123117538">"SSL/TLS (accepta tots els certificats)"</string>
     <string name="account_setup_incoming_security_ssl_label" msgid="2798501138420163861">"SSL/TLS"</string>
@@ -131,18 +131,18 @@
     <string name="account_setup_incoming_imap_path_prefix_hint" msgid="9190845919067906033">"Opcional"</string>
     <string name="account_setup_outgoing_title" msgid="7208495965665711539">"Configuració del compte"</string>
     <string name="account_setup_outgoing_headline" msgid="2025001060935366394">"Configuració del servidor de sortida"</string>
-    <string name="account_setup_outgoing_smtp_server_label" msgid="6035137446691195177">"Servidor SMTP"</string>
-    <string name="account_setup_outgoing_port_label" msgid="7573207437835827876">"Port"</string>
-    <string name="account_setup_outgoing_security_label" msgid="911398071120720589">"Tipus de seguretat"</string>
+    <string name="account_setup_outgoing_smtp_server_label" msgid="1164004960070541473">"SERVIDOR SMTP"</string>
+    <string name="account_setup_outgoing_port_label" msgid="4670120792135566784">"PORT"</string>
+    <string name="account_setup_outgoing_security_label" msgid="9200220309360082664">"TIPUS DE SEGURETAT"</string>
     <string name="account_setup_outgoing_require_login_label" msgid="7779484127897397562">"Requereix l\'inici de sessió"</string>
-    <string name="account_setup_outgoing_username_label" msgid="3309680794731596981">"Nom d\'usuari"</string>
-    <string name="account_setup_outgoing_password_label" msgid="227844585493317550">"Contrasenya"</string>
-    <string name="account_setup_exchange_certificate_title" msgid="8473793588405277962">"Certificat de client"</string>
+    <string name="account_setup_outgoing_username_label" msgid="7239411429115525841">"NOM D\'USUARI"</string>
+    <string name="account_setup_outgoing_password_label" msgid="3720429254654722208">"CONTRASENYA"</string>
+    <string name="account_setup_exchange_certificate_title" msgid="1635140303999054002">"CERTIFICAT DE CLIENT"</string>
     <string name="account_setup_exchange_select_certificate" msgid="1536103662037268683">"Selecciona"</string>
     <string name="account_setup_exchange_use_certificate" msgid="8690682770083161349">"Utilitza un certificat de client"</string>
     <string name="account_setup_exchange_remove_certificate" msgid="5633249155510301766">"Elimina"</string>
     <string name="account_setup_exchange_no_certificate" msgid="1119542961954780872">"Cap"</string>
-    <string name="account_setup_exchange_device_id_label" msgid="1646827333223157658">"ID de dispositiu mòbil"</string>
+    <string name="account_setup_exchange_device_id_label" msgid="5105898844003459657">"ID DE DISPOSITIU MÒBIL"</string>
     <string name="account_setup_options_title" msgid="9016600767888846051">"Configuració del compte"</string>
     <string name="account_setup_options_headline" msgid="4181274232835368085">"Opcions del compte"</string>
     <string name="account_setup_options_mail_check_frequency_label" msgid="4824859792882810053">"Comprovació de missatges nous"</string>
diff --git a/res/values-cs/strings.xml b/res/values-cs/strings.xml
index e4001eb65..5df32128c 100644
--- a/res/values-cs/strings.xml
+++ b/res/values-cs/strings.xml
@@ -87,13 +87,13 @@
     <string name="account_setup_basics_email_label" msgid="3454164053624112047">"E-mailová adresa"</string>
     <string name="or_label" msgid="2207403489755254427">"NEBO"</string>
     <string name="sign_in_with_google" msgid="9051489501495503976">"Přihlášení k účtu Google"</string>
-    <string name="account_setup_basics_password_label" msgid="9133549799291519298">"Heslo"</string>
-    <string name="password_label" msgid="5228754278985667134">"Heslo"</string>
+    <string name="account_setup_basics_password_label" msgid="3402762431598148148">"HESLO"</string>
+    <string name="password_hint" msgid="8835390747504721561">"Heslo"</string>
     <string name="signed_in_with_service_label" msgid="4909910797357155961">"Jste přihlášeni pomocí služby %s"</string>
-    <string name="authentication_label" msgid="5210804218348191833">"Ověření"</string>
+    <string name="authentication_label" msgid="6917956186120234602">"OVĚŘENÍ"</string>
     <string name="add_authentication_label" msgid="865206092644419804">"Přidat ověření"</string>
     <string name="clear_authentication_label" msgid="8113966442068335059">"Smazat ověření"</string>
-    <string name="account_setup_basics_manual_setup_action" msgid="6640115171889882878"><u>"Ruční nastavení"</u></string>
+    <string name="account_setup_basics_manual_setup_action" msgid="8053852205391155912">"Ruční nastavení"</string>
     <string name="account_setup_username_password_toast" msgid="3968270274727947460">"Zadejte platnou e-mailovou adresu a heslo."</string>
     <string name="account_duplicate_dlg_title" msgid="8089732986912704425">"Duplicitní účet"</string>
     <string name="account_duplicate_dlg_message_fmt" msgid="6447629283679935840">"Toto uživatelské jméno již používáte pro účet <xliff:g id="DUPLICATE">%s</xliff:g>."</string>
@@ -114,11 +114,11 @@
     <string name="account_setup_account_type_instructions" msgid="114515540798408760">"O jaký typ účtu se jedná?"</string>
     <string name="account_setup_incoming_title" msgid="6796626791039136005">"Nastavení účtu"</string>
     <string name="account_setup_incoming_headline" msgid="6183711037633407184">"Nastavení serveru příchozí pošty"</string>
-    <string name="account_setup_incoming_username_label" msgid="5700581386104070302">"Uživatelské jméno"</string>
-    <string name="account_setup_incoming_password_label" msgid="6365327603172559859">"Heslo"</string>
-    <string name="account_setup_incoming_server_label" msgid="1480342966630002638">"Server"</string>
-    <string name="account_setup_incoming_port_label" msgid="8214738923690447796">"Port"</string>
-    <string name="account_setup_incoming_security_label" msgid="2110260791086007424">"Typ zabezpečení"</string>
+    <string name="account_setup_incoming_username_label" msgid="406939983633223354">"UŽIVATELSKÉ JMÉNO"</string>
+    <string name="account_setup_incoming_password_label" msgid="634540235479188709">"HESLO"</string>
+    <string name="account_setup_incoming_server_label" msgid="3528558488000638420">"SERVER"</string>
+    <string name="account_setup_incoming_port_label" msgid="5311652277990186704">"PORT"</string>
+    <string name="account_setup_incoming_security_label" msgid="1175710992470593691">"TYP ZABEZPEČENÍ"</string>
     <string name="account_setup_incoming_security_none_label" msgid="8300169413118264895">"Žádný"</string>
     <string name="account_setup_incoming_security_ssl_trust_certificates_label" msgid="6151855090123117538">"SSL/TLS (Přijímat všechny certifikáty)"</string>
     <string name="account_setup_incoming_security_ssl_label" msgid="2798501138420163861">"SSL/TLS"</string>
@@ -131,18 +131,18 @@
     <string name="account_setup_incoming_imap_path_prefix_hint" msgid="9190845919067906033">"Nepovinné"</string>
     <string name="account_setup_outgoing_title" msgid="7208495965665711539">"Nastavení účtu"</string>
     <string name="account_setup_outgoing_headline" msgid="2025001060935366394">"Nastavení serveru odchozí pošty"</string>
-    <string name="account_setup_outgoing_smtp_server_label" msgid="6035137446691195177">"Server SMTP"</string>
-    <string name="account_setup_outgoing_port_label" msgid="7573207437835827876">"Port"</string>
-    <string name="account_setup_outgoing_security_label" msgid="911398071120720589">"Typ zabezpečení"</string>
+    <string name="account_setup_outgoing_smtp_server_label" msgid="1164004960070541473">"SERVER SMTP"</string>
+    <string name="account_setup_outgoing_port_label" msgid="4670120792135566784">"PORT"</string>
+    <string name="account_setup_outgoing_security_label" msgid="9200220309360082664">"TYP ZABEZPEČENÍ"</string>
     <string name="account_setup_outgoing_require_login_label" msgid="7779484127897397562">"Vyžadovat přihlášení"</string>
-    <string name="account_setup_outgoing_username_label" msgid="3309680794731596981">"Uživatelské jméno"</string>
-    <string name="account_setup_outgoing_password_label" msgid="227844585493317550">"Heslo"</string>
-    <string name="account_setup_exchange_certificate_title" msgid="8473793588405277962">"Certifikát klienta"</string>
+    <string name="account_setup_outgoing_username_label" msgid="7239411429115525841">"UŽIVATELSKÉ JMÉNO"</string>
+    <string name="account_setup_outgoing_password_label" msgid="3720429254654722208">"HESLO"</string>
+    <string name="account_setup_exchange_certificate_title" msgid="1635140303999054002">"CERTIFIKÁT KLIENTA"</string>
     <string name="account_setup_exchange_select_certificate" msgid="1536103662037268683">"Vybrat"</string>
     <string name="account_setup_exchange_use_certificate" msgid="8690682770083161349">"Použít klientský certifikát"</string>
     <string name="account_setup_exchange_remove_certificate" msgid="5633249155510301766">"Odebrat"</string>
     <string name="account_setup_exchange_no_certificate" msgid="1119542961954780872">"Žádný"</string>
-    <string name="account_setup_exchange_device_id_label" msgid="1646827333223157658">"ID mobilního zařízení"</string>
+    <string name="account_setup_exchange_device_id_label" msgid="5105898844003459657">"ID MOBILNÍHO ZAŘÍZENÍ"</string>
     <string name="account_setup_options_title" msgid="9016600767888846051">"Nastavení účtu"</string>
     <string name="account_setup_options_headline" msgid="4181274232835368085">"Možnosti účtu"</string>
     <string name="account_setup_options_mail_check_frequency_label" msgid="4824859792882810053">"Četnost kontroly doručené pošty"</string>
diff --git a/res/values-da/strings.xml b/res/values-da/strings.xml
index 456628ff2..d489bad93 100644
--- a/res/values-da/strings.xml
+++ b/res/values-da/strings.xml
@@ -87,13 +87,13 @@
     <string name="account_setup_basics_email_label" msgid="3454164053624112047">"E-mailadresse"</string>
     <string name="or_label" msgid="2207403489755254427">"ELLER"</string>
     <string name="sign_in_with_google" msgid="9051489501495503976">"Log ind med Google"</string>
-    <string name="account_setup_basics_password_label" msgid="9133549799291519298">"Adgangskode"</string>
-    <string name="password_label" msgid="5228754278985667134">"Adgangskode"</string>
+    <string name="account_setup_basics_password_label" msgid="3402762431598148148">"ADGANGSKODE"</string>
+    <string name="password_hint" msgid="8835390747504721561">"Adgangskode"</string>
     <string name="signed_in_with_service_label" msgid="4909910797357155961">"Logget ind med %s"</string>
-    <string name="authentication_label" msgid="5210804218348191833">"Godkendelse"</string>
+    <string name="authentication_label" msgid="6917956186120234602">"GODKENDELSE"</string>
     <string name="add_authentication_label" msgid="865206092644419804">"Tilføj godkendelse"</string>
     <string name="clear_authentication_label" msgid="8113966442068335059">"Ryd godkendelse"</string>
-    <string name="account_setup_basics_manual_setup_action" msgid="6640115171889882878"><u>"Manuel konfiguration"</u></string>
+    <string name="account_setup_basics_manual_setup_action" msgid="8053852205391155912">"Manuel opsætning"</string>
     <string name="account_setup_username_password_toast" msgid="3968270274727947460">"Indtast en gyldig e-mailadresse og adgangskode."</string>
     <string name="account_duplicate_dlg_title" msgid="8089732986912704425">"Dobbeltforekomst af konto"</string>
     <string name="account_duplicate_dlg_message_fmt" msgid="6447629283679935840">"Du bruger allerede dette brugernavn til kontoen \"<xliff:g id="DUPLICATE">%s</xliff:g>\"."</string>
@@ -114,11 +114,11 @@
     <string name="account_setup_account_type_instructions" msgid="114515540798408760">"Hvilken slags konto er dette?"</string>
     <string name="account_setup_incoming_title" msgid="6796626791039136005">"Kontoindstillinger"</string>
     <string name="account_setup_incoming_headline" msgid="6183711037633407184">"Indstillinger for indgående server"</string>
-    <string name="account_setup_incoming_username_label" msgid="5700581386104070302">"Brugernavn"</string>
-    <string name="account_setup_incoming_password_label" msgid="6365327603172559859">"Adgangskode"</string>
-    <string name="account_setup_incoming_server_label" msgid="1480342966630002638">"Server"</string>
-    <string name="account_setup_incoming_port_label" msgid="8214738923690447796">"Port"</string>
-    <string name="account_setup_incoming_security_label" msgid="2110260791086007424">"Sikkerhedstype"</string>
+    <string name="account_setup_incoming_username_label" msgid="406939983633223354">"BRUGERNAVN"</string>
+    <string name="account_setup_incoming_password_label" msgid="634540235479188709">"ADGANGSKODE"</string>
+    <string name="account_setup_incoming_server_label" msgid="3528558488000638420">"SERVER"</string>
+    <string name="account_setup_incoming_port_label" msgid="5311652277990186704">"PORT"</string>
+    <string name="account_setup_incoming_security_label" msgid="1175710992470593691">"SIKKERHEDSTYPE"</string>
     <string name="account_setup_incoming_security_none_label" msgid="8300169413118264895">"Ingen"</string>
     <string name="account_setup_incoming_security_ssl_trust_certificates_label" msgid="6151855090123117538">"SSL/TLS (Accepter alle certifikater)"</string>
     <string name="account_setup_incoming_security_ssl_label" msgid="2798501138420163861">"SSL/TLS"</string>
@@ -131,18 +131,18 @@
     <string name="account_setup_incoming_imap_path_prefix_hint" msgid="9190845919067906033">"Valgfrit"</string>
     <string name="account_setup_outgoing_title" msgid="7208495965665711539">"Kontoindstillinger"</string>
     <string name="account_setup_outgoing_headline" msgid="2025001060935366394">"Indstillinger for udgående server"</string>
-    <string name="account_setup_outgoing_smtp_server_label" msgid="6035137446691195177">"SMTP-server"</string>
-    <string name="account_setup_outgoing_port_label" msgid="7573207437835827876">"Port"</string>
-    <string name="account_setup_outgoing_security_label" msgid="911398071120720589">"Sikkerhedstype"</string>
+    <string name="account_setup_outgoing_smtp_server_label" msgid="1164004960070541473">"SMTP-SERVER"</string>
+    <string name="account_setup_outgoing_port_label" msgid="4670120792135566784">"PORT"</string>
+    <string name="account_setup_outgoing_security_label" msgid="9200220309360082664">"SIKKERHEDSTYPE"</string>
     <string name="account_setup_outgoing_require_login_label" msgid="7779484127897397562">"Kræv login"</string>
-    <string name="account_setup_outgoing_username_label" msgid="3309680794731596981">"Brugernavn"</string>
-    <string name="account_setup_outgoing_password_label" msgid="227844585493317550">"Adgangskode"</string>
-    <string name="account_setup_exchange_certificate_title" msgid="8473793588405277962">"Klientcertifikat"</string>
+    <string name="account_setup_outgoing_username_label" msgid="7239411429115525841">"BRUGERNAVN"</string>
+    <string name="account_setup_outgoing_password_label" msgid="3720429254654722208">"ADGANGSKODE"</string>
+    <string name="account_setup_exchange_certificate_title" msgid="1635140303999054002">"KLIENTCERTIFIKAT"</string>
     <string name="account_setup_exchange_select_certificate" msgid="1536103662037268683">"Vælg"</string>
     <string name="account_setup_exchange_use_certificate" msgid="8690682770083161349">"Brug klientcertifikat"</string>
     <string name="account_setup_exchange_remove_certificate" msgid="5633249155510301766">"Fjern"</string>
     <string name="account_setup_exchange_no_certificate" msgid="1119542961954780872">"Intet"</string>
-    <string name="account_setup_exchange_device_id_label" msgid="1646827333223157658">"Id for mobilenhed"</string>
+    <string name="account_setup_exchange_device_id_label" msgid="5105898844003459657">"ID FOR MOBILENHED"</string>
     <string name="account_setup_options_title" msgid="9016600767888846051">"Indstillinger for konto"</string>
     <string name="account_setup_options_headline" msgid="4181274232835368085">"Kontovalgmuligheder"</string>
     <string name="account_setup_options_mail_check_frequency_label" msgid="4824859792882810053">"Kontrolfrekvens for indbakke"</string>
diff --git a/res/values-de/strings.xml b/res/values-de/strings.xml
index b3824c9f0..c47620467 100644
--- a/res/values-de/strings.xml
+++ b/res/values-de/strings.xml
@@ -87,13 +87,13 @@
     <string name="account_setup_basics_email_label" msgid="3454164053624112047">"E-Mail-Adresse"</string>
     <string name="or_label" msgid="2207403489755254427">"oder"</string>
     <string name="sign_in_with_google" msgid="9051489501495503976">"Über Google anmelden"</string>
-    <string name="account_setup_basics_password_label" msgid="9133549799291519298">"Passwort"</string>
-    <string name="password_label" msgid="5228754278985667134">"Passwort"</string>
+    <string name="account_setup_basics_password_label" msgid="3402762431598148148">"Passwort"</string>
+    <string name="password_hint" msgid="8835390747504721561">"Passwort"</string>
     <string name="signed_in_with_service_label" msgid="4909910797357155961">"Angemeldet mit %s"</string>
-    <string name="authentication_label" msgid="5210804218348191833">"Authentifizierung"</string>
+    <string name="authentication_label" msgid="6917956186120234602">"Authentifizierung"</string>
     <string name="add_authentication_label" msgid="865206092644419804">"Authentifizierung hinzufügen"</string>
     <string name="clear_authentication_label" msgid="8113966442068335059">"Authentifizierung löschen"</string>
-    <string name="account_setup_basics_manual_setup_action" msgid="6640115171889882878"><u>"Manuelle Einrichtung"</u></string>
+    <string name="account_setup_basics_manual_setup_action" msgid="8053852205391155912">"Manuell einrichten"</string>
     <string name="account_setup_username_password_toast" msgid="3968270274727947460">"Geben Sie eine gültige E-Mail-Adresse und ein gültiges Passwort ein."</string>
     <string name="account_duplicate_dlg_title" msgid="8089732986912704425">"Identisches Konto"</string>
     <string name="account_duplicate_dlg_message_fmt" msgid="6447629283679935840">"Sie verwenden diesen Nutzernamen bereits für das Konto \"<xliff:g id="DUPLICATE">%s</xliff:g>\"."</string>
@@ -114,11 +114,11 @@
     <string name="account_setup_account_type_instructions" msgid="114515540798408760">"Um welchen Kontotyp handelt es sich hierbei?"</string>
     <string name="account_setup_incoming_title" msgid="6796626791039136005">"Kontoeinrichtung"</string>
     <string name="account_setup_incoming_headline" msgid="6183711037633407184">"Einstellungen des Eingangsserver"</string>
-    <string name="account_setup_incoming_username_label" msgid="5700581386104070302">"Nutzername"</string>
-    <string name="account_setup_incoming_password_label" msgid="6365327603172559859">"Passwort"</string>
-    <string name="account_setup_incoming_server_label" msgid="1480342966630002638">"Server"</string>
-    <string name="account_setup_incoming_port_label" msgid="8214738923690447796">"Port"</string>
-    <string name="account_setup_incoming_security_label" msgid="2110260791086007424">"Sicherheitstyp"</string>
+    <string name="account_setup_incoming_username_label" msgid="406939983633223354">"Nutzername"</string>
+    <string name="account_setup_incoming_password_label" msgid="634540235479188709">"Passwort"</string>
+    <string name="account_setup_incoming_server_label" msgid="3528558488000638420">"Server"</string>
+    <string name="account_setup_incoming_port_label" msgid="5311652277990186704">"Port"</string>
+    <string name="account_setup_incoming_security_label" msgid="1175710992470593691">"Sicherheitstyp"</string>
     <string name="account_setup_incoming_security_none_label" msgid="8300169413118264895">"Keine"</string>
     <string name="account_setup_incoming_security_ssl_trust_certificates_label" msgid="6151855090123117538">"SSL/TLS (alle Zertifikate akzeptieren)"</string>
     <string name="account_setup_incoming_security_ssl_label" msgid="2798501138420163861">"SSL/TLS"</string>
@@ -131,18 +131,18 @@
     <string name="account_setup_incoming_imap_path_prefix_hint" msgid="9190845919067906033">"Optional"</string>
     <string name="account_setup_outgoing_title" msgid="7208495965665711539">"Kontoeinrichtung"</string>
     <string name="account_setup_outgoing_headline" msgid="2025001060935366394">"Einstellungen des Ausgangsserver"</string>
-    <string name="account_setup_outgoing_smtp_server_label" msgid="6035137446691195177">"SMTP-Server"</string>
-    <string name="account_setup_outgoing_port_label" msgid="7573207437835827876">"Port"</string>
-    <string name="account_setup_outgoing_security_label" msgid="911398071120720589">"Sicherheitstyp"</string>
+    <string name="account_setup_outgoing_smtp_server_label" msgid="1164004960070541473">"SMTP-Server"</string>
+    <string name="account_setup_outgoing_port_label" msgid="4670120792135566784">"Port"</string>
+    <string name="account_setup_outgoing_security_label" msgid="9200220309360082664">"Sicherheitstyp"</string>
     <string name="account_setup_outgoing_require_login_label" msgid="7779484127897397562">"Anmeldung erforderlich"</string>
-    <string name="account_setup_outgoing_username_label" msgid="3309680794731596981">"Nutzername"</string>
-    <string name="account_setup_outgoing_password_label" msgid="227844585493317550">"Passwort"</string>
-    <string name="account_setup_exchange_certificate_title" msgid="8473793588405277962">"Client-Zertifikat"</string>
+    <string name="account_setup_outgoing_username_label" msgid="7239411429115525841">"Nutzername"</string>
+    <string name="account_setup_outgoing_password_label" msgid="3720429254654722208">"Passwort"</string>
+    <string name="account_setup_exchange_certificate_title" msgid="1635140303999054002">"Clientzertifikat"</string>
     <string name="account_setup_exchange_select_certificate" msgid="1536103662037268683">"Auswählen"</string>
     <string name="account_setup_exchange_use_certificate" msgid="8690682770083161349">"Client-Zertifikat verwenden"</string>
     <string name="account_setup_exchange_remove_certificate" msgid="5633249155510301766">"Entfernen"</string>
     <string name="account_setup_exchange_no_certificate" msgid="1119542961954780872">"Keine"</string>
-    <string name="account_setup_exchange_device_id_label" msgid="1646827333223157658">"Mobilgerät-ID"</string>
+    <string name="account_setup_exchange_device_id_label" msgid="5105898844003459657">"Mobilgerät-ID"</string>
     <string name="account_setup_options_title" msgid="9016600767888846051">"Kontoeinstellungen"</string>
     <string name="account_setup_options_headline" msgid="4181274232835368085">"Konto-Optionen"</string>
     <string name="account_setup_options_mail_check_frequency_label" msgid="4824859792882810053">"Häufigkeit des E-Mail-Abrufs"</string>
diff --git a/res/values-el/strings.xml b/res/values-el/strings.xml
index da4804284..fda2e92e4 100644
--- a/res/values-el/strings.xml
+++ b/res/values-el/strings.xml
@@ -87,13 +87,13 @@
     <string name="account_setup_basics_email_label" msgid="3454164053624112047">"Διεύθυνση ηλεκτρονικού ταχυδρομείου"</string>
     <string name="or_label" msgid="2207403489755254427">"Ή"</string>
     <string name="sign_in_with_google" msgid="9051489501495503976">"Σύνδεση με το Google"</string>
-    <string name="account_setup_basics_password_label" msgid="9133549799291519298">"Κωδικός πρόσβασης"</string>
-    <string name="password_label" msgid="5228754278985667134">"Κωδικός πρόσβασης"</string>
+    <string name="account_setup_basics_password_label" msgid="3402762431598148148">"ΚΩΔΙΚΟΣ ΠΡΟΣΒΑΣΗΣ"</string>
+    <string name="password_hint" msgid="8835390747504721561">"Κωδικός πρόσβασης"</string>
     <string name="signed_in_with_service_label" msgid="4909910797357155961">"Συνδέθηκε με %s"</string>
-    <string name="authentication_label" msgid="5210804218348191833">"Έλεγχος ταυτότητας"</string>
+    <string name="authentication_label" msgid="6917956186120234602">"ΕΛΕΓΧΟΣ ΤΑΥΤΟΤΗΤΑΣ"</string>
     <string name="add_authentication_label" msgid="865206092644419804">"Προσθήκη ελέγχου ταυτότητας"</string>
     <string name="clear_authentication_label" msgid="8113966442068335059">"Διαγραφή ελέγχου ταυτότητας"</string>
-    <string name="account_setup_basics_manual_setup_action" msgid="6640115171889882878"><u>"Μη αυτόματη ρύθμιση"</u></string>
+    <string name="account_setup_basics_manual_setup_action" msgid="8053852205391155912">"Μη αυτόματη ρύθμιση"</string>
     <string name="account_setup_username_password_toast" msgid="3968270274727947460">"Πληκτρολογήστε μια έγκυρη διεύθυνση ηλεκτρονικού ταχυδρομείου και έναν έγκυρο κωδικό πρόσβασης."</string>
     <string name="account_duplicate_dlg_title" msgid="8089732986912704425">"Διπλότυπος λογαριασμός"</string>
     <string name="account_duplicate_dlg_message_fmt" msgid="6447629283679935840">"Χρησιμοποιείτε ήδη αυτό το όνομα χρήστη για τον λογαριασμό \"<xliff:g id="DUPLICATE">%s</xliff:g>\"."</string>
@@ -114,11 +114,11 @@
     <string name="account_setup_account_type_instructions" msgid="114515540798408760">"Τι τύπος λογαριασμού είναι αυτός;"</string>
     <string name="account_setup_incoming_title" msgid="6796626791039136005">"Ρύθμιση λογαριασμού"</string>
     <string name="account_setup_incoming_headline" msgid="6183711037633407184">"Ρυθμίσεις διακομιστή εισερχομένων"</string>
-    <string name="account_setup_incoming_username_label" msgid="5700581386104070302">"Όνομα χρήστη"</string>
-    <string name="account_setup_incoming_password_label" msgid="6365327603172559859">"Κωδικός πρόσβασης"</string>
-    <string name="account_setup_incoming_server_label" msgid="1480342966630002638">"Διακομιστής"</string>
-    <string name="account_setup_incoming_port_label" msgid="8214738923690447796">"Θύρα"</string>
-    <string name="account_setup_incoming_security_label" msgid="2110260791086007424">"Τύπος ασφάλειας"</string>
+    <string name="account_setup_incoming_username_label" msgid="406939983633223354">"ΟΝΟΜΑ ΧΡΗΣΤΗ"</string>
+    <string name="account_setup_incoming_password_label" msgid="634540235479188709">"ΚΩΔΙΚΟΣ ΠΡΟΣΒΑΣΗΣ"</string>
+    <string name="account_setup_incoming_server_label" msgid="3528558488000638420">"ΔΙΑΚΟΜΙΣΤΗΣ"</string>
+    <string name="account_setup_incoming_port_label" msgid="5311652277990186704">"ΘΥΡΑ"</string>
+    <string name="account_setup_incoming_security_label" msgid="1175710992470593691">"ΤΥΠΟΣ ΑΣΦΑΛΕΙΑΣ"</string>
     <string name="account_setup_incoming_security_none_label" msgid="8300169413118264895">"Καμία"</string>
     <string name="account_setup_incoming_security_ssl_trust_certificates_label" msgid="6151855090123117538">"SSL/TLS (Αποδοχή όλων των πιστοποιητικών)"</string>
     <string name="account_setup_incoming_security_ssl_label" msgid="2798501138420163861">"SSL/TLS"</string>
@@ -131,18 +131,18 @@
     <string name="account_setup_incoming_imap_path_prefix_hint" msgid="9190845919067906033">"Προαιρετικό"</string>
     <string name="account_setup_outgoing_title" msgid="7208495965665711539">"Ρύθμιση λογαριασμού"</string>
     <string name="account_setup_outgoing_headline" msgid="2025001060935366394">"Ρυθμίσεις διακομιστή εξερχομένων"</string>
-    <string name="account_setup_outgoing_smtp_server_label" msgid="6035137446691195177">"Διακομιστής SMTP"</string>
-    <string name="account_setup_outgoing_port_label" msgid="7573207437835827876">"Θύρα"</string>
-    <string name="account_setup_outgoing_security_label" msgid="911398071120720589">"Τύπος ασφάλειας"</string>
+    <string name="account_setup_outgoing_smtp_server_label" msgid="1164004960070541473">"ΔΙΑΚΟΜΙΣΤΗΣ SMTP:"</string>
+    <string name="account_setup_outgoing_port_label" msgid="4670120792135566784">"ΘΥΡΑ"</string>
+    <string name="account_setup_outgoing_security_label" msgid="9200220309360082664">"ΤΥΠΟΣ ΑΣΦΑΛΕΙΑΣ"</string>
     <string name="account_setup_outgoing_require_login_label" msgid="7779484127897397562">"Να απαιτείται σύνδεση"</string>
-    <string name="account_setup_outgoing_username_label" msgid="3309680794731596981">"Όνομα χρήστη"</string>
-    <string name="account_setup_outgoing_password_label" msgid="227844585493317550">"Κωδικός πρόσβασης"</string>
-    <string name="account_setup_exchange_certificate_title" msgid="8473793588405277962">"Πιστοποιητικό πελάτη"</string>
+    <string name="account_setup_outgoing_username_label" msgid="7239411429115525841">"ΟΝΟΜΑ ΧΡΗΣΤΗ"</string>
+    <string name="account_setup_outgoing_password_label" msgid="3720429254654722208">"ΚΩΔΙΚΟΣ ΠΡΟΣΒΑΣΗΣ"</string>
+    <string name="account_setup_exchange_certificate_title" msgid="1635140303999054002">"ΠΙΣΤΟΠΟΙΗΤΙΚΟ ΠΕΛΑΤΗ"</string>
     <string name="account_setup_exchange_select_certificate" msgid="1536103662037268683">"Επιλογή"</string>
     <string name="account_setup_exchange_use_certificate" msgid="8690682770083161349">"Χρήση του πιστοποιητικού πελάτη"</string>
     <string name="account_setup_exchange_remove_certificate" msgid="5633249155510301766">"Κατάργηση"</string>
     <string name="account_setup_exchange_no_certificate" msgid="1119542961954780872">"Κανένα"</string>
-    <string name="account_setup_exchange_device_id_label" msgid="1646827333223157658">"Αναγνωριστικό κινητής συσκευής"</string>
+    <string name="account_setup_exchange_device_id_label" msgid="5105898844003459657">"ΑΝΑΓΝΩΡΙΣΤΙΚΟ ΚΙΝΗΤΗΣ ΣΥΣΚΕΥΗΣ"</string>
     <string name="account_setup_options_title" msgid="9016600767888846051">"Ρυθμίσεις λογαριασμού"</string>
     <string name="account_setup_options_headline" msgid="4181274232835368085">"Επιλογές λογαριασμού"</string>
     <string name="account_setup_options_mail_check_frequency_label" msgid="4824859792882810053">"Συχνότητα ελέγχου εισερχομένων"</string>
diff --git a/res/values-en-rGB/strings.xml b/res/values-en-rGB/strings.xml
index 26a63fdb4..45d9e06d8 100644
--- a/res/values-en-rGB/strings.xml
+++ b/res/values-en-rGB/strings.xml
@@ -87,13 +87,13 @@
     <string name="account_setup_basics_email_label" msgid="3454164053624112047">"Email address"</string>
     <string name="or_label" msgid="2207403489755254427">"OR"</string>
     <string name="sign_in_with_google" msgid="9051489501495503976">"Sign in with Google"</string>
-    <string name="account_setup_basics_password_label" msgid="9133549799291519298">"Password"</string>
-    <string name="password_label" msgid="5228754278985667134">"Password"</string>
+    <string name="account_setup_basics_password_label" msgid="3402762431598148148">"PASSWORD"</string>
+    <string name="password_hint" msgid="8835390747504721561">"Password"</string>
     <string name="signed_in_with_service_label" msgid="4909910797357155961">"Signed in with %s"</string>
-    <string name="authentication_label" msgid="5210804218348191833">"Authentication"</string>
+    <string name="authentication_label" msgid="6917956186120234602">"AUTHENTICATION"</string>
     <string name="add_authentication_label" msgid="865206092644419804">"Add authentication"</string>
     <string name="clear_authentication_label" msgid="8113966442068335059">"Clear authentication"</string>
-    <string name="account_setup_basics_manual_setup_action" msgid="6640115171889882878"><u>"Manual setup"</u></string>
+    <string name="account_setup_basics_manual_setup_action" msgid="8053852205391155912">"Manual setup"</string>
     <string name="account_setup_username_password_toast" msgid="3968270274727947460">"Type a valid email address and password."</string>
     <string name="account_duplicate_dlg_title" msgid="8089732986912704425">"Duplicate Account"</string>
     <string name="account_duplicate_dlg_message_fmt" msgid="6447629283679935840">"You\'re already using this username for the account \"<xliff:g id="DUPLICATE">%s</xliff:g>\"."</string>
@@ -114,11 +114,11 @@
     <string name="account_setup_account_type_instructions" msgid="114515540798408760">"What type of account is this?"</string>
     <string name="account_setup_incoming_title" msgid="6796626791039136005">"Account setup"</string>
     <string name="account_setup_incoming_headline" msgid="6183711037633407184">"Incoming server settings"</string>
-    <string name="account_setup_incoming_username_label" msgid="5700581386104070302">"Username"</string>
-    <string name="account_setup_incoming_password_label" msgid="6365327603172559859">"Password"</string>
-    <string name="account_setup_incoming_server_label" msgid="1480342966630002638">"Server"</string>
-    <string name="account_setup_incoming_port_label" msgid="8214738923690447796">"Port"</string>
-    <string name="account_setup_incoming_security_label" msgid="2110260791086007424">"Security type"</string>
+    <string name="account_setup_incoming_username_label" msgid="406939983633223354">"USERNAME"</string>
+    <string name="account_setup_incoming_password_label" msgid="634540235479188709">"PASSWORD"</string>
+    <string name="account_setup_incoming_server_label" msgid="3528558488000638420">"SERVER"</string>
+    <string name="account_setup_incoming_port_label" msgid="5311652277990186704">"PORT"</string>
+    <string name="account_setup_incoming_security_label" msgid="1175710992470593691">"SECURITY TYPE"</string>
     <string name="account_setup_incoming_security_none_label" msgid="8300169413118264895">"None"</string>
     <string name="account_setup_incoming_security_ssl_trust_certificates_label" msgid="6151855090123117538">"SSL/TLS (Accept all certificates)"</string>
     <string name="account_setup_incoming_security_ssl_label" msgid="2798501138420163861">"SSL/TLS"</string>
@@ -131,18 +131,18 @@
     <string name="account_setup_incoming_imap_path_prefix_hint" msgid="9190845919067906033">"Optional"</string>
     <string name="account_setup_outgoing_title" msgid="7208495965665711539">"Account setup"</string>
     <string name="account_setup_outgoing_headline" msgid="2025001060935366394">"Outgoing server settings"</string>
-    <string name="account_setup_outgoing_smtp_server_label" msgid="6035137446691195177">"SMTP server"</string>
-    <string name="account_setup_outgoing_port_label" msgid="7573207437835827876">"Port"</string>
-    <string name="account_setup_outgoing_security_label" msgid="911398071120720589">"Security type"</string>
+    <string name="account_setup_outgoing_smtp_server_label" msgid="1164004960070541473">"SMTP SERVER"</string>
+    <string name="account_setup_outgoing_port_label" msgid="4670120792135566784">"PORT"</string>
+    <string name="account_setup_outgoing_security_label" msgid="9200220309360082664">"SECURITY TYPE"</string>
     <string name="account_setup_outgoing_require_login_label" msgid="7779484127897397562">"Require sign-in"</string>
-    <string name="account_setup_outgoing_username_label" msgid="3309680794731596981">"Username"</string>
-    <string name="account_setup_outgoing_password_label" msgid="227844585493317550">"Password"</string>
-    <string name="account_setup_exchange_certificate_title" msgid="8473793588405277962">"Client certificate"</string>
+    <string name="account_setup_outgoing_username_label" msgid="7239411429115525841">"USERNAME"</string>
+    <string name="account_setup_outgoing_password_label" msgid="3720429254654722208">"PASSWORD"</string>
+    <string name="account_setup_exchange_certificate_title" msgid="1635140303999054002">"CLIENT CERTIFICATE"</string>
     <string name="account_setup_exchange_select_certificate" msgid="1536103662037268683">"Select"</string>
     <string name="account_setup_exchange_use_certificate" msgid="8690682770083161349">"Use client certificate"</string>
     <string name="account_setup_exchange_remove_certificate" msgid="5633249155510301766">"Remove"</string>
     <string name="account_setup_exchange_no_certificate" msgid="1119542961954780872">"None"</string>
-    <string name="account_setup_exchange_device_id_label" msgid="1646827333223157658">"Mobile Device ID"</string>
+    <string name="account_setup_exchange_device_id_label" msgid="5105898844003459657">"MOBILE DEVICE ID"</string>
     <string name="account_setup_options_title" msgid="9016600767888846051">"Account settings"</string>
     <string name="account_setup_options_headline" msgid="4181274232835368085">"Account options"</string>
     <string name="account_setup_options_mail_check_frequency_label" msgid="4824859792882810053">"Inbox checking frequency"</string>
diff --git a/res/values-en-rIN/strings.xml b/res/values-en-rIN/strings.xml
index 26a63fdb4..45d9e06d8 100644
--- a/res/values-en-rIN/strings.xml
+++ b/res/values-en-rIN/strings.xml
@@ -87,13 +87,13 @@
     <string name="account_setup_basics_email_label" msgid="3454164053624112047">"Email address"</string>
     <string name="or_label" msgid="2207403489755254427">"OR"</string>
     <string name="sign_in_with_google" msgid="9051489501495503976">"Sign in with Google"</string>
-    <string name="account_setup_basics_password_label" msgid="9133549799291519298">"Password"</string>
-    <string name="password_label" msgid="5228754278985667134">"Password"</string>
+    <string name="account_setup_basics_password_label" msgid="3402762431598148148">"PASSWORD"</string>
+    <string name="password_hint" msgid="8835390747504721561">"Password"</string>
     <string name="signed_in_with_service_label" msgid="4909910797357155961">"Signed in with %s"</string>
-    <string name="authentication_label" msgid="5210804218348191833">"Authentication"</string>
+    <string name="authentication_label" msgid="6917956186120234602">"AUTHENTICATION"</string>
     <string name="add_authentication_label" msgid="865206092644419804">"Add authentication"</string>
     <string name="clear_authentication_label" msgid="8113966442068335059">"Clear authentication"</string>
-    <string name="account_setup_basics_manual_setup_action" msgid="6640115171889882878"><u>"Manual setup"</u></string>
+    <string name="account_setup_basics_manual_setup_action" msgid="8053852205391155912">"Manual setup"</string>
     <string name="account_setup_username_password_toast" msgid="3968270274727947460">"Type a valid email address and password."</string>
     <string name="account_duplicate_dlg_title" msgid="8089732986912704425">"Duplicate Account"</string>
     <string name="account_duplicate_dlg_message_fmt" msgid="6447629283679935840">"You\'re already using this username for the account \"<xliff:g id="DUPLICATE">%s</xliff:g>\"."</string>
@@ -114,11 +114,11 @@
     <string name="account_setup_account_type_instructions" msgid="114515540798408760">"What type of account is this?"</string>
     <string name="account_setup_incoming_title" msgid="6796626791039136005">"Account setup"</string>
     <string name="account_setup_incoming_headline" msgid="6183711037633407184">"Incoming server settings"</string>
-    <string name="account_setup_incoming_username_label" msgid="5700581386104070302">"Username"</string>
-    <string name="account_setup_incoming_password_label" msgid="6365327603172559859">"Password"</string>
-    <string name="account_setup_incoming_server_label" msgid="1480342966630002638">"Server"</string>
-    <string name="account_setup_incoming_port_label" msgid="8214738923690447796">"Port"</string>
-    <string name="account_setup_incoming_security_label" msgid="2110260791086007424">"Security type"</string>
+    <string name="account_setup_incoming_username_label" msgid="406939983633223354">"USERNAME"</string>
+    <string name="account_setup_incoming_password_label" msgid="634540235479188709">"PASSWORD"</string>
+    <string name="account_setup_incoming_server_label" msgid="3528558488000638420">"SERVER"</string>
+    <string name="account_setup_incoming_port_label" msgid="5311652277990186704">"PORT"</string>
+    <string name="account_setup_incoming_security_label" msgid="1175710992470593691">"SECURITY TYPE"</string>
     <string name="account_setup_incoming_security_none_label" msgid="8300169413118264895">"None"</string>
     <string name="account_setup_incoming_security_ssl_trust_certificates_label" msgid="6151855090123117538">"SSL/TLS (Accept all certificates)"</string>
     <string name="account_setup_incoming_security_ssl_label" msgid="2798501138420163861">"SSL/TLS"</string>
@@ -131,18 +131,18 @@
     <string name="account_setup_incoming_imap_path_prefix_hint" msgid="9190845919067906033">"Optional"</string>
     <string name="account_setup_outgoing_title" msgid="7208495965665711539">"Account setup"</string>
     <string name="account_setup_outgoing_headline" msgid="2025001060935366394">"Outgoing server settings"</string>
-    <string name="account_setup_outgoing_smtp_server_label" msgid="6035137446691195177">"SMTP server"</string>
-    <string name="account_setup_outgoing_port_label" msgid="7573207437835827876">"Port"</string>
-    <string name="account_setup_outgoing_security_label" msgid="911398071120720589">"Security type"</string>
+    <string name="account_setup_outgoing_smtp_server_label" msgid="1164004960070541473">"SMTP SERVER"</string>
+    <string name="account_setup_outgoing_port_label" msgid="4670120792135566784">"PORT"</string>
+    <string name="account_setup_outgoing_security_label" msgid="9200220309360082664">"SECURITY TYPE"</string>
     <string name="account_setup_outgoing_require_login_label" msgid="7779484127897397562">"Require sign-in"</string>
-    <string name="account_setup_outgoing_username_label" msgid="3309680794731596981">"Username"</string>
-    <string name="account_setup_outgoing_password_label" msgid="227844585493317550">"Password"</string>
-    <string name="account_setup_exchange_certificate_title" msgid="8473793588405277962">"Client certificate"</string>
+    <string name="account_setup_outgoing_username_label" msgid="7239411429115525841">"USERNAME"</string>
+    <string name="account_setup_outgoing_password_label" msgid="3720429254654722208">"PASSWORD"</string>
+    <string name="account_setup_exchange_certificate_title" msgid="1635140303999054002">"CLIENT CERTIFICATE"</string>
     <string name="account_setup_exchange_select_certificate" msgid="1536103662037268683">"Select"</string>
     <string name="account_setup_exchange_use_certificate" msgid="8690682770083161349">"Use client certificate"</string>
     <string name="account_setup_exchange_remove_certificate" msgid="5633249155510301766">"Remove"</string>
     <string name="account_setup_exchange_no_certificate" msgid="1119542961954780872">"None"</string>
-    <string name="account_setup_exchange_device_id_label" msgid="1646827333223157658">"Mobile Device ID"</string>
+    <string name="account_setup_exchange_device_id_label" msgid="5105898844003459657">"MOBILE DEVICE ID"</string>
     <string name="account_setup_options_title" msgid="9016600767888846051">"Account settings"</string>
     <string name="account_setup_options_headline" msgid="4181274232835368085">"Account options"</string>
     <string name="account_setup_options_mail_check_frequency_label" msgid="4824859792882810053">"Inbox checking frequency"</string>
diff --git a/res/values-es-rUS/strings.xml b/res/values-es-rUS/strings.xml
index 1d90799f6..6ba0361bf 100644
--- a/res/values-es-rUS/strings.xml
+++ b/res/values-es-rUS/strings.xml
@@ -87,13 +87,13 @@
     <string name="account_setup_basics_email_label" msgid="3454164053624112047">"Dirección de correo"</string>
     <string name="or_label" msgid="2207403489755254427">"O también puedes hacer lo siguiente:"</string>
     <string name="sign_in_with_google" msgid="9051489501495503976">"Acceder con Google"</string>
-    <string name="account_setup_basics_password_label" msgid="9133549799291519298">"Contraseña"</string>
-    <string name="password_label" msgid="5228754278985667134">"Contraseña"</string>
+    <string name="account_setup_basics_password_label" msgid="3402762431598148148">"CONTRASEÑA"</string>
+    <string name="password_hint" msgid="8835390747504721561">"Contraseña"</string>
     <string name="signed_in_with_service_label" msgid="4909910797357155961">"Acceso con %s"</string>
-    <string name="authentication_label" msgid="5210804218348191833">"Autenticación"</string>
+    <string name="authentication_label" msgid="6917956186120234602">"AUTENTICACIÓN"</string>
     <string name="add_authentication_label" msgid="865206092644419804">"Agregar autenticación"</string>
     <string name="clear_authentication_label" msgid="8113966442068335059">"Eliminar autenticación"</string>
-    <string name="account_setup_basics_manual_setup_action" msgid="6640115171889882878"><u>"Configuración manual"</u></string>
+    <string name="account_setup_basics_manual_setup_action" msgid="8053852205391155912">"Configuración manual"</string>
     <string name="account_setup_username_password_toast" msgid="3968270274727947460">"Escribe una dirección de correo y contraseña válidas."</string>
     <string name="account_duplicate_dlg_title" msgid="8089732986912704425">"Cuenta duplicada"</string>
     <string name="account_duplicate_dlg_message_fmt" msgid="6447629283679935840">"Ya estás usando este nombre de usuario para la cuenta \"<xliff:g id="DUPLICATE">%s</xliff:g>\"."</string>
@@ -114,11 +114,11 @@
     <string name="account_setup_account_type_instructions" msgid="114515540798408760">"¿Qué tipo de cuenta es?"</string>
     <string name="account_setup_incoming_title" msgid="6796626791039136005">"Configuración de la cuenta"</string>
     <string name="account_setup_incoming_headline" msgid="6183711037633407184">"Configuración del servidor de entrada"</string>
-    <string name="account_setup_incoming_username_label" msgid="5700581386104070302">"Nombre de usuario"</string>
-    <string name="account_setup_incoming_password_label" msgid="6365327603172559859">"Contraseña"</string>
-    <string name="account_setup_incoming_server_label" msgid="1480342966630002638">"Servidor"</string>
-    <string name="account_setup_incoming_port_label" msgid="8214738923690447796">"Puerto"</string>
-    <string name="account_setup_incoming_security_label" msgid="2110260791086007424">"Tipo de seguridad"</string>
+    <string name="account_setup_incoming_username_label" msgid="406939983633223354">"NOMBRE DE USUARIO"</string>
+    <string name="account_setup_incoming_password_label" msgid="634540235479188709">"CONTRASEÑA"</string>
+    <string name="account_setup_incoming_server_label" msgid="3528558488000638420">"SERVIDOR"</string>
+    <string name="account_setup_incoming_port_label" msgid="5311652277990186704">"PUERTO"</string>
+    <string name="account_setup_incoming_security_label" msgid="1175710992470593691">"TIPO DE SEGURIDAD"</string>
     <string name="account_setup_incoming_security_none_label" msgid="8300169413118264895">"Ninguno"</string>
     <string name="account_setup_incoming_security_ssl_trust_certificates_label" msgid="6151855090123117538">"SSL/TLS (aceptar todos)"</string>
     <string name="account_setup_incoming_security_ssl_label" msgid="2798501138420163861">"SSL/TLS"</string>
@@ -131,18 +131,18 @@
     <string name="account_setup_incoming_imap_path_prefix_hint" msgid="9190845919067906033">"Opcional"</string>
     <string name="account_setup_outgoing_title" msgid="7208495965665711539">"Configuración de la cuenta"</string>
     <string name="account_setup_outgoing_headline" msgid="2025001060935366394">"Configuración del servidor de salida"</string>
-    <string name="account_setup_outgoing_smtp_server_label" msgid="6035137446691195177">"Servidor SMTP"</string>
-    <string name="account_setup_outgoing_port_label" msgid="7573207437835827876">"Puerto"</string>
-    <string name="account_setup_outgoing_security_label" msgid="911398071120720589">"Tipo de seguridad"</string>
+    <string name="account_setup_outgoing_smtp_server_label" msgid="1164004960070541473">"SERVIDOR SMTP"</string>
+    <string name="account_setup_outgoing_port_label" msgid="4670120792135566784">"PUERTO"</string>
+    <string name="account_setup_outgoing_security_label" msgid="9200220309360082664">"TIPO DE SEGURIDAD"</string>
     <string name="account_setup_outgoing_require_login_label" msgid="7779484127897397562">"Requiere acceso"</string>
-    <string name="account_setup_outgoing_username_label" msgid="3309680794731596981">"Nombre de usuario"</string>
-    <string name="account_setup_outgoing_password_label" msgid="227844585493317550">"Contraseña"</string>
-    <string name="account_setup_exchange_certificate_title" msgid="8473793588405277962">"Certificado de cliente"</string>
+    <string name="account_setup_outgoing_username_label" msgid="7239411429115525841">"NOMBRE DE USUARIO"</string>
+    <string name="account_setup_outgoing_password_label" msgid="3720429254654722208">"CONTRASEÑA"</string>
+    <string name="account_setup_exchange_certificate_title" msgid="1635140303999054002">"CERTIFICADO DE CLIENTE"</string>
     <string name="account_setup_exchange_select_certificate" msgid="1536103662037268683">"Seleccionar"</string>
     <string name="account_setup_exchange_use_certificate" msgid="8690682770083161349">"Usar certificado de cliente"</string>
     <string name="account_setup_exchange_remove_certificate" msgid="5633249155510301766">"Eliminar"</string>
     <string name="account_setup_exchange_no_certificate" msgid="1119542961954780872">"Ninguno"</string>
-    <string name="account_setup_exchange_device_id_label" msgid="1646827333223157658">"ID de dispositivo móvil"</string>
+    <string name="account_setup_exchange_device_id_label" msgid="5105898844003459657">"ID DE DISPOSITIVO MÓVIL"</string>
     <string name="account_setup_options_title" msgid="9016600767888846051">"Configuración de la cuenta"</string>
     <string name="account_setup_options_headline" msgid="4181274232835368085">"Opciones de cuenta"</string>
     <string name="account_setup_options_mail_check_frequency_label" msgid="4824859792882810053">"Frecuencia de verificación de la bandeja de entrada"</string>
diff --git a/res/values-es/strings.xml b/res/values-es/strings.xml
index 486269d71..424ec7f53 100644
--- a/res/values-es/strings.xml
+++ b/res/values-es/strings.xml
@@ -87,13 +87,13 @@
     <string name="account_setup_basics_email_label" msgid="3454164053624112047">"Dirección de correo electrónico"</string>
     <string name="or_label" msgid="2207403489755254427">"O"</string>
     <string name="sign_in_with_google" msgid="9051489501495503976">"Iniciar sesión con Google"</string>
-    <string name="account_setup_basics_password_label" msgid="9133549799291519298">"Contraseña"</string>
-    <string name="password_label" msgid="5228754278985667134">"Contraseña"</string>
+    <string name="account_setup_basics_password_label" msgid="3402762431598148148">"CONTRASEÑA"</string>
+    <string name="password_hint" msgid="8835390747504721561">"Contraseña"</string>
     <string name="signed_in_with_service_label" msgid="4909910797357155961">"Has iniciado sesión con %s"</string>
-    <string name="authentication_label" msgid="5210804218348191833">"Autenticación"</string>
+    <string name="authentication_label" msgid="6917956186120234602">"AUTENTICACIÓN"</string>
     <string name="add_authentication_label" msgid="865206092644419804">"Añadir autenticación"</string>
     <string name="clear_authentication_label" msgid="8113966442068335059">"Borrar autenticación"</string>
-    <string name="account_setup_basics_manual_setup_action" msgid="6640115171889882878"><u>"Configuración manual"</u></string>
+    <string name="account_setup_basics_manual_setup_action" msgid="8053852205391155912">"Ajustes manuales"</string>
     <string name="account_setup_username_password_toast" msgid="3968270274727947460">"Introduce una dirección de correo electrónico y una contraseña válidas."</string>
     <string name="account_duplicate_dlg_title" msgid="8089732986912704425">"Cuenta duplicada"</string>
     <string name="account_duplicate_dlg_message_fmt" msgid="6447629283679935840">"Ya estás usando este nombre de usuario para la cuenta \"<xliff:g id="DUPLICATE">%s</xliff:g>\"."</string>
@@ -114,11 +114,11 @@
     <string name="account_setup_account_type_instructions" msgid="114515540798408760">"¿Qué tipo de cuenta tienes?"</string>
     <string name="account_setup_incoming_title" msgid="6796626791039136005">"Ajustes de la cuenta"</string>
     <string name="account_setup_incoming_headline" msgid="6183711037633407184">"Ajustes del servidor de entrada"</string>
-    <string name="account_setup_incoming_username_label" msgid="5700581386104070302">"Nombre de usuario"</string>
-    <string name="account_setup_incoming_password_label" msgid="6365327603172559859">"Contraseña"</string>
-    <string name="account_setup_incoming_server_label" msgid="1480342966630002638">"Servidor"</string>
-    <string name="account_setup_incoming_port_label" msgid="8214738923690447796">"Puerto"</string>
-    <string name="account_setup_incoming_security_label" msgid="2110260791086007424">"Tipo de seguridad"</string>
+    <string name="account_setup_incoming_username_label" msgid="406939983633223354">"NOMBRE DE USUARIO"</string>
+    <string name="account_setup_incoming_password_label" msgid="634540235479188709">"CONTRASEÑA"</string>
+    <string name="account_setup_incoming_server_label" msgid="3528558488000638420">"SERVIDOR"</string>
+    <string name="account_setup_incoming_port_label" msgid="5311652277990186704">"PUERTO"</string>
+    <string name="account_setup_incoming_security_label" msgid="1175710992470593691">"TIPO DE SEGURIDAD"</string>
     <string name="account_setup_incoming_security_none_label" msgid="8300169413118264895">"Ninguna"</string>
     <string name="account_setup_incoming_security_ssl_trust_certificates_label" msgid="6151855090123117538">"SSL/TLS (aceptar todos los certif.)"</string>
     <string name="account_setup_incoming_security_ssl_label" msgid="2798501138420163861">"SSL/TLS"</string>
@@ -131,18 +131,18 @@
     <string name="account_setup_incoming_imap_path_prefix_hint" msgid="9190845919067906033">"Opcional"</string>
     <string name="account_setup_outgoing_title" msgid="7208495965665711539">"Ajustes de la cuenta"</string>
     <string name="account_setup_outgoing_headline" msgid="2025001060935366394">"Ajustes del servidor de salida"</string>
-    <string name="account_setup_outgoing_smtp_server_label" msgid="6035137446691195177">"Servidor SMTP"</string>
-    <string name="account_setup_outgoing_port_label" msgid="7573207437835827876">"Puerto"</string>
-    <string name="account_setup_outgoing_security_label" msgid="911398071120720589">"Tipo de seguridad"</string>
+    <string name="account_setup_outgoing_smtp_server_label" msgid="1164004960070541473">"SERVIDOR SMTP"</string>
+    <string name="account_setup_outgoing_port_label" msgid="4670120792135566784">"PUERTO"</string>
+    <string name="account_setup_outgoing_security_label" msgid="9200220309360082664">"TIPO DE SEGURIDAD"</string>
     <string name="account_setup_outgoing_require_login_label" msgid="7779484127897397562">"Solicitar inicio de sesión"</string>
-    <string name="account_setup_outgoing_username_label" msgid="3309680794731596981">"Nombre de usuario"</string>
-    <string name="account_setup_outgoing_password_label" msgid="227844585493317550">"Contraseña"</string>
-    <string name="account_setup_exchange_certificate_title" msgid="8473793588405277962">"Certificado de cliente"</string>
+    <string name="account_setup_outgoing_username_label" msgid="7239411429115525841">"NOMBRE DE USUARIO"</string>
+    <string name="account_setup_outgoing_password_label" msgid="3720429254654722208">"CONTRASEÑA"</string>
+    <string name="account_setup_exchange_certificate_title" msgid="1635140303999054002">"CERTIFICADO DE CLIENTE"</string>
     <string name="account_setup_exchange_select_certificate" msgid="1536103662037268683">"Seleccionar"</string>
     <string name="account_setup_exchange_use_certificate" msgid="8690682770083161349">"Utilizar certificado de cliente"</string>
     <string name="account_setup_exchange_remove_certificate" msgid="5633249155510301766">"Eliminar"</string>
     <string name="account_setup_exchange_no_certificate" msgid="1119542961954780872">"Ninguno"</string>
-    <string name="account_setup_exchange_device_id_label" msgid="1646827333223157658">"ID del dispositivo móvil"</string>
+    <string name="account_setup_exchange_device_id_label" msgid="5105898844003459657">"ID DE DISPOSITIVO MÓVIL"</string>
     <string name="account_setup_options_title" msgid="9016600767888846051">"Ajustes de la cuenta"</string>
     <string name="account_setup_options_headline" msgid="4181274232835368085">"Opciones de cuenta"</string>
     <string name="account_setup_options_mail_check_frequency_label" msgid="4824859792882810053">"Comprobar mensajes nuevos"</string>
diff --git a/res/values-et-rEE/strings.xml b/res/values-et-rEE/strings.xml
index 3c7e077df..211707dee 100644
--- a/res/values-et-rEE/strings.xml
+++ b/res/values-et-rEE/strings.xml
@@ -87,13 +87,13 @@
     <string name="account_setup_basics_email_label" msgid="3454164053624112047">"E-posti aadress"</string>
     <string name="or_label" msgid="2207403489755254427">"VÕI"</string>
     <string name="sign_in_with_google" msgid="9051489501495503976">"Sisselogimine Google\'i kontoga"</string>
-    <string name="account_setup_basics_password_label" msgid="9133549799291519298">"Parool"</string>
-    <string name="password_label" msgid="5228754278985667134">"Parool"</string>
+    <string name="account_setup_basics_password_label" msgid="3402762431598148148">"PAROOL"</string>
+    <string name="password_hint" msgid="8835390747504721561">"Parool"</string>
     <string name="signed_in_with_service_label" msgid="4909910797357155961">"Logitud sisse teenusega %s"</string>
-    <string name="authentication_label" msgid="5210804218348191833">"Autentimine"</string>
+    <string name="authentication_label" msgid="6917956186120234602">"AUTENTIMINE"</string>
     <string name="add_authentication_label" msgid="865206092644419804">"Lisa autentimine"</string>
     <string name="clear_authentication_label" msgid="8113966442068335059">"Kustuta autentimine"</string>
-    <string name="account_setup_basics_manual_setup_action" msgid="6640115171889882878"><u>"Käsitsi seadistamine"</u></string>
+    <string name="account_setup_basics_manual_setup_action" msgid="8053852205391155912">"Seadista käsitsi"</string>
     <string name="account_setup_username_password_toast" msgid="3968270274727947460">"Sisestage kehtiv e-posti aadress ja parool."</string>
     <string name="account_duplicate_dlg_title" msgid="8089732986912704425">"Duplikaatkonto"</string>
     <string name="account_duplicate_dlg_message_fmt" msgid="6447629283679935840">"Kasutate juba konto „<xliff:g id="DUPLICATE">%s</xliff:g>” puhul seda kasutajanime."</string>
@@ -114,11 +114,11 @@
     <string name="account_setup_account_type_instructions" msgid="114515540798408760">"Mis tüüpi see konto on?"</string>
     <string name="account_setup_incoming_title" msgid="6796626791039136005">"Konto seadistamine"</string>
     <string name="account_setup_incoming_headline" msgid="6183711037633407184">"Sissetuleva serveri seaded"</string>
-    <string name="account_setup_incoming_username_label" msgid="5700581386104070302">"Kasutajanimi"</string>
-    <string name="account_setup_incoming_password_label" msgid="6365327603172559859">"Parool"</string>
-    <string name="account_setup_incoming_server_label" msgid="1480342966630002638">"Server"</string>
-    <string name="account_setup_incoming_port_label" msgid="8214738923690447796">"Port"</string>
-    <string name="account_setup_incoming_security_label" msgid="2110260791086007424">"Turvalisuse tüüp"</string>
+    <string name="account_setup_incoming_username_label" msgid="406939983633223354">"KASUTAJANIMI"</string>
+    <string name="account_setup_incoming_password_label" msgid="634540235479188709">"PAROOL"</string>
+    <string name="account_setup_incoming_server_label" msgid="3528558488000638420">"SERVER"</string>
+    <string name="account_setup_incoming_port_label" msgid="5311652277990186704">"PORT"</string>
+    <string name="account_setup_incoming_security_label" msgid="1175710992470593691">"TURVATÜÜP"</string>
     <string name="account_setup_incoming_security_none_label" msgid="8300169413118264895">"Puudub"</string>
     <string name="account_setup_incoming_security_ssl_trust_certificates_label" msgid="6151855090123117538">"SSL/TLS (Nõustuge kõigi sertifikaatidega)"</string>
     <string name="account_setup_incoming_security_ssl_label" msgid="2798501138420163861">"SSL/TLS"</string>
@@ -131,18 +131,18 @@
     <string name="account_setup_incoming_imap_path_prefix_hint" msgid="9190845919067906033">"Valikuline"</string>
     <string name="account_setup_outgoing_title" msgid="7208495965665711539">"Konto seadistamine"</string>
     <string name="account_setup_outgoing_headline" msgid="2025001060935366394">"Väljuva serveri seaded"</string>
-    <string name="account_setup_outgoing_smtp_server_label" msgid="6035137446691195177">"SMTP-server"</string>
-    <string name="account_setup_outgoing_port_label" msgid="7573207437835827876">"Port"</string>
-    <string name="account_setup_outgoing_security_label" msgid="911398071120720589">"Turvalisuse tüüp"</string>
+    <string name="account_setup_outgoing_smtp_server_label" msgid="1164004960070541473">"SMTP-SERVER"</string>
+    <string name="account_setup_outgoing_port_label" msgid="4670120792135566784">"PORT"</string>
+    <string name="account_setup_outgoing_security_label" msgid="9200220309360082664">"TURVATÜÜP"</string>
     <string name="account_setup_outgoing_require_login_label" msgid="7779484127897397562">"Sisselogimine on nõutav"</string>
-    <string name="account_setup_outgoing_username_label" msgid="3309680794731596981">"Kasutajanimi"</string>
-    <string name="account_setup_outgoing_password_label" msgid="227844585493317550">"Parool"</string>
-    <string name="account_setup_exchange_certificate_title" msgid="8473793588405277962">"Kliendisertifikaat"</string>
+    <string name="account_setup_outgoing_username_label" msgid="7239411429115525841">"KASUTAJANIMI"</string>
+    <string name="account_setup_outgoing_password_label" msgid="3720429254654722208">"PAROOL"</string>
+    <string name="account_setup_exchange_certificate_title" msgid="1635140303999054002">"KLIENDI SERTIFIKAAT"</string>
     <string name="account_setup_exchange_select_certificate" msgid="1536103662037268683">"Vali"</string>
     <string name="account_setup_exchange_use_certificate" msgid="8690682770083161349">"Kasuta kliendisertifikaati"</string>
     <string name="account_setup_exchange_remove_certificate" msgid="5633249155510301766">"Eemalda"</string>
     <string name="account_setup_exchange_no_certificate" msgid="1119542961954780872">"Puudub"</string>
-    <string name="account_setup_exchange_device_id_label" msgid="1646827333223157658">"Mobiilseadme ID"</string>
+    <string name="account_setup_exchange_device_id_label" msgid="5105898844003459657">"MOBIILSEADME ID"</string>
     <string name="account_setup_options_title" msgid="9016600767888846051">"Konto seaded"</string>
     <string name="account_setup_options_headline" msgid="4181274232835368085">"Konto valikud"</string>
     <string name="account_setup_options_mail_check_frequency_label" msgid="4824859792882810053">"Postkasti kontrollimise sagedus"</string>
diff --git a/res/values-fa/strings.xml b/res/values-fa/strings.xml
index 681f3fb31..94a68a379 100644
--- a/res/values-fa/strings.xml
+++ b/res/values-fa/strings.xml
@@ -87,13 +87,13 @@
     <string name="account_setup_basics_email_label" msgid="3454164053624112047">"آدرس ایمیل"</string>
     <string name="or_label" msgid="2207403489755254427">"یا"</string>
     <string name="sign_in_with_google" msgid="9051489501495503976">"‏ورود به سیستم با Google‎"</string>
-    <string name="account_setup_basics_password_label" msgid="9133549799291519298">"رمز ورود"</string>
-    <string name="password_label" msgid="5228754278985667134">"گذرواژه"</string>
+    <string name="account_setup_basics_password_label" msgid="3402762431598148148">"گذرواژه"</string>
+    <string name="password_hint" msgid="8835390747504721561">"گذرواژه"</string>
     <string name="signed_in_with_service_label" msgid="4909910797357155961">"‏وارد شده به سیستم با %s"</string>
-    <string name="authentication_label" msgid="5210804218348191833">"احراز هویت"</string>
+    <string name="authentication_label" msgid="6917956186120234602">"احراز هویت"</string>
     <string name="add_authentication_label" msgid="865206092644419804">"افزودن احراز هویت"</string>
     <string name="clear_authentication_label" msgid="8113966442068335059">"پاک کردن احراز هویت"</string>
-    <string name="account_setup_basics_manual_setup_action" msgid="6640115171889882878"><u>"تنظیم دستی"</u></string>
+    <string name="account_setup_basics_manual_setup_action" msgid="8053852205391155912">"تنظیم دستی"</string>
     <string name="account_setup_username_password_toast" msgid="3968270274727947460">"یک آدرس ایمیل و گذرواژه معتبر تایپ کنید."</string>
     <string name="account_duplicate_dlg_title" msgid="8089732986912704425">"حساب تکراری"</string>
     <string name="account_duplicate_dlg_message_fmt" msgid="6447629283679935840">"شما در حال حاضر از این نام کاربری برای حساب \"<xliff:g id="DUPLICATE">%s</xliff:g>\" استفاده می‌کنید."</string>
@@ -114,11 +114,11 @@
     <string name="account_setup_account_type_instructions" msgid="114515540798408760">"این چه نوع حسابی است؟"</string>
     <string name="account_setup_incoming_title" msgid="6796626791039136005">"تنظیم حساب"</string>
     <string name="account_setup_incoming_headline" msgid="6183711037633407184">"تنظیمات سرور ورودی"</string>
-    <string name="account_setup_incoming_username_label" msgid="5700581386104070302">"نام کاربری"</string>
-    <string name="account_setup_incoming_password_label" msgid="6365327603172559859">"رمز ورود"</string>
-    <string name="account_setup_incoming_server_label" msgid="1480342966630002638">"سرور"</string>
-    <string name="account_setup_incoming_port_label" msgid="8214738923690447796">"درگاه"</string>
-    <string name="account_setup_incoming_security_label" msgid="2110260791086007424">"نوع امنیت"</string>
+    <string name="account_setup_incoming_username_label" msgid="406939983633223354">"نام کاربری"</string>
+    <string name="account_setup_incoming_password_label" msgid="634540235479188709">"گذرواژه"</string>
+    <string name="account_setup_incoming_server_label" msgid="3528558488000638420">"سرور"</string>
+    <string name="account_setup_incoming_port_label" msgid="5311652277990186704">"درگاه"</string>
+    <string name="account_setup_incoming_security_label" msgid="1175710992470593691">"نوع امنیت"</string>
     <string name="account_setup_incoming_security_none_label" msgid="8300169413118264895">"هیچکدام"</string>
     <string name="account_setup_incoming_security_ssl_trust_certificates_label" msgid="6151855090123117538">"‏SSL/TLS (پذیرش همه گواهی‌ها)"</string>
     <string name="account_setup_incoming_security_ssl_label" msgid="2798501138420163861">"SSL/TLS"</string>
@@ -131,18 +131,18 @@
     <string name="account_setup_incoming_imap_path_prefix_hint" msgid="9190845919067906033">"اختیاری"</string>
     <string name="account_setup_outgoing_title" msgid="7208495965665711539">"تنظیم حساب"</string>
     <string name="account_setup_outgoing_headline" msgid="2025001060935366394">"تنظیمات سرور خروجی"</string>
-    <string name="account_setup_outgoing_smtp_server_label" msgid="6035137446691195177">"‏سرور SMTP"</string>
-    <string name="account_setup_outgoing_port_label" msgid="7573207437835827876">"درگاه"</string>
-    <string name="account_setup_outgoing_security_label" msgid="911398071120720589">"نوع امنیت"</string>
+    <string name="account_setup_outgoing_smtp_server_label" msgid="1164004960070541473">"‏سرور SMTP"</string>
+    <string name="account_setup_outgoing_port_label" msgid="4670120792135566784">"درگاه"</string>
+    <string name="account_setup_outgoing_security_label" msgid="9200220309360082664">"نوع امنیت"</string>
     <string name="account_setup_outgoing_require_login_label" msgid="7779484127897397562">"ورود به سیستم لازم است"</string>
-    <string name="account_setup_outgoing_username_label" msgid="3309680794731596981">"نام کاربری"</string>
-    <string name="account_setup_outgoing_password_label" msgid="227844585493317550">"رمز ورود"</string>
-    <string name="account_setup_exchange_certificate_title" msgid="8473793588405277962">"گواهی سرویس گیرنده"</string>
+    <string name="account_setup_outgoing_username_label" msgid="7239411429115525841">"نام کاربری"</string>
+    <string name="account_setup_outgoing_password_label" msgid="3720429254654722208">"گذرواژه"</string>
+    <string name="account_setup_exchange_certificate_title" msgid="1635140303999054002">"گواهینامه سرویس گیرنده"</string>
     <string name="account_setup_exchange_select_certificate" msgid="1536103662037268683">"انتخاب"</string>
     <string name="account_setup_exchange_use_certificate" msgid="8690682770083161349">"استفاده از گواهی مشتری"</string>
     <string name="account_setup_exchange_remove_certificate" msgid="5633249155510301766">"حذف"</string>
     <string name="account_setup_exchange_no_certificate" msgid="1119542961954780872">"هیچکدام"</string>
-    <string name="account_setup_exchange_device_id_label" msgid="1646827333223157658">"شناسه تلفن همراه"</string>
+    <string name="account_setup_exchange_device_id_label" msgid="5105898844003459657">"شناسه دستگاه همراه"</string>
     <string name="account_setup_options_title" msgid="9016600767888846051">"تنظیمات حساب"</string>
     <string name="account_setup_options_headline" msgid="4181274232835368085">"گزینه‌های حساب"</string>
     <string name="account_setup_options_mail_check_frequency_label" msgid="4824859792882810053">"دفعات بررسی صندوق ورودی"</string>
diff --git a/res/values-fi/strings.xml b/res/values-fi/strings.xml
index d1173fb41..4adb78b02 100644
--- a/res/values-fi/strings.xml
+++ b/res/values-fi/strings.xml
@@ -87,13 +87,16 @@
     <string name="account_setup_basics_email_label" msgid="3454164053624112047">"Sähköpostiosoite"</string>
     <string name="or_label" msgid="2207403489755254427">"TAI"</string>
     <string name="sign_in_with_google" msgid="9051489501495503976">"Kirjaudu Google-tiliin"</string>
-    <string name="account_setup_basics_password_label" msgid="9133549799291519298">"Salasana"</string>
-    <string name="password_label" msgid="5228754278985667134">"Salasana"</string>
+    <!-- no translation found for account_setup_basics_password_label (3402762431598148148) -->
+    <skip />
+    <!-- no translation found for password_hint (8835390747504721561) -->
+    <skip />
     <string name="signed_in_with_service_label" msgid="4909910797357155961">"Kirjautunut palveluun %s"</string>
-    <string name="authentication_label" msgid="5210804218348191833">"Todennus"</string>
+    <!-- no translation found for authentication_label (6917956186120234602) -->
+    <skip />
     <string name="add_authentication_label" msgid="865206092644419804">"Lisää todennus"</string>
     <string name="clear_authentication_label" msgid="8113966442068335059">"Poista todennus"</string>
-    <string name="account_setup_basics_manual_setup_action" msgid="6640115171889882878"><u>"Manuaalinen määritys"</u></string>
+    <string name="account_setup_basics_manual_setup_action" msgid="8053852205391155912">"Manuaalinen määritys"</string>
     <string name="account_setup_username_password_toast" msgid="3968270274727947460">"Anna kelvollinen sähköpostiosoite ja salasana."</string>
     <string name="account_duplicate_dlg_title" msgid="8089732986912704425">"Päällekkäiset tilit"</string>
     <string name="account_duplicate_dlg_message_fmt" msgid="6447629283679935840">"Käytät tätä käyttäjänimeä jo tilissä <xliff:g id="DUPLICATE">%s</xliff:g>."</string>
@@ -114,11 +117,16 @@
     <string name="account_setup_account_type_instructions" msgid="114515540798408760">"Millainen tili tämä on?"</string>
     <string name="account_setup_incoming_title" msgid="6796626791039136005">"Tilin asetukset"</string>
     <string name="account_setup_incoming_headline" msgid="6183711037633407184">"Saapuvan postin palvelimen asetukset"</string>
-    <string name="account_setup_incoming_username_label" msgid="5700581386104070302">"Käyttäjänimi"</string>
-    <string name="account_setup_incoming_password_label" msgid="6365327603172559859">"Salasana"</string>
-    <string name="account_setup_incoming_server_label" msgid="1480342966630002638">"Palvelin"</string>
-    <string name="account_setup_incoming_port_label" msgid="8214738923690447796">"Portti"</string>
-    <string name="account_setup_incoming_security_label" msgid="2110260791086007424">"Suojaustyyppi"</string>
+    <!-- no translation found for account_setup_incoming_username_label (406939983633223354) -->
+    <skip />
+    <!-- no translation found for account_setup_incoming_password_label (634540235479188709) -->
+    <skip />
+    <!-- no translation found for account_setup_incoming_server_label (3528558488000638420) -->
+    <skip />
+    <!-- no translation found for account_setup_incoming_port_label (5311652277990186704) -->
+    <skip />
+    <!-- no translation found for account_setup_incoming_security_label (1175710992470593691) -->
+    <skip />
     <string name="account_setup_incoming_security_none_label" msgid="8300169413118264895">"Ei mitään"</string>
     <string name="account_setup_incoming_security_ssl_trust_certificates_label" msgid="6151855090123117538">"SSL/TLS (Hyväksy kaikki varmenteet)"</string>
     <string name="account_setup_incoming_security_ssl_label" msgid="2798501138420163861">"SSL/TLS"</string>
@@ -131,18 +139,25 @@
     <string name="account_setup_incoming_imap_path_prefix_hint" msgid="9190845919067906033">"Valinnainen"</string>
     <string name="account_setup_outgoing_title" msgid="7208495965665711539">"Tilin asetukset"</string>
     <string name="account_setup_outgoing_headline" msgid="2025001060935366394">"Lähtevän postin palvelimen asetukset"</string>
-    <string name="account_setup_outgoing_smtp_server_label" msgid="6035137446691195177">"SMTP-palvelin"</string>
-    <string name="account_setup_outgoing_port_label" msgid="7573207437835827876">"Portti"</string>
-    <string name="account_setup_outgoing_security_label" msgid="911398071120720589">"Suojaustyyppi"</string>
+    <!-- no translation found for account_setup_outgoing_smtp_server_label (1164004960070541473) -->
+    <skip />
+    <!-- no translation found for account_setup_outgoing_port_label (4670120792135566784) -->
+    <skip />
+    <!-- no translation found for account_setup_outgoing_security_label (9200220309360082664) -->
+    <skip />
     <string name="account_setup_outgoing_require_login_label" msgid="7779484127897397562">"Vaadi kirjautuminen"</string>
-    <string name="account_setup_outgoing_username_label" msgid="3309680794731596981">"Käyttäjänimi"</string>
-    <string name="account_setup_outgoing_password_label" msgid="227844585493317550">"Salasana"</string>
-    <string name="account_setup_exchange_certificate_title" msgid="8473793588405277962">"Asiakassovelluksen varmenne"</string>
+    <!-- no translation found for account_setup_outgoing_username_label (7239411429115525841) -->
+    <skip />
+    <!-- no translation found for account_setup_outgoing_password_label (3720429254654722208) -->
+    <skip />
+    <!-- no translation found for account_setup_exchange_certificate_title (1635140303999054002) -->
+    <skip />
     <string name="account_setup_exchange_select_certificate" msgid="1536103662037268683">"Valitse"</string>
     <string name="account_setup_exchange_use_certificate" msgid="8690682770083161349">"Käytä asiakasvarmennetta"</string>
     <string name="account_setup_exchange_remove_certificate" msgid="5633249155510301766">"Poista"</string>
     <string name="account_setup_exchange_no_certificate" msgid="1119542961954780872">"Ei mitään"</string>
-    <string name="account_setup_exchange_device_id_label" msgid="1646827333223157658">"Mobiililaitteen tunnus"</string>
+    <!-- no translation found for account_setup_exchange_device_id_label (5105898844003459657) -->
+    <skip />
     <string name="account_setup_options_title" msgid="9016600767888846051">"Tilin asetukset"</string>
     <string name="account_setup_options_headline" msgid="4181274232835368085">"Tiliasetukset"</string>
     <string name="account_setup_options_mail_check_frequency_label" msgid="4824859792882810053">"Uusien viestien tarkistustiheys"</string>
diff --git a/res/values-fr-rCA/strings.xml b/res/values-fr-rCA/strings.xml
index 80eb3ceb1..863201e46 100644
--- a/res/values-fr-rCA/strings.xml
+++ b/res/values-fr-rCA/strings.xml
@@ -87,13 +87,13 @@
     <string name="account_setup_basics_email_label" msgid="3454164053624112047">"Adresse de courriel"</string>
     <string name="or_label" msgid="2207403489755254427">"OU"</string>
     <string name="sign_in_with_google" msgid="9051489501495503976">"Se connecter avec Google"</string>
-    <string name="account_setup_basics_password_label" msgid="9133549799291519298">"Mot de passe"</string>
-    <string name="password_label" msgid="5228754278985667134">"Mot de passe"</string>
+    <string name="account_setup_basics_password_label" msgid="3402762431598148148">"MOT DE PASSE"</string>
+    <string name="password_hint" msgid="8835390747504721561">"Mot de passe"</string>
     <string name="signed_in_with_service_label" msgid="4909910797357155961">"Connecté en tant que %s"</string>
-    <string name="authentication_label" msgid="5210804218348191833">"Authentification"</string>
+    <string name="authentication_label" msgid="6917956186120234602">"AUTHENTIFICATION"</string>
     <string name="add_authentication_label" msgid="865206092644419804">"Ajouter l\'authentification"</string>
     <string name="clear_authentication_label" msgid="8113966442068335059">"Effacer l\'authentification"</string>
-    <string name="account_setup_basics_manual_setup_action" msgid="6640115171889882878"><u>"Configuration manuelle"</u></string>
+    <string name="account_setup_basics_manual_setup_action" msgid="8053852205391155912">"Config. manuelle"</string>
     <string name="account_setup_username_password_toast" msgid="3968270274727947460">"Saisissez une adresse de courriel et un mot de passe corrects."</string>
     <string name="account_duplicate_dlg_title" msgid="8089732986912704425">"Dupliquer le compte"</string>
     <string name="account_duplicate_dlg_message_fmt" msgid="6447629283679935840">"Vous utilisez déjà ce nom d\'utilisateur pour le compte \"<xliff:g id="DUPLICATE">%s</xliff:g>\"."</string>
@@ -114,11 +114,11 @@
     <string name="account_setup_account_type_instructions" msgid="114515540798408760">"De quel type de compte s\'agit-il ?"</string>
     <string name="account_setup_incoming_title" msgid="6796626791039136005">"Configuration du compte"</string>
     <string name="account_setup_incoming_headline" msgid="6183711037633407184">"Paramètres du serveur entrant"</string>
-    <string name="account_setup_incoming_username_label" msgid="5700581386104070302">"Nom d\'utilisateur"</string>
-    <string name="account_setup_incoming_password_label" msgid="6365327603172559859">"Mot de passe"</string>
-    <string name="account_setup_incoming_server_label" msgid="1480342966630002638">"Serveur"</string>
-    <string name="account_setup_incoming_port_label" msgid="8214738923690447796">"Port"</string>
-    <string name="account_setup_incoming_security_label" msgid="2110260791086007424">"Type de sécurité"</string>
+    <string name="account_setup_incoming_username_label" msgid="406939983633223354">"NOM D\'UTILISATEUR"</string>
+    <string name="account_setup_incoming_password_label" msgid="634540235479188709">"MOT DE PASSE"</string>
+    <string name="account_setup_incoming_server_label" msgid="3528558488000638420">"SERVEUR"</string>
+    <string name="account_setup_incoming_port_label" msgid="5311652277990186704">"PORT"</string>
+    <string name="account_setup_incoming_security_label" msgid="1175710992470593691">"TYPE DE SÉCURITÉ"</string>
     <string name="account_setup_incoming_security_none_label" msgid="8300169413118264895">"Aucun"</string>
     <string name="account_setup_incoming_security_ssl_trust_certificates_label" msgid="6151855090123117538">"SSL/TLS (accepter tous les certificats)"</string>
     <string name="account_setup_incoming_security_ssl_label" msgid="2798501138420163861">"SSL/TLS"</string>
@@ -131,18 +131,18 @@
     <string name="account_setup_incoming_imap_path_prefix_hint" msgid="9190845919067906033">"Facultatif"</string>
     <string name="account_setup_outgoing_title" msgid="7208495965665711539">"Configuration du compte"</string>
     <string name="account_setup_outgoing_headline" msgid="2025001060935366394">"Paramètres du serveur sortant"</string>
-    <string name="account_setup_outgoing_smtp_server_label" msgid="6035137446691195177">"Serveur SMTP"</string>
-    <string name="account_setup_outgoing_port_label" msgid="7573207437835827876">"Port"</string>
-    <string name="account_setup_outgoing_security_label" msgid="911398071120720589">"Type de sécurité"</string>
+    <string name="account_setup_outgoing_smtp_server_label" msgid="1164004960070541473">"SERVEUR SMTP"</string>
+    <string name="account_setup_outgoing_port_label" msgid="4670120792135566784">"PORT"</string>
+    <string name="account_setup_outgoing_security_label" msgid="9200220309360082664">"TYPE DE SÉCURITÉ"</string>
     <string name="account_setup_outgoing_require_login_label" msgid="7779484127897397562">"Exiger une connexion"</string>
-    <string name="account_setup_outgoing_username_label" msgid="3309680794731596981">"Nom d\'utilisateur"</string>
-    <string name="account_setup_outgoing_password_label" msgid="227844585493317550">"Mot de passe"</string>
-    <string name="account_setup_exchange_certificate_title" msgid="8473793588405277962">"Certificat client"</string>
+    <string name="account_setup_outgoing_username_label" msgid="7239411429115525841">"NOM D\'UTILISATEUR"</string>
+    <string name="account_setup_outgoing_password_label" msgid="3720429254654722208">"MOT DE PASSE"</string>
+    <string name="account_setup_exchange_certificate_title" msgid="1635140303999054002">"CERTIFICAT CLIENT"</string>
     <string name="account_setup_exchange_select_certificate" msgid="1536103662037268683">"Sélectionner"</string>
     <string name="account_setup_exchange_use_certificate" msgid="8690682770083161349">"Utiliser un certificat client"</string>
     <string name="account_setup_exchange_remove_certificate" msgid="5633249155510301766">"Supprimer"</string>
     <string name="account_setup_exchange_no_certificate" msgid="1119542961954780872">"Aucun"</string>
-    <string name="account_setup_exchange_device_id_label" msgid="1646827333223157658">"Numéro de périphérique mobile :"</string>
+    <string name="account_setup_exchange_device_id_label" msgid="5105898844003459657">"IDENTIFIANT D\'APPAREIL MOBILE"</string>
     <string name="account_setup_options_title" msgid="9016600767888846051">"Paramètres de compte"</string>
     <string name="account_setup_options_headline" msgid="4181274232835368085">"Options de compte"</string>
     <string name="account_setup_options_mail_check_frequency_label" msgid="4824859792882810053">"Fréquence de consultation de la boîte de réception"</string>
diff --git a/res/values-fr/strings.xml b/res/values-fr/strings.xml
index 0fc341727..74dfdb2e6 100644
--- a/res/values-fr/strings.xml
+++ b/res/values-fr/strings.xml
@@ -87,13 +87,13 @@
     <string name="account_setup_basics_email_label" msgid="3454164053624112047">"Adresse e-mail"</string>
     <string name="or_label" msgid="2207403489755254427">"OU"</string>
     <string name="sign_in_with_google" msgid="9051489501495503976">"Se connecter avec Google"</string>
-    <string name="account_setup_basics_password_label" msgid="9133549799291519298">"Mot de passe"</string>
-    <string name="password_label" msgid="5228754278985667134">"Mot de passe"</string>
+    <string name="account_setup_basics_password_label" msgid="3402762431598148148">"MOT DE PASSE"</string>
+    <string name="password_hint" msgid="8835390747504721561">"Mot de passe"</string>
     <string name="signed_in_with_service_label" msgid="4909910797357155961">"Connecté en tant que %s"</string>
-    <string name="authentication_label" msgid="5210804218348191833">"Authentification"</string>
+    <string name="authentication_label" msgid="6917956186120234602">"AUTHENTIFICATION"</string>
     <string name="add_authentication_label" msgid="865206092644419804">"Ajouter l\'authentification"</string>
     <string name="clear_authentication_label" msgid="8113966442068335059">"Effacer l\'authentification"</string>
-    <string name="account_setup_basics_manual_setup_action" msgid="6640115171889882878"><u>"Configuration manuelle"</u></string>
+    <string name="account_setup_basics_manual_setup_action" msgid="8053852205391155912">"Config. manuelle"</string>
     <string name="account_setup_username_password_toast" msgid="3968270274727947460">"Saisissez une adresse e-mail et un mot de passe corrects."</string>
     <string name="account_duplicate_dlg_title" msgid="8089732986912704425">"Dupliquer le compte"</string>
     <string name="account_duplicate_dlg_message_fmt" msgid="6447629283679935840">"Vous utilisez déjà ce nom d\'utilisateur pour le compte \"<xliff:g id="DUPLICATE">%s</xliff:g>\"."</string>
@@ -114,11 +114,11 @@
     <string name="account_setup_account_type_instructions" msgid="114515540798408760">"De quel type de compte s\'agit-il ?"</string>
     <string name="account_setup_incoming_title" msgid="6796626791039136005">"Configuration du compte"</string>
     <string name="account_setup_incoming_headline" msgid="6183711037633407184">"Paramètres du serveur entrant"</string>
-    <string name="account_setup_incoming_username_label" msgid="5700581386104070302">"Nom d\'utilisateur"</string>
-    <string name="account_setup_incoming_password_label" msgid="6365327603172559859">"Mot de passe"</string>
-    <string name="account_setup_incoming_server_label" msgid="1480342966630002638">"Serveur"</string>
-    <string name="account_setup_incoming_port_label" msgid="8214738923690447796">"Port"</string>
-    <string name="account_setup_incoming_security_label" msgid="2110260791086007424">"Type de sécurité"</string>
+    <string name="account_setup_incoming_username_label" msgid="406939983633223354">"NOM D\'UTILISATEUR"</string>
+    <string name="account_setup_incoming_password_label" msgid="634540235479188709">"MOT DE PASSE"</string>
+    <string name="account_setup_incoming_server_label" msgid="3528558488000638420">"SERVEUR"</string>
+    <string name="account_setup_incoming_port_label" msgid="5311652277990186704">"PORT"</string>
+    <string name="account_setup_incoming_security_label" msgid="1175710992470593691">"TYPE DE SÉCURITÉ"</string>
     <string name="account_setup_incoming_security_none_label" msgid="8300169413118264895">"Aucune"</string>
     <string name="account_setup_incoming_security_ssl_trust_certificates_label" msgid="6151855090123117538">"SSL/TLS (accepter tous les certificats)"</string>
     <string name="account_setup_incoming_security_ssl_label" msgid="2798501138420163861">"SSL/TLS"</string>
@@ -131,18 +131,18 @@
     <string name="account_setup_incoming_imap_path_prefix_hint" msgid="9190845919067906033">"Facultatif"</string>
     <string name="account_setup_outgoing_title" msgid="7208495965665711539">"Configuration du compte"</string>
     <string name="account_setup_outgoing_headline" msgid="2025001060935366394">"Paramètres du serveur sortant"</string>
-    <string name="account_setup_outgoing_smtp_server_label" msgid="6035137446691195177">"Serveur SMTP"</string>
-    <string name="account_setup_outgoing_port_label" msgid="7573207437835827876">"Port"</string>
-    <string name="account_setup_outgoing_security_label" msgid="911398071120720589">"Type de sécurité"</string>
+    <string name="account_setup_outgoing_smtp_server_label" msgid="1164004960070541473">"SERVEUR SMTP"</string>
+    <string name="account_setup_outgoing_port_label" msgid="4670120792135566784">"PORT"</string>
+    <string name="account_setup_outgoing_security_label" msgid="9200220309360082664">"TYPE DE SÉCURITÉ"</string>
     <string name="account_setup_outgoing_require_login_label" msgid="7779484127897397562">"Exiger une connexion"</string>
-    <string name="account_setup_outgoing_username_label" msgid="3309680794731596981">"Nom d\'utilisateur"</string>
-    <string name="account_setup_outgoing_password_label" msgid="227844585493317550">"Mot de passe"</string>
-    <string name="account_setup_exchange_certificate_title" msgid="8473793588405277962">"Certificat client"</string>
+    <string name="account_setup_outgoing_username_label" msgid="7239411429115525841">"NOM D\'UTILISATEUR"</string>
+    <string name="account_setup_outgoing_password_label" msgid="3720429254654722208">"MOT DE PASSE"</string>
+    <string name="account_setup_exchange_certificate_title" msgid="1635140303999054002">"CERTIFICAT CLIENT"</string>
     <string name="account_setup_exchange_select_certificate" msgid="1536103662037268683">"Sélectionner"</string>
     <string name="account_setup_exchange_use_certificate" msgid="8690682770083161349">"Utiliser un certificat client"</string>
     <string name="account_setup_exchange_remove_certificate" msgid="5633249155510301766">"Supprimer"</string>
     <string name="account_setup_exchange_no_certificate" msgid="1119542961954780872">"Aucun"</string>
-    <string name="account_setup_exchange_device_id_label" msgid="1646827333223157658">"Numéro d\'appareil mobile :"</string>
+    <string name="account_setup_exchange_device_id_label" msgid="5105898844003459657">"IDENTIFIANT D\'APPAREIL MOBILE"</string>
     <string name="account_setup_options_title" msgid="9016600767888846051">"Paramètres du compte"</string>
     <string name="account_setup_options_headline" msgid="4181274232835368085">"Options de compte"</string>
     <string name="account_setup_options_mail_check_frequency_label" msgid="4824859792882810053">"Fréquence de consultation de la boîte de réception"</string>
diff --git a/res/values-hi/strings.xml b/res/values-hi/strings.xml
index df2068e26..cb892a24b 100644
--- a/res/values-hi/strings.xml
+++ b/res/values-hi/strings.xml
@@ -87,13 +87,13 @@
     <string name="account_setup_basics_email_label" msgid="3454164053624112047">"ईमेल पता"</string>
     <string name="or_label" msgid="2207403489755254427">"या"</string>
     <string name="sign_in_with_google" msgid="9051489501495503976">"Google से प्रवेश करें"</string>
-    <string name="account_setup_basics_password_label" msgid="9133549799291519298">"पासवर्ड"</string>
-    <string name="password_label" msgid="5228754278985667134">"पासवर्ड"</string>
+    <string name="account_setup_basics_password_label" msgid="3402762431598148148">"पासवर्ड"</string>
+    <string name="password_hint" msgid="8835390747504721561">"पासवर्ड"</string>
     <string name="signed_in_with_service_label" msgid="4909910797357155961">"%s के साथ प्रवेश किया"</string>
-    <string name="authentication_label" msgid="5210804218348191833">"प्रमाणीकरण"</string>
+    <string name="authentication_label" msgid="6917956186120234602">"प्रमाणीकरण"</string>
     <string name="add_authentication_label" msgid="865206092644419804">"प्रमाणीकरण जोड़ें"</string>
     <string name="clear_authentication_label" msgid="8113966442068335059">"प्रमाणीकरण साफ़ करें"</string>
-    <string name="account_setup_basics_manual_setup_action" msgid="6640115171889882878"><u>"मैन्युअल सेटअप"</u></string>
+    <string name="account_setup_basics_manual_setup_action" msgid="8053852205391155912">"मैन्‍युअल सेटअप"</string>
     <string name="account_setup_username_password_toast" msgid="3968270274727947460">"कोई मान्‍य ईमेल पता और पासवर्ड लिखें."</string>
     <string name="account_duplicate_dlg_title" msgid="8089732986912704425">"डुप्‍लिकेट खाता"</string>
     <string name="account_duplicate_dlg_message_fmt" msgid="6447629283679935840">"आप पहले से ही \"<xliff:g id="DUPLICATE">%s</xliff:g>\" खाते के लिए इस उपयोगकर्ता नाम का उपयोग कर रहे हैं."</string>
@@ -114,11 +114,11 @@
     <string name="account_setup_account_type_instructions" msgid="114515540798408760">"यह किस प्रकार का खाता है?"</string>
     <string name="account_setup_incoming_title" msgid="6796626791039136005">"खाता सेटअप"</string>
     <string name="account_setup_incoming_headline" msgid="6183711037633407184">"इनकमिंग सर्वर सेटिंग"</string>
-    <string name="account_setup_incoming_username_label" msgid="5700581386104070302">"उपयोगकर्ता नाम"</string>
-    <string name="account_setup_incoming_password_label" msgid="6365327603172559859">"पासवर्ड"</string>
-    <string name="account_setup_incoming_server_label" msgid="1480342966630002638">"सर्वर"</string>
-    <string name="account_setup_incoming_port_label" msgid="8214738923690447796">"पोर्ट"</string>
-    <string name="account_setup_incoming_security_label" msgid="2110260791086007424">"सुरक्षा प्रकार"</string>
+    <string name="account_setup_incoming_username_label" msgid="406939983633223354">"उपयोगकर्ता नाम"</string>
+    <string name="account_setup_incoming_password_label" msgid="634540235479188709">"पासवर्ड"</string>
+    <string name="account_setup_incoming_server_label" msgid="3528558488000638420">"सर्वर"</string>
+    <string name="account_setup_incoming_port_label" msgid="5311652277990186704">"पोर्ट"</string>
+    <string name="account_setup_incoming_security_label" msgid="1175710992470593691">"सुरक्षा प्रकार"</string>
     <string name="account_setup_incoming_security_none_label" msgid="8300169413118264895">"कोई नहीं"</string>
     <string name="account_setup_incoming_security_ssl_trust_certificates_label" msgid="6151855090123117538">"SSL/TLS (सभी प्रमाणपत्र स्‍वीकार करें)"</string>
     <string name="account_setup_incoming_security_ssl_label" msgid="2798501138420163861">"SSL/TLS"</string>
@@ -131,18 +131,18 @@
     <string name="account_setup_incoming_imap_path_prefix_hint" msgid="9190845919067906033">"वैकल्पिक"</string>
     <string name="account_setup_outgoing_title" msgid="7208495965665711539">"खाता सेटअप"</string>
     <string name="account_setup_outgoing_headline" msgid="2025001060935366394">"आउटगोइंग सर्वर सेटिंग"</string>
-    <string name="account_setup_outgoing_smtp_server_label" msgid="6035137446691195177">"SMTP सर्वर"</string>
-    <string name="account_setup_outgoing_port_label" msgid="7573207437835827876">"पोर्ट"</string>
-    <string name="account_setup_outgoing_security_label" msgid="911398071120720589">"सुरक्षा प्रकार"</string>
+    <string name="account_setup_outgoing_smtp_server_label" msgid="1164004960070541473">"SMTP सर्वर"</string>
+    <string name="account_setup_outgoing_port_label" msgid="4670120792135566784">"पोर्ट"</string>
+    <string name="account_setup_outgoing_security_label" msgid="9200220309360082664">"सुरक्षा प्रकार"</string>
     <string name="account_setup_outgoing_require_login_label" msgid="7779484127897397562">"प्रवेश आवश्यक"</string>
-    <string name="account_setup_outgoing_username_label" msgid="3309680794731596981">"उपयोगकर्ता नाम"</string>
-    <string name="account_setup_outgoing_password_label" msgid="227844585493317550">"पासवर्ड"</string>
-    <string name="account_setup_exchange_certificate_title" msgid="8473793588405277962">"क्लाइंट प्रमाणपत्र"</string>
+    <string name="account_setup_outgoing_username_label" msgid="7239411429115525841">"उपयोगकर्ता नाम"</string>
+    <string name="account_setup_outgoing_password_label" msgid="3720429254654722208">"पासवर्ड"</string>
+    <string name="account_setup_exchange_certificate_title" msgid="1635140303999054002">"क्लाइंट प्रमाणपत्र"</string>
     <string name="account_setup_exchange_select_certificate" msgid="1536103662037268683">"चुनें"</string>
     <string name="account_setup_exchange_use_certificate" msgid="8690682770083161349">"क्लाइंट प्रमाणपत्र का उपयोग करें"</string>
     <string name="account_setup_exchange_remove_certificate" msgid="5633249155510301766">"निकालें"</string>
     <string name="account_setup_exchange_no_certificate" msgid="1119542961954780872">"कोई नहीं"</string>
-    <string name="account_setup_exchange_device_id_label" msgid="1646827333223157658">"मोबाइल उपकरण ID"</string>
+    <string name="account_setup_exchange_device_id_label" msgid="5105898844003459657">"मोबाइल उपकरण आईडी"</string>
     <string name="account_setup_options_title" msgid="9016600767888846051">"खाता सेटिंग"</string>
     <string name="account_setup_options_headline" msgid="4181274232835368085">"खाता विकल्प"</string>
     <string name="account_setup_options_mail_check_frequency_label" msgid="4824859792882810053">"इनबॉक्‍स देखने की आवृति"</string>
diff --git a/res/values-hr/strings.xml b/res/values-hr/strings.xml
index d65b93e0c..e1b4c773a 100644
--- a/res/values-hr/strings.xml
+++ b/res/values-hr/strings.xml
@@ -87,13 +87,13 @@
     <string name="account_setup_basics_email_label" msgid="3454164053624112047">"Adresa e-pošte"</string>
     <string name="or_label" msgid="2207403489755254427">"ILI"</string>
     <string name="sign_in_with_google" msgid="9051489501495503976">"Prijava putem Googlea"</string>
-    <string name="account_setup_basics_password_label" msgid="9133549799291519298">"Zaporka"</string>
-    <string name="password_label" msgid="5228754278985667134">"Zaporka"</string>
+    <string name="account_setup_basics_password_label" msgid="3402762431598148148">"ZAPORKA"</string>
+    <string name="password_hint" msgid="8835390747504721561">"Zaporka"</string>
     <string name="signed_in_with_service_label" msgid="4909910797357155961">"Prijavljeni ste na uslugu %s"</string>
-    <string name="authentication_label" msgid="5210804218348191833">"Autentifikacija"</string>
+    <string name="authentication_label" msgid="6917956186120234602">"AUTENTIFIKACIJA"</string>
     <string name="add_authentication_label" msgid="865206092644419804">"Dodavanje autentifikacije"</string>
     <string name="clear_authentication_label" msgid="8113966442068335059">"Brisanje autentifikacije"</string>
-    <string name="account_setup_basics_manual_setup_action" msgid="6640115171889882878"><u>"Ručno postavljanje"</u></string>
+    <string name="account_setup_basics_manual_setup_action" msgid="8053852205391155912">"Ručno postavljanje"</string>
     <string name="account_setup_username_password_toast" msgid="3968270274727947460">"Upišite važeću adresu e-pošte i zaporku."</string>
     <string name="account_duplicate_dlg_title" msgid="8089732986912704425">"Dvostruki račun"</string>
     <string name="account_duplicate_dlg_message_fmt" msgid="6447629283679935840">"To korisničko ime već upotrebljavate za račun \"<xliff:g id="DUPLICATE">%s</xliff:g>\"."</string>
@@ -114,11 +114,11 @@
     <string name="account_setup_account_type_instructions" msgid="114515540798408760">"Koja je ovo vrsta računa?"</string>
     <string name="account_setup_incoming_title" msgid="6796626791039136005">"Postavljanje računa"</string>
     <string name="account_setup_incoming_headline" msgid="6183711037633407184">"Postavke dolaznog poslužitelja"</string>
-    <string name="account_setup_incoming_username_label" msgid="5700581386104070302">"Korisničko ime"</string>
-    <string name="account_setup_incoming_password_label" msgid="6365327603172559859">"Zaporka"</string>
-    <string name="account_setup_incoming_server_label" msgid="1480342966630002638">"Poslužitelj"</string>
-    <string name="account_setup_incoming_port_label" msgid="8214738923690447796">"Port"</string>
-    <string name="account_setup_incoming_security_label" msgid="2110260791086007424">"Vrsta sigurnosti"</string>
+    <string name="account_setup_incoming_username_label" msgid="406939983633223354">"KORISNIČKO IME"</string>
+    <string name="account_setup_incoming_password_label" msgid="634540235479188709">"ZAPORKA"</string>
+    <string name="account_setup_incoming_server_label" msgid="3528558488000638420">"POSLUŽITELJ"</string>
+    <string name="account_setup_incoming_port_label" msgid="5311652277990186704">"PRIKLJUČAK"</string>
+    <string name="account_setup_incoming_security_label" msgid="1175710992470593691">"VRSTA SIGURNOSTI"</string>
     <string name="account_setup_incoming_security_none_label" msgid="8300169413118264895">"Ništa"</string>
     <string name="account_setup_incoming_security_ssl_trust_certificates_label" msgid="6151855090123117538">"SSL/TLS (prihvati sve certifikate)"</string>
     <string name="account_setup_incoming_security_ssl_label" msgid="2798501138420163861">"SSL/TLS"</string>
@@ -131,18 +131,18 @@
     <string name="account_setup_incoming_imap_path_prefix_hint" msgid="9190845919067906033">"Izborno"</string>
     <string name="account_setup_outgoing_title" msgid="7208495965665711539">"Postavljanje računa"</string>
     <string name="account_setup_outgoing_headline" msgid="2025001060935366394">"Postavke odlaznog poslužitelja"</string>
-    <string name="account_setup_outgoing_smtp_server_label" msgid="6035137446691195177">"SMTP poslužitelj"</string>
-    <string name="account_setup_outgoing_port_label" msgid="7573207437835827876">"Port"</string>
-    <string name="account_setup_outgoing_security_label" msgid="911398071120720589">"Vrsta sigurnosti"</string>
+    <string name="account_setup_outgoing_smtp_server_label" msgid="1164004960070541473">"SMTP POSLUŽITELJ"</string>
+    <string name="account_setup_outgoing_port_label" msgid="4670120792135566784">"PRIKLJUČAK"</string>
+    <string name="account_setup_outgoing_security_label" msgid="9200220309360082664">"VRSTA SIGURNOSTI"</string>
     <string name="account_setup_outgoing_require_login_label" msgid="7779484127897397562">"Potrebna je prijava"</string>
-    <string name="account_setup_outgoing_username_label" msgid="3309680794731596981">"Korisničko ime"</string>
-    <string name="account_setup_outgoing_password_label" msgid="227844585493317550">"Zaporka"</string>
-    <string name="account_setup_exchange_certificate_title" msgid="8473793588405277962">"Certifikat klijenta"</string>
+    <string name="account_setup_outgoing_username_label" msgid="7239411429115525841">"KORISNIČKO IME"</string>
+    <string name="account_setup_outgoing_password_label" msgid="3720429254654722208">"ZAPORKA"</string>
+    <string name="account_setup_exchange_certificate_title" msgid="1635140303999054002">"CERTIFIKAT KLIJENTA"</string>
     <string name="account_setup_exchange_select_certificate" msgid="1536103662037268683">"Odaberi"</string>
     <string name="account_setup_exchange_use_certificate" msgid="8690682770083161349">"Upotrijebi certifikat klijenta"</string>
     <string name="account_setup_exchange_remove_certificate" msgid="5633249155510301766">"Ukloni"</string>
     <string name="account_setup_exchange_no_certificate" msgid="1119542961954780872">"Ništa"</string>
-    <string name="account_setup_exchange_device_id_label" msgid="1646827333223157658">"ID mobilnog uređaja"</string>
+    <string name="account_setup_exchange_device_id_label" msgid="5105898844003459657">"ID MOBILNOG UREĐAJA"</string>
     <string name="account_setup_options_title" msgid="9016600767888846051">"Postavke računa"</string>
     <string name="account_setup_options_headline" msgid="4181274232835368085">"Mogućnosti računa"</string>
     <string name="account_setup_options_mail_check_frequency_label" msgid="4824859792882810053">"Učestalost provjeravanja e-pošte"</string>
diff --git a/res/values-hu/strings.xml b/res/values-hu/strings.xml
index f54d89b9f..6d579809e 100644
--- a/res/values-hu/strings.xml
+++ b/res/values-hu/strings.xml
@@ -87,13 +87,13 @@
     <string name="account_setup_basics_email_label" msgid="3454164053624112047">"E-mail cím"</string>
     <string name="or_label" msgid="2207403489755254427">"VAGY"</string>
     <string name="sign_in_with_google" msgid="9051489501495503976">"Bejelentkezés Google-fiókkal"</string>
-    <string name="account_setup_basics_password_label" msgid="9133549799291519298">"Jelszó"</string>
-    <string name="password_label" msgid="5228754278985667134">"Jelszó"</string>
+    <string name="account_setup_basics_password_label" msgid="3402762431598148148">"JELSZÓ"</string>
+    <string name="password_hint" msgid="8835390747504721561">"Jelszó"</string>
     <string name="signed_in_with_service_label" msgid="4909910797357155961">"Bejelentkezve a következővel: %s"</string>
-    <string name="authentication_label" msgid="5210804218348191833">"Hitelesítés"</string>
+    <string name="authentication_label" msgid="6917956186120234602">"HITELESÍTÉS"</string>
     <string name="add_authentication_label" msgid="865206092644419804">"Hitelesítés hozzáadása"</string>
     <string name="clear_authentication_label" msgid="8113966442068335059">"Hitelesítés törlése"</string>
-    <string name="account_setup_basics_manual_setup_action" msgid="6640115171889882878"><u>"Kézi beállítás"</u></string>
+    <string name="account_setup_basics_manual_setup_action" msgid="8053852205391155912">"Manuális beállítás"</string>
     <string name="account_setup_username_password_toast" msgid="3968270274727947460">"Írjon be egy érvényes e-mail címet és jelszót."</string>
     <string name="account_duplicate_dlg_title" msgid="8089732986912704425">"Már létező fiók"</string>
     <string name="account_duplicate_dlg_message_fmt" msgid="6447629283679935840">"Már használja ezt a felhasználónevet a(z) \"<xliff:g id="DUPLICATE">%s</xliff:g>\" fiókhoz."</string>
@@ -114,11 +114,11 @@
     <string name="account_setup_account_type_instructions" msgid="114515540798408760">"Milyen típusú ez a fiók?"</string>
     <string name="account_setup_incoming_title" msgid="6796626791039136005">"Fiók beállítása"</string>
     <string name="account_setup_incoming_headline" msgid="6183711037633407184">"Bejövő üzenetek szerverének beállításai"</string>
-    <string name="account_setup_incoming_username_label" msgid="5700581386104070302">"Felhasználónév"</string>
-    <string name="account_setup_incoming_password_label" msgid="6365327603172559859">"Jelszó"</string>
-    <string name="account_setup_incoming_server_label" msgid="1480342966630002638">"Szerver"</string>
-    <string name="account_setup_incoming_port_label" msgid="8214738923690447796">"Port"</string>
-    <string name="account_setup_incoming_security_label" msgid="2110260791086007424">"Biztonság típusa"</string>
+    <string name="account_setup_incoming_username_label" msgid="406939983633223354">"FELHASZNÁLÓNÉV"</string>
+    <string name="account_setup_incoming_password_label" msgid="634540235479188709">"JELSZÓ"</string>
+    <string name="account_setup_incoming_server_label" msgid="3528558488000638420">"SZERVER"</string>
+    <string name="account_setup_incoming_port_label" msgid="5311652277990186704">"PORT"</string>
+    <string name="account_setup_incoming_security_label" msgid="1175710992470593691">"TITKOSÍTÁS TÍPUSA"</string>
     <string name="account_setup_incoming_security_none_label" msgid="8300169413118264895">"Nincs"</string>
     <string name="account_setup_incoming_security_ssl_trust_certificates_label" msgid="6151855090123117538">"SSL/TLS (Minden tanúsítvány elfogadása)"</string>
     <string name="account_setup_incoming_security_ssl_label" msgid="2798501138420163861">"SSL/TLS"</string>
@@ -131,18 +131,18 @@
     <string name="account_setup_incoming_imap_path_prefix_hint" msgid="9190845919067906033">"Opcionális"</string>
     <string name="account_setup_outgoing_title" msgid="7208495965665711539">"Fiók beállítása"</string>
     <string name="account_setup_outgoing_headline" msgid="2025001060935366394">"Kimenő üzenetek szerverének beállításai"</string>
-    <string name="account_setup_outgoing_smtp_server_label" msgid="6035137446691195177">"SMTP-szerver"</string>
-    <string name="account_setup_outgoing_port_label" msgid="7573207437835827876">"Port"</string>
-    <string name="account_setup_outgoing_security_label" msgid="911398071120720589">"Biztonság típusa"</string>
+    <string name="account_setup_outgoing_smtp_server_label" msgid="1164004960070541473">"SMTP-SZERVER"</string>
+    <string name="account_setup_outgoing_port_label" msgid="4670120792135566784">"PORT"</string>
+    <string name="account_setup_outgoing_security_label" msgid="9200220309360082664">"TITKOSÍTÁS TÍPUSA"</string>
     <string name="account_setup_outgoing_require_login_label" msgid="7779484127897397562">"Bejelentkezés szükséges"</string>
-    <string name="account_setup_outgoing_username_label" msgid="3309680794731596981">"Felhasználónév"</string>
-    <string name="account_setup_outgoing_password_label" msgid="227844585493317550">"Jelszó"</string>
-    <string name="account_setup_exchange_certificate_title" msgid="8473793588405277962">"Ügyféltanúsítvány"</string>
+    <string name="account_setup_outgoing_username_label" msgid="7239411429115525841">"FELHASZNÁLÓNÉV"</string>
+    <string name="account_setup_outgoing_password_label" msgid="3720429254654722208">"JELSZÓ"</string>
+    <string name="account_setup_exchange_certificate_title" msgid="1635140303999054002">"ÜGYFÉLTANÚSÍTVÁNY"</string>
     <string name="account_setup_exchange_select_certificate" msgid="1536103662037268683">"Kiválasztás"</string>
     <string name="account_setup_exchange_use_certificate" msgid="8690682770083161349">"Ügyféltanúsítvány használata"</string>
     <string name="account_setup_exchange_remove_certificate" msgid="5633249155510301766">"Eltávolítás"</string>
     <string name="account_setup_exchange_no_certificate" msgid="1119542961954780872">"Egy sem"</string>
-    <string name="account_setup_exchange_device_id_label" msgid="1646827333223157658">"A mobil eszköz azonosítója"</string>
+    <string name="account_setup_exchange_device_id_label" msgid="5105898844003459657">"A MOBILESZKÖZ AZONOSÍTÓJA"</string>
     <string name="account_setup_options_title" msgid="9016600767888846051">"Fiókbeállítások"</string>
     <string name="account_setup_options_headline" msgid="4181274232835368085">"Fiókbeállítások"</string>
     <string name="account_setup_options_mail_check_frequency_label" msgid="4824859792882810053">"Beérkező levelek ellenőrzésének gyakorisága"</string>
diff --git a/res/values-hy-rAM/strings.xml b/res/values-hy-rAM/strings.xml
index 15600bbf9..5ff6ea7b2 100644
--- a/res/values-hy-rAM/strings.xml
+++ b/res/values-hy-rAM/strings.xml
@@ -87,15 +87,18 @@
     <string name="account_setup_basics_email_label" msgid="3454164053624112047">"Էլփոստի հասցե"</string>
     <string name="or_label" msgid="2207403489755254427">"ԿԱՄ"</string>
     <string name="sign_in_with_google" msgid="9051489501495503976">"Մուտք գործել Google-ով"</string>
-    <string name="account_setup_basics_password_label" msgid="9133549799291519298">"Գաղտնաբառ"</string>
-    <string name="password_label" msgid="5228754278985667134">"Գաղտնաբառ"</string>
+    <!-- no translation found for account_setup_basics_password_label (3402762431598148148) -->
+    <skip />
+    <!-- no translation found for password_hint (8835390747504721561) -->
+    <skip />
     <!-- String.format failed for translation -->
     <!-- no translation found for signed_in_with_service_label (4909910797357155961) -->
     <skip />
-    <string name="authentication_label" msgid="5210804218348191833">"Նույնականացում"</string>
+    <!-- no translation found for authentication_label (6917956186120234602) -->
+    <skip />
     <string name="add_authentication_label" msgid="865206092644419804">"Ավելացնել նույնականացում"</string>
     <string name="clear_authentication_label" msgid="8113966442068335059">"Մաքրել նույնականացումը"</string>
-    <string name="account_setup_basics_manual_setup_action" msgid="6640115171889882878"><u>"Ձեռքով կարգավորում"</u></string>
+    <string name="account_setup_basics_manual_setup_action" msgid="8053852205391155912">"Ձեռքով կարգավորում"</string>
     <string name="account_setup_username_password_toast" msgid="3968270274727947460">"Մուտքագրեք վավեր էլփոստի հասցե և գաղտնաբառ:"</string>
     <string name="account_duplicate_dlg_title" msgid="8089732986912704425">"Կրկնօրինակել հաշիվը"</string>
     <string name="account_duplicate_dlg_message_fmt" msgid="6447629283679935840">"Դուք արդեն օգտագործում եք այս օգտանունը «<xliff:g id="DUPLICATE">%s</xliff:g>» հաշվի համար:"</string>
@@ -116,11 +119,16 @@
     <string name="account_setup_account_type_instructions" msgid="114515540798408760">"Ի՞նչ տեսակի հաշիվ է սա"</string>
     <string name="account_setup_incoming_title" msgid="6796626791039136005">"Հաշվի կարգավորում"</string>
     <string name="account_setup_incoming_headline" msgid="6183711037633407184">"Մուտքային սերվերի կարգավորումներ"</string>
-    <string name="account_setup_incoming_username_label" msgid="5700581386104070302">"Օգտանունը"</string>
-    <string name="account_setup_incoming_password_label" msgid="6365327603172559859">"Գաղտնաբառ"</string>
-    <string name="account_setup_incoming_server_label" msgid="1480342966630002638">"Սերվեր"</string>
-    <string name="account_setup_incoming_port_label" msgid="8214738923690447796">"Միացք"</string>
-    <string name="account_setup_incoming_security_label" msgid="2110260791086007424">"Անվտանգության տեսակը"</string>
+    <!-- no translation found for account_setup_incoming_username_label (406939983633223354) -->
+    <skip />
+    <!-- no translation found for account_setup_incoming_password_label (634540235479188709) -->
+    <skip />
+    <!-- no translation found for account_setup_incoming_server_label (3528558488000638420) -->
+    <skip />
+    <!-- no translation found for account_setup_incoming_port_label (5311652277990186704) -->
+    <skip />
+    <!-- no translation found for account_setup_incoming_security_label (1175710992470593691) -->
+    <skip />
     <string name="account_setup_incoming_security_none_label" msgid="8300169413118264895">"Ոչ մեկը"</string>
     <string name="account_setup_incoming_security_ssl_trust_certificates_label" msgid="6151855090123117538">"SSL/TLS (Ընդունել բոլոր վկայականները)"</string>
     <string name="account_setup_incoming_security_ssl_label" msgid="2798501138420163861">"SSL/TLS"</string>
@@ -133,18 +141,25 @@
     <string name="account_setup_incoming_imap_path_prefix_hint" msgid="9190845919067906033">"Ընտրովի"</string>
     <string name="account_setup_outgoing_title" msgid="7208495965665711539">"Հաշվի կարգավորում"</string>
     <string name="account_setup_outgoing_headline" msgid="2025001060935366394">"Ելքային սերվերի կարգավորումներ"</string>
-    <string name="account_setup_outgoing_smtp_server_label" msgid="6035137446691195177">"SMTP սերվեր"</string>
-    <string name="account_setup_outgoing_port_label" msgid="7573207437835827876">"Միացք"</string>
-    <string name="account_setup_outgoing_security_label" msgid="911398071120720589">"Անվտանգության տեսակը"</string>
+    <!-- no translation found for account_setup_outgoing_smtp_server_label (1164004960070541473) -->
+    <skip />
+    <!-- no translation found for account_setup_outgoing_port_label (4670120792135566784) -->
+    <skip />
+    <!-- no translation found for account_setup_outgoing_security_label (9200220309360082664) -->
+    <skip />
     <string name="account_setup_outgoing_require_login_label" msgid="7779484127897397562">"Պահանջում է մուտք գործել"</string>
-    <string name="account_setup_outgoing_username_label" msgid="3309680794731596981">"Օգտանունը"</string>
-    <string name="account_setup_outgoing_password_label" msgid="227844585493317550">"Գաղտնաբառ"</string>
-    <string name="account_setup_exchange_certificate_title" msgid="8473793588405277962">"Սպասառուի վկայական"</string>
+    <!-- no translation found for account_setup_outgoing_username_label (7239411429115525841) -->
+    <skip />
+    <!-- no translation found for account_setup_outgoing_password_label (3720429254654722208) -->
+    <skip />
+    <!-- no translation found for account_setup_exchange_certificate_title (1635140303999054002) -->
+    <skip />
     <string name="account_setup_exchange_select_certificate" msgid="1536103662037268683">"Ընտրել"</string>
     <string name="account_setup_exchange_use_certificate" msgid="8690682770083161349">"Օգտագործել հաճախորդի վկայական"</string>
     <string name="account_setup_exchange_remove_certificate" msgid="5633249155510301766">"Հեռացնել"</string>
     <string name="account_setup_exchange_no_certificate" msgid="1119542961954780872">"Ոչ մեկը"</string>
-    <string name="account_setup_exchange_device_id_label" msgid="1646827333223157658">"Շարժական սարքի ID"</string>
+    <!-- no translation found for account_setup_exchange_device_id_label (5105898844003459657) -->
+    <skip />
     <string name="account_setup_options_title" msgid="9016600767888846051">"Հաշվի կարգավորումներ"</string>
     <string name="account_setup_options_headline" msgid="4181274232835368085">"Հաշվի ընտրանքներ"</string>
     <string name="account_setup_options_mail_check_frequency_label" msgid="4824859792882810053">"Մուտքի արկղի ստուգման հաճախականությունը"</string>
diff --git a/res/values-in/strings.xml b/res/values-in/strings.xml
index f905f23bc..0c9d7f116 100644
--- a/res/values-in/strings.xml
+++ b/res/values-in/strings.xml
@@ -87,13 +87,13 @@
     <string name="account_setup_basics_email_label" msgid="3454164053624112047">"Alamat email"</string>
     <string name="or_label" msgid="2207403489755254427">"ATAU"</string>
     <string name="sign_in_with_google" msgid="9051489501495503976">"Masuk dengan Google"</string>
-    <string name="account_setup_basics_password_label" msgid="9133549799291519298">"Sandi"</string>
-    <string name="password_label" msgid="5228754278985667134">"Sandi"</string>
+    <string name="account_setup_basics_password_label" msgid="3402762431598148148">"SANDI"</string>
+    <string name="password_hint" msgid="8835390747504721561">"Sandi"</string>
     <string name="signed_in_with_service_label" msgid="4909910797357155961">"Masuk dengan %s"</string>
-    <string name="authentication_label" msgid="5210804218348191833">"Autentikasi"</string>
+    <string name="authentication_label" msgid="6917956186120234602">"AUTENTIKASI"</string>
     <string name="add_authentication_label" msgid="865206092644419804">"Tambahkan autentikasi"</string>
     <string name="clear_authentication_label" msgid="8113966442068335059">"Hapus autentikasi"</string>
-    <string name="account_setup_basics_manual_setup_action" msgid="6640115171889882878"><u>"Penyiapan manual"</u></string>
+    <string name="account_setup_basics_manual_setup_action" msgid="8053852205391155912">"Penyiapan manual"</string>
     <string name="account_setup_username_password_toast" msgid="3968270274727947460">"Ketik alamat email dan sandi yang valid."</string>
     <string name="account_duplicate_dlg_title" msgid="8089732986912704425">"Akun rangkap"</string>
     <string name="account_duplicate_dlg_message_fmt" msgid="6447629283679935840">"Anda telah menggunakan nama pengguna ini untuk akun \"<xliff:g id="DUPLICATE">%s</xliff:g>\"."</string>
@@ -114,11 +114,11 @@
     <string name="account_setup_account_type_instructions" msgid="114515540798408760">"Jenis akun apakah ini?"</string>
     <string name="account_setup_incoming_title" msgid="6796626791039136005">"Penyiapan akun"</string>
     <string name="account_setup_incoming_headline" msgid="6183711037633407184">"Setelan server masuk"</string>
-    <string name="account_setup_incoming_username_label" msgid="5700581386104070302">"Nama Pengguna"</string>
-    <string name="account_setup_incoming_password_label" msgid="6365327603172559859">"Sandi"</string>
-    <string name="account_setup_incoming_server_label" msgid="1480342966630002638">"Server"</string>
-    <string name="account_setup_incoming_port_label" msgid="8214738923690447796">"Port"</string>
-    <string name="account_setup_incoming_security_label" msgid="2110260791086007424">"Jenis keamanan"</string>
+    <string name="account_setup_incoming_username_label" msgid="406939983633223354">"NAMA PENGGUNA"</string>
+    <string name="account_setup_incoming_password_label" msgid="634540235479188709">"SANDI"</string>
+    <string name="account_setup_incoming_server_label" msgid="3528558488000638420">"SERVER"</string>
+    <string name="account_setup_incoming_port_label" msgid="5311652277990186704">"PORT"</string>
+    <string name="account_setup_incoming_security_label" msgid="1175710992470593691">"JENIS KEAMANAN"</string>
     <string name="account_setup_incoming_security_none_label" msgid="8300169413118264895">"Tak Satu Pun"</string>
     <string name="account_setup_incoming_security_ssl_trust_certificates_label" msgid="6151855090123117538">"SSL/TLS (Terima semua sertifikat)"</string>
     <string name="account_setup_incoming_security_ssl_label" msgid="2798501138420163861">"SSL/TLS"</string>
@@ -131,18 +131,18 @@
     <string name="account_setup_incoming_imap_path_prefix_hint" msgid="9190845919067906033">"Opsional"</string>
     <string name="account_setup_outgoing_title" msgid="7208495965665711539">"Penyiapan akun"</string>
     <string name="account_setup_outgoing_headline" msgid="2025001060935366394">"Setelan server keluar"</string>
-    <string name="account_setup_outgoing_smtp_server_label" msgid="6035137446691195177">"Server SMTP"</string>
-    <string name="account_setup_outgoing_port_label" msgid="7573207437835827876">"Port"</string>
-    <string name="account_setup_outgoing_security_label" msgid="911398071120720589">"Jenis keamanan"</string>
+    <string name="account_setup_outgoing_smtp_server_label" msgid="1164004960070541473">"SERVER SMTP"</string>
+    <string name="account_setup_outgoing_port_label" msgid="4670120792135566784">"PORT"</string>
+    <string name="account_setup_outgoing_security_label" msgid="9200220309360082664">"JENIS KEAMANAN"</string>
     <string name="account_setup_outgoing_require_login_label" msgid="7779484127897397562">"Harus masuk"</string>
-    <string name="account_setup_outgoing_username_label" msgid="3309680794731596981">"Nama Pengguna"</string>
-    <string name="account_setup_outgoing_password_label" msgid="227844585493317550">"Sandi"</string>
-    <string name="account_setup_exchange_certificate_title" msgid="8473793588405277962">"Sertifikat klien"</string>
+    <string name="account_setup_outgoing_username_label" msgid="7239411429115525841">"NAMA PENGGUNA"</string>
+    <string name="account_setup_outgoing_password_label" msgid="3720429254654722208">"SANDI"</string>
+    <string name="account_setup_exchange_certificate_title" msgid="1635140303999054002">"SERTIFIKAT KLIEN"</string>
     <string name="account_setup_exchange_select_certificate" msgid="1536103662037268683">"Pilih"</string>
     <string name="account_setup_exchange_use_certificate" msgid="8690682770083161349">"Gunakan sertifikat klien"</string>
     <string name="account_setup_exchange_remove_certificate" msgid="5633249155510301766">"Hapus"</string>
     <string name="account_setup_exchange_no_certificate" msgid="1119542961954780872">"Tidak ada"</string>
-    <string name="account_setup_exchange_device_id_label" msgid="1646827333223157658">"ID Perangkat Seluler"</string>
+    <string name="account_setup_exchange_device_id_label" msgid="5105898844003459657">"ID PERANGKAT SELULER"</string>
     <string name="account_setup_options_title" msgid="9016600767888846051">"Setelan akun"</string>
     <string name="account_setup_options_headline" msgid="4181274232835368085">"Opsi akun"</string>
     <string name="account_setup_options_mail_check_frequency_label" msgid="4824859792882810053">"Frekuensi pemeriksaan kotak masuk"</string>
diff --git a/res/values-it/strings.xml b/res/values-it/strings.xml
index 5f2cf67fc..63c374396 100644
--- a/res/values-it/strings.xml
+++ b/res/values-it/strings.xml
@@ -87,13 +87,13 @@
     <string name="account_setup_basics_email_label" msgid="3454164053624112047">"Indirizzo email"</string>
     <string name="or_label" msgid="2207403489755254427">"O"</string>
     <string name="sign_in_with_google" msgid="9051489501495503976">"Accedi con Google"</string>
-    <string name="account_setup_basics_password_label" msgid="9133549799291519298">"Password"</string>
-    <string name="password_label" msgid="5228754278985667134">"Password"</string>
+    <string name="account_setup_basics_password_label" msgid="3402762431598148148">"PASSWORD"</string>
+    <string name="password_hint" msgid="8835390747504721561">"Password"</string>
     <string name="signed_in_with_service_label" msgid="4909910797357155961">"Accesso eseguito con %s"</string>
-    <string name="authentication_label" msgid="5210804218348191833">"Autenticazione"</string>
+    <string name="authentication_label" msgid="6917956186120234602">"AUTENTICAZIONE"</string>
     <string name="add_authentication_label" msgid="865206092644419804">"Aggiungi autenticazione"</string>
     <string name="clear_authentication_label" msgid="8113966442068335059">"Cancella autenticazione"</string>
-    <string name="account_setup_basics_manual_setup_action" msgid="6640115171889882878"><u>"Configuraz. manuale"</u></string>
+    <string name="account_setup_basics_manual_setup_action" msgid="8053852205391155912">"Config. manuale"</string>
     <string name="account_setup_username_password_toast" msgid="3968270274727947460">"Digita un indirizzo email e una password validi."</string>
     <string name="account_duplicate_dlg_title" msgid="8089732986912704425">"Account duplicato"</string>
     <string name="account_duplicate_dlg_message_fmt" msgid="6447629283679935840">"Utilizzi già questo nome utente per l\'account \"<xliff:g id="DUPLICATE">%s</xliff:g>\"."</string>
@@ -114,11 +114,11 @@
     <string name="account_setup_account_type_instructions" msgid="114515540798408760">"Di quale tipo di account si tratta?"</string>
     <string name="account_setup_incoming_title" msgid="6796626791039136005">"Impostazione account"</string>
     <string name="account_setup_incoming_headline" msgid="6183711037633407184">"Impostazioni server Posta in arrivo"</string>
-    <string name="account_setup_incoming_username_label" msgid="5700581386104070302">"Nome utente"</string>
-    <string name="account_setup_incoming_password_label" msgid="6365327603172559859">"Password"</string>
-    <string name="account_setup_incoming_server_label" msgid="1480342966630002638">"Server"</string>
-    <string name="account_setup_incoming_port_label" msgid="8214738923690447796">"Porta"</string>
-    <string name="account_setup_incoming_security_label" msgid="2110260791086007424">"Tipo di sicurezza"</string>
+    <string name="account_setup_incoming_username_label" msgid="406939983633223354">"NOME UTENTE"</string>
+    <string name="account_setup_incoming_password_label" msgid="634540235479188709">"PASSWORD"</string>
+    <string name="account_setup_incoming_server_label" msgid="3528558488000638420">"SERVER"</string>
+    <string name="account_setup_incoming_port_label" msgid="5311652277990186704">"PORTA"</string>
+    <string name="account_setup_incoming_security_label" msgid="1175710992470593691">"TIPO DI SICUREZZA"</string>
     <string name="account_setup_incoming_security_none_label" msgid="8300169413118264895">"Nessuna"</string>
     <string name="account_setup_incoming_security_ssl_trust_certificates_label" msgid="6151855090123117538">"SSL/TLS (Accetta tutti i certificati)"</string>
     <string name="account_setup_incoming_security_ssl_label" msgid="2798501138420163861">"SSL/TLS"</string>
@@ -131,18 +131,18 @@
     <string name="account_setup_incoming_imap_path_prefix_hint" msgid="9190845919067906033">"Facoltativo"</string>
     <string name="account_setup_outgoing_title" msgid="7208495965665711539">"Impostazione account"</string>
     <string name="account_setup_outgoing_headline" msgid="2025001060935366394">"Impostazioni server Posta in uscita"</string>
-    <string name="account_setup_outgoing_smtp_server_label" msgid="6035137446691195177">"Server SMTP"</string>
-    <string name="account_setup_outgoing_port_label" msgid="7573207437835827876">"Porta"</string>
-    <string name="account_setup_outgoing_security_label" msgid="911398071120720589">"Tipo di sicurezza"</string>
+    <string name="account_setup_outgoing_smtp_server_label" msgid="1164004960070541473">"SERVER SMTP"</string>
+    <string name="account_setup_outgoing_port_label" msgid="4670120792135566784">"PORTA"</string>
+    <string name="account_setup_outgoing_security_label" msgid="9200220309360082664">"TIPO DI SICUREZZA"</string>
     <string name="account_setup_outgoing_require_login_label" msgid="7779484127897397562">"Richiedi accesso"</string>
-    <string name="account_setup_outgoing_username_label" msgid="3309680794731596981">"Nome utente"</string>
-    <string name="account_setup_outgoing_password_label" msgid="227844585493317550">"Password"</string>
-    <string name="account_setup_exchange_certificate_title" msgid="8473793588405277962">"Certificato client"</string>
+    <string name="account_setup_outgoing_username_label" msgid="7239411429115525841">"NOME UTENTE"</string>
+    <string name="account_setup_outgoing_password_label" msgid="3720429254654722208">"PASSWORD"</string>
+    <string name="account_setup_exchange_certificate_title" msgid="1635140303999054002">"CERTIFICATO CLIENT"</string>
     <string name="account_setup_exchange_select_certificate" msgid="1536103662037268683">"Seleziona"</string>
     <string name="account_setup_exchange_use_certificate" msgid="8690682770083161349">"Usa certificato client"</string>
     <string name="account_setup_exchange_remove_certificate" msgid="5633249155510301766">"Rimuovi"</string>
     <string name="account_setup_exchange_no_certificate" msgid="1119542961954780872">"Nessuno"</string>
-    <string name="account_setup_exchange_device_id_label" msgid="1646827333223157658">"ID dispositivo mobile"</string>
+    <string name="account_setup_exchange_device_id_label" msgid="5105898844003459657">"ID DISPOSITIVO MOBILE"</string>
     <string name="account_setup_options_title" msgid="9016600767888846051">"Impostazioni account"</string>
     <string name="account_setup_options_headline" msgid="4181274232835368085">"Opzioni account"</string>
     <string name="account_setup_options_mail_check_frequency_label" msgid="4824859792882810053">"Frequenza di controllo casella di posta"</string>
diff --git a/res/values-iw/strings.xml b/res/values-iw/strings.xml
index f61f57f12..09f737025 100644
--- a/res/values-iw/strings.xml
+++ b/res/values-iw/strings.xml
@@ -87,13 +87,13 @@
     <string name="account_setup_basics_email_label" msgid="3454164053624112047">"כתובת דוא\"ל"</string>
     <string name="or_label" msgid="2207403489755254427">"או"</string>
     <string name="sign_in_with_google" msgid="9051489501495503976">"‏היכנס באמצעות Google"</string>
-    <string name="account_setup_basics_password_label" msgid="9133549799291519298">"סיסמה"</string>
-    <string name="password_label" msgid="5228754278985667134">"סיסמה"</string>
+    <string name="account_setup_basics_password_label" msgid="3402762431598148148">"סיסמה"</string>
+    <string name="password_hint" msgid="8835390747504721561">"סיסמה"</string>
     <string name="signed_in_with_service_label" msgid="4909910797357155961">"‏מחובר באמצעות ‎%s‎"</string>
-    <string name="authentication_label" msgid="5210804218348191833">"אימות"</string>
+    <string name="authentication_label" msgid="6917956186120234602">"אימות"</string>
     <string name="add_authentication_label" msgid="865206092644419804">"הוסף אימות"</string>
     <string name="clear_authentication_label" msgid="8113966442068335059">"הסר אימות"</string>
-    <string name="account_setup_basics_manual_setup_action" msgid="6640115171889882878"><u>"הגדרה ידנית"</u></string>
+    <string name="account_setup_basics_manual_setup_action" msgid="8053852205391155912">"הגדרה ידנית"</string>
     <string name="account_setup_username_password_toast" msgid="3968270274727947460">"הקלד כתובת דוא\"ל וסיסמה חוקיות."</string>
     <string name="account_duplicate_dlg_title" msgid="8089732986912704425">"חשבון משוכפל"</string>
     <string name="account_duplicate_dlg_message_fmt" msgid="6447629283679935840">"אתה כבר משתמש בשם משתמש זה עבור החשבון \"<xliff:g id="DUPLICATE">%s</xliff:g>\"."</string>
@@ -114,11 +114,11 @@
     <string name="account_setup_account_type_instructions" msgid="114515540798408760">"איזה סוג חשבון זה?"</string>
     <string name="account_setup_incoming_title" msgid="6796626791039136005">"הגדרת חשבון"</string>
     <string name="account_setup_incoming_headline" msgid="6183711037633407184">"הגדרות שרת דואר נכנס"</string>
-    <string name="account_setup_incoming_username_label" msgid="5700581386104070302">"שם משתמש"</string>
-    <string name="account_setup_incoming_password_label" msgid="6365327603172559859">"סיסמה"</string>
-    <string name="account_setup_incoming_server_label" msgid="1480342966630002638">"שרת"</string>
-    <string name="account_setup_incoming_port_label" msgid="8214738923690447796">"יציאה"</string>
-    <string name="account_setup_incoming_security_label" msgid="2110260791086007424">"סוג אבטחה"</string>
+    <string name="account_setup_incoming_username_label" msgid="406939983633223354">"שם משתמש"</string>
+    <string name="account_setup_incoming_password_label" msgid="634540235479188709">"סיסמה"</string>
+    <string name="account_setup_incoming_server_label" msgid="3528558488000638420">"שרת"</string>
+    <string name="account_setup_incoming_port_label" msgid="5311652277990186704">"יציאה"</string>
+    <string name="account_setup_incoming_security_label" msgid="1175710992470593691">"סוג אבטחה"</string>
     <string name="account_setup_incoming_security_none_label" msgid="8300169413118264895">"ללא"</string>
     <string name="account_setup_incoming_security_ssl_trust_certificates_label" msgid="6151855090123117538">"‏SSL/TLS (קבל את כל האישורים)"</string>
     <string name="account_setup_incoming_security_ssl_label" msgid="2798501138420163861">"SSL/TLS"</string>
@@ -131,18 +131,18 @@
     <string name="account_setup_incoming_imap_path_prefix_hint" msgid="9190845919067906033">"אופציונלי"</string>
     <string name="account_setup_outgoing_title" msgid="7208495965665711539">"הגדרת חשבון"</string>
     <string name="account_setup_outgoing_headline" msgid="2025001060935366394">"הגדרות של שרת דואר יוצא"</string>
-    <string name="account_setup_outgoing_smtp_server_label" msgid="6035137446691195177">"‏שרת SMTP"</string>
-    <string name="account_setup_outgoing_port_label" msgid="7573207437835827876">"יציאה"</string>
-    <string name="account_setup_outgoing_security_label" msgid="911398071120720589">"סוג אבטחה"</string>
+    <string name="account_setup_outgoing_smtp_server_label" msgid="1164004960070541473">"‏שרת SMTP"</string>
+    <string name="account_setup_outgoing_port_label" msgid="4670120792135566784">"יציאה"</string>
+    <string name="account_setup_outgoing_security_label" msgid="9200220309360082664">"סוג אבטחה"</string>
     <string name="account_setup_outgoing_require_login_label" msgid="7779484127897397562">"דרושה כניסה"</string>
-    <string name="account_setup_outgoing_username_label" msgid="3309680794731596981">"שם משתמש"</string>
-    <string name="account_setup_outgoing_password_label" msgid="227844585493317550">"סיסמה"</string>
-    <string name="account_setup_exchange_certificate_title" msgid="8473793588405277962">"אישור לקוח"</string>
+    <string name="account_setup_outgoing_username_label" msgid="7239411429115525841">"שם משתמש"</string>
+    <string name="account_setup_outgoing_password_label" msgid="3720429254654722208">"סיסמה"</string>
+    <string name="account_setup_exchange_certificate_title" msgid="1635140303999054002">"אישור לקוח"</string>
     <string name="account_setup_exchange_select_certificate" msgid="1536103662037268683">"בחר"</string>
     <string name="account_setup_exchange_use_certificate" msgid="8690682770083161349">"השתמש באישור לקוח"</string>
     <string name="account_setup_exchange_remove_certificate" msgid="5633249155510301766">"הסר"</string>
     <string name="account_setup_exchange_no_certificate" msgid="1119542961954780872">"ללא"</string>
-    <string name="account_setup_exchange_device_id_label" msgid="1646827333223157658">"מזהה מכשיר נייד"</string>
+    <string name="account_setup_exchange_device_id_label" msgid="5105898844003459657">"מזהה מכשיר נייד"</string>
     <string name="account_setup_options_title" msgid="9016600767888846051">"הגדרות חשבון"</string>
     <string name="account_setup_options_headline" msgid="4181274232835368085">"אפשרויות חשבון"</string>
     <string name="account_setup_options_mail_check_frequency_label" msgid="4824859792882810053">"תדירות הבדיקה של דואר נכנס"</string>
diff --git a/res/values-ja/strings.xml b/res/values-ja/strings.xml
index feb1864d7..9aba62c2a 100644
--- a/res/values-ja/strings.xml
+++ b/res/values-ja/strings.xml
@@ -87,13 +87,16 @@
     <string name="account_setup_basics_email_label" msgid="3454164053624112047">"メールアドレス"</string>
     <string name="or_label" msgid="2207403489755254427">"または"</string>
     <string name="sign_in_with_google" msgid="9051489501495503976">"Googleにログイン"</string>
-    <string name="account_setup_basics_password_label" msgid="9133549799291519298">"パスワード"</string>
-    <string name="password_label" msgid="5228754278985667134">"パスワード"</string>
+    <!-- no translation found for account_setup_basics_password_label (3402762431598148148) -->
+    <skip />
+    <!-- no translation found for password_hint (8835390747504721561) -->
+    <skip />
     <string name="signed_in_with_service_label" msgid="4909910797357155961">"%sでログイン済み"</string>
-    <string name="authentication_label" msgid="5210804218348191833">"認証"</string>
+    <!-- no translation found for authentication_label (6917956186120234602) -->
+    <skip />
     <string name="add_authentication_label" msgid="865206092644419804">"認証を追加"</string>
     <string name="clear_authentication_label" msgid="8113966442068335059">"認証をクリア"</string>
-    <string name="account_setup_basics_manual_setup_action" msgid="6640115171889882878"><u>"手動セットアップ"</u></string>
+    <string name="account_setup_basics_manual_setup_action" msgid="8053852205391155912">"手動セットアップ"</string>
     <string name="account_setup_username_password_toast" msgid="3968270274727947460">"有効なメールアドレスとパスワードを入力してください。"</string>
     <string name="account_duplicate_dlg_title" msgid="8089732986912704425">"重複するアカウント"</string>
     <string name="account_duplicate_dlg_message_fmt" msgid="6447629283679935840">"このユーザー名はアカウント「<xliff:g id="DUPLICATE">%s</xliff:g>」で既に使用しています。"</string>
@@ -114,11 +117,16 @@
     <string name="account_setup_account_type_instructions" msgid="114515540798408760">"このアカウントのタイプ"</string>
     <string name="account_setup_incoming_title" msgid="6796626791039136005">"アカウント設定"</string>
     <string name="account_setup_incoming_headline" msgid="6183711037633407184">"受信サーバーの設定"</string>
-    <string name="account_setup_incoming_username_label" msgid="5700581386104070302">"ユーザー名"</string>
-    <string name="account_setup_incoming_password_label" msgid="6365327603172559859">"パスワード"</string>
-    <string name="account_setup_incoming_server_label" msgid="1480342966630002638">"サーバー"</string>
-    <string name="account_setup_incoming_port_label" msgid="8214738923690447796">"ポート"</string>
-    <string name="account_setup_incoming_security_label" msgid="2110260791086007424">"セキュリティの種類"</string>
+    <!-- no translation found for account_setup_incoming_username_label (406939983633223354) -->
+    <skip />
+    <!-- no translation found for account_setup_incoming_password_label (634540235479188709) -->
+    <skip />
+    <!-- no translation found for account_setup_incoming_server_label (3528558488000638420) -->
+    <skip />
+    <!-- no translation found for account_setup_incoming_port_label (5311652277990186704) -->
+    <skip />
+    <!-- no translation found for account_setup_incoming_security_label (1175710992470593691) -->
+    <skip />
     <string name="account_setup_incoming_security_none_label" msgid="8300169413118264895">"なし"</string>
     <string name="account_setup_incoming_security_ssl_trust_certificates_label" msgid="6151855090123117538">"SSL/TLS（証明書をすべて承認）"</string>
     <string name="account_setup_incoming_security_ssl_label" msgid="2798501138420163861">"SSL/TLS"</string>
@@ -131,18 +139,25 @@
     <string name="account_setup_incoming_imap_path_prefix_hint" msgid="9190845919067906033">"省略可"</string>
     <string name="account_setup_outgoing_title" msgid="7208495965665711539">"アカウント設定"</string>
     <string name="account_setup_outgoing_headline" msgid="2025001060935366394">"送信サーバーの設定"</string>
-    <string name="account_setup_outgoing_smtp_server_label" msgid="6035137446691195177">"SMTPサーバー"</string>
-    <string name="account_setup_outgoing_port_label" msgid="7573207437835827876">"ポート"</string>
-    <string name="account_setup_outgoing_security_label" msgid="911398071120720589">"セキュリティの種類"</string>
+    <!-- no translation found for account_setup_outgoing_smtp_server_label (1164004960070541473) -->
+    <skip />
+    <!-- no translation found for account_setup_outgoing_port_label (4670120792135566784) -->
+    <skip />
+    <!-- no translation found for account_setup_outgoing_security_label (9200220309360082664) -->
+    <skip />
     <string name="account_setup_outgoing_require_login_label" msgid="7779484127897397562">"ログインが必要"</string>
-    <string name="account_setup_outgoing_username_label" msgid="3309680794731596981">"ユーザー名"</string>
-    <string name="account_setup_outgoing_password_label" msgid="227844585493317550">"パスワード"</string>
-    <string name="account_setup_exchange_certificate_title" msgid="8473793588405277962">"クライアント証明書"</string>
+    <!-- no translation found for account_setup_outgoing_username_label (7239411429115525841) -->
+    <skip />
+    <!-- no translation found for account_setup_outgoing_password_label (3720429254654722208) -->
+    <skip />
+    <!-- no translation found for account_setup_exchange_certificate_title (1635140303999054002) -->
+    <skip />
     <string name="account_setup_exchange_select_certificate" msgid="1536103662037268683">"選択"</string>
     <string name="account_setup_exchange_use_certificate" msgid="8690682770083161349">"クライアント証明書を使用"</string>
     <string name="account_setup_exchange_remove_certificate" msgid="5633249155510301766">"削除"</string>
     <string name="account_setup_exchange_no_certificate" msgid="1119542961954780872">"なし"</string>
-    <string name="account_setup_exchange_device_id_label" msgid="1646827333223157658">"携帯端末ID"</string>
+    <!-- no translation found for account_setup_exchange_device_id_label (5105898844003459657) -->
+    <skip />
     <string name="account_setup_options_title" msgid="9016600767888846051">"アカウントの設定"</string>
     <string name="account_setup_options_headline" msgid="4181274232835368085">"アカウントのオプション"</string>
     <string name="account_setup_options_mail_check_frequency_label" msgid="4824859792882810053">"受信トレイを確認する頻度"</string>
diff --git a/res/values-ka-rGE/strings.xml b/res/values-ka-rGE/strings.xml
index a00e1dc17..1c849eacd 100644
--- a/res/values-ka-rGE/strings.xml
+++ b/res/values-ka-rGE/strings.xml
@@ -87,13 +87,13 @@
     <string name="account_setup_basics_email_label" msgid="3454164053624112047">"ელფოსტის მისამართი"</string>
     <string name="or_label" msgid="2207403489755254427">"OR"</string>
     <string name="sign_in_with_google" msgid="9051489501495503976">"Google-ით შესვლა"</string>
-    <string name="account_setup_basics_password_label" msgid="9133549799291519298">"პაროლი"</string>
-    <string name="password_label" msgid="5228754278985667134">"პაროლი"</string>
+    <string name="account_setup_basics_password_label" msgid="3402762431598148148">"პაროლი"</string>
+    <string name="password_hint" msgid="8835390747504721561">"პაროლი"</string>
     <string name="signed_in_with_service_label" msgid="4909910797357155961">"შესულია %s-ით"</string>
-    <string name="authentication_label" msgid="5210804218348191833">"ავტორიზაცია"</string>
+    <string name="authentication_label" msgid="6917956186120234602">"ავტორიზაცია"</string>
     <string name="add_authentication_label" msgid="865206092644419804">"ავტორიზაციის დამატება"</string>
     <string name="clear_authentication_label" msgid="8113966442068335059">"ავტორიზაციის გასუფთავება"</string>
-    <string name="account_setup_basics_manual_setup_action" msgid="6640115171889882878"><u>"ხელით დაყენება"</u></string>
+    <string name="account_setup_basics_manual_setup_action" msgid="8053852205391155912">"ხელით დაყენება"</string>
     <string name="account_setup_username_password_toast" msgid="3968270274727947460">"აკრიფეთ ნამდვილი ელფოსტის მისამართი და პაროლი."</string>
     <string name="account_duplicate_dlg_title" msgid="8089732986912704425">"დუბლირებული ანგარიში"</string>
     <string name="account_duplicate_dlg_message_fmt" msgid="6447629283679935840">"თქვენ უკვე იყენებთ მომხმარებლის სახელს ანგარიშისთვის \"<xliff:g id="DUPLICATE">%s</xliff:g>\"."</string>
@@ -114,11 +114,11 @@
     <string name="account_setup_account_type_instructions" msgid="114515540798408760">"ეს რა ტიპის ანგარიშია?"</string>
     <string name="account_setup_incoming_title" msgid="6796626791039136005">"ანგარიშის დაყენება"</string>
     <string name="account_setup_incoming_headline" msgid="6183711037633407184">"შემომავალი სერვერის პარამეტრები"</string>
-    <string name="account_setup_incoming_username_label" msgid="5700581386104070302">"მომხმარებლის სახელი"</string>
-    <string name="account_setup_incoming_password_label" msgid="6365327603172559859">"პაროლი"</string>
-    <string name="account_setup_incoming_server_label" msgid="1480342966630002638">"სერვერი"</string>
-    <string name="account_setup_incoming_port_label" msgid="8214738923690447796">"პორტი"</string>
-    <string name="account_setup_incoming_security_label" msgid="2110260791086007424">"უსაფრთხოების ტიპი"</string>
+    <string name="account_setup_incoming_username_label" msgid="406939983633223354">"მომხმარებლის სახელი"</string>
+    <string name="account_setup_incoming_password_label" msgid="634540235479188709">"პაროლი"</string>
+    <string name="account_setup_incoming_server_label" msgid="3528558488000638420">"სერვერი"</string>
+    <string name="account_setup_incoming_port_label" msgid="5311652277990186704">"პორტი"</string>
+    <string name="account_setup_incoming_security_label" msgid="1175710992470593691">"უსაფრთხოების ტიპი"</string>
     <string name="account_setup_incoming_security_none_label" msgid="8300169413118264895">"არცერთი"</string>
     <string name="account_setup_incoming_security_ssl_trust_certificates_label" msgid="6151855090123117538">"SSL/TLS (ყველა სერტიფიკატის დაშვება)"</string>
     <string name="account_setup_incoming_security_ssl_label" msgid="2798501138420163861">"SSL/TLS"</string>
@@ -131,18 +131,18 @@
     <string name="account_setup_incoming_imap_path_prefix_hint" msgid="9190845919067906033">"სურვილისამებრ"</string>
     <string name="account_setup_outgoing_title" msgid="7208495965665711539">"ანგარიშის დაყენება"</string>
     <string name="account_setup_outgoing_headline" msgid="2025001060935366394">"გამავალი სერვერის პარამეტრები"</string>
-    <string name="account_setup_outgoing_smtp_server_label" msgid="6035137446691195177">"SMTP სერვერი"</string>
-    <string name="account_setup_outgoing_port_label" msgid="7573207437835827876">"პორტი"</string>
-    <string name="account_setup_outgoing_security_label" msgid="911398071120720589">"უსაფრთხოების ტიპი"</string>
+    <string name="account_setup_outgoing_smtp_server_label" msgid="1164004960070541473">"SMTP სერვერი"</string>
+    <string name="account_setup_outgoing_port_label" msgid="4670120792135566784">"პორტი"</string>
+    <string name="account_setup_outgoing_security_label" msgid="9200220309360082664">"უსაფრთხოების ტიპი"</string>
     <string name="account_setup_outgoing_require_login_label" msgid="7779484127897397562">"მოითხოვე სისტემაში შესვლა"</string>
-    <string name="account_setup_outgoing_username_label" msgid="3309680794731596981">"მომხმარებლის სახელი"</string>
-    <string name="account_setup_outgoing_password_label" msgid="227844585493317550">"პაროლი"</string>
-    <string name="account_setup_exchange_certificate_title" msgid="8473793588405277962">"კლიენტის სერტიფიკატი"</string>
+    <string name="account_setup_outgoing_username_label" msgid="7239411429115525841">"მომხმარებლის სახელი"</string>
+    <string name="account_setup_outgoing_password_label" msgid="3720429254654722208">"პაროლი"</string>
+    <string name="account_setup_exchange_certificate_title" msgid="1635140303999054002">"კლიენტის სერტიფიკატი"</string>
     <string name="account_setup_exchange_select_certificate" msgid="1536103662037268683">"არჩევა"</string>
     <string name="account_setup_exchange_use_certificate" msgid="8690682770083161349">"კლიენტის სერტიფიკატის გამოყენება"</string>
     <string name="account_setup_exchange_remove_certificate" msgid="5633249155510301766">"ამოშლა"</string>
     <string name="account_setup_exchange_no_certificate" msgid="1119542961954780872">"არცერთი"</string>
-    <string name="account_setup_exchange_device_id_label" msgid="1646827333223157658">"მობილური მოწყობილობის ID"</string>
+    <string name="account_setup_exchange_device_id_label" msgid="5105898844003459657">"მობილური მოწყობილობის ID"</string>
     <string name="account_setup_options_title" msgid="9016600767888846051">"ანგარიშის პარამეტრები"</string>
     <string name="account_setup_options_headline" msgid="4181274232835368085">"ანგარიშის პარამეტრები"</string>
     <string name="account_setup_options_mail_check_frequency_label" msgid="4824859792882810053">"შემოსულების შემოწმების სიხშირე"</string>
diff --git a/res/values-km-rKH/strings.xml b/res/values-km-rKH/strings.xml
index 47c9f1af6..83a3f10a5 100644
--- a/res/values-km-rKH/strings.xml
+++ b/res/values-km-rKH/strings.xml
@@ -87,13 +87,13 @@
     <string name="account_setup_basics_email_label" msgid="3454164053624112047">"អាសយដ្ឋាន​អ៊ីមែល"</string>
     <string name="or_label" msgid="2207403489755254427">"OR"</string>
     <string name="sign_in_with_google" msgid="9051489501495503976">"ចូល​ដោយ​ប្រើ​ Google"</string>
-    <string name="account_setup_basics_password_label" msgid="9133549799291519298">"ពាក្យសម្ងាត់"</string>
-    <string name="password_label" msgid="5228754278985667134">"ពាក្យសម្ងាត់"</string>
+    <string name="account_setup_basics_password_label" msgid="3402762431598148148">"ពាក្យសម្ងាត់"</string>
+    <string name="password_hint" msgid="8835390747504721561">"ពាក្យសម្ងាត់"</string>
     <string name="signed_in_with_service_label" msgid="4909910797357155961">"បាន​ចូល​​ជា​មួយ %s"</string>
-    <string name="authentication_label" msgid="5210804218348191833">"ការ​ផ្ទៀងផ្ទាត់"</string>
+    <string name="authentication_label" msgid="6917956186120234602">"ការ​ផ្ទៀងផ្ទាត់"</string>
     <string name="add_authentication_label" msgid="865206092644419804">"បន្ថែម​ការ​ផ្ទៀងផ្ទាត់"</string>
     <string name="clear_authentication_label" msgid="8113966442068335059">"សម្អាត​ការ​ផ្ទៀងផ្ទាត់"</string>
-    <string name="account_setup_basics_manual_setup_action" msgid="6640115171889882878"><u>"រៀបចំ​ដោយ​ដៃ"</u></string>
+    <string name="account_setup_basics_manual_setup_action" msgid="8053852205391155912">"រៀបចំ​ដោយ​ដៃ"</string>
     <string name="account_setup_username_password_toast" msgid="3968270274727947460">"​បញ្ចូល​​ពាក្យ​សម្ងាត់ ​និង​​អាសយដ្ឋាន​អ៊ីមែល​​ដែល​ត្រឹមត្រូវ​។"</string>
     <string name="account_duplicate_dlg_title" msgid="8089732986912704425">"ស្ទួន​គណនី"</string>
     <string name="account_duplicate_dlg_message_fmt" msgid="6447629283679935840">"អ្នក​កំពុង​តែ​ប្រើ​ឈ្មោះ​អ្នក​ប្រើ​សម្រាប់​គណនី​នេះ \" <xliff:g id="DUPLICATE">%s</xliff:g> \"។"</string>
@@ -114,11 +114,11 @@
     <string name="account_setup_account_type_instructions" msgid="114515540798408760">"តើ​​គណនី​នេះ​ជា​ប្រភេទ​អ្វី?"</string>
     <string name="account_setup_incoming_title" msgid="6796626791039136005">"រៀបចំ​គណនី"</string>
     <string name="account_setup_incoming_headline" msgid="6183711037633407184">"ការ​កំណត់​ម៉ាស៊ីន​មេ​​ចូល"</string>
-    <string name="account_setup_incoming_username_label" msgid="5700581386104070302">"ឈ្មោះ​អ្នក​ប្រើ"</string>
-    <string name="account_setup_incoming_password_label" msgid="6365327603172559859">"ពាក្យសម្ងាត់"</string>
-    <string name="account_setup_incoming_server_label" msgid="1480342966630002638">"ម៉ាស៊ីន​មេ"</string>
-    <string name="account_setup_incoming_port_label" msgid="8214738923690447796">"ច្រក"</string>
-    <string name="account_setup_incoming_security_label" msgid="2110260791086007424">"ប្រភេទ​សុវត្ថិភាព"</string>
+    <string name="account_setup_incoming_username_label" msgid="406939983633223354">"ឈ្មោះ​អ្នក​ប្រើ"</string>
+    <string name="account_setup_incoming_password_label" msgid="634540235479188709">"ពាក្យសម្ងាត់"</string>
+    <string name="account_setup_incoming_server_label" msgid="3528558488000638420">"ម៉ាស៊ីន​​មេ"</string>
+    <string name="account_setup_incoming_port_label" msgid="5311652277990186704">"ច្រក"</string>
+    <string name="account_setup_incoming_security_label" msgid="1175710992470593691">"ប្រភេទ​​សុវត្ថិភាព"</string>
     <string name="account_setup_incoming_security_none_label" msgid="8300169413118264895">"គ្មាន"</string>
     <string name="account_setup_incoming_security_ssl_trust_certificates_label" msgid="6151855090123117538">"SSL/TLS (ទទួល​យក​វិញ្ញាបនបត្រ​ទាំងអស់)"</string>
     <string name="account_setup_incoming_security_ssl_label" msgid="2798501138420163861">"SSL/TLS"</string>
@@ -131,18 +131,18 @@
     <string name="account_setup_incoming_imap_path_prefix_hint" msgid="9190845919067906033">"ជា​ជម្រើស"</string>
     <string name="account_setup_outgoing_title" msgid="7208495965665711539">"រៀបចំ​គណនី"</string>
     <string name="account_setup_outgoing_headline" msgid="2025001060935366394">"ការ​កំណត់​ម៉ាស៊ីន​​​មេ​ចេញ"</string>
-    <string name="account_setup_outgoing_smtp_server_label" msgid="6035137446691195177">"ម៉ាស៊ីន​មេ SMTP"</string>
-    <string name="account_setup_outgoing_port_label" msgid="7573207437835827876">"ច្រក"</string>
-    <string name="account_setup_outgoing_security_label" msgid="911398071120720589">"ប្រភេទ​​សុវត្ថិភាព"</string>
+    <string name="account_setup_outgoing_smtp_server_label" msgid="1164004960070541473">"ម៉ាស៊ីន​​មេ SMTP"</string>
+    <string name="account_setup_outgoing_port_label" msgid="4670120792135566784">"ច្រក"</string>
+    <string name="account_setup_outgoing_security_label" msgid="9200220309360082664">"ប្រភេទ​​សុវត្ថិភាព"</string>
     <string name="account_setup_outgoing_require_login_label" msgid="7779484127897397562">"ទាមទារ​ឲ្យ​​ចូល"</string>
-    <string name="account_setup_outgoing_username_label" msgid="3309680794731596981">"ឈ្មោះ​អ្នក​ប្រើ"</string>
-    <string name="account_setup_outgoing_password_label" msgid="227844585493317550">"ពាក្យសម្ងាត់"</string>
-    <string name="account_setup_exchange_certificate_title" msgid="8473793588405277962">"វិញ្ញាបនបត្រ​ម៉ាស៊ីន​ភ្ញៀវ"</string>
+    <string name="account_setup_outgoing_username_label" msgid="7239411429115525841">"ឈ្មោះ​អ្នក​ប្រើ"</string>
+    <string name="account_setup_outgoing_password_label" msgid="3720429254654722208">"ពាក្យសម្ងាត់"</string>
+    <string name="account_setup_exchange_certificate_title" msgid="1635140303999054002">"វិញ្ញាបនបត្រ​​​អតិថិជន"</string>
     <string name="account_setup_exchange_select_certificate" msgid="1536103662037268683">"ជ្រើស"</string>
     <string name="account_setup_exchange_use_certificate" msgid="8690682770083161349">"ប្រើ​វិញ្ញាបនបត្រ​ម៉ាស៊ីន​ភ្ញៀវ"</string>
     <string name="account_setup_exchange_remove_certificate" msgid="5633249155510301766">"លុប​ចេញ"</string>
     <string name="account_setup_exchange_no_certificate" msgid="1119542961954780872">"គ្មាន"</string>
-    <string name="account_setup_exchange_device_id_label" msgid="1646827333223157658">"លេខ​សម្គាល់​ឧបករណ៍​ចល័ត"</string>
+    <string name="account_setup_exchange_device_id_label" msgid="5105898844003459657">"លេខ​សម្គាល់​ឧបករណ៍​ចល័ត"</string>
     <string name="account_setup_options_title" msgid="9016600767888846051">"ការ​កំណត់​គណនី"</string>
     <string name="account_setup_options_headline" msgid="4181274232835368085">"ជម្រើស​គណនី"</string>
     <string name="account_setup_options_mail_check_frequency_label" msgid="4824859792882810053">"ពិនិត្យ​​ប្រអប់​ទទួល​ញឹកញាប់"</string>
diff --git a/res/values-ko/strings.xml b/res/values-ko/strings.xml
index bc5cd6f1f..750917d5d 100644
--- a/res/values-ko/strings.xml
+++ b/res/values-ko/strings.xml
@@ -87,13 +87,16 @@
     <string name="account_setup_basics_email_label" msgid="3454164053624112047">"이메일 주소"</string>
     <string name="or_label" msgid="2207403489755254427">"또는"</string>
     <string name="sign_in_with_google" msgid="9051489501495503976">"Google 계정으로 로그인"</string>
-    <string name="account_setup_basics_password_label" msgid="9133549799291519298">"비밀번호"</string>
-    <string name="password_label" msgid="5228754278985667134">"비밀번호"</string>
+    <!-- no translation found for account_setup_basics_password_label (3402762431598148148) -->
+    <skip />
+    <!-- no translation found for password_hint (8835390747504721561) -->
+    <skip />
     <string name="signed_in_with_service_label" msgid="4909910797357155961">"%s(으)로 로그인함"</string>
-    <string name="authentication_label" msgid="5210804218348191833">"인증"</string>
+    <!-- no translation found for authentication_label (6917956186120234602) -->
+    <skip />
     <string name="add_authentication_label" msgid="865206092644419804">"인증 추가"</string>
     <string name="clear_authentication_label" msgid="8113966442068335059">"인증 삭제"</string>
-    <string name="account_setup_basics_manual_setup_action" msgid="6640115171889882878"><u>"수동 설정"</u></string>
+    <string name="account_setup_basics_manual_setup_action" msgid="8053852205391155912">"수동 설정"</string>
     <string name="account_setup_username_password_toast" msgid="3968270274727947460">"올바른 이메일 주소와 비밀번호를 입력하세요."</string>
     <string name="account_duplicate_dlg_title" msgid="8089732986912704425">"중복 계정"</string>
     <string name="account_duplicate_dlg_message_fmt" msgid="6447629283679935840">"이미 \'<xliff:g id="DUPLICATE">%s</xliff:g>\' 계정에 이 사용자 이름을 사용하고 있습니다."</string>
@@ -114,11 +117,16 @@
     <string name="account_setup_account_type_instructions" msgid="114515540798408760">"계정 유형이 무엇입니까?"</string>
     <string name="account_setup_incoming_title" msgid="6796626791039136005">"계정 설정"</string>
     <string name="account_setup_incoming_headline" msgid="6183711037633407184">"수신 서버 설정"</string>
-    <string name="account_setup_incoming_username_label" msgid="5700581386104070302">"사용자 이름"</string>
-    <string name="account_setup_incoming_password_label" msgid="6365327603172559859">"비밀번호"</string>
-    <string name="account_setup_incoming_server_label" msgid="1480342966630002638">"서버"</string>
-    <string name="account_setup_incoming_port_label" msgid="8214738923690447796">"포트"</string>
-    <string name="account_setup_incoming_security_label" msgid="2110260791086007424">"보안 유형"</string>
+    <!-- no translation found for account_setup_incoming_username_label (406939983633223354) -->
+    <skip />
+    <!-- no translation found for account_setup_incoming_password_label (634540235479188709) -->
+    <skip />
+    <!-- no translation found for account_setup_incoming_server_label (3528558488000638420) -->
+    <skip />
+    <!-- no translation found for account_setup_incoming_port_label (5311652277990186704) -->
+    <skip />
+    <!-- no translation found for account_setup_incoming_security_label (1175710992470593691) -->
+    <skip />
     <string name="account_setup_incoming_security_none_label" msgid="8300169413118264895">"없음"</string>
     <string name="account_setup_incoming_security_ssl_trust_certificates_label" msgid="6151855090123117538">"SSL/TLS(모든 인증서 수락)"</string>
     <string name="account_setup_incoming_security_ssl_label" msgid="2798501138420163861">"SSL/TLS"</string>
@@ -131,18 +139,25 @@
     <string name="account_setup_incoming_imap_path_prefix_hint" msgid="9190845919067906033">"선택사항"</string>
     <string name="account_setup_outgoing_title" msgid="7208495965665711539">"계정 설정"</string>
     <string name="account_setup_outgoing_headline" msgid="2025001060935366394">"발신 서버 설정"</string>
-    <string name="account_setup_outgoing_smtp_server_label" msgid="6035137446691195177">"SMTP 서버"</string>
-    <string name="account_setup_outgoing_port_label" msgid="7573207437835827876">"포트"</string>
-    <string name="account_setup_outgoing_security_label" msgid="911398071120720589">"보안 유형"</string>
+    <!-- no translation found for account_setup_outgoing_smtp_server_label (1164004960070541473) -->
+    <skip />
+    <!-- no translation found for account_setup_outgoing_port_label (4670120792135566784) -->
+    <skip />
+    <!-- no translation found for account_setup_outgoing_security_label (9200220309360082664) -->
+    <skip />
     <string name="account_setup_outgoing_require_login_label" msgid="7779484127897397562">"로그인 필요"</string>
-    <string name="account_setup_outgoing_username_label" msgid="3309680794731596981">"사용자 이름"</string>
-    <string name="account_setup_outgoing_password_label" msgid="227844585493317550">"비밀번호"</string>
-    <string name="account_setup_exchange_certificate_title" msgid="8473793588405277962">"클라이언트 인증서"</string>
+    <!-- no translation found for account_setup_outgoing_username_label (7239411429115525841) -->
+    <skip />
+    <!-- no translation found for account_setup_outgoing_password_label (3720429254654722208) -->
+    <skip />
+    <!-- no translation found for account_setup_exchange_certificate_title (1635140303999054002) -->
+    <skip />
     <string name="account_setup_exchange_select_certificate" msgid="1536103662037268683">"선택"</string>
     <string name="account_setup_exchange_use_certificate" msgid="8690682770083161349">"클라이언트 인증서 사용"</string>
     <string name="account_setup_exchange_remove_certificate" msgid="5633249155510301766">"삭제"</string>
     <string name="account_setup_exchange_no_certificate" msgid="1119542961954780872">"선택 취소"</string>
-    <string name="account_setup_exchange_device_id_label" msgid="1646827333223157658">"휴대기기 ID"</string>
+    <!-- no translation found for account_setup_exchange_device_id_label (5105898844003459657) -->
+    <skip />
     <string name="account_setup_options_title" msgid="9016600767888846051">"계정 설정"</string>
     <string name="account_setup_options_headline" msgid="4181274232835368085">"계정 옵션"</string>
     <string name="account_setup_options_mail_check_frequency_label" msgid="4824859792882810053">"받은편지함 확인 빈도"</string>
diff --git a/res/values-lo-rLA/strings.xml b/res/values-lo-rLA/strings.xml
index 9dac5ffea..108002c49 100644
--- a/res/values-lo-rLA/strings.xml
+++ b/res/values-lo-rLA/strings.xml
@@ -87,13 +87,16 @@
     <string name="account_setup_basics_email_label" msgid="3454164053624112047">"ທີ່ຢູ່ອີເມວ"</string>
     <string name="or_label" msgid="2207403489755254427">"ຫຼື"</string>
     <string name="sign_in_with_google" msgid="9051489501495503976">"ເຂົ້າສູ່ລະບົບດ້ວຍ Google"</string>
-    <string name="account_setup_basics_password_label" msgid="9133549799291519298">"ລະຫັດຜ່ານ"</string>
-    <string name="password_label" msgid="5228754278985667134">"ລະຫັດຜ່ານ"</string>
+    <!-- no translation found for account_setup_basics_password_label (3402762431598148148) -->
+    <skip />
+    <!-- no translation found for password_hint (8835390747504721561) -->
+    <skip />
     <string name="signed_in_with_service_label" msgid="4909910797357155961">"ເຂົ້າສູ່ລະບົບໂດຍໃຊ້ %s"</string>
-    <string name="authentication_label" msgid="5210804218348191833">"ການກວດສອບຢືນຢັນ"</string>
+    <!-- no translation found for authentication_label (6917956186120234602) -->
+    <skip />
     <string name="add_authentication_label" msgid="865206092644419804">"ເພີ່ມການກວດສອບ"</string>
     <string name="clear_authentication_label" msgid="8113966442068335059">"ລຶບລ້າງການກວດສອບຢືນຢັນ"</string>
-    <string name="account_setup_basics_manual_setup_action" msgid="6640115171889882878"><u>"ຕັ້ງ​ຄ່າ​ເອງ"</u></string>
+    <string name="account_setup_basics_manual_setup_action" msgid="8053852205391155912">"ຕັ້ງດ້ວຍຕົນເອງ"</string>
     <string name="account_setup_username_password_toast" msgid="3968270274727947460">"ພິມທີ່ຢູ່ອີເມວ ແລະ ລະຫັດຜ່ານທີ່ຖືກຕ້ອງ."</string>
     <string name="account_duplicate_dlg_title" msgid="8089732986912704425">"ບັນຊີຊ້ຳກັນ"</string>
     <string name="account_duplicate_dlg_message_fmt" msgid="6447629283679935840">"ທ່ານໄດ້ໃຊ້ຊື່ຜູ່ໃຊ້ນີ້ສຳລັບບັນຊີ \"<xliff:g id="DUPLICATE">%s</xliff:g>\" ຢູ່ແລ້ວ."</string>
@@ -114,11 +117,16 @@
     <string name="account_setup_account_type_instructions" msgid="114515540798408760">"ປະເພດບັນຊີຂອງທ່ານນີ້ແມ່ນປະເພດໃດ?"</string>
     <string name="account_setup_incoming_title" msgid="6796626791039136005">"ຕິດຕັ້ງບັນຊີ"</string>
     <string name="account_setup_incoming_headline" msgid="6183711037633407184">"ການຕັ້ງຄ່າທີ່ກຳລັງສົ່ງມາຈາກເຊີບເວີ"</string>
-    <string name="account_setup_incoming_username_label" msgid="5700581386104070302">"ຊື່ຜູ່ໃຊ້"</string>
-    <string name="account_setup_incoming_password_label" msgid="6365327603172559859">"ລະຫັດຜ່ານ"</string>
-    <string name="account_setup_incoming_server_label" msgid="1480342966630002638">"ເຊີບເວີ"</string>
-    <string name="account_setup_incoming_port_label" msgid="8214738923690447796">"ພອດ"</string>
-    <string name="account_setup_incoming_security_label" msgid="2110260791086007424">"ປະເພດຄວາມປອດໄພ"</string>
+    <!-- no translation found for account_setup_incoming_username_label (406939983633223354) -->
+    <skip />
+    <!-- no translation found for account_setup_incoming_password_label (634540235479188709) -->
+    <skip />
+    <!-- no translation found for account_setup_incoming_server_label (3528558488000638420) -->
+    <skip />
+    <!-- no translation found for account_setup_incoming_port_label (5311652277990186704) -->
+    <skip />
+    <!-- no translation found for account_setup_incoming_security_label (1175710992470593691) -->
+    <skip />
     <string name="account_setup_incoming_security_none_label" msgid="8300169413118264895">"ບໍ່ມີ"</string>
     <string name="account_setup_incoming_security_ssl_trust_certificates_label" msgid="6151855090123117538">"SSL/TLS (ຮັບໃບຮັບຮອງທັງຫມົດ)"</string>
     <string name="account_setup_incoming_security_ssl_label" msgid="2798501138420163861">"SSL/TLS"</string>
@@ -131,18 +139,25 @@
     <string name="account_setup_incoming_imap_path_prefix_hint" msgid="9190845919067906033">"ໂຕເລືອກ"</string>
     <string name="account_setup_outgoing_title" msgid="7208495965665711539">"ຕັ້ງບັນຊີ"</string>
     <string name="account_setup_outgoing_headline" msgid="2025001060935366394">"ການຕັ້ງຄ່າທີ່ກຳລັງສົ່ງອອກຈາກເຊີບເວີ"</string>
-    <string name="account_setup_outgoing_smtp_server_label" msgid="6035137446691195177">"ເຊີບເວີ SMTP"</string>
-    <string name="account_setup_outgoing_port_label" msgid="7573207437835827876">"ພອດ"</string>
-    <string name="account_setup_outgoing_security_label" msgid="911398071120720589">"ປະເພດຄວາມປອດໄພ"</string>
+    <!-- no translation found for account_setup_outgoing_smtp_server_label (1164004960070541473) -->
+    <skip />
+    <!-- no translation found for account_setup_outgoing_port_label (4670120792135566784) -->
+    <skip />
+    <!-- no translation found for account_setup_outgoing_security_label (9200220309360082664) -->
+    <skip />
     <string name="account_setup_outgoing_require_login_label" msgid="7779484127897397562">"ຕ້ອງເຂົ້າສູ່ລະບົບ"</string>
-    <string name="account_setup_outgoing_username_label" msgid="3309680794731596981">"ຊື່ຜູ່ໃຊ້"</string>
-    <string name="account_setup_outgoing_password_label" msgid="227844585493317550">"ລະຫັດຜ່ານ"</string>
-    <string name="account_setup_exchange_certificate_title" msgid="8473793588405277962">"ໃບຮັບຮອງໄຄຼເອນ"</string>
+    <!-- no translation found for account_setup_outgoing_username_label (7239411429115525841) -->
+    <skip />
+    <!-- no translation found for account_setup_outgoing_password_label (3720429254654722208) -->
+    <skip />
+    <!-- no translation found for account_setup_exchange_certificate_title (1635140303999054002) -->
+    <skip />
     <string name="account_setup_exchange_select_certificate" msgid="1536103662037268683">"ເລືອກ"</string>
     <string name="account_setup_exchange_use_certificate" msgid="8690682770083161349">"ນໍາໃຊ້ໃບຮັບຮອງຂອງໄຄຼເອນ"</string>
     <string name="account_setup_exchange_remove_certificate" msgid="5633249155510301766">"ລຶບ"</string>
     <string name="account_setup_exchange_no_certificate" msgid="1119542961954780872">"ບໍ່ມີ"</string>
-    <string name="account_setup_exchange_device_id_label" msgid="1646827333223157658">"ໄອດີອຸປະກອນມືຖື"</string>
+    <!-- no translation found for account_setup_exchange_device_id_label (5105898844003459657) -->
+    <skip />
     <string name="account_setup_options_title" msgid="9016600767888846051">"ການຕັ້ງຄ່າບັນຊີ"</string>
     <string name="account_setup_options_headline" msgid="4181274232835368085">"ຕົວເລືອກບັນຊີ"</string>
     <string name="account_setup_options_mail_check_frequency_label" msgid="4824859792882810053">"ຄວາມຖີ່ໃນການກວດກ່ອງຮັບອີເມວ"</string>
diff --git a/res/values-lt/strings.xml b/res/values-lt/strings.xml
index 70336f0bc..36b6f95be 100644
--- a/res/values-lt/strings.xml
+++ b/res/values-lt/strings.xml
@@ -87,13 +87,13 @@
     <string name="account_setup_basics_email_label" msgid="3454164053624112047">"El. pašto adresas"</string>
     <string name="or_label" msgid="2207403489755254427">"ARBA"</string>
     <string name="sign_in_with_google" msgid="9051489501495503976">"Prisijungti naudojant „Google“"</string>
-    <string name="account_setup_basics_password_label" msgid="9133549799291519298">"Slaptažodis"</string>
-    <string name="password_label" msgid="5228754278985667134">"Slaptažodis"</string>
+    <string name="account_setup_basics_password_label" msgid="3402762431598148148">"SLAPTAŽODIS"</string>
+    <string name="password_hint" msgid="8835390747504721561">"Slaptažodis"</string>
     <string name="signed_in_with_service_label" msgid="4909910797357155961">"Prisijungta naudojant „%s“"</string>
-    <string name="authentication_label" msgid="5210804218348191833">"Autentifikavimas"</string>
+    <string name="authentication_label" msgid="6917956186120234602">"AUTENTIFIKAVIMAS"</string>
     <string name="add_authentication_label" msgid="865206092644419804">"Pridėti autentifikavimą"</string>
     <string name="clear_authentication_label" msgid="8113966442068335059">"Išvalyti autentifikavimą"</string>
-    <string name="account_setup_basics_manual_setup_action" msgid="6640115171889882878"><u>"Neautomatinė sąranka"</u></string>
+    <string name="account_setup_basics_manual_setup_action" msgid="8053852205391155912">"Neaut. nustat."</string>
     <string name="account_setup_username_password_toast" msgid="3968270274727947460">"Įveskite galiojantį el. pašto adresą ir slaptažodį."</string>
     <string name="account_duplicate_dlg_title" msgid="8089732986912704425">"Kopijuoti paskyrą"</string>
     <string name="account_duplicate_dlg_message_fmt" msgid="6447629283679935840">"Jau naudojate šį naudotojo vardą „<xliff:g id="DUPLICATE">%s</xliff:g>“ paskyroje."</string>
@@ -114,11 +114,11 @@
     <string name="account_setup_account_type_instructions" msgid="114515540798408760">"Kokio tipo tai paskyra?"</string>
     <string name="account_setup_incoming_title" msgid="6796626791039136005">"Paskyros sąranka"</string>
     <string name="account_setup_incoming_headline" msgid="6183711037633407184">"Gaunamų laiškų serverio nustatymai"</string>
-    <string name="account_setup_incoming_username_label" msgid="5700581386104070302">"Naudotojo vardas"</string>
-    <string name="account_setup_incoming_password_label" msgid="6365327603172559859">"Slaptažodis"</string>
-    <string name="account_setup_incoming_server_label" msgid="1480342966630002638">"Serveris"</string>
-    <string name="account_setup_incoming_port_label" msgid="8214738923690447796">"Prievadas"</string>
-    <string name="account_setup_incoming_security_label" msgid="2110260791086007424">"Saugos tipas"</string>
+    <string name="account_setup_incoming_username_label" msgid="406939983633223354">"NAUDOTOJO VARDAS"</string>
+    <string name="account_setup_incoming_password_label" msgid="634540235479188709">"SLAPTAŽODIS"</string>
+    <string name="account_setup_incoming_server_label" msgid="3528558488000638420">"SERVERIS"</string>
+    <string name="account_setup_incoming_port_label" msgid="5311652277990186704">"PRIEVADAS"</string>
+    <string name="account_setup_incoming_security_label" msgid="1175710992470593691">"SAUGOS TIPAS"</string>
     <string name="account_setup_incoming_security_none_label" msgid="8300169413118264895">"Nėra"</string>
     <string name="account_setup_incoming_security_ssl_trust_certificates_label" msgid="6151855090123117538">"SSL / TLS (priimti visus sertifikatus)"</string>
     <string name="account_setup_incoming_security_ssl_label" msgid="2798501138420163861">"SSL / TLS"</string>
@@ -131,18 +131,18 @@
     <string name="account_setup_incoming_imap_path_prefix_hint" msgid="9190845919067906033">"Pasirenkama"</string>
     <string name="account_setup_outgoing_title" msgid="7208495965665711539">"Paskyros sąranka"</string>
     <string name="account_setup_outgoing_headline" msgid="2025001060935366394">"Siunčiamų laiškų serverio nustatymai"</string>
-    <string name="account_setup_outgoing_smtp_server_label" msgid="6035137446691195177">"SMTP serveris"</string>
-    <string name="account_setup_outgoing_port_label" msgid="7573207437835827876">"Prievadas"</string>
-    <string name="account_setup_outgoing_security_label" msgid="911398071120720589">"Saugos tipas"</string>
+    <string name="account_setup_outgoing_smtp_server_label" msgid="1164004960070541473">"SMTP SERVERIS"</string>
+    <string name="account_setup_outgoing_port_label" msgid="4670120792135566784">"PRIEVADAS"</string>
+    <string name="account_setup_outgoing_security_label" msgid="9200220309360082664">"SAUGOS TIPAS"</string>
     <string name="account_setup_outgoing_require_login_label" msgid="7779484127897397562">"Reikalauti prisijungti"</string>
-    <string name="account_setup_outgoing_username_label" msgid="3309680794731596981">"Naudotojo vardas"</string>
-    <string name="account_setup_outgoing_password_label" msgid="227844585493317550">"Slaptažodis"</string>
-    <string name="account_setup_exchange_certificate_title" msgid="8473793588405277962">"Kliento sertifikatas"</string>
+    <string name="account_setup_outgoing_username_label" msgid="7239411429115525841">"NAUDOTOJO VARDAS"</string>
+    <string name="account_setup_outgoing_password_label" msgid="3720429254654722208">"SLAPTAŽODIS"</string>
+    <string name="account_setup_exchange_certificate_title" msgid="1635140303999054002">"KLIENTO SERTIFIKATAS"</string>
     <string name="account_setup_exchange_select_certificate" msgid="1536103662037268683">"Pasirinkti"</string>
     <string name="account_setup_exchange_use_certificate" msgid="8690682770083161349">"Naudoti kliento sertifikatą"</string>
     <string name="account_setup_exchange_remove_certificate" msgid="5633249155510301766">"Pašalinti"</string>
     <string name="account_setup_exchange_no_certificate" msgid="1119542961954780872">"Nėra"</string>
-    <string name="account_setup_exchange_device_id_label" msgid="1646827333223157658">"Mobiliojo įrenginio ID"</string>
+    <string name="account_setup_exchange_device_id_label" msgid="5105898844003459657">"MOBILIOJO ĮRENGINIO ID"</string>
     <string name="account_setup_options_title" msgid="9016600767888846051">"Paskyros nustatymai"</string>
     <string name="account_setup_options_headline" msgid="4181274232835368085">"Paskyros parinktys"</string>
     <string name="account_setup_options_mail_check_frequency_label" msgid="4824859792882810053">"Gautųjų tikrinimo dažnumas"</string>
diff --git a/res/values-lv/strings.xml b/res/values-lv/strings.xml
index 0086e7034..479a1b5f9 100644
--- a/res/values-lv/strings.xml
+++ b/res/values-lv/strings.xml
@@ -87,13 +87,13 @@
     <string name="account_setup_basics_email_label" msgid="3454164053624112047">"E-pasta adrese"</string>
     <string name="or_label" msgid="2207403489755254427">"VAI"</string>
     <string name="sign_in_with_google" msgid="9051489501495503976">"Pierakstīties ar Google"</string>
-    <string name="account_setup_basics_password_label" msgid="9133549799291519298">"Parole"</string>
-    <string name="password_label" msgid="5228754278985667134">"Parole"</string>
+    <string name="account_setup_basics_password_label" msgid="3402762431598148148">"PAROLE"</string>
+    <string name="password_hint" msgid="8835390747504721561">"Parole"</string>
     <string name="signed_in_with_service_label" msgid="4909910797357155961">"Pierkakstījies šajā kontā: %s"</string>
-    <string name="authentication_label" msgid="5210804218348191833">"Autentifikācija"</string>
+    <string name="authentication_label" msgid="6917956186120234602">"AUTENTIFIKĀCIJA"</string>
     <string name="add_authentication_label" msgid="865206092644419804">"Pievienot autentifikācijas ikonu"</string>
     <string name="clear_authentication_label" msgid="8113966442068335059">"Notīrīt autentifikācijas ikonu"</string>
-    <string name="account_setup_basics_manual_setup_action" msgid="6640115171889882878"><u>"Manuāla iestatīšana"</u></string>
+    <string name="account_setup_basics_manual_setup_action" msgid="8053852205391155912">"Manuāla iest."</string>
     <string name="account_setup_username_password_toast" msgid="3968270274727947460">"Ierakstiet derīgu e-pasta adresi un paroli."</string>
     <string name="account_duplicate_dlg_title" msgid="8089732986912704425">"Dublikāta konts"</string>
     <string name="account_duplicate_dlg_message_fmt" msgid="6447629283679935840">"Jūs jau izmantojat šo lietotājvārdu kontam <xliff:g id="DUPLICATE">%s</xliff:g>."</string>
@@ -114,11 +114,11 @@
     <string name="account_setup_account_type_instructions" msgid="114515540798408760">"Kāds ir šī konta veids?"</string>
     <string name="account_setup_incoming_title" msgid="6796626791039136005">"Konta iestatīšana"</string>
     <string name="account_setup_incoming_headline" msgid="6183711037633407184">"Ienākošā servera iestatījumi"</string>
-    <string name="account_setup_incoming_username_label" msgid="5700581386104070302">"Lietotājvārds"</string>
-    <string name="account_setup_incoming_password_label" msgid="6365327603172559859">"Parole"</string>
-    <string name="account_setup_incoming_server_label" msgid="1480342966630002638">"Serveris"</string>
-    <string name="account_setup_incoming_port_label" msgid="8214738923690447796">"Ports"</string>
-    <string name="account_setup_incoming_security_label" msgid="2110260791086007424">"Drošības veids"</string>
+    <string name="account_setup_incoming_username_label" msgid="406939983633223354">"LIETOTĀJVĀRDS"</string>
+    <string name="account_setup_incoming_password_label" msgid="634540235479188709">"PAROLE"</string>
+    <string name="account_setup_incoming_server_label" msgid="3528558488000638420">"SERVERIS"</string>
+    <string name="account_setup_incoming_port_label" msgid="5311652277990186704">"PORTS"</string>
+    <string name="account_setup_incoming_security_label" msgid="1175710992470593691">"DROŠĪBAS VEIDS"</string>
     <string name="account_setup_incoming_security_none_label" msgid="8300169413118264895">"Nav"</string>
     <string name="account_setup_incoming_security_ssl_trust_certificates_label" msgid="6151855090123117538">"SSL/TLS (pieņemt visus sertifikātus)"</string>
     <string name="account_setup_incoming_security_ssl_label" msgid="2798501138420163861">"SSL/TLS"</string>
@@ -131,18 +131,18 @@
     <string name="account_setup_incoming_imap_path_prefix_hint" msgid="9190845919067906033">"Neobligāti"</string>
     <string name="account_setup_outgoing_title" msgid="7208495965665711539">"Konta iestatīšana"</string>
     <string name="account_setup_outgoing_headline" msgid="2025001060935366394">"Izejošā servera iestatījumi"</string>
-    <string name="account_setup_outgoing_smtp_server_label" msgid="6035137446691195177">"SMTP serveris"</string>
-    <string name="account_setup_outgoing_port_label" msgid="7573207437835827876">"Ports"</string>
-    <string name="account_setup_outgoing_security_label" msgid="911398071120720589">"Drošības veids"</string>
+    <string name="account_setup_outgoing_smtp_server_label" msgid="1164004960070541473">"SMTP SERVERIS"</string>
+    <string name="account_setup_outgoing_port_label" msgid="4670120792135566784">"PORTS"</string>
+    <string name="account_setup_outgoing_security_label" msgid="9200220309360082664">"DROŠĪBAS VEIDS"</string>
     <string name="account_setup_outgoing_require_login_label" msgid="7779484127897397562">"Pieprasīt pierakstīšanos"</string>
-    <string name="account_setup_outgoing_username_label" msgid="3309680794731596981">"Lietotājvārds"</string>
-    <string name="account_setup_outgoing_password_label" msgid="227844585493317550">"Parole"</string>
-    <string name="account_setup_exchange_certificate_title" msgid="8473793588405277962">"Klienta sertifikāts"</string>
+    <string name="account_setup_outgoing_username_label" msgid="7239411429115525841">"LIETOTĀJVĀRDS"</string>
+    <string name="account_setup_outgoing_password_label" msgid="3720429254654722208">"PAROLE"</string>
+    <string name="account_setup_exchange_certificate_title" msgid="1635140303999054002">"KLIENTA SERTIFIKĀTS"</string>
     <string name="account_setup_exchange_select_certificate" msgid="1536103662037268683">"Atlasīt"</string>
     <string name="account_setup_exchange_use_certificate" msgid="8690682770083161349">"Izmantot klienta sertifikātu"</string>
     <string name="account_setup_exchange_remove_certificate" msgid="5633249155510301766">"Noņemt"</string>
     <string name="account_setup_exchange_no_certificate" msgid="1119542961954780872">"Nav"</string>
-    <string name="account_setup_exchange_device_id_label" msgid="1646827333223157658">"Mobilās ierīces ID"</string>
+    <string name="account_setup_exchange_device_id_label" msgid="5105898844003459657">"MOBILĀS IERĪCES ID"</string>
     <string name="account_setup_options_title" msgid="9016600767888846051">"Konta iestatījumi"</string>
     <string name="account_setup_options_headline" msgid="4181274232835368085">"Konta iespējas"</string>
     <string name="account_setup_options_mail_check_frequency_label" msgid="4824859792882810053">"Iesūtnes pārbaudes biežums"</string>
diff --git a/res/values-mn-rMN/strings.xml b/res/values-mn-rMN/strings.xml
index e3cc48145..cb39a537d 100644
--- a/res/values-mn-rMN/strings.xml
+++ b/res/values-mn-rMN/strings.xml
@@ -87,13 +87,13 @@
     <string name="account_setup_basics_email_label" msgid="3454164053624112047">"Имэйл хаяг"</string>
     <string name="or_label" msgid="2207403489755254427">"ЭСВЭЛ"</string>
     <string name="sign_in_with_google" msgid="9051489501495503976">"Google-р нэвтрэх"</string>
-    <string name="account_setup_basics_password_label" msgid="9133549799291519298">"Нууц үг"</string>
-    <string name="password_label" msgid="5228754278985667134">"Нууц үг"</string>
+    <string name="account_setup_basics_password_label" msgid="3402762431598148148">"НУУЦ ҮГ"</string>
+    <string name="password_hint" msgid="8835390747504721561">"Нууц үг"</string>
     <string name="signed_in_with_service_label" msgid="4909910797357155961">"%s-р нэвтэрсэн"</string>
-    <string name="authentication_label" msgid="5210804218348191833">"Гэрчлэлт"</string>
+    <string name="authentication_label" msgid="6917956186120234602">"ГЭРЧЛЭЛТ"</string>
     <string name="add_authentication_label" msgid="865206092644419804">"Гэрчлэлт нэмэх"</string>
     <string name="clear_authentication_label" msgid="8113966442068335059">"Гэрчлэлтийг арилгах"</string>
-    <string name="account_setup_basics_manual_setup_action" msgid="6640115171889882878"><u>" Гар тохируулга"</u></string>
+    <string name="account_setup_basics_manual_setup_action" msgid="8053852205391155912">"Гараар тохируулах"</string>
     <string name="account_setup_username_password_toast" msgid="3968270274727947460">"Зөв имэйл хаяг болон нууц үг оруулна уу."</string>
     <string name="account_duplicate_dlg_title" msgid="8089732986912704425">"Давхардсан Акаунт"</string>
     <string name="account_duplicate_dlg_message_fmt" msgid="6447629283679935840">"Та энэ хэрэглэгчийн нэрийг \"<xliff:g id="DUPLICATE">%s</xliff:g>\" акаунтад ашиглаж байна."</string>
@@ -114,11 +114,11 @@
     <string name="account_setup_account_type_instructions" msgid="114515540798408760">"Энэ ямар төрлийн акаунт вэ?"</string>
     <string name="account_setup_incoming_title" msgid="6796626791039136005">"Акаунт тохируулах"</string>
     <string name="account_setup_incoming_headline" msgid="6183711037633407184">"Орж ирж буй серверийн тохиргоо"</string>
-    <string name="account_setup_incoming_username_label" msgid="5700581386104070302">"Хэрэглэгчийн нэр"</string>
-    <string name="account_setup_incoming_password_label" msgid="6365327603172559859">"Нууц үг"</string>
-    <string name="account_setup_incoming_server_label" msgid="1480342966630002638">"Сервер"</string>
-    <string name="account_setup_incoming_port_label" msgid="8214738923690447796">"Порт"</string>
-    <string name="account_setup_incoming_security_label" msgid="2110260791086007424">"Аюулгүй байдлын төрөл"</string>
+    <string name="account_setup_incoming_username_label" msgid="406939983633223354">"ХЭРЭГЛЭГЧИЙН НЭР"</string>
+    <string name="account_setup_incoming_password_label" msgid="634540235479188709">"НУУЦ ҮГ"</string>
+    <string name="account_setup_incoming_server_label" msgid="3528558488000638420">"СЕРВЕР"</string>
+    <string name="account_setup_incoming_port_label" msgid="5311652277990186704">"ПОРТ"</string>
+    <string name="account_setup_incoming_security_label" msgid="1175710992470593691">"ХАМГААЛАЛТЫН ТӨРӨЛ"</string>
     <string name="account_setup_incoming_security_none_label" msgid="8300169413118264895">"Байхгүй"</string>
     <string name="account_setup_incoming_security_ssl_trust_certificates_label" msgid="6151855090123117538">"SSL/TLS (Бүх сертификатыг хүлээн авах)"</string>
     <string name="account_setup_incoming_security_ssl_label" msgid="2798501138420163861">"SSL/TLS"</string>
@@ -131,18 +131,18 @@
     <string name="account_setup_incoming_imap_path_prefix_hint" msgid="9190845919067906033">"Сонголтын"</string>
     <string name="account_setup_outgoing_title" msgid="7208495965665711539">"Акаунт тохируулах"</string>
     <string name="account_setup_outgoing_headline" msgid="2025001060935366394">"Гарч буй серверийн тохиргоо"</string>
-    <string name="account_setup_outgoing_smtp_server_label" msgid="6035137446691195177">"SMTP сервер:"</string>
-    <string name="account_setup_outgoing_port_label" msgid="7573207437835827876">"Порт"</string>
-    <string name="account_setup_outgoing_security_label" msgid="911398071120720589">"Аюулгүй байдлын төрөл"</string>
+    <string name="account_setup_outgoing_smtp_server_label" msgid="1164004960070541473">"SMTP СЕРВЕР"</string>
+    <string name="account_setup_outgoing_port_label" msgid="4670120792135566784">"ПОРТ"</string>
+    <string name="account_setup_outgoing_security_label" msgid="9200220309360082664">"ХАМГААЛАЛТЫН ТӨРӨЛ"</string>
     <string name="account_setup_outgoing_require_login_label" msgid="7779484127897397562">"Нэвтрэхийг шаардах"</string>
-    <string name="account_setup_outgoing_username_label" msgid="3309680794731596981">"Хэрэглэгчийн нэр"</string>
-    <string name="account_setup_outgoing_password_label" msgid="227844585493317550">"Нууц үг"</string>
-    <string name="account_setup_exchange_certificate_title" msgid="8473793588405277962">"Клиент сертификат"</string>
+    <string name="account_setup_outgoing_username_label" msgid="7239411429115525841">"ХЭРЭГЛЭГЧИЙН НЭР"</string>
+    <string name="account_setup_outgoing_password_label" msgid="3720429254654722208">"НУУЦ ҮГ"</string>
+    <string name="account_setup_exchange_certificate_title" msgid="1635140303999054002">"КЛИЕНТ СЕРТИФИКАТ"</string>
     <string name="account_setup_exchange_select_certificate" msgid="1536103662037268683">"Сонгох"</string>
     <string name="account_setup_exchange_use_certificate" msgid="8690682770083161349">"Клиент сертификат ашиглах"</string>
     <string name="account_setup_exchange_remove_certificate" msgid="5633249155510301766">"Устгах"</string>
     <string name="account_setup_exchange_no_certificate" msgid="1119542961954780872">"Байхгүй"</string>
-    <string name="account_setup_exchange_device_id_label" msgid="1646827333223157658">"Мобайл Төхөөрөмжийн ID"</string>
+    <string name="account_setup_exchange_device_id_label" msgid="5105898844003459657">"МОБАЙЛ ТӨХӨӨРӨМЖИЙН ID"</string>
     <string name="account_setup_options_title" msgid="9016600767888846051">"Акаунтын тохиргоо"</string>
     <string name="account_setup_options_headline" msgid="4181274232835368085">"Акаунтын тохируулга"</string>
     <string name="account_setup_options_mail_check_frequency_label" msgid="4824859792882810053">"Ирсэн имэйл шалгах давтамж"</string>
diff --git a/res/values-ms-rMY/strings.xml b/res/values-ms-rMY/strings.xml
index dae76be75..83096d68c 100644
--- a/res/values-ms-rMY/strings.xml
+++ b/res/values-ms-rMY/strings.xml
@@ -87,13 +87,16 @@
     <string name="account_setup_basics_email_label" msgid="3454164053624112047">"Alamat e-mel"</string>
     <string name="or_label" msgid="2207403489755254427">"ATAU"</string>
     <string name="sign_in_with_google" msgid="9051489501495503976">"Log masuk dengan Google"</string>
-    <string name="account_setup_basics_password_label" msgid="9133549799291519298">"Kata laluan"</string>
-    <string name="password_label" msgid="5228754278985667134">"Kata laluan"</string>
+    <!-- no translation found for account_setup_basics_password_label (3402762431598148148) -->
+    <skip />
+    <!-- no translation found for password_hint (8835390747504721561) -->
+    <skip />
     <string name="signed_in_with_service_label" msgid="4909910797357155961">"Dilog masuk dengan %s"</string>
-    <string name="authentication_label" msgid="5210804218348191833">"Pengesahan"</string>
+    <!-- no translation found for authentication_label (6917956186120234602) -->
+    <skip />
     <string name="add_authentication_label" msgid="865206092644419804">"Tambah pengesahan"</string>
     <string name="clear_authentication_label" msgid="8113966442068335059">"Padamkan pengesahan"</string>
-    <string name="account_setup_basics_manual_setup_action" msgid="6640115171889882878"><u>"Persediaan manual"</u></string>
+    <string name="account_setup_basics_manual_setup_action" msgid="8053852205391155912">"Persediaan manual"</string>
     <string name="account_setup_username_password_toast" msgid="3968270274727947460">"Taipkan alamat e-mel dan kata laluan yang sah."</string>
     <string name="account_duplicate_dlg_title" msgid="8089732986912704425">"Akaun pendua"</string>
     <string name="account_duplicate_dlg_message_fmt" msgid="6447629283679935840">"Anda telah menggunakan nama pengguna ini untuk akaun \"<xliff:g id="DUPLICATE">%s</xliff:g>\"."</string>
@@ -114,11 +117,16 @@
     <string name="account_setup_account_type_instructions" msgid="114515540798408760">"Jenis apakah akaun ini?"</string>
     <string name="account_setup_incoming_title" msgid="6796626791039136005">"Persediaan akaun"</string>
     <string name="account_setup_incoming_headline" msgid="6183711037633407184">"Tetapan pelayan masuk"</string>
-    <string name="account_setup_incoming_username_label" msgid="5700581386104070302">"Nama pengguna"</string>
-    <string name="account_setup_incoming_password_label" msgid="6365327603172559859">"Kata laluan"</string>
-    <string name="account_setup_incoming_server_label" msgid="1480342966630002638">"Pelayan"</string>
-    <string name="account_setup_incoming_port_label" msgid="8214738923690447796">"Port"</string>
-    <string name="account_setup_incoming_security_label" msgid="2110260791086007424">"Jenis keselamatan"</string>
+    <!-- no translation found for account_setup_incoming_username_label (406939983633223354) -->
+    <skip />
+    <!-- no translation found for account_setup_incoming_password_label (634540235479188709) -->
+    <skip />
+    <!-- no translation found for account_setup_incoming_server_label (3528558488000638420) -->
+    <skip />
+    <!-- no translation found for account_setup_incoming_port_label (5311652277990186704) -->
+    <skip />
+    <!-- no translation found for account_setup_incoming_security_label (1175710992470593691) -->
+    <skip />
     <string name="account_setup_incoming_security_none_label" msgid="8300169413118264895">"Tiada"</string>
     <string name="account_setup_incoming_security_ssl_trust_certificates_label" msgid="6151855090123117538">"SSL/TLS (Terima semua perakuan)"</string>
     <string name="account_setup_incoming_security_ssl_label" msgid="2798501138420163861">"SSL/TLS"</string>
@@ -131,18 +139,25 @@
     <string name="account_setup_incoming_imap_path_prefix_hint" msgid="9190845919067906033">"Pilihan"</string>
     <string name="account_setup_outgoing_title" msgid="7208495965665711539">"Persediaan akaun"</string>
     <string name="account_setup_outgoing_headline" msgid="2025001060935366394">"Tetapan pelayan keluar"</string>
-    <string name="account_setup_outgoing_smtp_server_label" msgid="6035137446691195177">"Pelayan SMTP"</string>
-    <string name="account_setup_outgoing_port_label" msgid="7573207437835827876">"Port"</string>
-    <string name="account_setup_outgoing_security_label" msgid="911398071120720589">"Jenis keselamatan"</string>
+    <!-- no translation found for account_setup_outgoing_smtp_server_label (1164004960070541473) -->
+    <skip />
+    <!-- no translation found for account_setup_outgoing_port_label (4670120792135566784) -->
+    <skip />
+    <!-- no translation found for account_setup_outgoing_security_label (9200220309360082664) -->
+    <skip />
     <string name="account_setup_outgoing_require_login_label" msgid="7779484127897397562">"Memerlukan log masuk"</string>
-    <string name="account_setup_outgoing_username_label" msgid="3309680794731596981">"Nama pengguna"</string>
-    <string name="account_setup_outgoing_password_label" msgid="227844585493317550">"Kata laluan"</string>
-    <string name="account_setup_exchange_certificate_title" msgid="8473793588405277962">"Sijil klien"</string>
+    <!-- no translation found for account_setup_outgoing_username_label (7239411429115525841) -->
+    <skip />
+    <!-- no translation found for account_setup_outgoing_password_label (3720429254654722208) -->
+    <skip />
+    <!-- no translation found for account_setup_exchange_certificate_title (1635140303999054002) -->
+    <skip />
     <string name="account_setup_exchange_select_certificate" msgid="1536103662037268683">"Pilih"</string>
     <string name="account_setup_exchange_use_certificate" msgid="8690682770083161349">"Gunakan sijil klien"</string>
     <string name="account_setup_exchange_remove_certificate" msgid="5633249155510301766">"Alih keluar"</string>
     <string name="account_setup_exchange_no_certificate" msgid="1119542961954780872">"Tiada"</string>
-    <string name="account_setup_exchange_device_id_label" msgid="1646827333223157658">"ID Peranti Mudah Alih"</string>
+    <!-- no translation found for account_setup_exchange_device_id_label (5105898844003459657) -->
+    <skip />
     <string name="account_setup_options_title" msgid="9016600767888846051">"Tetapan akaun"</string>
     <string name="account_setup_options_headline" msgid="4181274232835368085">"Pilihan akaun"</string>
     <string name="account_setup_options_mail_check_frequency_label" msgid="4824859792882810053">"Kekerapan menyemak peti masuk"</string>
diff --git a/res/values-nb/strings.xml b/res/values-nb/strings.xml
index c2ca96774..243d469a6 100644
--- a/res/values-nb/strings.xml
+++ b/res/values-nb/strings.xml
@@ -87,13 +87,13 @@
     <string name="account_setup_basics_email_label" msgid="3454164053624112047">"E-postadresse"</string>
     <string name="or_label" msgid="2207403489755254427">"ELLER"</string>
     <string name="sign_in_with_google" msgid="9051489501495503976">"Logg på med Google"</string>
-    <string name="account_setup_basics_password_label" msgid="9133549799291519298">"Passord"</string>
-    <string name="password_label" msgid="5228754278985667134">"Passord"</string>
+    <string name="account_setup_basics_password_label" msgid="3402762431598148148">"PASSORD"</string>
+    <string name="password_hint" msgid="8835390747504721561">"Passord"</string>
     <string name="signed_in_with_service_label" msgid="4909910797357155961">"Logget på med %s"</string>
-    <string name="authentication_label" msgid="5210804218348191833">"Autentisering"</string>
+    <string name="authentication_label" msgid="6917956186120234602">"AUTENTISERING"</string>
     <string name="add_authentication_label" msgid="865206092644419804">"Legg til autentisering"</string>
     <string name="clear_authentication_label" msgid="8113966442068335059">"Fjern autentiseringen"</string>
-    <string name="account_setup_basics_manual_setup_action" msgid="6640115171889882878"><u>"Konfigurer manuelt"</u></string>
+    <string name="account_setup_basics_manual_setup_action" msgid="8053852205391155912">"Manuelt oppsett"</string>
     <string name="account_setup_username_password_toast" msgid="3968270274727947460">"Angi gyldig e-postadresse og passord."</string>
     <string name="account_duplicate_dlg_title" msgid="8089732986912704425">"Duplisert konto"</string>
     <string name="account_duplicate_dlg_message_fmt" msgid="6447629283679935840">"Du bruker allerede dette brukernavnet for kontoen <xliff:g id="DUPLICATE">%s</xliff:g>."</string>
@@ -114,11 +114,11 @@
     <string name="account_setup_account_type_instructions" msgid="114515540798408760">"Hva slags konto er dette?"</string>
     <string name="account_setup_incoming_title" msgid="6796626791039136005">"Konfigurering av konto"</string>
     <string name="account_setup_incoming_headline" msgid="6183711037633407184">"Tjenerinnstillinger for innkommende e-postmelding"</string>
-    <string name="account_setup_incoming_username_label" msgid="5700581386104070302">"Brukernavn"</string>
-    <string name="account_setup_incoming_password_label" msgid="6365327603172559859">"Passord"</string>
-    <string name="account_setup_incoming_server_label" msgid="1480342966630002638">"Tjener"</string>
-    <string name="account_setup_incoming_port_label" msgid="8214738923690447796">"Port"</string>
-    <string name="account_setup_incoming_security_label" msgid="2110260791086007424">"Sikkerhetstype"</string>
+    <string name="account_setup_incoming_username_label" msgid="406939983633223354">"BRUKERNAVN"</string>
+    <string name="account_setup_incoming_password_label" msgid="634540235479188709">"PASSORD"</string>
+    <string name="account_setup_incoming_server_label" msgid="3528558488000638420">"TJENER"</string>
+    <string name="account_setup_incoming_port_label" msgid="5311652277990186704">"PORT"</string>
+    <string name="account_setup_incoming_security_label" msgid="1175710992470593691">"SIKKERHETSTYPE"</string>
     <string name="account_setup_incoming_security_none_label" msgid="8300169413118264895">"Ingen"</string>
     <string name="account_setup_incoming_security_ssl_trust_certificates_label" msgid="6151855090123117538">"SSL/TLS (Godta alle sertifikater)"</string>
     <string name="account_setup_incoming_security_ssl_label" msgid="2798501138420163861">"SSL/TLS"</string>
@@ -131,18 +131,18 @@
     <string name="account_setup_incoming_imap_path_prefix_hint" msgid="9190845919067906033">"Valgfritt"</string>
     <string name="account_setup_outgoing_title" msgid="7208495965665711539">"Konfigurering av konto"</string>
     <string name="account_setup_outgoing_headline" msgid="2025001060935366394">"Tjenerinnstillinger for utgående e-postmelding"</string>
-    <string name="account_setup_outgoing_smtp_server_label" msgid="6035137446691195177">"SMTP-tjener"</string>
-    <string name="account_setup_outgoing_port_label" msgid="7573207437835827876">"Port"</string>
-    <string name="account_setup_outgoing_security_label" msgid="911398071120720589">"Sikkerhetstype"</string>
+    <string name="account_setup_outgoing_smtp_server_label" msgid="1164004960070541473">"SMTP-TJENER"</string>
+    <string name="account_setup_outgoing_port_label" msgid="4670120792135566784">"PORT"</string>
+    <string name="account_setup_outgoing_security_label" msgid="9200220309360082664">"SIKKERHETSTYPE"</string>
     <string name="account_setup_outgoing_require_login_label" msgid="7779484127897397562">"Krev pålogging"</string>
-    <string name="account_setup_outgoing_username_label" msgid="3309680794731596981">"Brukernavn"</string>
-    <string name="account_setup_outgoing_password_label" msgid="227844585493317550">"Passord"</string>
-    <string name="account_setup_exchange_certificate_title" msgid="8473793588405277962">"Klientsertifikat"</string>
+    <string name="account_setup_outgoing_username_label" msgid="7239411429115525841">"BRUKERNAVN"</string>
+    <string name="account_setup_outgoing_password_label" msgid="3720429254654722208">"PASSORD"</string>
+    <string name="account_setup_exchange_certificate_title" msgid="1635140303999054002">"KLIENTSERTIFIKAT"</string>
     <string name="account_setup_exchange_select_certificate" msgid="1536103662037268683">"Velg"</string>
     <string name="account_setup_exchange_use_certificate" msgid="8690682770083161349">"Bruk klientsertifikat"</string>
     <string name="account_setup_exchange_remove_certificate" msgid="5633249155510301766">"Fjern"</string>
     <string name="account_setup_exchange_no_certificate" msgid="1119542961954780872">"Ingen"</string>
-    <string name="account_setup_exchange_device_id_label" msgid="1646827333223157658">"Mobilenhets-ID"</string>
+    <string name="account_setup_exchange_device_id_label" msgid="5105898844003459657">"MOBILENHETS-ID"</string>
     <string name="account_setup_options_title" msgid="9016600767888846051">"Kontoinnstillinger"</string>
     <string name="account_setup_options_headline" msgid="4181274232835368085">"Alternativer for konto"</string>
     <string name="account_setup_options_mail_check_frequency_label" msgid="4824859792882810053">"Frekvens for kontroll av innboks"</string>
diff --git a/res/values-nl/strings.xml b/res/values-nl/strings.xml
index 93e22f7c9..0787813d3 100644
--- a/res/values-nl/strings.xml
+++ b/res/values-nl/strings.xml
@@ -87,13 +87,13 @@
     <string name="account_setup_basics_email_label" msgid="3454164053624112047">"E-mailadres"</string>
     <string name="or_label" msgid="2207403489755254427">"OF"</string>
     <string name="sign_in_with_google" msgid="9051489501495503976">"Inloggen met Google"</string>
-    <string name="account_setup_basics_password_label" msgid="9133549799291519298">"Wachtwoord"</string>
-    <string name="password_label" msgid="5228754278985667134">"Wachtwoord"</string>
+    <string name="account_setup_basics_password_label" msgid="3402762431598148148">"WACHTWOORD"</string>
+    <string name="password_hint" msgid="8835390747504721561">"Wachtwoord"</string>
     <string name="signed_in_with_service_label" msgid="4909910797357155961">"Ingelogd met %s"</string>
-    <string name="authentication_label" msgid="5210804218348191833">"Verificatie"</string>
+    <string name="authentication_label" msgid="6917956186120234602">"VERIFICATIE"</string>
     <string name="add_authentication_label" msgid="865206092644419804">"Verificatie toevoegen"</string>
     <string name="clear_authentication_label" msgid="8113966442068335059">"Verificatie wissen"</string>
-    <string name="account_setup_basics_manual_setup_action" msgid="6640115171889882878"><u>"Handmatig instellen"</u></string>
+    <string name="account_setup_basics_manual_setup_action" msgid="8053852205391155912">"Handmatig instellen"</string>
     <string name="account_setup_username_password_toast" msgid="3968270274727947460">"Typ een geldig e-mailadres en wachtwoord."</string>
     <string name="account_duplicate_dlg_title" msgid="8089732986912704425">"Dubbel account"</string>
     <string name="account_duplicate_dlg_message_fmt" msgid="6447629283679935840">"U gebruikt deze gebruikersnaam al voor het account \'<xliff:g id="DUPLICATE">%s</xliff:g>\'."</string>
@@ -114,11 +114,11 @@
     <string name="account_setup_account_type_instructions" msgid="114515540798408760">"Welk type account is dit?"</string>
     <string name="account_setup_incoming_title" msgid="6796626791039136005">"Accountinstellingen"</string>
     <string name="account_setup_incoming_headline" msgid="6183711037633407184">"Instellingen voor de inkomende server"</string>
-    <string name="account_setup_incoming_username_label" msgid="5700581386104070302">"Gebruikersnaam"</string>
-    <string name="account_setup_incoming_password_label" msgid="6365327603172559859">"Wachtwoord"</string>
-    <string name="account_setup_incoming_server_label" msgid="1480342966630002638">"Server"</string>
-    <string name="account_setup_incoming_port_label" msgid="8214738923690447796">"Poort"</string>
-    <string name="account_setup_incoming_security_label" msgid="2110260791086007424">"Beveiligingstype"</string>
+    <string name="account_setup_incoming_username_label" msgid="406939983633223354">"GEBRUIKERSNAAM"</string>
+    <string name="account_setup_incoming_password_label" msgid="634540235479188709">"WACHTWOORD"</string>
+    <string name="account_setup_incoming_server_label" msgid="3528558488000638420">"SERVER"</string>
+    <string name="account_setup_incoming_port_label" msgid="5311652277990186704">"POORT"</string>
+    <string name="account_setup_incoming_security_label" msgid="1175710992470593691">"BEVEILIGINGSTYPE"</string>
     <string name="account_setup_incoming_security_none_label" msgid="8300169413118264895">"Geen"</string>
     <string name="account_setup_incoming_security_ssl_trust_certificates_label" msgid="6151855090123117538">"SSL/TLS (Alle certificaten accepteren)"</string>
     <string name="account_setup_incoming_security_ssl_label" msgid="2798501138420163861">"SSL/TLS"</string>
@@ -131,18 +131,18 @@
     <string name="account_setup_incoming_imap_path_prefix_hint" msgid="9190845919067906033">"Optioneel"</string>
     <string name="account_setup_outgoing_title" msgid="7208495965665711539">"Accountinstellingen"</string>
     <string name="account_setup_outgoing_headline" msgid="2025001060935366394">"Instellingen voor de uitgaande server"</string>
-    <string name="account_setup_outgoing_smtp_server_label" msgid="6035137446691195177">"SMTP-server"</string>
-    <string name="account_setup_outgoing_port_label" msgid="7573207437835827876">"Poort"</string>
-    <string name="account_setup_outgoing_security_label" msgid="911398071120720589">"Beveiligingstype"</string>
+    <string name="account_setup_outgoing_smtp_server_label" msgid="1164004960070541473">"SMTP-SERVER"</string>
+    <string name="account_setup_outgoing_port_label" msgid="4670120792135566784">"POORT"</string>
+    <string name="account_setup_outgoing_security_label" msgid="9200220309360082664">"BEVEILIGINGSTYPE"</string>
     <string name="account_setup_outgoing_require_login_label" msgid="7779484127897397562">"Aanmelding vereisen"</string>
-    <string name="account_setup_outgoing_username_label" msgid="3309680794731596981">"Gebruikersnaam"</string>
-    <string name="account_setup_outgoing_password_label" msgid="227844585493317550">"Wachtwoord"</string>
-    <string name="account_setup_exchange_certificate_title" msgid="8473793588405277962">"Clientcertificaat"</string>
+    <string name="account_setup_outgoing_username_label" msgid="7239411429115525841">"GEBRUIKERSNAAM"</string>
+    <string name="account_setup_outgoing_password_label" msgid="3720429254654722208">"WACHTWOORD"</string>
+    <string name="account_setup_exchange_certificate_title" msgid="1635140303999054002">"CLIENTCERTIFICAAT"</string>
     <string name="account_setup_exchange_select_certificate" msgid="1536103662037268683">"Selecteren"</string>
     <string name="account_setup_exchange_use_certificate" msgid="8690682770083161349">"Klantcertificaat gebruiken"</string>
     <string name="account_setup_exchange_remove_certificate" msgid="5633249155510301766">"Verwijderen"</string>
     <string name="account_setup_exchange_no_certificate" msgid="1119542961954780872">"Geen"</string>
-    <string name="account_setup_exchange_device_id_label" msgid="1646827333223157658">"Mobiele apparaat-id"</string>
+    <string name="account_setup_exchange_device_id_label" msgid="5105898844003459657">"MOBIELE APPARAAT-ID"</string>
     <string name="account_setup_options_title" msgid="9016600767888846051">"Accountinstellingen"</string>
     <string name="account_setup_options_headline" msgid="4181274232835368085">"Accountopties"</string>
     <string name="account_setup_options_mail_check_frequency_label" msgid="4824859792882810053">"Controlefrequentie inbox"</string>
diff --git a/res/values-pl/strings.xml b/res/values-pl/strings.xml
index b4023c3c5..e8c8af1c6 100644
--- a/res/values-pl/strings.xml
+++ b/res/values-pl/strings.xml
@@ -87,13 +87,13 @@
     <string name="account_setup_basics_email_label" msgid="3454164053624112047">"Adres e-mail"</string>
     <string name="or_label" msgid="2207403489755254427">"LUB"</string>
     <string name="sign_in_with_google" msgid="9051489501495503976">"Zaloguj się przez Google"</string>
-    <string name="account_setup_basics_password_label" msgid="9133549799291519298">"Hasło"</string>
-    <string name="password_label" msgid="5228754278985667134">"Hasło"</string>
+    <string name="account_setup_basics_password_label" msgid="3402762431598148148">"HASŁO"</string>
+    <string name="password_hint" msgid="8835390747504721561">"Hasło"</string>
     <string name="signed_in_with_service_label" msgid="4909910797357155961">"Jesteś zalogowany w %s"</string>
-    <string name="authentication_label" msgid="5210804218348191833">"Uwierzytelnianie"</string>
+    <string name="authentication_label" msgid="6917956186120234602">"UWIERZYTELNIANIE"</string>
     <string name="add_authentication_label" msgid="865206092644419804">"Dodaj uwierzytelnianie"</string>
     <string name="clear_authentication_label" msgid="8113966442068335059">"Wyczyść uwierzytelnianie"</string>
-    <string name="account_setup_basics_manual_setup_action" msgid="6640115171889882878"><u>"Konfiguracja ręczna"</u></string>
+    <string name="account_setup_basics_manual_setup_action" msgid="8053852205391155912">"Konfig. ręczna"</string>
     <string name="account_setup_username_password_toast" msgid="3968270274727947460">"Wpisz prawidłowy adres e-mail i hasło."</string>
     <string name="account_duplicate_dlg_title" msgid="8089732986912704425">"Zduplikowane konto"</string>
     <string name="account_duplicate_dlg_message_fmt" msgid="6447629283679935840">"Używasz już tej nazwy użytkownika na koncie „<xliff:g id="DUPLICATE">%s</xliff:g>”."</string>
@@ -114,11 +114,11 @@
     <string name="account_setup_account_type_instructions" msgid="114515540798408760">"Jakiego typu jest to konto?"</string>
     <string name="account_setup_incoming_title" msgid="6796626791039136005">"Konfiguracja konta"</string>
     <string name="account_setup_incoming_headline" msgid="6183711037633407184">"Ustawienia serwera poczty przychodzącej"</string>
-    <string name="account_setup_incoming_username_label" msgid="5700581386104070302">"Nazwa użytkownika"</string>
-    <string name="account_setup_incoming_password_label" msgid="6365327603172559859">"Hasło"</string>
-    <string name="account_setup_incoming_server_label" msgid="1480342966630002638">"Serwer"</string>
-    <string name="account_setup_incoming_port_label" msgid="8214738923690447796">"Port"</string>
-    <string name="account_setup_incoming_security_label" msgid="2110260791086007424">"Typ zabezpieczeń"</string>
+    <string name="account_setup_incoming_username_label" msgid="406939983633223354">"NAZWA UŻYTKOWNIKA"</string>
+    <string name="account_setup_incoming_password_label" msgid="634540235479188709">"HASŁO"</string>
+    <string name="account_setup_incoming_server_label" msgid="3528558488000638420">"SERWER"</string>
+    <string name="account_setup_incoming_port_label" msgid="5311652277990186704">"PORT"</string>
+    <string name="account_setup_incoming_security_label" msgid="1175710992470593691">"TYP ZABEZPIECZEŃ"</string>
     <string name="account_setup_incoming_security_none_label" msgid="8300169413118264895">"Brak"</string>
     <string name="account_setup_incoming_security_ssl_trust_certificates_label" msgid="6151855090123117538">"SSL/TLS (akceptuj wszystkie certyfikaty)"</string>
     <string name="account_setup_incoming_security_ssl_label" msgid="2798501138420163861">"SSL/TLS"</string>
@@ -131,18 +131,18 @@
     <string name="account_setup_incoming_imap_path_prefix_hint" msgid="9190845919067906033">"Opcjonalnie"</string>
     <string name="account_setup_outgoing_title" msgid="7208495965665711539">"Konfiguracja konta"</string>
     <string name="account_setup_outgoing_headline" msgid="2025001060935366394">"Ustawienia serwera poczty wychodzącej"</string>
-    <string name="account_setup_outgoing_smtp_server_label" msgid="6035137446691195177">"Serwer SMTP"</string>
-    <string name="account_setup_outgoing_port_label" msgid="7573207437835827876">"Port"</string>
-    <string name="account_setup_outgoing_security_label" msgid="911398071120720589">"Typ zabezpieczeń"</string>
+    <string name="account_setup_outgoing_smtp_server_label" msgid="1164004960070541473">"SERWER SMTP"</string>
+    <string name="account_setup_outgoing_port_label" msgid="4670120792135566784">"PORT"</string>
+    <string name="account_setup_outgoing_security_label" msgid="9200220309360082664">"TYP ZABEZPIECZEŃ"</string>
     <string name="account_setup_outgoing_require_login_label" msgid="7779484127897397562">"Wymagaj logowania"</string>
-    <string name="account_setup_outgoing_username_label" msgid="3309680794731596981">"Nazwa użytkownika"</string>
-    <string name="account_setup_outgoing_password_label" msgid="227844585493317550">"Hasło"</string>
-    <string name="account_setup_exchange_certificate_title" msgid="8473793588405277962">"Certyfikat klienta"</string>
+    <string name="account_setup_outgoing_username_label" msgid="7239411429115525841">"NAZWA UŻYTKOWNIKA"</string>
+    <string name="account_setup_outgoing_password_label" msgid="3720429254654722208">"HASŁO"</string>
+    <string name="account_setup_exchange_certificate_title" msgid="1635140303999054002">"CERTYFIKAT KLIENTA"</string>
     <string name="account_setup_exchange_select_certificate" msgid="1536103662037268683">"Wybierz"</string>
     <string name="account_setup_exchange_use_certificate" msgid="8690682770083161349">"Użyj certyfikatu klienta"</string>
     <string name="account_setup_exchange_remove_certificate" msgid="5633249155510301766">"Usuń"</string>
     <string name="account_setup_exchange_no_certificate" msgid="1119542961954780872">"Brak"</string>
-    <string name="account_setup_exchange_device_id_label" msgid="1646827333223157658">"Identyfikator urządzenia"</string>
+    <string name="account_setup_exchange_device_id_label" msgid="5105898844003459657">"ID URZĄDZENIA MOBILNEGO"</string>
     <string name="account_setup_options_title" msgid="9016600767888846051">"Ustawienia konta"</string>
     <string name="account_setup_options_headline" msgid="4181274232835368085">"Opcje konta"</string>
     <string name="account_setup_options_mail_check_frequency_label" msgid="4824859792882810053">"Sprawdzaj pocztę"</string>
diff --git a/res/values-pt-rPT/strings.xml b/res/values-pt-rPT/strings.xml
index 355dc1015..063c8cec6 100644
--- a/res/values-pt-rPT/strings.xml
+++ b/res/values-pt-rPT/strings.xml
@@ -87,13 +87,13 @@
     <string name="account_setup_basics_email_label" msgid="3454164053624112047">"Endereço de email"</string>
     <string name="or_label" msgid="2207403489755254427">"OU"</string>
     <string name="sign_in_with_google" msgid="9051489501495503976">"Iniciar sessão com o Google"</string>
-    <string name="account_setup_basics_password_label" msgid="9133549799291519298">"Palavra-passe"</string>
-    <string name="password_label" msgid="5228754278985667134">"Palavra-passe"</string>
+    <string name="account_setup_basics_password_label" msgid="3402762431598148148">"PALAVRA-PASSE"</string>
+    <string name="password_hint" msgid="8835390747504721561">"Palavra-passe"</string>
     <string name="signed_in_with_service_label" msgid="4909910797357155961">"Sessão iniciada com o %s"</string>
-    <string name="authentication_label" msgid="5210804218348191833">"Autenticação"</string>
+    <string name="authentication_label" msgid="6917956186120234602">"AUTENTICAÇÃO"</string>
     <string name="add_authentication_label" msgid="865206092644419804">"Adicionar autenticação"</string>
     <string name="clear_authentication_label" msgid="8113966442068335059">"Limpar autenticação"</string>
-    <string name="account_setup_basics_manual_setup_action" msgid="6640115171889882878"><u>"Configuração manual"</u></string>
+    <string name="account_setup_basics_manual_setup_action" msgid="8053852205391155912">"Configuração manual"</string>
     <string name="account_setup_username_password_toast" msgid="3968270274727947460">"Introduza um endereço de e-mail e palavra-passe válidos."</string>
     <string name="account_duplicate_dlg_title" msgid="8089732986912704425">"Conta duplicada"</string>
     <string name="account_duplicate_dlg_message_fmt" msgid="6447629283679935840">"Este nome de utilizador já está a ser utilizado para a conta “<xliff:g id="DUPLICATE">%s</xliff:g>”."</string>
@@ -114,11 +114,11 @@
     <string name="account_setup_account_type_instructions" msgid="114515540798408760">"Que tipo de conta é este?"</string>
     <string name="account_setup_incoming_title" msgid="6796626791039136005">"Configuração da conta"</string>
     <string name="account_setup_incoming_headline" msgid="6183711037633407184">"Definições do servidor de recepção"</string>
-    <string name="account_setup_incoming_username_label" msgid="5700581386104070302">"Nome de utilizador"</string>
-    <string name="account_setup_incoming_password_label" msgid="6365327603172559859">"Palavra-passe"</string>
-    <string name="account_setup_incoming_server_label" msgid="1480342966630002638">"Servidor"</string>
-    <string name="account_setup_incoming_port_label" msgid="8214738923690447796">"Porta"</string>
-    <string name="account_setup_incoming_security_label" msgid="2110260791086007424">"Tipo de segurança"</string>
+    <string name="account_setup_incoming_username_label" msgid="406939983633223354">"NOME DE UTILIZADOR"</string>
+    <string name="account_setup_incoming_password_label" msgid="634540235479188709">"PALAVRA-PASSE"</string>
+    <string name="account_setup_incoming_server_label" msgid="3528558488000638420">"SERVIDOR"</string>
+    <string name="account_setup_incoming_port_label" msgid="5311652277990186704">"PORTA"</string>
+    <string name="account_setup_incoming_security_label" msgid="1175710992470593691">"TIPO DE SEGURANÇA"</string>
     <string name="account_setup_incoming_security_none_label" msgid="8300169413118264895">"Nenhuma"</string>
     <string name="account_setup_incoming_security_ssl_trust_certificates_label" msgid="6151855090123117538">"SSL/TLS (Aceitar todos os certificados)"</string>
     <string name="account_setup_incoming_security_ssl_label" msgid="2798501138420163861">"SSL/TLS"</string>
@@ -131,18 +131,18 @@
     <string name="account_setup_incoming_imap_path_prefix_hint" msgid="9190845919067906033">"Opcional"</string>
     <string name="account_setup_outgoing_title" msgid="7208495965665711539">"Configuração da conta"</string>
     <string name="account_setup_outgoing_headline" msgid="2025001060935366394">"Definições de servidor de envio"</string>
-    <string name="account_setup_outgoing_smtp_server_label" msgid="6035137446691195177">"Servidor SMTP"</string>
-    <string name="account_setup_outgoing_port_label" msgid="7573207437835827876">"Porta"</string>
-    <string name="account_setup_outgoing_security_label" msgid="911398071120720589">"Tipo de segurança"</string>
+    <string name="account_setup_outgoing_smtp_server_label" msgid="1164004960070541473">"SERVIDOR SMTP"</string>
+    <string name="account_setup_outgoing_port_label" msgid="4670120792135566784">"PORTA"</string>
+    <string name="account_setup_outgoing_security_label" msgid="9200220309360082664">"TIPO DE SEGURANÇA"</string>
     <string name="account_setup_outgoing_require_login_label" msgid="7779484127897397562">"Requerer início de sessão"</string>
-    <string name="account_setup_outgoing_username_label" msgid="3309680794731596981">"Nome de utilizador"</string>
-    <string name="account_setup_outgoing_password_label" msgid="227844585493317550">"Palavra-passe"</string>
-    <string name="account_setup_exchange_certificate_title" msgid="8473793588405277962">"Certificado do cliente"</string>
+    <string name="account_setup_outgoing_username_label" msgid="7239411429115525841">"NOME DO UTILIZADOR"</string>
+    <string name="account_setup_outgoing_password_label" msgid="3720429254654722208">"PALAVRA-PASSE"</string>
+    <string name="account_setup_exchange_certificate_title" msgid="1635140303999054002">"CERTIFICADO CLIENTE"</string>
     <string name="account_setup_exchange_select_certificate" msgid="1536103662037268683">"Selecionar"</string>
     <string name="account_setup_exchange_use_certificate" msgid="8690682770083161349">"Utilizar certificado de cliente"</string>
     <string name="account_setup_exchange_remove_certificate" msgid="5633249155510301766">"Remover"</string>
     <string name="account_setup_exchange_no_certificate" msgid="1119542961954780872">"Nenhum"</string>
-    <string name="account_setup_exchange_device_id_label" msgid="1646827333223157658">"ID do dispositivo móvel"</string>
+    <string name="account_setup_exchange_device_id_label" msgid="5105898844003459657">"ID DO DISPOSITIVO MÓVEL"</string>
     <string name="account_setup_options_title" msgid="9016600767888846051">"Definições da conta"</string>
     <string name="account_setup_options_headline" msgid="4181274232835368085">"Opções da conta"</string>
     <string name="account_setup_options_mail_check_frequency_label" msgid="4824859792882810053">"Frequência de verificação de caixa de entrada"</string>
diff --git a/res/values-pt/strings.xml b/res/values-pt/strings.xml
index f1d4db2b2..ca950c8b5 100644
--- a/res/values-pt/strings.xml
+++ b/res/values-pt/strings.xml
@@ -87,13 +87,16 @@
     <string name="account_setup_basics_email_label" msgid="3454164053624112047">"Endereço de e-mail"</string>
     <string name="or_label" msgid="2207403489755254427">"OU"</string>
     <string name="sign_in_with_google" msgid="9051489501495503976">"Fazer login com o Google"</string>
-    <string name="account_setup_basics_password_label" msgid="9133549799291519298">"Senha"</string>
-    <string name="password_label" msgid="5228754278985667134">"Senha"</string>
+    <!-- no translation found for account_setup_basics_password_label (3402762431598148148) -->
+    <skip />
+    <!-- no translation found for password_hint (8835390747504721561) -->
+    <skip />
     <string name="signed_in_with_service_label" msgid="4909910797357155961">"Conectado com o %s"</string>
-    <string name="authentication_label" msgid="5210804218348191833">"Autenticação"</string>
+    <!-- no translation found for authentication_label (6917956186120234602) -->
+    <skip />
     <string name="add_authentication_label" msgid="865206092644419804">"Adicionar autenticação"</string>
     <string name="clear_authentication_label" msgid="8113966442068335059">"Limpar autenticação"</string>
-    <string name="account_setup_basics_manual_setup_action" msgid="6640115171889882878"><u>"Configuração manual"</u></string>
+    <string name="account_setup_basics_manual_setup_action" msgid="8053852205391155912">"Configuração manual"</string>
     <string name="account_setup_username_password_toast" msgid="3968270274727947460">"Digite um endereço de e-mail e senha válidos."</string>
     <string name="account_duplicate_dlg_title" msgid="8089732986912704425">"Conta duplicada"</string>
     <string name="account_duplicate_dlg_message_fmt" msgid="6447629283679935840">"Você já está usando este nome de usuário para a conta \"<xliff:g id="DUPLICATE">%s</xliff:g>\"."</string>
@@ -114,11 +117,16 @@
     <string name="account_setup_account_type_instructions" msgid="114515540798408760">"Que tipo de conta é esta?"</string>
     <string name="account_setup_incoming_title" msgid="6796626791039136005">"Configuração da conta"</string>
     <string name="account_setup_incoming_headline" msgid="6183711037633407184">"Configurações de entrada do servidor"</string>
-    <string name="account_setup_incoming_username_label" msgid="5700581386104070302">"Nome de usuário"</string>
-    <string name="account_setup_incoming_password_label" msgid="6365327603172559859">"Senha"</string>
-    <string name="account_setup_incoming_server_label" msgid="1480342966630002638">"Servidor"</string>
-    <string name="account_setup_incoming_port_label" msgid="8214738923690447796">"Porta"</string>
-    <string name="account_setup_incoming_security_label" msgid="2110260791086007424">"Tipo de segurança"</string>
+    <!-- no translation found for account_setup_incoming_username_label (406939983633223354) -->
+    <skip />
+    <!-- no translation found for account_setup_incoming_password_label (634540235479188709) -->
+    <skip />
+    <!-- no translation found for account_setup_incoming_server_label (3528558488000638420) -->
+    <skip />
+    <!-- no translation found for account_setup_incoming_port_label (5311652277990186704) -->
+    <skip />
+    <!-- no translation found for account_setup_incoming_security_label (1175710992470593691) -->
+    <skip />
     <string name="account_setup_incoming_security_none_label" msgid="8300169413118264895">"Nenhum"</string>
     <string name="account_setup_incoming_security_ssl_trust_certificates_label" msgid="6151855090123117538">"SSL/TLS (Aceitar todos os certificados)"</string>
     <string name="account_setup_incoming_security_ssl_label" msgid="2798501138420163861">"SSL/TLS"</string>
@@ -131,18 +139,25 @@
     <string name="account_setup_incoming_imap_path_prefix_hint" msgid="9190845919067906033">"Opcional"</string>
     <string name="account_setup_outgoing_title" msgid="7208495965665711539">"Configuração da conta"</string>
     <string name="account_setup_outgoing_headline" msgid="2025001060935366394">"Configurações de saída do servidor"</string>
-    <string name="account_setup_outgoing_smtp_server_label" msgid="6035137446691195177">"Servidor SMTP"</string>
-    <string name="account_setup_outgoing_port_label" msgid="7573207437835827876">"Porta"</string>
-    <string name="account_setup_outgoing_security_label" msgid="911398071120720589">"Tipo de segurança"</string>
+    <!-- no translation found for account_setup_outgoing_smtp_server_label (1164004960070541473) -->
+    <skip />
+    <!-- no translation found for account_setup_outgoing_port_label (4670120792135566784) -->
+    <skip />
+    <!-- no translation found for account_setup_outgoing_security_label (9200220309360082664) -->
+    <skip />
     <string name="account_setup_outgoing_require_login_label" msgid="7779484127897397562">"Exigir login"</string>
-    <string name="account_setup_outgoing_username_label" msgid="3309680794731596981">"Nome de usuário"</string>
-    <string name="account_setup_outgoing_password_label" msgid="227844585493317550">"Senha"</string>
-    <string name="account_setup_exchange_certificate_title" msgid="8473793588405277962">"Certificado do cliente"</string>
+    <!-- no translation found for account_setup_outgoing_username_label (7239411429115525841) -->
+    <skip />
+    <!-- no translation found for account_setup_outgoing_password_label (3720429254654722208) -->
+    <skip />
+    <!-- no translation found for account_setup_exchange_certificate_title (1635140303999054002) -->
+    <skip />
     <string name="account_setup_exchange_select_certificate" msgid="1536103662037268683">"Selecionar"</string>
     <string name="account_setup_exchange_use_certificate" msgid="8690682770083161349">"Usar certificado de cliente"</string>
     <string name="account_setup_exchange_remove_certificate" msgid="5633249155510301766">"Remover"</string>
     <string name="account_setup_exchange_no_certificate" msgid="1119542961954780872">"Nenhum"</string>
-    <string name="account_setup_exchange_device_id_label" msgid="1646827333223157658">"ID do aparelho celular"</string>
+    <!-- no translation found for account_setup_exchange_device_id_label (5105898844003459657) -->
+    <skip />
     <string name="account_setup_options_title" msgid="9016600767888846051">"Configurações da conta"</string>
     <string name="account_setup_options_headline" msgid="4181274232835368085">"Opções da conta"</string>
     <string name="account_setup_options_mail_check_frequency_label" msgid="4824859792882810053">"Frequência de verificação da caixa de entrada"</string>
diff --git a/res/values-rm/strings.xml b/res/values-rm/strings.xml
index 0401ce074..280e5bf05 100644
--- a/res/values-rm/strings.xml
+++ b/res/values-rm/strings.xml
@@ -121,20 +121,19 @@
     <skip />
     <!-- no translation found for sign_in_with_google (9051489501495503976) -->
     <skip />
-    <!-- no translation found for account_setup_basics_password_label (9133549799291519298) -->
+    <!-- no translation found for account_setup_basics_password_label (3402762431598148148) -->
     <skip />
-    <!-- no translation found for password_label (5228754278985667134) -->
+    <!-- no translation found for password_hint (8835390747504721561) -->
     <skip />
     <!-- no translation found for signed_in_with_service_label (4909910797357155961) -->
     <skip />
-    <!-- no translation found for authentication_label (5210804218348191833) -->
+    <!-- no translation found for authentication_label (6917956186120234602) -->
     <skip />
     <!-- no translation found for add_authentication_label (865206092644419804) -->
     <skip />
     <!-- no translation found for clear_authentication_label (8113966442068335059) -->
     <skip />
-    <!-- no translation found for account_setup_basics_manual_setup_action (6640115171889882878) -->
-    <skip />
+    <string name="account_setup_basics_manual_setup_action" msgid="8053852205391155912">"Configuraziun manuala"</string>
     <!-- no translation found for account_setup_username_password_toast (3968270274727947460) -->
     <skip />
     <!-- no translation found for account_duplicate_dlg_title (8089732986912704425) -->
@@ -171,12 +170,16 @@
     <skip />
     <!-- no translation found for account_setup_incoming_headline (6183711037633407184) -->
     <skip />
-    <string name="account_setup_incoming_username_label" msgid="5700581386104070302">"Num d\'utilisader"</string>
-    <string name="account_setup_incoming_password_label" msgid="6365327603172559859">"Pled-clav"</string>
-    <!-- no translation found for account_setup_incoming_server_label (1480342966630002638) -->
+    <!-- no translation found for account_setup_incoming_username_label (406939983633223354) -->
+    <skip />
+    <!-- no translation found for account_setup_incoming_password_label (634540235479188709) -->
+    <skip />
+    <!-- no translation found for account_setup_incoming_server_label (3528558488000638420) -->
+    <skip />
+    <!-- no translation found for account_setup_incoming_port_label (5311652277990186704) -->
+    <skip />
+    <!-- no translation found for account_setup_incoming_security_label (1175710992470593691) -->
     <skip />
-    <string name="account_setup_incoming_port_label" msgid="8214738923690447796">"Port"</string>
-    <string name="account_setup_incoming_security_label" msgid="2110260791086007424">"Tip da segirezza"</string>
     <string name="account_setup_incoming_security_none_label" msgid="8300169413118264895">"Nagin"</string>
     <!-- no translation found for account_setup_incoming_security_ssl_trust_certificates_label (6151855090123117538) -->
     <skip />
@@ -195,14 +198,19 @@
     <skip />
     <!-- no translation found for account_setup_outgoing_headline (2025001060935366394) -->
     <skip />
-    <string name="account_setup_outgoing_smtp_server_label" msgid="6035137446691195177">"Server SMTP"</string>
-    <string name="account_setup_outgoing_port_label" msgid="7573207437835827876">"Port"</string>
-    <string name="account_setup_outgoing_security_label" msgid="911398071120720589">"Tip da segirezza"</string>
+    <!-- no translation found for account_setup_outgoing_smtp_server_label (1164004960070541473) -->
+    <skip />
+    <!-- no translation found for account_setup_outgoing_port_label (4670120792135566784) -->
+    <skip />
+    <!-- no translation found for account_setup_outgoing_security_label (9200220309360082664) -->
+    <skip />
     <!-- no translation found for account_setup_outgoing_require_login_label (7779484127897397562) -->
     <skip />
-    <string name="account_setup_outgoing_username_label" msgid="3309680794731596981">"Num d\'utilisader"</string>
-    <string name="account_setup_outgoing_password_label" msgid="227844585493317550">"Pled-clav"</string>
-    <!-- no translation found for account_setup_exchange_certificate_title (8473793588405277962) -->
+    <!-- no translation found for account_setup_outgoing_username_label (7239411429115525841) -->
+    <skip />
+    <!-- no translation found for account_setup_outgoing_password_label (3720429254654722208) -->
+    <skip />
+    <!-- no translation found for account_setup_exchange_certificate_title (1635140303999054002) -->
     <skip />
     <!-- no translation found for account_setup_exchange_select_certificate (1536103662037268683) -->
     <skip />
@@ -212,7 +220,8 @@
     <skip />
     <!-- no translation found for account_setup_exchange_no_certificate (1119542961954780872) -->
     <skip />
-    <string name="account_setup_exchange_device_id_label" msgid="1646827333223157658">"ID dad apparats mobils"</string>
+    <!-- no translation found for account_setup_exchange_device_id_label (5105898844003459657) -->
+    <skip />
     <!-- no translation found for account_setup_options_title (9016600767888846051) -->
     <skip />
     <!-- no translation found for account_setup_options_headline (4181274232835368085) -->
diff --git a/res/values-ro/strings.xml b/res/values-ro/strings.xml
index c569164d3..7b041499c 100644
--- a/res/values-ro/strings.xml
+++ b/res/values-ro/strings.xml
@@ -87,13 +87,16 @@
     <string name="account_setup_basics_email_label" msgid="3454164053624112047">"Adresă de e-mail"</string>
     <string name="or_label" msgid="2207403489755254427">"SAU"</string>
     <string name="sign_in_with_google" msgid="9051489501495503976">"Conectați-vă cu Google"</string>
-    <string name="account_setup_basics_password_label" msgid="9133549799291519298">"Parolă"</string>
-    <string name="password_label" msgid="5228754278985667134">"Parolă"</string>
+    <!-- no translation found for account_setup_basics_password_label (3402762431598148148) -->
+    <skip />
+    <!-- no translation found for password_hint (8835390747504721561) -->
+    <skip />
     <string name="signed_in_with_service_label" msgid="4909910797357155961">"Conectat(ă) cu %s"</string>
-    <string name="authentication_label" msgid="5210804218348191833">"Autentificare"</string>
+    <!-- no translation found for authentication_label (6917956186120234602) -->
+    <skip />
     <string name="add_authentication_label" msgid="865206092644419804">"Adăugați autentificare"</string>
     <string name="clear_authentication_label" msgid="8113966442068335059">"Ștergeți autentificarea"</string>
-    <string name="account_setup_basics_manual_setup_action" msgid="6640115171889882878"><u>"Configurare manuală"</u></string>
+    <string name="account_setup_basics_manual_setup_action" msgid="8053852205391155912">"Configurare manuală"</string>
     <string name="account_setup_username_password_toast" msgid="3968270274727947460">"Introduceţi o adresă de e-mail şi o parolă valide."</string>
     <string name="account_duplicate_dlg_title" msgid="8089732986912704425">"Cont duplicat"</string>
     <string name="account_duplicate_dlg_message_fmt" msgid="6447629283679935840">"Utilizaţi deja acest nume de utilizator pentru contul „<xliff:g id="DUPLICATE">%s</xliff:g>”."</string>
@@ -114,11 +117,16 @@
     <string name="account_setup_account_type_instructions" msgid="114515540798408760">"Ce tip de cont este acesta?"</string>
     <string name="account_setup_incoming_title" msgid="6796626791039136005">"Configurare cont"</string>
     <string name="account_setup_incoming_headline" msgid="6183711037633407184">"Setări pentru serverul de mesaje de intrare"</string>
-    <string name="account_setup_incoming_username_label" msgid="5700581386104070302">"Nume de utilizator"</string>
-    <string name="account_setup_incoming_password_label" msgid="6365327603172559859">"Parolă"</string>
-    <string name="account_setup_incoming_server_label" msgid="1480342966630002638">"Server"</string>
-    <string name="account_setup_incoming_port_label" msgid="8214738923690447796">"Port"</string>
-    <string name="account_setup_incoming_security_label" msgid="2110260791086007424">"Tipul de securitate"</string>
+    <!-- no translation found for account_setup_incoming_username_label (406939983633223354) -->
+    <skip />
+    <!-- no translation found for account_setup_incoming_password_label (634540235479188709) -->
+    <skip />
+    <!-- no translation found for account_setup_incoming_server_label (3528558488000638420) -->
+    <skip />
+    <!-- no translation found for account_setup_incoming_port_label (5311652277990186704) -->
+    <skip />
+    <!-- no translation found for account_setup_incoming_security_label (1175710992470593691) -->
+    <skip />
     <string name="account_setup_incoming_security_none_label" msgid="8300169413118264895">"Niciunul"</string>
     <string name="account_setup_incoming_security_ssl_trust_certificates_label" msgid="6151855090123117538">"SSL/TLS (Acceptaţi toate certificatele)"</string>
     <string name="account_setup_incoming_security_ssl_label" msgid="2798501138420163861">"SSL/TLS"</string>
@@ -131,18 +139,25 @@
     <string name="account_setup_incoming_imap_path_prefix_hint" msgid="9190845919067906033">"Opţional"</string>
     <string name="account_setup_outgoing_title" msgid="7208495965665711539">"Configurare cont"</string>
     <string name="account_setup_outgoing_headline" msgid="2025001060935366394">"Setări pentru serverul de mesaje de ieşire"</string>
-    <string name="account_setup_outgoing_smtp_server_label" msgid="6035137446691195177">"Server SMTP"</string>
-    <string name="account_setup_outgoing_port_label" msgid="7573207437835827876">"Port"</string>
-    <string name="account_setup_outgoing_security_label" msgid="911398071120720589">"Tipul de securitate"</string>
+    <!-- no translation found for account_setup_outgoing_smtp_server_label (1164004960070541473) -->
+    <skip />
+    <!-- no translation found for account_setup_outgoing_port_label (4670120792135566784) -->
+    <skip />
+    <!-- no translation found for account_setup_outgoing_security_label (9200220309360082664) -->
+    <skip />
     <string name="account_setup_outgoing_require_login_label" msgid="7779484127897397562">"Necesită conectare"</string>
-    <string name="account_setup_outgoing_username_label" msgid="3309680794731596981">"Nume de utilizator"</string>
-    <string name="account_setup_outgoing_password_label" msgid="227844585493317550">"Parolă"</string>
-    <string name="account_setup_exchange_certificate_title" msgid="8473793588405277962">"Certificat client"</string>
+    <!-- no translation found for account_setup_outgoing_username_label (7239411429115525841) -->
+    <skip />
+    <!-- no translation found for account_setup_outgoing_password_label (3720429254654722208) -->
+    <skip />
+    <!-- no translation found for account_setup_exchange_certificate_title (1635140303999054002) -->
+    <skip />
     <string name="account_setup_exchange_select_certificate" msgid="1536103662037268683">"Selectaţi"</string>
     <string name="account_setup_exchange_use_certificate" msgid="8690682770083161349">"Utilizaţi certificatul de client"</string>
     <string name="account_setup_exchange_remove_certificate" msgid="5633249155510301766">"Eliminaţi"</string>
     <string name="account_setup_exchange_no_certificate" msgid="1119542961954780872">"Niciunul"</string>
-    <string name="account_setup_exchange_device_id_label" msgid="1646827333223157658">"ID dispozitiv mobil"</string>
+    <!-- no translation found for account_setup_exchange_device_id_label (5105898844003459657) -->
+    <skip />
     <string name="account_setup_options_title" msgid="9016600767888846051">"Setări cont"</string>
     <string name="account_setup_options_headline" msgid="4181274232835368085">"Opţiunile contului"</string>
     <string name="account_setup_options_mail_check_frequency_label" msgid="4824859792882810053">"Frecvenţa verificării mesajelor primite"</string>
diff --git a/res/values-ru/strings.xml b/res/values-ru/strings.xml
index dea0bafcb..d246bbd05 100644
--- a/res/values-ru/strings.xml
+++ b/res/values-ru/strings.xml
@@ -87,13 +87,16 @@
     <string name="account_setup_basics_email_label" msgid="3454164053624112047">"Адрес электронной почты"</string>
     <string name="or_label" msgid="2207403489755254427">"ИЛИ"</string>
     <string name="sign_in_with_google" msgid="9051489501495503976">"Войти в аккаунт Google"</string>
-    <string name="account_setup_basics_password_label" msgid="9133549799291519298">"Пароль"</string>
-    <string name="password_label" msgid="5228754278985667134">"Пароль"</string>
+    <!-- no translation found for account_setup_basics_password_label (3402762431598148148) -->
+    <skip />
+    <!-- no translation found for password_hint (8835390747504721561) -->
+    <skip />
     <string name="signed_in_with_service_label" msgid="4909910797357155961">"Выполнен вход в аккаунт %s"</string>
-    <string name="authentication_label" msgid="5210804218348191833">"Аутентификация"</string>
+    <!-- no translation found for authentication_label (6917956186120234602) -->
+    <skip />
     <string name="add_authentication_label" msgid="865206092644419804">"Добавить проверку подлинности"</string>
     <string name="clear_authentication_label" msgid="8113966442068335059">"Отключить проверку подлинности"</string>
-    <string name="account_setup_basics_manual_setup_action" msgid="6640115171889882878"><u>"Ручная настройка"</u></string>
+    <string name="account_setup_basics_manual_setup_action" msgid="8053852205391155912">"Вручную"</string>
     <string name="account_setup_username_password_toast" msgid="3968270274727947460">"Введите действительный адрес электронной почты и пароль."</string>
     <string name="account_duplicate_dlg_title" msgid="8089732986912704425">"Копировать аккаунт"</string>
     <string name="account_duplicate_dlg_message_fmt" msgid="6447629283679935840">"Это имя уже используется в аккаунте \"<xliff:g id="DUPLICATE">%s</xliff:g>\"."</string>
@@ -114,11 +117,16 @@
     <string name="account_setup_account_type_instructions" msgid="114515540798408760">"Выберите тип аккаунта"</string>
     <string name="account_setup_incoming_title" msgid="6796626791039136005">"Настройка аккаунта"</string>
     <string name="account_setup_incoming_headline" msgid="6183711037633407184">"Настройки сервера входящей почты"</string>
-    <string name="account_setup_incoming_username_label" msgid="5700581386104070302">"Имя пользователя"</string>
-    <string name="account_setup_incoming_password_label" msgid="6365327603172559859">"Пароль"</string>
-    <string name="account_setup_incoming_server_label" msgid="1480342966630002638">"Сервер"</string>
-    <string name="account_setup_incoming_port_label" msgid="8214738923690447796">"Порт"</string>
-    <string name="account_setup_incoming_security_label" msgid="2110260791086007424">"Тип безопасности"</string>
+    <!-- no translation found for account_setup_incoming_username_label (406939983633223354) -->
+    <skip />
+    <!-- no translation found for account_setup_incoming_password_label (634540235479188709) -->
+    <skip />
+    <!-- no translation found for account_setup_incoming_server_label (3528558488000638420) -->
+    <skip />
+    <!-- no translation found for account_setup_incoming_port_label (5311652277990186704) -->
+    <skip />
+    <!-- no translation found for account_setup_incoming_security_label (1175710992470593691) -->
+    <skip />
     <string name="account_setup_incoming_security_none_label" msgid="8300169413118264895">"Нет"</string>
     <string name="account_setup_incoming_security_ssl_trust_certificates_label" msgid="6151855090123117538">"SSL/TLS (принимать все сертификаты)"</string>
     <string name="account_setup_incoming_security_ssl_label" msgid="2798501138420163861">"SSL/TLS"</string>
@@ -131,18 +139,25 @@
     <string name="account_setup_incoming_imap_path_prefix_hint" msgid="9190845919067906033">"По желанию"</string>
     <string name="account_setup_outgoing_title" msgid="7208495965665711539">"Настройка аккаунта"</string>
     <string name="account_setup_outgoing_headline" msgid="2025001060935366394">"Настройки сервера исходящих сообщений"</string>
-    <string name="account_setup_outgoing_smtp_server_label" msgid="6035137446691195177">"Сервер SMTP"</string>
-    <string name="account_setup_outgoing_port_label" msgid="7573207437835827876">"Порт"</string>
-    <string name="account_setup_outgoing_security_label" msgid="911398071120720589">"Тип безопасности"</string>
+    <!-- no translation found for account_setup_outgoing_smtp_server_label (1164004960070541473) -->
+    <skip />
+    <!-- no translation found for account_setup_outgoing_port_label (4670120792135566784) -->
+    <skip />
+    <!-- no translation found for account_setup_outgoing_security_label (9200220309360082664) -->
+    <skip />
     <string name="account_setup_outgoing_require_login_label" msgid="7779484127897397562">"Выполнять вход в систему"</string>
-    <string name="account_setup_outgoing_username_label" msgid="3309680794731596981">"Имя пользователя"</string>
-    <string name="account_setup_outgoing_password_label" msgid="227844585493317550">"Пароль"</string>
-    <string name="account_setup_exchange_certificate_title" msgid="8473793588405277962">"Сертификат клиента"</string>
+    <!-- no translation found for account_setup_outgoing_username_label (7239411429115525841) -->
+    <skip />
+    <!-- no translation found for account_setup_outgoing_password_label (3720429254654722208) -->
+    <skip />
+    <!-- no translation found for account_setup_exchange_certificate_title (1635140303999054002) -->
+    <skip />
     <string name="account_setup_exchange_select_certificate" msgid="1536103662037268683">"Выбрать"</string>
     <string name="account_setup_exchange_use_certificate" msgid="8690682770083161349">"Использовать сертификат клиента"</string>
     <string name="account_setup_exchange_remove_certificate" msgid="5633249155510301766">"Удалить"</string>
     <string name="account_setup_exchange_no_certificate" msgid="1119542961954780872">"Не используется"</string>
-    <string name="account_setup_exchange_device_id_label" msgid="1646827333223157658">"Идентификатор мобильного устройства"</string>
+    <!-- no translation found for account_setup_exchange_device_id_label (5105898844003459657) -->
+    <skip />
     <string name="account_setup_options_title" msgid="9016600767888846051">"Настройки аккаунта"</string>
     <string name="account_setup_options_headline" msgid="4181274232835368085">"Параметры аккаунта"</string>
     <string name="account_setup_options_mail_check_frequency_label" msgid="4824859792882810053">"Частота проверки папки \"Входящие\""</string>
diff --git a/res/values-sk/strings.xml b/res/values-sk/strings.xml
index b851d909d..80ae32e5e 100644
--- a/res/values-sk/strings.xml
+++ b/res/values-sk/strings.xml
@@ -87,13 +87,13 @@
     <string name="account_setup_basics_email_label" msgid="3454164053624112047">"E-mailová adresa"</string>
     <string name="or_label" msgid="2207403489755254427">"ALEBO"</string>
     <string name="sign_in_with_google" msgid="9051489501495503976">"Prihlásiť sa pomocou účtu Google"</string>
-    <string name="account_setup_basics_password_label" msgid="9133549799291519298">"Heslo"</string>
-    <string name="password_label" msgid="5228754278985667134">"Heslo"</string>
+    <string name="account_setup_basics_password_label" msgid="3402762431598148148">"HESLO"</string>
+    <string name="password_hint" msgid="8835390747504721561">"Heslo"</string>
     <string name="signed_in_with_service_label" msgid="4909910797357155961">"Prihlásený/-á pomocou účtu %s"</string>
-    <string name="authentication_label" msgid="5210804218348191833">"Overenie"</string>
+    <string name="authentication_label" msgid="6917956186120234602">"OVERENIE"</string>
     <string name="add_authentication_label" msgid="865206092644419804">"Pridať overenie"</string>
     <string name="clear_authentication_label" msgid="8113966442068335059">"Vymazať overenie"</string>
-    <string name="account_setup_basics_manual_setup_action" msgid="6640115171889882878"><u>"Ručné nastavenie"</u></string>
+    <string name="account_setup_basics_manual_setup_action" msgid="8053852205391155912">"Ručné nastavenie"</string>
     <string name="account_setup_username_password_toast" msgid="3968270274727947460">"Zadajte platnú e-mailovú adresu a heslo."</string>
     <string name="account_duplicate_dlg_title" msgid="8089732986912704425">"Duplikovať účet"</string>
     <string name="account_duplicate_dlg_message_fmt" msgid="6447629283679935840">"Toto používateľské meno už používate pre účet „<xliff:g id="DUPLICATE">%s</xliff:g>“."</string>
@@ -114,11 +114,11 @@
     <string name="account_setup_account_type_instructions" msgid="114515540798408760">"O aký typ účtu ide?"</string>
     <string name="account_setup_incoming_title" msgid="6796626791039136005">"Nastavenie účtu"</string>
     <string name="account_setup_incoming_headline" msgid="6183711037633407184">"Nastavenia servera prichádzajúcej pošty"</string>
-    <string name="account_setup_incoming_username_label" msgid="5700581386104070302">"Používateľské meno"</string>
-    <string name="account_setup_incoming_password_label" msgid="6365327603172559859">"Heslo"</string>
-    <string name="account_setup_incoming_server_label" msgid="1480342966630002638">"Server"</string>
-    <string name="account_setup_incoming_port_label" msgid="8214738923690447796">"Port"</string>
-    <string name="account_setup_incoming_security_label" msgid="2110260791086007424">"Typ zabezpečenia"</string>
+    <string name="account_setup_incoming_username_label" msgid="406939983633223354">"POUŽÍVATEĽSKÉ MENO"</string>
+    <string name="account_setup_incoming_password_label" msgid="634540235479188709">"HESLO"</string>
+    <string name="account_setup_incoming_server_label" msgid="3528558488000638420">"SERVER"</string>
+    <string name="account_setup_incoming_port_label" msgid="5311652277990186704">"PORT"</string>
+    <string name="account_setup_incoming_security_label" msgid="1175710992470593691">"TYP ZABEZPEČENIA"</string>
     <string name="account_setup_incoming_security_none_label" msgid="8300169413118264895">"Žiadne"</string>
     <string name="account_setup_incoming_security_ssl_trust_certificates_label" msgid="6151855090123117538">"SSL/TLS (Akceptovať všetky certifikáty)"</string>
     <string name="account_setup_incoming_security_ssl_label" msgid="2798501138420163861">"SSL/TLS"</string>
@@ -131,18 +131,18 @@
     <string name="account_setup_incoming_imap_path_prefix_hint" msgid="9190845919067906033">"Voliteľné"</string>
     <string name="account_setup_outgoing_title" msgid="7208495965665711539">"Nastavenie účtu"</string>
     <string name="account_setup_outgoing_headline" msgid="2025001060935366394">"Nastavenia servera odchádzajúcej pošty"</string>
-    <string name="account_setup_outgoing_smtp_server_label" msgid="6035137446691195177">"Server SMTP"</string>
-    <string name="account_setup_outgoing_port_label" msgid="7573207437835827876">"Port"</string>
-    <string name="account_setup_outgoing_security_label" msgid="911398071120720589">"Typ zabezpečenia"</string>
+    <string name="account_setup_outgoing_smtp_server_label" msgid="1164004960070541473">"SERVER SMTP"</string>
+    <string name="account_setup_outgoing_port_label" msgid="4670120792135566784">"PORT"</string>
+    <string name="account_setup_outgoing_security_label" msgid="9200220309360082664">"TYP ZABEZPEČENIA"</string>
     <string name="account_setup_outgoing_require_login_label" msgid="7779484127897397562">"Vyžadovať prihlásenie"</string>
-    <string name="account_setup_outgoing_username_label" msgid="3309680794731596981">"Používateľské meno"</string>
-    <string name="account_setup_outgoing_password_label" msgid="227844585493317550">"Heslo"</string>
-    <string name="account_setup_exchange_certificate_title" msgid="8473793588405277962">"Certifikát klienta"</string>
+    <string name="account_setup_outgoing_username_label" msgid="7239411429115525841">"POUŽÍVATEĽSKÉ MENO"</string>
+    <string name="account_setup_outgoing_password_label" msgid="3720429254654722208">"HESLO"</string>
+    <string name="account_setup_exchange_certificate_title" msgid="1635140303999054002">"CERTIFIKÁT KLIENTA"</string>
     <string name="account_setup_exchange_select_certificate" msgid="1536103662037268683">"Vybrať"</string>
     <string name="account_setup_exchange_use_certificate" msgid="8690682770083161349">"Použite certifikát klienta"</string>
     <string name="account_setup_exchange_remove_certificate" msgid="5633249155510301766">"Odstrániť"</string>
     <string name="account_setup_exchange_no_certificate" msgid="1119542961954780872">"Žiadny"</string>
-    <string name="account_setup_exchange_device_id_label" msgid="1646827333223157658">"ID mobilného zariadenia"</string>
+    <string name="account_setup_exchange_device_id_label" msgid="5105898844003459657">"ID MOBILNÉHO ZARIADENIA"</string>
     <string name="account_setup_options_title" msgid="9016600767888846051">"Nastavenia účtu"</string>
     <string name="account_setup_options_headline" msgid="4181274232835368085">"Možnosti účtu"</string>
     <string name="account_setup_options_mail_check_frequency_label" msgid="4824859792882810053">"Frekvencia kontroly doručenej pošty"</string>
diff --git a/res/values-sl/strings.xml b/res/values-sl/strings.xml
index 5fd1c48d4..cc0883e66 100644
--- a/res/values-sl/strings.xml
+++ b/res/values-sl/strings.xml
@@ -87,13 +87,13 @@
     <string name="account_setup_basics_email_label" msgid="3454164053624112047">"E-poštni naslov"</string>
     <string name="or_label" msgid="2207403489755254427">"ALI"</string>
     <string name="sign_in_with_google" msgid="9051489501495503976">"Prijava z Google Računom"</string>
-    <string name="account_setup_basics_password_label" msgid="9133549799291519298">"Geslo"</string>
-    <string name="password_label" msgid="5228754278985667134">"Geslo"</string>
+    <string name="account_setup_basics_password_label" msgid="3402762431598148148">"GESLO"</string>
+    <string name="password_hint" msgid="8835390747504721561">"Geslo"</string>
     <string name="signed_in_with_service_label" msgid="4909910797357155961">"Prijava s storitvijo %s"</string>
-    <string name="authentication_label" msgid="5210804218348191833">"Preverj. pristnosti"</string>
+    <string name="authentication_label" msgid="6917956186120234602">"PREVER. PRISTNOSTI"</string>
     <string name="add_authentication_label" msgid="865206092644419804">"Dodaj preverjanje pristnosti"</string>
     <string name="clear_authentication_label" msgid="8113966442068335059">"Počisti preverjanje pristnosti"</string>
-    <string name="account_setup_basics_manual_setup_action" msgid="6640115171889882878"><u>"Ročna nastavitev"</u></string>
+    <string name="account_setup_basics_manual_setup_action" msgid="8053852205391155912">"Ročna nastavitev"</string>
     <string name="account_setup_username_password_toast" msgid="3968270274727947460">"Vnesite veljaven e-poštni naslov in geslo."</string>
     <string name="account_duplicate_dlg_title" msgid="8089732986912704425">"Podvojeni račun"</string>
     <string name="account_duplicate_dlg_message_fmt" msgid="6447629283679935840">"To uporabniško ime že uporabljate za račun »<xliff:g id="DUPLICATE">%s</xliff:g>«."</string>
@@ -114,11 +114,11 @@
     <string name="account_setup_account_type_instructions" msgid="114515540798408760">"Katera vrsta računa je to?"</string>
     <string name="account_setup_incoming_title" msgid="6796626791039136005">"Nastavitev računa"</string>
     <string name="account_setup_incoming_headline" msgid="6183711037633407184">"Nastavitve strežnika za dohodno pošto"</string>
-    <string name="account_setup_incoming_username_label" msgid="5700581386104070302">"Uporabniško ime"</string>
-    <string name="account_setup_incoming_password_label" msgid="6365327603172559859">"Geslo"</string>
-    <string name="account_setup_incoming_server_label" msgid="1480342966630002638">"Strežnik"</string>
-    <string name="account_setup_incoming_port_label" msgid="8214738923690447796">"Vrata"</string>
-    <string name="account_setup_incoming_security_label" msgid="2110260791086007424">"Vrsta varnosti"</string>
+    <string name="account_setup_incoming_username_label" msgid="406939983633223354">"UPORABNIŠKO IME"</string>
+    <string name="account_setup_incoming_password_label" msgid="634540235479188709">"GESLO"</string>
+    <string name="account_setup_incoming_server_label" msgid="3528558488000638420">"STREŽNIK"</string>
+    <string name="account_setup_incoming_port_label" msgid="5311652277990186704">"VRATA"</string>
+    <string name="account_setup_incoming_security_label" msgid="1175710992470593691">"VRSTA VARNOSTI"</string>
     <string name="account_setup_incoming_security_none_label" msgid="8300169413118264895">"Brez"</string>
     <string name="account_setup_incoming_security_ssl_trust_certificates_label" msgid="6151855090123117538">"SSL/TLS (Sprejmi vsa potrdila)"</string>
     <string name="account_setup_incoming_security_ssl_label" msgid="2798501138420163861">"SSL/TLS"</string>
@@ -131,18 +131,18 @@
     <string name="account_setup_incoming_imap_path_prefix_hint" msgid="9190845919067906033">"Neobvezno"</string>
     <string name="account_setup_outgoing_title" msgid="7208495965665711539">"Nastavitev računa"</string>
     <string name="account_setup_outgoing_headline" msgid="2025001060935366394">"Nastavitve strežnika za odhodno pošto"</string>
-    <string name="account_setup_outgoing_smtp_server_label" msgid="6035137446691195177">"Strežnik SMTP"</string>
-    <string name="account_setup_outgoing_port_label" msgid="7573207437835827876">"Vrata"</string>
-    <string name="account_setup_outgoing_security_label" msgid="911398071120720589">"Vrsta varnosti"</string>
+    <string name="account_setup_outgoing_smtp_server_label" msgid="1164004960070541473">"STREŽNIK SMTP"</string>
+    <string name="account_setup_outgoing_port_label" msgid="4670120792135566784">"VRATA"</string>
+    <string name="account_setup_outgoing_security_label" msgid="9200220309360082664">"VRSTA VARNOSTI"</string>
     <string name="account_setup_outgoing_require_login_label" msgid="7779484127897397562">"Zahtevaj prijavo"</string>
-    <string name="account_setup_outgoing_username_label" msgid="3309680794731596981">"Uporabniško ime"</string>
-    <string name="account_setup_outgoing_password_label" msgid="227844585493317550">"Geslo"</string>
-    <string name="account_setup_exchange_certificate_title" msgid="8473793588405277962">"Potrdilo odjemalca"</string>
+    <string name="account_setup_outgoing_username_label" msgid="7239411429115525841">"UPORABNIŠKO IME"</string>
+    <string name="account_setup_outgoing_password_label" msgid="3720429254654722208">"GESLO"</string>
+    <string name="account_setup_exchange_certificate_title" msgid="1635140303999054002">"POTRDILO ODJEMALCA"</string>
     <string name="account_setup_exchange_select_certificate" msgid="1536103662037268683">"Izberi"</string>
     <string name="account_setup_exchange_use_certificate" msgid="8690682770083161349">"Uporaba potrdila odjemalca"</string>
     <string name="account_setup_exchange_remove_certificate" msgid="5633249155510301766">"Odstrani"</string>
     <string name="account_setup_exchange_no_certificate" msgid="1119542961954780872">"Brez"</string>
-    <string name="account_setup_exchange_device_id_label" msgid="1646827333223157658">"ID mobilne naprave"</string>
+    <string name="account_setup_exchange_device_id_label" msgid="5105898844003459657">"ID MOBILNE NAPRAVE"</string>
     <string name="account_setup_options_title" msgid="9016600767888846051">"Nastavitve računa"</string>
     <string name="account_setup_options_headline" msgid="4181274232835368085">"Možnosti računa"</string>
     <string name="account_setup_options_mail_check_frequency_label" msgid="4824859792882810053">"Pogostost preverjanja mape »Prejeto«"</string>
diff --git a/res/values-sr/strings.xml b/res/values-sr/strings.xml
index 4f3bff5d9..01f8be69c 100644
--- a/res/values-sr/strings.xml
+++ b/res/values-sr/strings.xml
@@ -84,17 +84,17 @@
     <string name="email_confirmation_label" msgid="1082319634606902954">"Имејл адреса:"</string>
     <string name="account_setup_basics_headline" msgid="6726590205905464015">"Налог е-поште"</string>
     <string name="accounts_welcome" msgid="8337750045270269649">"Можете да подесите налог у свега неколико корака."</string>
-    <string name="account_setup_basics_email_label" msgid="3454164053624112047">"Адреса е-поште"</string>
+    <string name="account_setup_basics_email_label" msgid="3454164053624112047">"Имејл адреса"</string>
     <string name="or_label" msgid="2207403489755254427">"ИЛИ"</string>
     <string name="sign_in_with_google" msgid="9051489501495503976">"Пријави ме на Google"</string>
-    <string name="account_setup_basics_password_label" msgid="9133549799291519298">"Лозинка"</string>
-    <string name="password_label" msgid="5228754278985667134">"Лозинка"</string>
+    <string name="account_setup_basics_password_label" msgid="3402762431598148148">"ЛОЗИНКА"</string>
+    <string name="password_hint" msgid="8835390747504721561">"Лозинка"</string>
     <string name="signed_in_with_service_label" msgid="4909910797357155961">"Пријављени сте на %s"</string>
-    <string name="authentication_label" msgid="5210804218348191833">"Потвр. аутентичности"</string>
+    <string name="authentication_label" msgid="6917956186120234602">"ПОТВР. АУТЕНТИЧНОСТИ"</string>
     <string name="add_authentication_label" msgid="865206092644419804">"Додај потврду аутентичности"</string>
     <string name="clear_authentication_label" msgid="8113966442068335059">"Обриши потврду аутентичности"</string>
-    <string name="account_setup_basics_manual_setup_action" msgid="6640115171889882878"><u>"Ручно подешавање"</u></string>
-    <string name="account_setup_username_password_toast" msgid="3968270274727947460">"Унесите важећу адресу е-поште и лозинку."</string>
+    <string name="account_setup_basics_manual_setup_action" msgid="8053852205391155912">"Ручно подешавање"</string>
+    <string name="account_setup_username_password_toast" msgid="3968270274727947460">"Унесите важећу имејл адресу и лозинку."</string>
     <string name="account_duplicate_dlg_title" msgid="8089732986912704425">"Дуплирани налог"</string>
     <string name="account_duplicate_dlg_message_fmt" msgid="6447629283679935840">"Већ користите ово корисничко име за налог „<xliff:g id="DUPLICATE">%s</xliff:g>“."</string>
     <string name="account_password_spaces_error" msgid="8928309156658903257">"Ова лозинка почиње или се завршава једним размаком или више њих. Многи сервери не подржавају лозинке са размацима."</string>
@@ -114,11 +114,11 @@
     <string name="account_setup_account_type_instructions" msgid="114515540798408760">"Који је ово тип налога?"</string>
     <string name="account_setup_incoming_title" msgid="6796626791039136005">"Подешавање налога"</string>
     <string name="account_setup_incoming_headline" msgid="6183711037633407184">"Подешавања сервера за долазну пошту"</string>
-    <string name="account_setup_incoming_username_label" msgid="5700581386104070302">"Корисничко име"</string>
-    <string name="account_setup_incoming_password_label" msgid="6365327603172559859">"Лозинка"</string>
-    <string name="account_setup_incoming_server_label" msgid="1480342966630002638">"Сервер"</string>
-    <string name="account_setup_incoming_port_label" msgid="8214738923690447796">"Порт"</string>
-    <string name="account_setup_incoming_security_label" msgid="2110260791086007424">"Тип безбедности"</string>
+    <string name="account_setup_incoming_username_label" msgid="406939983633223354">"КОРИСНИЧКО ИМЕ"</string>
+    <string name="account_setup_incoming_password_label" msgid="634540235479188709">"ЛОЗИНКА"</string>
+    <string name="account_setup_incoming_server_label" msgid="3528558488000638420">"СЕРВЕР"</string>
+    <string name="account_setup_incoming_port_label" msgid="5311652277990186704">"ПОРТ"</string>
+    <string name="account_setup_incoming_security_label" msgid="1175710992470593691">"ТИП БЕЗБЕДНОСТИ"</string>
     <string name="account_setup_incoming_security_none_label" msgid="8300169413118264895">"Ништа"</string>
     <string name="account_setup_incoming_security_ssl_trust_certificates_label" msgid="6151855090123117538">"SSL/TLS (Прихвати све сертификате)"</string>
     <string name="account_setup_incoming_security_ssl_label" msgid="2798501138420163861">"SSL/TLS"</string>
@@ -131,18 +131,18 @@
     <string name="account_setup_incoming_imap_path_prefix_hint" msgid="9190845919067906033">"Опционално"</string>
     <string name="account_setup_outgoing_title" msgid="7208495965665711539">"Подешавање налога"</string>
     <string name="account_setup_outgoing_headline" msgid="2025001060935366394">"Подешавања сервера за одлазну пошту"</string>
-    <string name="account_setup_outgoing_smtp_server_label" msgid="6035137446691195177">"SMTP сервер"</string>
-    <string name="account_setup_outgoing_port_label" msgid="7573207437835827876">"Порт"</string>
-    <string name="account_setup_outgoing_security_label" msgid="911398071120720589">"Тип безбедности"</string>
+    <string name="account_setup_outgoing_smtp_server_label" msgid="1164004960070541473">"SMTP СЕРВЕР"</string>
+    <string name="account_setup_outgoing_port_label" msgid="4670120792135566784">"ПОРТ"</string>
+    <string name="account_setup_outgoing_security_label" msgid="9200220309360082664">"ТИП БЕЗБЕДНОСТИ"</string>
     <string name="account_setup_outgoing_require_login_label" msgid="7779484127897397562">"Захтевај пријављивање"</string>
-    <string name="account_setup_outgoing_username_label" msgid="3309680794731596981">"Корисничко име"</string>
-    <string name="account_setup_outgoing_password_label" msgid="227844585493317550">"Лозинка"</string>
-    <string name="account_setup_exchange_certificate_title" msgid="8473793588405277962">"Сертификат клијента"</string>
+    <string name="account_setup_outgoing_username_label" msgid="7239411429115525841">"КОРИСНИЧКО ИМЕ"</string>
+    <string name="account_setup_outgoing_password_label" msgid="3720429254654722208">"ЛОЗИНКА"</string>
+    <string name="account_setup_exchange_certificate_title" msgid="1635140303999054002">"СЕРТИФИКАТ КЛИЈЕНТА"</string>
     <string name="account_setup_exchange_select_certificate" msgid="1536103662037268683">"Изабери"</string>
     <string name="account_setup_exchange_use_certificate" msgid="8690682770083161349">"Користи сертификат клијента"</string>
     <string name="account_setup_exchange_remove_certificate" msgid="5633249155510301766">"Уклони"</string>
     <string name="account_setup_exchange_no_certificate" msgid="1119542961954780872">"Ниједан"</string>
-    <string name="account_setup_exchange_device_id_label" msgid="1646827333223157658">"ИД мобилног уређаја"</string>
+    <string name="account_setup_exchange_device_id_label" msgid="5105898844003459657">"ИД МОБИЛНОГ УРЕЂАЈА"</string>
     <string name="account_setup_options_title" msgid="9016600767888846051">"Подешавања налога"</string>
     <string name="account_setup_options_headline" msgid="4181274232835368085">"Опције налога"</string>
     <string name="account_setup_options_mail_check_frequency_label" msgid="4824859792882810053">"Учесталост провере пријемног сандучета"</string>
@@ -260,7 +260,7 @@
     <string name="mailbox_settings_sync_enabled_summary" msgid="345878979425044320">"Поруке ће бити преузете после повезивања"</string>
     <string name="mailbox_settings_mailbox_sync_window_label" msgid="851180833264474141">"Дани поште за синхронизацију"</string>
     <string name="prefDialogTitle_conversationListIcon" msgid="4601797400885989153">"Слика пошиљаоца"</string>
-    <string name="provider_note_live" msgid="2995297671709325333">"Само неки „Плус“ налози подржавају приступ преко POP протокола, што омогућава повезивање овог програма. Ако не можете да се пријавите користећи тачну адресу е-поште и лозинку, можда немате плаћени „Плус“ налог. Покрените веб прегледач да бисте приступили овим налозима е-поште."</string>
+    <string name="provider_note_live" msgid="2995297671709325333">"Само неки „Плус“ налози подржавају приступ преко POP протокола, што омогућава повезивање овог програма. Ако не можете да се пријавите користећи тачну имејл адресу и лозинку, можда немате плаћени „Плус“ налог. Покрените веб прегледач да бисте приступили овим налозима е-поште."</string>
     <string name="provider_note_t_online" msgid="1630642061431427894">"Пре него што подесите овај налог е-поште, посетите T-Online веб сајт и направите лозинку за приступ е-пошти преко POP3 протокола."</string>
     <string name="exchange_name" msgid="1190783774800310346">"Corporate"</string>
     <string name="exchange_name_alternate" msgid="5772529644749041052">"Microsoft Exchange ActiveSync"</string>
diff --git a/res/values-sv/strings.xml b/res/values-sv/strings.xml
index e2c9bb79c..bb23f3bad 100644
--- a/res/values-sv/strings.xml
+++ b/res/values-sv/strings.xml
@@ -87,13 +87,13 @@
     <string name="account_setup_basics_email_label" msgid="3454164053624112047">"E-postadress"</string>
     <string name="or_label" msgid="2207403489755254427">"ELLER"</string>
     <string name="sign_in_with_google" msgid="9051489501495503976">"Logga in med Google"</string>
-    <string name="account_setup_basics_password_label" msgid="9133549799291519298">"Lösenord"</string>
-    <string name="password_label" msgid="5228754278985667134">"Lösenord"</string>
+    <string name="account_setup_basics_password_label" msgid="3402762431598148148">"LÖSENORD"</string>
+    <string name="password_hint" msgid="8835390747504721561">"Lösenord"</string>
     <string name="signed_in_with_service_label" msgid="4909910797357155961">"Inloggad med %s"</string>
-    <string name="authentication_label" msgid="5210804218348191833">"Autentisering"</string>
+    <string name="authentication_label" msgid="6917956186120234602">"AUTENTISERING"</string>
     <string name="add_authentication_label" msgid="865206092644419804">"Lägg till autentisering"</string>
     <string name="clear_authentication_label" msgid="8113966442068335059">"Rensa autentiseringen"</string>
-    <string name="account_setup_basics_manual_setup_action" msgid="6640115171889882878"><u>"Manuell konfiguration"</u></string>
+    <string name="account_setup_basics_manual_setup_action" msgid="8053852205391155912">"Manuell inställning"</string>
     <string name="account_setup_username_password_toast" msgid="3968270274727947460">"Ange en giltig e-postadress och lösenord."</string>
     <string name="account_duplicate_dlg_title" msgid="8089732986912704425">"Dubblettkonto"</string>
     <string name="account_duplicate_dlg_message_fmt" msgid="6447629283679935840">"Du använder redan det här användarnamnet för kontot <xliff:g id="DUPLICATE">%s</xliff:g>."</string>
@@ -114,11 +114,11 @@
     <string name="account_setup_account_type_instructions" msgid="114515540798408760">"Vilken typ av konto är det här?"</string>
     <string name="account_setup_incoming_title" msgid="6796626791039136005">"Kontoinställningar"</string>
     <string name="account_setup_incoming_headline" msgid="6183711037633407184">"Inkommande serverinställningar"</string>
-    <string name="account_setup_incoming_username_label" msgid="5700581386104070302">"Användarnamn"</string>
-    <string name="account_setup_incoming_password_label" msgid="6365327603172559859">"Lösenord"</string>
-    <string name="account_setup_incoming_server_label" msgid="1480342966630002638">"Server"</string>
-    <string name="account_setup_incoming_port_label" msgid="8214738923690447796">"Port"</string>
-    <string name="account_setup_incoming_security_label" msgid="2110260791086007424">"Säkerhetstyp"</string>
+    <string name="account_setup_incoming_username_label" msgid="406939983633223354">"ANVÄNDARNAMN"</string>
+    <string name="account_setup_incoming_password_label" msgid="634540235479188709">"LÖSENORD"</string>
+    <string name="account_setup_incoming_server_label" msgid="3528558488000638420">"SERVER"</string>
+    <string name="account_setup_incoming_port_label" msgid="5311652277990186704">"PORT"</string>
+    <string name="account_setup_incoming_security_label" msgid="1175710992470593691">"SÄKERHETSTYP"</string>
     <string name="account_setup_incoming_security_none_label" msgid="8300169413118264895">"Ingen"</string>
     <string name="account_setup_incoming_security_ssl_trust_certificates_label" msgid="6151855090123117538">"SSL/TLS (acceptera alla certifikat)"</string>
     <string name="account_setup_incoming_security_ssl_label" msgid="2798501138420163861">"SSL/TLS"</string>
@@ -131,18 +131,18 @@
     <string name="account_setup_incoming_imap_path_prefix_hint" msgid="9190845919067906033">"Valfritt"</string>
     <string name="account_setup_outgoing_title" msgid="7208495965665711539">"Kontoinställningar"</string>
     <string name="account_setup_outgoing_headline" msgid="2025001060935366394">"Utgående serverinställningar"</string>
-    <string name="account_setup_outgoing_smtp_server_label" msgid="6035137446691195177">"SMTP-server"</string>
-    <string name="account_setup_outgoing_port_label" msgid="7573207437835827876">"Port"</string>
-    <string name="account_setup_outgoing_security_label" msgid="911398071120720589">"Säkerhetstyp"</string>
+    <string name="account_setup_outgoing_smtp_server_label" msgid="1164004960070541473">"SMTP-SERVER"</string>
+    <string name="account_setup_outgoing_port_label" msgid="4670120792135566784">"PORT"</string>
+    <string name="account_setup_outgoing_security_label" msgid="9200220309360082664">"SÄKERHETSTYP"</string>
     <string name="account_setup_outgoing_require_login_label" msgid="7779484127897397562">"Kräv inloggning"</string>
-    <string name="account_setup_outgoing_username_label" msgid="3309680794731596981">"Användarnamn"</string>
-    <string name="account_setup_outgoing_password_label" msgid="227844585493317550">"Lösenord"</string>
-    <string name="account_setup_exchange_certificate_title" msgid="8473793588405277962">"Klientcertifikat"</string>
+    <string name="account_setup_outgoing_username_label" msgid="7239411429115525841">"ANVÄNDARNAMN"</string>
+    <string name="account_setup_outgoing_password_label" msgid="3720429254654722208">"LÖSENORD"</string>
+    <string name="account_setup_exchange_certificate_title" msgid="1635140303999054002">"KLIENTCERTIFIKAT"</string>
     <string name="account_setup_exchange_select_certificate" msgid="1536103662037268683">"Välj"</string>
     <string name="account_setup_exchange_use_certificate" msgid="8690682770083161349">"Använd klientcertifikat"</string>
     <string name="account_setup_exchange_remove_certificate" msgid="5633249155510301766">"Ta bort"</string>
     <string name="account_setup_exchange_no_certificate" msgid="1119542961954780872">"Inga"</string>
-    <string name="account_setup_exchange_device_id_label" msgid="1646827333223157658">"Den mobila enhetens ID"</string>
+    <string name="account_setup_exchange_device_id_label" msgid="5105898844003459657">"DEN MOBILA ENHETENS ID"</string>
     <string name="account_setup_options_title" msgid="9016600767888846051">"Kontoinställningar"</string>
     <string name="account_setup_options_headline" msgid="4181274232835368085">"Kontoalternativ"</string>
     <string name="account_setup_options_mail_check_frequency_label" msgid="4824859792882810053">"Intervall för e-postkontroll"</string>
diff --git a/res/values-sw/strings.xml b/res/values-sw/strings.xml
index 083ad6717..858717c26 100644
--- a/res/values-sw/strings.xml
+++ b/res/values-sw/strings.xml
@@ -87,13 +87,13 @@
     <string name="account_setup_basics_email_label" msgid="3454164053624112047">"Anwani ya barua pepe"</string>
     <string name="or_label" msgid="2207403489755254427">"AU"</string>
     <string name="sign_in_with_google" msgid="9051489501495503976">"Ingia katika akaunti ukitumia Google"</string>
-    <string name="account_setup_basics_password_label" msgid="9133549799291519298">"Nenosiri"</string>
-    <string name="password_label" msgid="5228754278985667134">"Nenosiri"</string>
+    <string name="account_setup_basics_password_label" msgid="3402762431598148148">"NENOSIRI"</string>
+    <string name="password_hint" msgid="8835390747504721561">"Nenosiri"</string>
     <string name="signed_in_with_service_label" msgid="4909910797357155961">"Umeingia katika akaunti ukitumia %s"</string>
-    <string name="authentication_label" msgid="5210804218348191833">"Uthibitishaji"</string>
+    <string name="authentication_label" msgid="6917956186120234602">"UTHIBITISHAJI"</string>
     <string name="add_authentication_label" msgid="865206092644419804">"Ongeza uthibitishaji"</string>
     <string name="clear_authentication_label" msgid="8113966442068335059">"Futa uthibitishaji"</string>
-    <string name="account_setup_basics_manual_setup_action" msgid="6640115171889882878"><u>"Usanidi wa kujifanyia"</u></string>
+    <string name="account_setup_basics_manual_setup_action" msgid="8053852205391155912">"Jifungulie mwenyewe"</string>
     <string name="account_setup_username_password_toast" msgid="3968270274727947460">"Tafadhali andika anwani na nenosiri halali ya barua pepe."</string>
     <string name="account_duplicate_dlg_title" msgid="8089732986912704425">"Akaunti Rudufu"</string>
     <string name="account_duplicate_dlg_message_fmt" msgid="6447629283679935840">"Tayari unatumia jina hili la mtumiaji kwa akaunti \"<xliff:g id="DUPLICATE">%s</xliff:g>\"."</string>
@@ -114,11 +114,11 @@
     <string name="account_setup_account_type_instructions" msgid="114515540798408760">"Hii ni akaunti ya aina gani ?"</string>
     <string name="account_setup_incoming_title" msgid="6796626791039136005">"Kufungua akaunti"</string>
     <string name="account_setup_incoming_headline" msgid="6183711037633407184">"Mipangilio ya seva ya kuingia"</string>
-    <string name="account_setup_incoming_username_label" msgid="5700581386104070302">"Jina la mtumiaji"</string>
-    <string name="account_setup_incoming_password_label" msgid="6365327603172559859">"Nenosiri"</string>
-    <string name="account_setup_incoming_server_label" msgid="1480342966630002638">"Seva"</string>
-    <string name="account_setup_incoming_port_label" msgid="8214738923690447796">"Mlango"</string>
-    <string name="account_setup_incoming_security_label" msgid="2110260791086007424">"Aina ya usalama"</string>
+    <string name="account_setup_incoming_username_label" msgid="406939983633223354">"JINA LA MTUMIAJI"</string>
+    <string name="account_setup_incoming_password_label" msgid="634540235479188709">"NENOSIRI"</string>
+    <string name="account_setup_incoming_server_label" msgid="3528558488000638420">"SEVA"</string>
+    <string name="account_setup_incoming_port_label" msgid="5311652277990186704">"MLANGO"</string>
+    <string name="account_setup_incoming_security_label" msgid="1175710992470593691">"AINA YA USALAMA"</string>
     <string name="account_setup_incoming_security_none_label" msgid="8300169413118264895">"Hamna"</string>
     <string name="account_setup_incoming_security_ssl_trust_certificates_label" msgid="6151855090123117538">"SSL/TLS (Kubali vyeti vyote)"</string>
     <string name="account_setup_incoming_security_ssl_label" msgid="2798501138420163861">"SSL/TLS"</string>
@@ -131,18 +131,18 @@
     <string name="account_setup_incoming_imap_path_prefix_hint" msgid="9190845919067906033">"Hiari"</string>
     <string name="account_setup_outgoing_title" msgid="7208495965665711539">"Kufungua akaunti"</string>
     <string name="account_setup_outgoing_headline" msgid="2025001060935366394">"Mipangilio ya seva ya kutoka"</string>
-    <string name="account_setup_outgoing_smtp_server_label" msgid="6035137446691195177">"Seva ya SMTP"</string>
-    <string name="account_setup_outgoing_port_label" msgid="7573207437835827876">"Mlango"</string>
-    <string name="account_setup_outgoing_security_label" msgid="911398071120720589">"Aina ya usalama"</string>
+    <string name="account_setup_outgoing_smtp_server_label" msgid="1164004960070541473">"SEVA YA SMTP"</string>
+    <string name="account_setup_outgoing_port_label" msgid="4670120792135566784">"MLANGO"</string>
+    <string name="account_setup_outgoing_security_label" msgid="9200220309360082664">"AINA YA USALAMA"</string>
     <string name="account_setup_outgoing_require_login_label" msgid="7779484127897397562">"Hitaji kuingia kwenye akaunti"</string>
-    <string name="account_setup_outgoing_username_label" msgid="3309680794731596981">"Jina la mtumiaji"</string>
-    <string name="account_setup_outgoing_password_label" msgid="227844585493317550">"Nenosiri"</string>
-    <string name="account_setup_exchange_certificate_title" msgid="8473793588405277962">"Cheti cha mteja"</string>
+    <string name="account_setup_outgoing_username_label" msgid="7239411429115525841">"JINA LA MTUMIAJI"</string>
+    <string name="account_setup_outgoing_password_label" msgid="3720429254654722208">"NENOSIRI"</string>
+    <string name="account_setup_exchange_certificate_title" msgid="1635140303999054002">"CHETI CHA KITEJA"</string>
     <string name="account_setup_exchange_select_certificate" msgid="1536103662037268683">"Chagua"</string>
     <string name="account_setup_exchange_use_certificate" msgid="8690682770083161349">"Tumia cheti cha mteja"</string>
     <string name="account_setup_exchange_remove_certificate" msgid="5633249155510301766">"Ondoa"</string>
     <string name="account_setup_exchange_no_certificate" msgid="1119542961954780872">"Hakuna"</string>
-    <string name="account_setup_exchange_device_id_label" msgid="1646827333223157658">"Kitambulisho cha Kifaa cha Mkononi"</string>
+    <string name="account_setup_exchange_device_id_label" msgid="5105898844003459657">"KITAMBULISHO CHA KIFAA CHA MKONONI"</string>
     <string name="account_setup_options_title" msgid="9016600767888846051">"Mipangilio ya akaunti"</string>
     <string name="account_setup_options_headline" msgid="4181274232835368085">"Chaguo za akaunti"</string>
     <string name="account_setup_options_mail_check_frequency_label" msgid="4824859792882810053">"Saa za kukagua kikasha"</string>
diff --git a/res/values-th/strings.xml b/res/values-th/strings.xml
index 1f2ea4285..489deec9c 100644
--- a/res/values-th/strings.xml
+++ b/res/values-th/strings.xml
@@ -87,13 +87,13 @@
     <string name="account_setup_basics_email_label" msgid="3454164053624112047">"ที่อยู่อีเมล"</string>
     <string name="or_label" msgid="2207403489755254427">"หรือ"</string>
     <string name="sign_in_with_google" msgid="9051489501495503976">"ลงชื่อเข้าใช้ด้วย Google"</string>
-    <string name="account_setup_basics_password_label" msgid="9133549799291519298">"รหัสผ่าน"</string>
-    <string name="password_label" msgid="5228754278985667134">"รหัสผ่าน"</string>
+    <string name="account_setup_basics_password_label" msgid="3402762431598148148">"รหัสผ่าน"</string>
+    <string name="password_hint" msgid="8835390747504721561">"รหัสผ่าน"</string>
     <string name="signed_in_with_service_label" msgid="4909910797357155961">"ลงชื่อเข้าใช้ด้วย %s"</string>
-    <string name="authentication_label" msgid="5210804218348191833">"การตรวจสอบสิทธิ์"</string>
+    <string name="authentication_label" msgid="6917956186120234602">"การตรวจสอบสิทธิ์"</string>
     <string name="add_authentication_label" msgid="865206092644419804">"เพิ่มการตรวจสอบสิทธิ์"</string>
     <string name="clear_authentication_label" msgid="8113966442068335059">"ล้างการตรวจสอบสิทธิ์"</string>
-    <string name="account_setup_basics_manual_setup_action" msgid="6640115171889882878"><u>"การตั้งค่าด้วยตนเอง"</u></string>
+    <string name="account_setup_basics_manual_setup_action" msgid="8053852205391155912">"ตั้งค่าด้วยตนเอง"</string>
     <string name="account_setup_username_password_toast" msgid="3968270274727947460">"พิมพ์ที่อยู่อีเมลและรหัสผ่านที่ถูกต้อง"</string>
     <string name="account_duplicate_dlg_title" msgid="8089732986912704425">"บัญชีซ้ำ"</string>
     <string name="account_duplicate_dlg_message_fmt" msgid="6447629283679935840">"คุณใช้ชื่อผู้ใช้นี้สำหรับบัญชี \"<xliff:g id="DUPLICATE">%s</xliff:g>\" ไปแล้ว"</string>
@@ -114,11 +114,11 @@
     <string name="account_setup_account_type_instructions" msgid="114515540798408760">"บัญชีนี้เป็นบัญชีประเภทใด"</string>
     <string name="account_setup_incoming_title" msgid="6796626791039136005">"การตั้งค่าบัญชี"</string>
     <string name="account_setup_incoming_headline" msgid="6183711037633407184">"การตั้งค่าเซิร์ฟเวอร์ขาเข้า"</string>
-    <string name="account_setup_incoming_username_label" msgid="5700581386104070302">"ชื่อผู้ใช้"</string>
-    <string name="account_setup_incoming_password_label" msgid="6365327603172559859">"รหัสผ่าน"</string>
-    <string name="account_setup_incoming_server_label" msgid="1480342966630002638">"เซิร์ฟเวอร์"</string>
-    <string name="account_setup_incoming_port_label" msgid="8214738923690447796">"พอร์ต"</string>
-    <string name="account_setup_incoming_security_label" msgid="2110260791086007424">"ประเภทการรักษาความปลอดภัย"</string>
+    <string name="account_setup_incoming_username_label" msgid="406939983633223354">"ชื่อผู้ใช้"</string>
+    <string name="account_setup_incoming_password_label" msgid="634540235479188709">"รหัสผ่าน"</string>
+    <string name="account_setup_incoming_server_label" msgid="3528558488000638420">"เซิร์ฟเวอร์"</string>
+    <string name="account_setup_incoming_port_label" msgid="5311652277990186704">"พอร์ต"</string>
+    <string name="account_setup_incoming_security_label" msgid="1175710992470593691">"ประเภทความปลอดภัย"</string>
     <string name="account_setup_incoming_security_none_label" msgid="8300169413118264895">"ไม่มี"</string>
     <string name="account_setup_incoming_security_ssl_trust_certificates_label" msgid="6151855090123117538">"SSL/TLS (ยอมรับใบรับรองทั้งหมด)"</string>
     <string name="account_setup_incoming_security_ssl_label" msgid="2798501138420163861">"SSL/TLS"</string>
@@ -131,18 +131,18 @@
     <string name="account_setup_incoming_imap_path_prefix_hint" msgid="9190845919067906033">"เป็นตัวเลือก"</string>
     <string name="account_setup_outgoing_title" msgid="7208495965665711539">"การตั้งค่าบัญชี"</string>
     <string name="account_setup_outgoing_headline" msgid="2025001060935366394">"การตั้งค่าเซิร์ฟเวอร์ขาออก"</string>
-    <string name="account_setup_outgoing_smtp_server_label" msgid="6035137446691195177">"เซิร์ฟเวอร์ SMTP"</string>
-    <string name="account_setup_outgoing_port_label" msgid="7573207437835827876">"พอร์ต"</string>
-    <string name="account_setup_outgoing_security_label" msgid="911398071120720589">"ประเภทการรักษาความปลอดภัย"</string>
+    <string name="account_setup_outgoing_smtp_server_label" msgid="1164004960070541473">"เซิร์ฟเวอร์ SMTP"</string>
+    <string name="account_setup_outgoing_port_label" msgid="4670120792135566784">"พอร์ต"</string>
+    <string name="account_setup_outgoing_security_label" msgid="9200220309360082664">"ประเภทความปลอดภัย"</string>
     <string name="account_setup_outgoing_require_login_label" msgid="7779484127897397562">"จำเป็นต้องลงชื่อเข้าใช้"</string>
-    <string name="account_setup_outgoing_username_label" msgid="3309680794731596981">"ชื่อผู้ใช้"</string>
-    <string name="account_setup_outgoing_password_label" msgid="227844585493317550">"รหัสผ่าน"</string>
-    <string name="account_setup_exchange_certificate_title" msgid="8473793588405277962">"ใบรับรองไคลเอ็นต์"</string>
+    <string name="account_setup_outgoing_username_label" msgid="7239411429115525841">"ชื่อผู้ใช้"</string>
+    <string name="account_setup_outgoing_password_label" msgid="3720429254654722208">"รหัสผ่าน"</string>
+    <string name="account_setup_exchange_certificate_title" msgid="1635140303999054002">"ใบรับรองไคลเอ็นต์"</string>
     <string name="account_setup_exchange_select_certificate" msgid="1536103662037268683">"เลือก"</string>
     <string name="account_setup_exchange_use_certificate" msgid="8690682770083161349">"ใช้ใบรับรองไคลเอ็นต์"</string>
     <string name="account_setup_exchange_remove_certificate" msgid="5633249155510301766">"นำออก"</string>
     <string name="account_setup_exchange_no_certificate" msgid="1119542961954780872">"ไม่มี"</string>
-    <string name="account_setup_exchange_device_id_label" msgid="1646827333223157658">"ID โทรศัพท์มือถือ"</string>
+    <string name="account_setup_exchange_device_id_label" msgid="5105898844003459657">"ID อุปกรณ์เคลื่อนที่"</string>
     <string name="account_setup_options_title" msgid="9016600767888846051">"การตั้งค่าบัญชี"</string>
     <string name="account_setup_options_headline" msgid="4181274232835368085">"ตัวเลือกของบัญชี"</string>
     <string name="account_setup_options_mail_check_frequency_label" msgid="4824859792882810053">"ความถี่ในการตรวจสอบกล่องจดหมาย"</string>
diff --git a/res/values-tl/strings.xml b/res/values-tl/strings.xml
index 16360887f..6b3d06db4 100644
--- a/res/values-tl/strings.xml
+++ b/res/values-tl/strings.xml
@@ -87,13 +87,16 @@
     <string name="account_setup_basics_email_label" msgid="3454164053624112047">"Email address"</string>
     <string name="or_label" msgid="2207403489755254427">"O KAYA"</string>
     <string name="sign_in_with_google" msgid="9051489501495503976">"Mag-sign in sa Google"</string>
-    <string name="account_setup_basics_password_label" msgid="9133549799291519298">"Password"</string>
-    <string name="password_label" msgid="5228754278985667134">"Password"</string>
+    <!-- no translation found for account_setup_basics_password_label (3402762431598148148) -->
+    <skip />
+    <!-- no translation found for password_hint (8835390747504721561) -->
+    <skip />
     <string name="signed_in_with_service_label" msgid="4909910797357155961">"Naka-sign in gamit ang %s"</string>
-    <string name="authentication_label" msgid="5210804218348191833">"Pagpapatotoo"</string>
+    <!-- no translation found for authentication_label (6917956186120234602) -->
+    <skip />
     <string name="add_authentication_label" msgid="865206092644419804">"Magdagdag ng pagpapatotoo"</string>
     <string name="clear_authentication_label" msgid="8113966442068335059">"I-clear ang pagpapatotoo"</string>
-    <string name="account_setup_basics_manual_setup_action" msgid="6640115171889882878"><u>"Manu-manong setup"</u></string>
+    <string name="account_setup_basics_manual_setup_action" msgid="8053852205391155912">"Manwal na setup"</string>
     <string name="account_setup_username_password_toast" msgid="3968270274727947460">"Mag-type ng wastong email address at password."</string>
     <string name="account_duplicate_dlg_title" msgid="8089732986912704425">"Duplicate na account"</string>
     <string name="account_duplicate_dlg_message_fmt" msgid="6447629283679935840">"Ginagamit mo na ang username na ito para sa account na \"<xliff:g id="DUPLICATE">%s</xliff:g>\"."</string>
@@ -114,11 +117,16 @@
     <string name="account_setup_account_type_instructions" msgid="114515540798408760">"Anong uri ng account ito?"</string>
     <string name="account_setup_incoming_title" msgid="6796626791039136005">"Setup ng account"</string>
     <string name="account_setup_incoming_headline" msgid="6183711037633407184">"Mga setting ng papasok na server"</string>
-    <string name="account_setup_incoming_username_label" msgid="5700581386104070302">"Username"</string>
-    <string name="account_setup_incoming_password_label" msgid="6365327603172559859">"Password"</string>
-    <string name="account_setup_incoming_server_label" msgid="1480342966630002638">"Server"</string>
-    <string name="account_setup_incoming_port_label" msgid="8214738923690447796">"Port"</string>
-    <string name="account_setup_incoming_security_label" msgid="2110260791086007424">"Uri ng seguridad"</string>
+    <!-- no translation found for account_setup_incoming_username_label (406939983633223354) -->
+    <skip />
+    <!-- no translation found for account_setup_incoming_password_label (634540235479188709) -->
+    <skip />
+    <!-- no translation found for account_setup_incoming_server_label (3528558488000638420) -->
+    <skip />
+    <!-- no translation found for account_setup_incoming_port_label (5311652277990186704) -->
+    <skip />
+    <!-- no translation found for account_setup_incoming_security_label (1175710992470593691) -->
+    <skip />
     <string name="account_setup_incoming_security_none_label" msgid="8300169413118264895">"Wala"</string>
     <string name="account_setup_incoming_security_ssl_trust_certificates_label" msgid="6151855090123117538">"SSL/TLS (Tanggapin ang lahat ng certificate)"</string>
     <string name="account_setup_incoming_security_ssl_label" msgid="2798501138420163861">"SSL/TLS"</string>
@@ -131,18 +139,25 @@
     <string name="account_setup_incoming_imap_path_prefix_hint" msgid="9190845919067906033">"Opsyonal"</string>
     <string name="account_setup_outgoing_title" msgid="7208495965665711539">"Setup ng account"</string>
     <string name="account_setup_outgoing_headline" msgid="2025001060935366394">"Mga setting ng papalabas na server"</string>
-    <string name="account_setup_outgoing_smtp_server_label" msgid="6035137446691195177">"SMTP server"</string>
-    <string name="account_setup_outgoing_port_label" msgid="7573207437835827876">"Port"</string>
-    <string name="account_setup_outgoing_security_label" msgid="911398071120720589">"Uri ng seguridad"</string>
+    <!-- no translation found for account_setup_outgoing_smtp_server_label (1164004960070541473) -->
+    <skip />
+    <!-- no translation found for account_setup_outgoing_port_label (4670120792135566784) -->
+    <skip />
+    <!-- no translation found for account_setup_outgoing_security_label (9200220309360082664) -->
+    <skip />
     <string name="account_setup_outgoing_require_login_label" msgid="7779484127897397562">"Hingin ang pag-signin"</string>
-    <string name="account_setup_outgoing_username_label" msgid="3309680794731596981">"Username"</string>
-    <string name="account_setup_outgoing_password_label" msgid="227844585493317550">"Password"</string>
-    <string name="account_setup_exchange_certificate_title" msgid="8473793588405277962">"Certificate ng client"</string>
+    <!-- no translation found for account_setup_outgoing_username_label (7239411429115525841) -->
+    <skip />
+    <!-- no translation found for account_setup_outgoing_password_label (3720429254654722208) -->
+    <skip />
+    <!-- no translation found for account_setup_exchange_certificate_title (1635140303999054002) -->
+    <skip />
     <string name="account_setup_exchange_select_certificate" msgid="1536103662037268683">"Piliin"</string>
     <string name="account_setup_exchange_use_certificate" msgid="8690682770083161349">"Gamitin ang certificate ng client"</string>
     <string name="account_setup_exchange_remove_certificate" msgid="5633249155510301766">"Alisin"</string>
     <string name="account_setup_exchange_no_certificate" msgid="1119542961954780872">"Wala"</string>
-    <string name="account_setup_exchange_device_id_label" msgid="1646827333223157658">"Mobile Device ID"</string>
+    <!-- no translation found for account_setup_exchange_device_id_label (5105898844003459657) -->
+    <skip />
     <string name="account_setup_options_title" msgid="9016600767888846051">"Mga setting ng account"</string>
     <string name="account_setup_options_headline" msgid="4181274232835368085">"Mga pagpipilian sa account"</string>
     <string name="account_setup_options_mail_check_frequency_label" msgid="4824859792882810053">"Dalas ng pagtingin sa inbox"</string>
diff --git a/res/values-tr/strings.xml b/res/values-tr/strings.xml
index 416821ac5..3d4c85789 100644
--- a/res/values-tr/strings.xml
+++ b/res/values-tr/strings.xml
@@ -87,13 +87,16 @@
     <string name="account_setup_basics_email_label" msgid="3454164053624112047">"E-posta adresi"</string>
     <string name="or_label" msgid="2207403489755254427">"VEYA"</string>
     <string name="sign_in_with_google" msgid="9051489501495503976">"Google ile oturum aç"</string>
-    <string name="account_setup_basics_password_label" msgid="9133549799291519298">"Şifre"</string>
-    <string name="password_label" msgid="5228754278985667134">"Şifre"</string>
+    <!-- no translation found for account_setup_basics_password_label (3402762431598148148) -->
+    <skip />
+    <!-- no translation found for password_hint (8835390747504721561) -->
+    <skip />
     <string name="signed_in_with_service_label" msgid="4909910797357155961">"%s hizmetinde oturum açıldı"</string>
-    <string name="authentication_label" msgid="5210804218348191833">"Kimlik doğrulama"</string>
+    <!-- no translation found for authentication_label (6917956186120234602) -->
+    <skip />
     <string name="add_authentication_label" msgid="865206092644419804">"Kimlik doğrulama ekle"</string>
     <string name="clear_authentication_label" msgid="8113966442068335059">"Kimlik doğrulamayı temizle"</string>
-    <string name="account_setup_basics_manual_setup_action" msgid="6640115171889882878"><u>"Manuel kurulum"</u></string>
+    <string name="account_setup_basics_manual_setup_action" msgid="8053852205391155912">"Manuel kurulum"</string>
     <string name="account_setup_username_password_toast" msgid="3968270274727947460">"Geçerli bir e-posta adresi ve şifre yazın."</string>
     <string name="account_duplicate_dlg_title" msgid="8089732986912704425">"Yinelenen hesap"</string>
     <string name="account_duplicate_dlg_message_fmt" msgid="6447629283679935840">"Bu kullanıcı adını \"<xliff:g id="DUPLICATE">%s</xliff:g>\" hesabı için zaten kullanıyorsunuz."</string>
@@ -114,11 +117,16 @@
     <string name="account_setup_account_type_instructions" msgid="114515540798408760">"Bu hesabın türü nedir?"</string>
     <string name="account_setup_incoming_title" msgid="6796626791039136005">"Hesap kurulumu"</string>
     <string name="account_setup_incoming_headline" msgid="6183711037633407184">"Gelen sunucu ayarları"</string>
-    <string name="account_setup_incoming_username_label" msgid="5700581386104070302">"Kullanıcı adı"</string>
-    <string name="account_setup_incoming_password_label" msgid="6365327603172559859">"Şifre"</string>
-    <string name="account_setup_incoming_server_label" msgid="1480342966630002638">"Sunucu"</string>
-    <string name="account_setup_incoming_port_label" msgid="8214738923690447796">"Bağlantı Noktası"</string>
-    <string name="account_setup_incoming_security_label" msgid="2110260791086007424">"Güvenlik türü"</string>
+    <!-- no translation found for account_setup_incoming_username_label (406939983633223354) -->
+    <skip />
+    <!-- no translation found for account_setup_incoming_password_label (634540235479188709) -->
+    <skip />
+    <!-- no translation found for account_setup_incoming_server_label (3528558488000638420) -->
+    <skip />
+    <!-- no translation found for account_setup_incoming_port_label (5311652277990186704) -->
+    <skip />
+    <!-- no translation found for account_setup_incoming_security_label (1175710992470593691) -->
+    <skip />
     <string name="account_setup_incoming_security_none_label" msgid="8300169413118264895">"Yok"</string>
     <string name="account_setup_incoming_security_ssl_trust_certificates_label" msgid="6151855090123117538">"SSL/TLS (Tüm sertifikaları kabul et)"</string>
     <string name="account_setup_incoming_security_ssl_label" msgid="2798501138420163861">"SSL/TLS"</string>
@@ -131,18 +139,25 @@
     <string name="account_setup_incoming_imap_path_prefix_hint" msgid="9190845919067906033">"İsteğe bağlı"</string>
     <string name="account_setup_outgoing_title" msgid="7208495965665711539">"Hesap kurulumu"</string>
     <string name="account_setup_outgoing_headline" msgid="2025001060935366394">"Giden sunucu ayarları"</string>
-    <string name="account_setup_outgoing_smtp_server_label" msgid="6035137446691195177">"SMTP sunucusu"</string>
-    <string name="account_setup_outgoing_port_label" msgid="7573207437835827876">"Bağlantı Noktası"</string>
-    <string name="account_setup_outgoing_security_label" msgid="911398071120720589">"Güvenlik türü"</string>
+    <!-- no translation found for account_setup_outgoing_smtp_server_label (1164004960070541473) -->
+    <skip />
+    <!-- no translation found for account_setup_outgoing_port_label (4670120792135566784) -->
+    <skip />
+    <!-- no translation found for account_setup_outgoing_security_label (9200220309360082664) -->
+    <skip />
     <string name="account_setup_outgoing_require_login_label" msgid="7779484127897397562">"Oturum açmayı gerektir"</string>
-    <string name="account_setup_outgoing_username_label" msgid="3309680794731596981">"Kullanıcı adı"</string>
-    <string name="account_setup_outgoing_password_label" msgid="227844585493317550">"Şifre"</string>
-    <string name="account_setup_exchange_certificate_title" msgid="8473793588405277962">"İstemci sertifikası"</string>
+    <!-- no translation found for account_setup_outgoing_username_label (7239411429115525841) -->
+    <skip />
+    <!-- no translation found for account_setup_outgoing_password_label (3720429254654722208) -->
+    <skip />
+    <!-- no translation found for account_setup_exchange_certificate_title (1635140303999054002) -->
+    <skip />
     <string name="account_setup_exchange_select_certificate" msgid="1536103662037268683">"Seç"</string>
     <string name="account_setup_exchange_use_certificate" msgid="8690682770083161349">"İstemci sertifikası kullan"</string>
     <string name="account_setup_exchange_remove_certificate" msgid="5633249155510301766">"Kaldır"</string>
     <string name="account_setup_exchange_no_certificate" msgid="1119542961954780872">"Yok"</string>
-    <string name="account_setup_exchange_device_id_label" msgid="1646827333223157658">"Mobil Cihaz Kimliği"</string>
+    <!-- no translation found for account_setup_exchange_device_id_label (5105898844003459657) -->
+    <skip />
     <string name="account_setup_options_title" msgid="9016600767888846051">"Hesap ayarları"</string>
     <string name="account_setup_options_headline" msgid="4181274232835368085">"Hesap seçenekleri"</string>
     <string name="account_setup_options_mail_check_frequency_label" msgid="4824859792882810053">"Gelen kutusunu denetleme sıklığı"</string>
diff --git a/res/values-uk/strings.xml b/res/values-uk/strings.xml
index f8c8ef099..9f5536aca 100644
--- a/res/values-uk/strings.xml
+++ b/res/values-uk/strings.xml
@@ -87,13 +87,13 @@
     <string name="account_setup_basics_email_label" msgid="3454164053624112047">"Електронна адреса"</string>
     <string name="or_label" msgid="2207403489755254427">"АБО"</string>
     <string name="sign_in_with_google" msgid="9051489501495503976">"Увійти через Google"</string>
-    <string name="account_setup_basics_password_label" msgid="9133549799291519298">"Пароль"</string>
-    <string name="password_label" msgid="5228754278985667134">"Пароль"</string>
+    <string name="account_setup_basics_password_label" msgid="3402762431598148148">"ПАРОЛЬ"</string>
+    <string name="password_hint" msgid="8835390747504721561">"Пароль"</string>
     <string name="signed_in_with_service_label" msgid="4909910797357155961">"Ви ввійшли в %s"</string>
-    <string name="authentication_label" msgid="5210804218348191833">"Автентифікація"</string>
+    <string name="authentication_label" msgid="6917956186120234602">"АВТЕНТИФІКАЦІЯ"</string>
     <string name="add_authentication_label" msgid="865206092644419804">"Додати автентифікацію"</string>
     <string name="clear_authentication_label" msgid="8113966442068335059">"Видалити автентифікацію"</string>
-    <string name="account_setup_basics_manual_setup_action" msgid="6640115171889882878"><u>"Налаштувати вручну"</u></string>
+    <string name="account_setup_basics_manual_setup_action" msgid="8053852205391155912">"Налашт-ня вручну"</string>
     <string name="account_setup_username_password_toast" msgid="3968270274727947460">"Введіть дійсну електронну адресу та пароль."</string>
     <string name="account_duplicate_dlg_title" msgid="8089732986912704425">"Копія облікового запису"</string>
     <string name="account_duplicate_dlg_message_fmt" msgid="6447629283679935840">"Ви вже використовуєте це ім’я користувача для облікового запису \"<xliff:g id="DUPLICATE">%s</xliff:g>\"."</string>
@@ -114,11 +114,11 @@
     <string name="account_setup_account_type_instructions" msgid="114515540798408760">"Тип облікового запису?"</string>
     <string name="account_setup_incoming_title" msgid="6796626791039136005">"Налаштування облікового запису"</string>
     <string name="account_setup_incoming_headline" msgid="6183711037633407184">"Параметри сервера вхідних повідомлень"</string>
-    <string name="account_setup_incoming_username_label" msgid="5700581386104070302">"Ім\'я корист."</string>
-    <string name="account_setup_incoming_password_label" msgid="6365327603172559859">"Пароль"</string>
-    <string name="account_setup_incoming_server_label" msgid="1480342966630002638">"Сервер"</string>
-    <string name="account_setup_incoming_port_label" msgid="8214738923690447796">"Порт"</string>
-    <string name="account_setup_incoming_security_label" msgid="2110260791086007424">"Тип безпеки"</string>
+    <string name="account_setup_incoming_username_label" msgid="406939983633223354">"ІМ’Я КОРИСТУВАЧА"</string>
+    <string name="account_setup_incoming_password_label" msgid="634540235479188709">"ПАРОЛЬ"</string>
+    <string name="account_setup_incoming_server_label" msgid="3528558488000638420">"СЕРВЕР"</string>
+    <string name="account_setup_incoming_port_label" msgid="5311652277990186704">"ПОРТ"</string>
+    <string name="account_setup_incoming_security_label" msgid="1175710992470593691">"ТИП ЗАХИСТУ"</string>
     <string name="account_setup_incoming_security_none_label" msgid="8300169413118264895">"Немає"</string>
     <string name="account_setup_incoming_security_ssl_trust_certificates_label" msgid="6151855090123117538">"SSL/TLS (Прийняти всі сертифікати)"</string>
     <string name="account_setup_incoming_security_ssl_label" msgid="2798501138420163861">"SSL/TLS"</string>
@@ -131,18 +131,18 @@
     <string name="account_setup_incoming_imap_path_prefix_hint" msgid="9190845919067906033">"Додатково"</string>
     <string name="account_setup_outgoing_title" msgid="7208495965665711539">"Налаштування облікового запису"</string>
     <string name="account_setup_outgoing_headline" msgid="2025001060935366394">"Параметри сервера вихідних повідомлень"</string>
-    <string name="account_setup_outgoing_smtp_server_label" msgid="6035137446691195177">"Сервер SMTP"</string>
-    <string name="account_setup_outgoing_port_label" msgid="7573207437835827876">"Порт"</string>
-    <string name="account_setup_outgoing_security_label" msgid="911398071120720589">"Тип безпеки"</string>
+    <string name="account_setup_outgoing_smtp_server_label" msgid="1164004960070541473">"SMTP-СЕРВЕР"</string>
+    <string name="account_setup_outgoing_port_label" msgid="4670120792135566784">"ПОРТ"</string>
+    <string name="account_setup_outgoing_security_label" msgid="9200220309360082664">"ТИП ЗАХИСТУ"</string>
     <string name="account_setup_outgoing_require_login_label" msgid="7779484127897397562">"Потрібно ввійти"</string>
-    <string name="account_setup_outgoing_username_label" msgid="3309680794731596981">"Ім\'я корист."</string>
-    <string name="account_setup_outgoing_password_label" msgid="227844585493317550">"Пароль"</string>
-    <string name="account_setup_exchange_certificate_title" msgid="8473793588405277962">"Сертифікат клієнта"</string>
+    <string name="account_setup_outgoing_username_label" msgid="7239411429115525841">"ІМ’Я КОРИСТУВАЧА"</string>
+    <string name="account_setup_outgoing_password_label" msgid="3720429254654722208">"ПАРОЛЬ"</string>
+    <string name="account_setup_exchange_certificate_title" msgid="1635140303999054002">"СЕРТИФІКАТ КЛІЄНТА"</string>
     <string name="account_setup_exchange_select_certificate" msgid="1536103662037268683">"Вибрати"</string>
     <string name="account_setup_exchange_use_certificate" msgid="8690682770083161349">"Використати сертифікат клієнта"</string>
     <string name="account_setup_exchange_remove_certificate" msgid="5633249155510301766">"Видалити"</string>
     <string name="account_setup_exchange_no_certificate" msgid="1119542961954780872">"Немає"</string>
-    <string name="account_setup_exchange_device_id_label" msgid="1646827333223157658">"Ідентифікатор мобіл. пристрою"</string>
+    <string name="account_setup_exchange_device_id_label" msgid="5105898844003459657">"ІДЕНТИФІКАТОР МОБІЛ. ПРИСТРОЮ"</string>
     <string name="account_setup_options_title" msgid="9016600767888846051">"Параметри облікового запису"</string>
     <string name="account_setup_options_headline" msgid="4181274232835368085">"Параметри облікового запису"</string>
     <string name="account_setup_options_mail_check_frequency_label" msgid="4824859792882810053">"Частота перевірки вхідних"</string>
diff --git a/res/values-vi/strings.xml b/res/values-vi/strings.xml
index 0c90a6bf2..fc713670b 100644
--- a/res/values-vi/strings.xml
+++ b/res/values-vi/strings.xml
@@ -87,13 +87,16 @@
     <string name="account_setup_basics_email_label" msgid="3454164053624112047">"Địa chỉ email"</string>
     <string name="or_label" msgid="2207403489755254427">"HOẶC"</string>
     <string name="sign_in_with_google" msgid="9051489501495503976">"Đăng nhập bằng Google"</string>
-    <string name="account_setup_basics_password_label" msgid="9133549799291519298">"Mật khẩu"</string>
-    <string name="password_label" msgid="5228754278985667134">"Mật khẩu"</string>
+    <!-- no translation found for account_setup_basics_password_label (3402762431598148148) -->
+    <skip />
+    <!-- no translation found for password_hint (8835390747504721561) -->
+    <skip />
     <string name="signed_in_with_service_label" msgid="4909910797357155961">"Đã đăng nhập bằng %s"</string>
-    <string name="authentication_label" msgid="5210804218348191833">"Xác thực"</string>
+    <!-- no translation found for authentication_label (6917956186120234602) -->
+    <skip />
     <string name="add_authentication_label" msgid="865206092644419804">"Thêm xác thực"</string>
     <string name="clear_authentication_label" msgid="8113966442068335059">"Xóa xác thực"</string>
-    <string name="account_setup_basics_manual_setup_action" msgid="6640115171889882878"><u>"Thiết lập thủ công"</u></string>
+    <string name="account_setup_basics_manual_setup_action" msgid="8053852205391155912">"Thiết lập thủ công"</string>
     <string name="account_setup_username_password_toast" msgid="3968270274727947460">"Hãy nhập địa chỉ email và mật khẩu hợp lệ."</string>
     <string name="account_duplicate_dlg_title" msgid="8089732986912704425">"Tài khoản trùng lặp"</string>
     <string name="account_duplicate_dlg_message_fmt" msgid="6447629283679935840">"Bạn đã và đang sử dụng tên người dùng này cho tài khoản \"<xliff:g id="DUPLICATE">%s</xliff:g>\"."</string>
@@ -114,11 +117,16 @@
     <string name="account_setup_account_type_instructions" msgid="114515540798408760">"Đây loại tài khoản gì?"</string>
     <string name="account_setup_incoming_title" msgid="6796626791039136005">"Thiết lập tài khoản"</string>
     <string name="account_setup_incoming_headline" msgid="6183711037633407184">"Cài đặt máy chủ thư đến"</string>
-    <string name="account_setup_incoming_username_label" msgid="5700581386104070302">"Tên người dùng"</string>
-    <string name="account_setup_incoming_password_label" msgid="6365327603172559859">"Mật khẩu"</string>
-    <string name="account_setup_incoming_server_label" msgid="1480342966630002638">"Máy chủ"</string>
-    <string name="account_setup_incoming_port_label" msgid="8214738923690447796">"Cổng"</string>
-    <string name="account_setup_incoming_security_label" msgid="2110260791086007424">"Loại bảo mật"</string>
+    <!-- no translation found for account_setup_incoming_username_label (406939983633223354) -->
+    <skip />
+    <!-- no translation found for account_setup_incoming_password_label (634540235479188709) -->
+    <skip />
+    <!-- no translation found for account_setup_incoming_server_label (3528558488000638420) -->
+    <skip />
+    <!-- no translation found for account_setup_incoming_port_label (5311652277990186704) -->
+    <skip />
+    <!-- no translation found for account_setup_incoming_security_label (1175710992470593691) -->
+    <skip />
     <string name="account_setup_incoming_security_none_label" msgid="8300169413118264895">"Không"</string>
     <string name="account_setup_incoming_security_ssl_trust_certificates_label" msgid="6151855090123117538">"SSL/TLS (Chấp nhận tất cả chứng chỉ)"</string>
     <string name="account_setup_incoming_security_ssl_label" msgid="2798501138420163861">"SSL/TLS"</string>
@@ -131,18 +139,25 @@
     <string name="account_setup_incoming_imap_path_prefix_hint" msgid="9190845919067906033">"Tùy chọn"</string>
     <string name="account_setup_outgoing_title" msgid="7208495965665711539">"Thiết lập tài khoản"</string>
     <string name="account_setup_outgoing_headline" msgid="2025001060935366394">"Cài đặt máy chủ thư đi"</string>
-    <string name="account_setup_outgoing_smtp_server_label" msgid="6035137446691195177">"Máy chủ SMTP"</string>
-    <string name="account_setup_outgoing_port_label" msgid="7573207437835827876">"Cổng"</string>
-    <string name="account_setup_outgoing_security_label" msgid="911398071120720589">"Loại bảo mật"</string>
+    <!-- no translation found for account_setup_outgoing_smtp_server_label (1164004960070541473) -->
+    <skip />
+    <!-- no translation found for account_setup_outgoing_port_label (4670120792135566784) -->
+    <skip />
+    <!-- no translation found for account_setup_outgoing_security_label (9200220309360082664) -->
+    <skip />
     <string name="account_setup_outgoing_require_login_label" msgid="7779484127897397562">"Yêu cầu đăng nhập"</string>
-    <string name="account_setup_outgoing_username_label" msgid="3309680794731596981">"Tên người dùng"</string>
-    <string name="account_setup_outgoing_password_label" msgid="227844585493317550">"Mật khẩu"</string>
-    <string name="account_setup_exchange_certificate_title" msgid="8473793588405277962">"Chứng chỉ ứng dụng khách"</string>
+    <!-- no translation found for account_setup_outgoing_username_label (7239411429115525841) -->
+    <skip />
+    <!-- no translation found for account_setup_outgoing_password_label (3720429254654722208) -->
+    <skip />
+    <!-- no translation found for account_setup_exchange_certificate_title (1635140303999054002) -->
+    <skip />
     <string name="account_setup_exchange_select_certificate" msgid="1536103662037268683">"Chọn"</string>
     <string name="account_setup_exchange_use_certificate" msgid="8690682770083161349">"Sử dụng chứng chỉ ứng dụng khách"</string>
     <string name="account_setup_exchange_remove_certificate" msgid="5633249155510301766">"Xóa"</string>
     <string name="account_setup_exchange_no_certificate" msgid="1119542961954780872">"Không"</string>
-    <string name="account_setup_exchange_device_id_label" msgid="1646827333223157658">"ID Thiết bị di động"</string>
+    <!-- no translation found for account_setup_exchange_device_id_label (5105898844003459657) -->
+    <skip />
     <string name="account_setup_options_title" msgid="9016600767888846051">"Cài đặt tài khoản"</string>
     <string name="account_setup_options_headline" msgid="4181274232835368085">"Tùy chọn tài khoản"</string>
     <string name="account_setup_options_mail_check_frequency_label" msgid="4824859792882810053">"Tần suất kiểm tra hộp thư đến"</string>
diff --git a/res/values-zh-rCN/strings.xml b/res/values-zh-rCN/strings.xml
index 14154bc58..b92b6ac02 100644
--- a/res/values-zh-rCN/strings.xml
+++ b/res/values-zh-rCN/strings.xml
@@ -87,13 +87,16 @@
     <string name="account_setup_basics_email_label" msgid="3454164053624112047">"电子邮件地址"</string>
     <string name="or_label" msgid="2207403489755254427">"或"</string>
     <string name="sign_in_with_google" msgid="9051489501495503976">"使用Google帐户登录"</string>
-    <string name="account_setup_basics_password_label" msgid="9133549799291519298">"密码"</string>
-    <string name="password_label" msgid="5228754278985667134">"密码"</string>
+    <!-- no translation found for account_setup_basics_password_label (3402762431598148148) -->
+    <skip />
+    <!-- no translation found for password_hint (8835390747504721561) -->
+    <skip />
     <string name="signed_in_with_service_label" msgid="4909910797357155961">"已登录%s"</string>
-    <string name="authentication_label" msgid="5210804218348191833">"身份验证"</string>
+    <!-- no translation found for authentication_label (6917956186120234602) -->
+    <skip />
     <string name="add_authentication_label" msgid="865206092644419804">"添加身份验证"</string>
     <string name="clear_authentication_label" msgid="8113966442068335059">"清除身份验证"</string>
-    <string name="account_setup_basics_manual_setup_action" msgid="6640115171889882878"><u>"手动设置"</u></string>
+    <string name="account_setup_basics_manual_setup_action" msgid="8053852205391155912">"手动设置"</string>
     <string name="account_setup_username_password_toast" msgid="3968270274727947460">"请键入有效的电子邮件地址和密码。"</string>
     <string name="account_duplicate_dlg_title" msgid="8089732986912704425">"帐户重复"</string>
     <string name="account_duplicate_dlg_message_fmt" msgid="6447629283679935840">"帐户“<xliff:g id="DUPLICATE">%s</xliff:g>”已经使用了此用户名。"</string>
@@ -114,11 +117,16 @@
     <string name="account_setup_account_type_instructions" msgid="114515540798408760">"这是什么类型的帐户？"</string>
     <string name="account_setup_incoming_title" msgid="6796626791039136005">"帐户设置"</string>
     <string name="account_setup_incoming_headline" msgid="6183711037633407184">"接收服务器设置"</string>
-    <string name="account_setup_incoming_username_label" msgid="5700581386104070302">"用户名"</string>
-    <string name="account_setup_incoming_password_label" msgid="6365327603172559859">"密码"</string>
-    <string name="account_setup_incoming_server_label" msgid="1480342966630002638">"服务器"</string>
-    <string name="account_setup_incoming_port_label" msgid="8214738923690447796">"端口"</string>
-    <string name="account_setup_incoming_security_label" msgid="2110260791086007424">"安全类型"</string>
+    <!-- no translation found for account_setup_incoming_username_label (406939983633223354) -->
+    <skip />
+    <!-- no translation found for account_setup_incoming_password_label (634540235479188709) -->
+    <skip />
+    <!-- no translation found for account_setup_incoming_server_label (3528558488000638420) -->
+    <skip />
+    <!-- no translation found for account_setup_incoming_port_label (5311652277990186704) -->
+    <skip />
+    <!-- no translation found for account_setup_incoming_security_label (1175710992470593691) -->
+    <skip />
     <string name="account_setup_incoming_security_none_label" msgid="8300169413118264895">"无"</string>
     <string name="account_setup_incoming_security_ssl_trust_certificates_label" msgid="6151855090123117538">"SSL/TLS（接受所有证书）"</string>
     <string name="account_setup_incoming_security_ssl_label" msgid="2798501138420163861">"SSL/TLS"</string>
@@ -131,18 +139,25 @@
     <string name="account_setup_incoming_imap_path_prefix_hint" msgid="9190845919067906033">"可选"</string>
     <string name="account_setup_outgoing_title" msgid="7208495965665711539">"帐户设置"</string>
     <string name="account_setup_outgoing_headline" msgid="2025001060935366394">"外发服务器设置"</string>
-    <string name="account_setup_outgoing_smtp_server_label" msgid="6035137446691195177">"SMTP 服务器"</string>
-    <string name="account_setup_outgoing_port_label" msgid="7573207437835827876">"端口"</string>
-    <string name="account_setup_outgoing_security_label" msgid="911398071120720589">"安全类型"</string>
+    <!-- no translation found for account_setup_outgoing_smtp_server_label (1164004960070541473) -->
+    <skip />
+    <!-- no translation found for account_setup_outgoing_port_label (4670120792135566784) -->
+    <skip />
+    <!-- no translation found for account_setup_outgoing_security_label (9200220309360082664) -->
+    <skip />
     <string name="account_setup_outgoing_require_login_label" msgid="7779484127897397562">"要求登录"</string>
-    <string name="account_setup_outgoing_username_label" msgid="3309680794731596981">"用户名"</string>
-    <string name="account_setup_outgoing_password_label" msgid="227844585493317550">"密码"</string>
-    <string name="account_setup_exchange_certificate_title" msgid="8473793588405277962">"客户端证书"</string>
+    <!-- no translation found for account_setup_outgoing_username_label (7239411429115525841) -->
+    <skip />
+    <!-- no translation found for account_setup_outgoing_password_label (3720429254654722208) -->
+    <skip />
+    <!-- no translation found for account_setup_exchange_certificate_title (1635140303999054002) -->
+    <skip />
     <string name="account_setup_exchange_select_certificate" msgid="1536103662037268683">"选择"</string>
     <string name="account_setup_exchange_use_certificate" msgid="8690682770083161349">"使用客户端证书"</string>
     <string name="account_setup_exchange_remove_certificate" msgid="5633249155510301766">"删除"</string>
     <string name="account_setup_exchange_no_certificate" msgid="1119542961954780872">"无"</string>
-    <string name="account_setup_exchange_device_id_label" msgid="1646827333223157658">"移动设备 ID"</string>
+    <!-- no translation found for account_setup_exchange_device_id_label (5105898844003459657) -->
+    <skip />
     <string name="account_setup_options_title" msgid="9016600767888846051">"帐户设置"</string>
     <string name="account_setup_options_headline" msgid="4181274232835368085">"帐户选项"</string>
     <string name="account_setup_options_mail_check_frequency_label" msgid="4824859792882810053">"邮件查收频率"</string>
diff --git a/res/values-zh-rHK/strings.xml b/res/values-zh-rHK/strings.xml
index 854c10055..08bd24186 100644
--- a/res/values-zh-rHK/strings.xml
+++ b/res/values-zh-rHK/strings.xml
@@ -87,13 +87,16 @@
     <string name="account_setup_basics_email_label" msgid="3454164053624112047">"電郵地址"</string>
     <string name="or_label" msgid="2207403489755254427">"或"</string>
     <string name="sign_in_with_google" msgid="9051489501495503976">"使用 Google 帳戶登入"</string>
-    <string name="account_setup_basics_password_label" msgid="9133549799291519298">"密碼"</string>
-    <string name="password_label" msgid="5228754278985667134">"密碼"</string>
+    <!-- no translation found for account_setup_basics_password_label (3402762431598148148) -->
+    <skip />
+    <!-- no translation found for password_hint (8835390747504721561) -->
+    <skip />
     <string name="signed_in_with_service_label" msgid="4909910797357155961">"已使用「%s」登入"</string>
-    <string name="authentication_label" msgid="5210804218348191833">"驗證"</string>
+    <!-- no translation found for authentication_label (6917956186120234602) -->
+    <skip />
     <string name="add_authentication_label" msgid="865206092644419804">"新增驗證"</string>
     <string name="clear_authentication_label" msgid="8113966442068335059">"清除驗證"</string>
-    <string name="account_setup_basics_manual_setup_action" msgid="6640115171889882878"><u>"手動設定"</u></string>
+    <string name="account_setup_basics_manual_setup_action" msgid="8053852205391155912">"手動設定"</string>
     <string name="account_setup_username_password_toast" msgid="3968270274727947460">"請輸入有效的電郵地址和密碼。"</string>
     <string name="account_duplicate_dlg_title" msgid="8089732986912704425">"重複帳戶"</string>
     <string name="account_duplicate_dlg_message_fmt" msgid="6447629283679935840">"您的「<xliff:g id="DUPLICATE">%s</xliff:g>」帳戶已經使用這個用戶名稱。"</string>
@@ -114,11 +117,16 @@
     <string name="account_setup_account_type_instructions" msgid="114515540798408760">"這是什麼類型的帳戶？"</string>
     <string name="account_setup_incoming_title" msgid="6796626791039136005">"帳戶設定"</string>
     <string name="account_setup_incoming_headline" msgid="6183711037633407184">"內送伺服器設定"</string>
-    <string name="account_setup_incoming_username_label" msgid="5700581386104070302">"用戶名稱"</string>
-    <string name="account_setup_incoming_password_label" msgid="6365327603172559859">"密碼"</string>
-    <string name="account_setup_incoming_server_label" msgid="1480342966630002638">"伺服器"</string>
-    <string name="account_setup_incoming_port_label" msgid="8214738923690447796">"通訊埠"</string>
-    <string name="account_setup_incoming_security_label" msgid="2110260791086007424">"安全性類型"</string>
+    <!-- no translation found for account_setup_incoming_username_label (406939983633223354) -->
+    <skip />
+    <!-- no translation found for account_setup_incoming_password_label (634540235479188709) -->
+    <skip />
+    <!-- no translation found for account_setup_incoming_server_label (3528558488000638420) -->
+    <skip />
+    <!-- no translation found for account_setup_incoming_port_label (5311652277990186704) -->
+    <skip />
+    <!-- no translation found for account_setup_incoming_security_label (1175710992470593691) -->
+    <skip />
     <string name="account_setup_incoming_security_none_label" msgid="8300169413118264895">"無"</string>
     <string name="account_setup_incoming_security_ssl_trust_certificates_label" msgid="6151855090123117538">"SSL/TLS (接受所有憑證)"</string>
     <string name="account_setup_incoming_security_ssl_label" msgid="2798501138420163861">"SSL/TLS"</string>
@@ -131,18 +139,25 @@
     <string name="account_setup_incoming_imap_path_prefix_hint" msgid="9190845919067906033">"非必填"</string>
     <string name="account_setup_outgoing_title" msgid="7208495965665711539">"帳戶設定"</string>
     <string name="account_setup_outgoing_headline" msgid="2025001060935366394">"外寄伺服器設定"</string>
-    <string name="account_setup_outgoing_smtp_server_label" msgid="6035137446691195177">"SMTP 伺服器"</string>
-    <string name="account_setup_outgoing_port_label" msgid="7573207437835827876">"通訊埠"</string>
-    <string name="account_setup_outgoing_security_label" msgid="911398071120720589">"安全類型"</string>
+    <!-- no translation found for account_setup_outgoing_smtp_server_label (1164004960070541473) -->
+    <skip />
+    <!-- no translation found for account_setup_outgoing_port_label (4670120792135566784) -->
+    <skip />
+    <!-- no translation found for account_setup_outgoing_security_label (9200220309360082664) -->
+    <skip />
     <string name="account_setup_outgoing_require_login_label" msgid="7779484127897397562">"要求登入"</string>
-    <string name="account_setup_outgoing_username_label" msgid="3309680794731596981">"用戶名稱"</string>
-    <string name="account_setup_outgoing_password_label" msgid="227844585493317550">"密碼"</string>
-    <string name="account_setup_exchange_certificate_title" msgid="8473793588405277962">"用戶端憑證"</string>
+    <!-- no translation found for account_setup_outgoing_username_label (7239411429115525841) -->
+    <skip />
+    <!-- no translation found for account_setup_outgoing_password_label (3720429254654722208) -->
+    <skip />
+    <!-- no translation found for account_setup_exchange_certificate_title (1635140303999054002) -->
+    <skip />
     <string name="account_setup_exchange_select_certificate" msgid="1536103662037268683">"選取"</string>
     <string name="account_setup_exchange_use_certificate" msgid="8690682770083161349">"使用用戶端憑證"</string>
     <string name="account_setup_exchange_remove_certificate" msgid="5633249155510301766">"移除"</string>
     <string name="account_setup_exchange_no_certificate" msgid="1119542961954780872">"無"</string>
-    <string name="account_setup_exchange_device_id_label" msgid="1646827333223157658">"流動裝置編號"</string>
+    <!-- no translation found for account_setup_exchange_device_id_label (5105898844003459657) -->
+    <skip />
     <string name="account_setup_options_title" msgid="9016600767888846051">"帳戶設定"</string>
     <string name="account_setup_options_headline" msgid="4181274232835368085">"帳戶選項"</string>
     <string name="account_setup_options_mail_check_frequency_label" msgid="4824859792882810053">"查看收件匣頻率"</string>
diff --git a/res/values-zh-rTW/strings.xml b/res/values-zh-rTW/strings.xml
index 13fcc0d6d..e294a90b3 100644
--- a/res/values-zh-rTW/strings.xml
+++ b/res/values-zh-rTW/strings.xml
@@ -87,13 +87,16 @@
     <string name="account_setup_basics_email_label" msgid="3454164053624112047">"電子郵件地址"</string>
     <string name="or_label" msgid="2207403489755254427">"或"</string>
     <string name="sign_in_with_google" msgid="9051489501495503976">"使用 Google 帳戶登入"</string>
-    <string name="account_setup_basics_password_label" msgid="9133549799291519298">"密碼"</string>
-    <string name="password_label" msgid="5228754278985667134">"密碼"</string>
+    <!-- no translation found for account_setup_basics_password_label (3402762431598148148) -->
+    <skip />
+    <!-- no translation found for password_hint (8835390747504721561) -->
+    <skip />
     <string name="signed_in_with_service_label" msgid="4909910797357155961">"已使用「%s」登入"</string>
-    <string name="authentication_label" msgid="5210804218348191833">"驗證"</string>
+    <!-- no translation found for authentication_label (6917956186120234602) -->
+    <skip />
     <string name="add_authentication_label" msgid="865206092644419804">"新增驗證"</string>
     <string name="clear_authentication_label" msgid="8113966442068335059">"清除驗證"</string>
-    <string name="account_setup_basics_manual_setup_action" msgid="6640115171889882878"><u>"手動設定"</u></string>
+    <string name="account_setup_basics_manual_setup_action" msgid="8053852205391155912">"手動設定"</string>
     <string name="account_setup_username_password_toast" msgid="3968270274727947460">"輸入有效的電子郵件地址和密碼。"</string>
     <string name="account_duplicate_dlg_title" msgid="8089732986912704425">"複製帳戶"</string>
     <string name="account_duplicate_dlg_message_fmt" msgid="6447629283679935840">"您的「<xliff:g id="DUPLICATE">%s</xliff:g>」帳戶已經使用這個使用者名稱。"</string>
@@ -114,11 +117,16 @@
     <string name="account_setup_account_type_instructions" msgid="114515540798408760">"帳戶類型為何？"</string>
     <string name="account_setup_incoming_title" msgid="6796626791039136005">"帳戶設定"</string>
     <string name="account_setup_incoming_headline" msgid="6183711037633407184">"內送伺服器設定"</string>
-    <string name="account_setup_incoming_username_label" msgid="5700581386104070302">"使用者名稱"</string>
-    <string name="account_setup_incoming_password_label" msgid="6365327603172559859">"密碼"</string>
-    <string name="account_setup_incoming_server_label" msgid="1480342966630002638">"伺服器"</string>
-    <string name="account_setup_incoming_port_label" msgid="8214738923690447796">"通訊埠"</string>
-    <string name="account_setup_incoming_security_label" msgid="2110260791086007424">"安全性類型"</string>
+    <!-- no translation found for account_setup_incoming_username_label (406939983633223354) -->
+    <skip />
+    <!-- no translation found for account_setup_incoming_password_label (634540235479188709) -->
+    <skip />
+    <!-- no translation found for account_setup_incoming_server_label (3528558488000638420) -->
+    <skip />
+    <!-- no translation found for account_setup_incoming_port_label (5311652277990186704) -->
+    <skip />
+    <!-- no translation found for account_setup_incoming_security_label (1175710992470593691) -->
+    <skip />
     <string name="account_setup_incoming_security_none_label" msgid="8300169413118264895">"無"</string>
     <string name="account_setup_incoming_security_ssl_trust_certificates_label" msgid="6151855090123117538">"SSL/TLS (接受所有憑證)"</string>
     <string name="account_setup_incoming_security_ssl_label" msgid="2798501138420163861">"SSL/TLS"</string>
@@ -131,18 +139,25 @@
     <string name="account_setup_incoming_imap_path_prefix_hint" msgid="9190845919067906033">"選用"</string>
     <string name="account_setup_outgoing_title" msgid="7208495965665711539">"帳戶設定"</string>
     <string name="account_setup_outgoing_headline" msgid="2025001060935366394">"外寄伺服器設定"</string>
-    <string name="account_setup_outgoing_smtp_server_label" msgid="6035137446691195177">"SMTP 伺服器"</string>
-    <string name="account_setup_outgoing_port_label" msgid="7573207437835827876">"通訊埠"</string>
-    <string name="account_setup_outgoing_security_label" msgid="911398071120720589">"安全性類型"</string>
+    <!-- no translation found for account_setup_outgoing_smtp_server_label (1164004960070541473) -->
+    <skip />
+    <!-- no translation found for account_setup_outgoing_port_label (4670120792135566784) -->
+    <skip />
+    <!-- no translation found for account_setup_outgoing_security_label (9200220309360082664) -->
+    <skip />
     <string name="account_setup_outgoing_require_login_label" msgid="7779484127897397562">"要求登入"</string>
-    <string name="account_setup_outgoing_username_label" msgid="3309680794731596981">"使用者名稱"</string>
-    <string name="account_setup_outgoing_password_label" msgid="227844585493317550">"密碼"</string>
-    <string name="account_setup_exchange_certificate_title" msgid="8473793588405277962">"用戶端憑證"</string>
+    <!-- no translation found for account_setup_outgoing_username_label (7239411429115525841) -->
+    <skip />
+    <!-- no translation found for account_setup_outgoing_password_label (3720429254654722208) -->
+    <skip />
+    <!-- no translation found for account_setup_exchange_certificate_title (1635140303999054002) -->
+    <skip />
     <string name="account_setup_exchange_select_certificate" msgid="1536103662037268683">"選取"</string>
     <string name="account_setup_exchange_use_certificate" msgid="8690682770083161349">"使用用戶端憑證"</string>
     <string name="account_setup_exchange_remove_certificate" msgid="5633249155510301766">"移除"</string>
     <string name="account_setup_exchange_no_certificate" msgid="1119542961954780872">"無"</string>
-    <string name="account_setup_exchange_device_id_label" msgid="1646827333223157658">"行動裝置 ID"</string>
+    <!-- no translation found for account_setup_exchange_device_id_label (5105898844003459657) -->
+    <skip />
     <string name="account_setup_options_title" msgid="9016600767888846051">"帳戶設定"</string>
     <string name="account_setup_options_headline" msgid="4181274232835368085">"帳戶選項"</string>
     <string name="account_setup_options_mail_check_frequency_label" msgid="4824859792882810053">"收件匣檢查頻率"</string>
diff --git a/res/values-zu/strings.xml b/res/values-zu/strings.xml
index c037f998a..2a3eecb02 100644
--- a/res/values-zu/strings.xml
+++ b/res/values-zu/strings.xml
@@ -87,13 +87,13 @@
     <string name="account_setup_basics_email_label" msgid="3454164053624112047">"Ikheli le-imeyli"</string>
     <string name="or_label" msgid="2207403489755254427">"NOMA"</string>
     <string name="sign_in_with_google" msgid="9051489501495503976">"Ngena ngemvume nge-Google"</string>
-    <string name="account_setup_basics_password_label" msgid="9133549799291519298">"Iphasiwedi"</string>
-    <string name="password_label" msgid="5228754278985667134">"Iphasiwedi"</string>
+    <string name="account_setup_basics_password_label" msgid="3402762431598148148">"IPHASIWEDI"</string>
+    <string name="password_hint" msgid="8835390747504721561">"Iphasiwedi"</string>
     <string name="signed_in_with_service_label" msgid="4909910797357155961">"Ingene ngemvume nge-%s"</string>
-    <string name="authentication_label" msgid="5210804218348191833">"Ukufakazela ubuqiniso"</string>
+    <string name="authentication_label" msgid="6917956186120234602">"UKUFAKAZELA UBUQINISO"</string>
     <string name="add_authentication_label" msgid="865206092644419804">"Engeza ukufakazela ubuqiniso"</string>
     <string name="clear_authentication_label" msgid="8113966442068335059">"Sula ukufakazela ubuqiniso"</string>
-    <string name="account_setup_basics_manual_setup_action" msgid="6640115171889882878"><u>"Ukusetha okwenza ngesandla"</u></string>
+    <string name="account_setup_basics_manual_setup_action" msgid="8053852205391155912">"Ukumisela"</string>
     <string name="account_setup_username_password_toast" msgid="3968270274727947460">"Sicela uthayiphe ikheli le-imeyili elilungile kanye nephasiwedi."</string>
     <string name="account_duplicate_dlg_title" msgid="8089732986912704425">"I-akhawunti Ephindiwe"</string>
     <string name="account_duplicate_dlg_message_fmt" msgid="6447629283679935840">"Usuvele usebenzisa leli gama lomsebenzisi kule akhawunti \"<xliff:g id="DUPLICATE">%s</xliff:g>\"."</string>
@@ -114,11 +114,11 @@
     <string name="account_setup_account_type_instructions" msgid="114515540798408760">"Yiluphi uhlobo lwe-akhawunti lolu?"</string>
     <string name="account_setup_incoming_title" msgid="6796626791039136005">"Ukumisa i-akhawunti"</string>
     <string name="account_setup_incoming_headline" msgid="6183711037633407184">"Izilungiselelo zeseva engenayo"</string>
-    <string name="account_setup_incoming_username_label" msgid="5700581386104070302">"Igama lomsebenzisi"</string>
-    <string name="account_setup_incoming_password_label" msgid="6365327603172559859">"Iphasiwedi"</string>
-    <string name="account_setup_incoming_server_label" msgid="1480342966630002638">"Iseva"</string>
-    <string name="account_setup_incoming_port_label" msgid="8214738923690447796">"Imbobo yokuxhuma"</string>
-    <string name="account_setup_incoming_security_label" msgid="2110260791086007424">"Uhlobo lokuphepha"</string>
+    <string name="account_setup_incoming_username_label" msgid="406939983633223354">"IGAMA LOMSEBENZISI"</string>
+    <string name="account_setup_incoming_password_label" msgid="634540235479188709">"IPHASIWEDI"</string>
+    <string name="account_setup_incoming_server_label" msgid="3528558488000638420">"ISEVA"</string>
+    <string name="account_setup_incoming_port_label" msgid="5311652277990186704">"IMBOBO"</string>
+    <string name="account_setup_incoming_security_label" msgid="1175710992470593691">"UHLOBO LWEZOKUPHEPHA"</string>
     <string name="account_setup_incoming_security_none_label" msgid="8300169413118264895">"Lutho"</string>
     <string name="account_setup_incoming_security_ssl_trust_certificates_label" msgid="6151855090123117538">"i-SSL/i-TLS (Yamukela zonke izitifiketi)"</string>
     <string name="account_setup_incoming_security_ssl_label" msgid="2798501138420163861">"i-SSL/i-TLS"</string>
@@ -131,18 +131,18 @@
     <string name="account_setup_incoming_imap_path_prefix_hint" msgid="9190845919067906033">"Okokuzithandela"</string>
     <string name="account_setup_outgoing_title" msgid="7208495965665711539">"Ukumisa i-akhawunti"</string>
     <string name="account_setup_outgoing_headline" msgid="2025001060935366394">"Izilungiselelo zeseva eziphumayo"</string>
-    <string name="account_setup_outgoing_smtp_server_label" msgid="6035137446691195177">"Iseva ye-SMTP"</string>
-    <string name="account_setup_outgoing_port_label" msgid="7573207437835827876">"Imbobo yokuxhuma"</string>
-    <string name="account_setup_outgoing_security_label" msgid="911398071120720589">"Uhlobo lokuphepha"</string>
+    <string name="account_setup_outgoing_smtp_server_label" msgid="1164004960070541473">"ISEVA YE-SMTP"</string>
+    <string name="account_setup_outgoing_port_label" msgid="4670120792135566784">"IMBOBO"</string>
+    <string name="account_setup_outgoing_security_label" msgid="9200220309360082664">"UHLOBO LWEZOKUPHEPHA"</string>
     <string name="account_setup_outgoing_require_login_label" msgid="7779484127897397562">"Kudingeka ukungena ngemvume"</string>
-    <string name="account_setup_outgoing_username_label" msgid="3309680794731596981">"Igama lomsebenzisi"</string>
-    <string name="account_setup_outgoing_password_label" msgid="227844585493317550">"Iphasiwedi"</string>
-    <string name="account_setup_exchange_certificate_title" msgid="8473793588405277962">"Isitifikethi sekhasimende"</string>
+    <string name="account_setup_outgoing_username_label" msgid="7239411429115525841">"IGAMA LOMSEBENZISI"</string>
+    <string name="account_setup_outgoing_password_label" msgid="3720429254654722208">"IPHASIWEDI"</string>
+    <string name="account_setup_exchange_certificate_title" msgid="1635140303999054002">"ISITIFIKETI SEKHASIMENDE"</string>
     <string name="account_setup_exchange_select_certificate" msgid="1536103662037268683">"Khetha"</string>
     <string name="account_setup_exchange_use_certificate" msgid="8690682770083161349">"Sebenzisa isitifiketi sekhasimende"</string>
     <string name="account_setup_exchange_remove_certificate" msgid="5633249155510301766">"Susa"</string>
     <string name="account_setup_exchange_no_certificate" msgid="1119542961954780872">"Lutho"</string>
-    <string name="account_setup_exchange_device_id_label" msgid="1646827333223157658">"i-ID Yedivaysi Yefoni"</string>
+    <string name="account_setup_exchange_device_id_label" msgid="5105898844003459657">"I-ID YEDIVAYISI YESELULA"</string>
     <string name="account_setup_options_title" msgid="9016600767888846051">"Izilungiselelo ze-akhawunti"</string>
     <string name="account_setup_options_headline" msgid="4181274232835368085">"Okukhethwa kukho kwe-akhawunti"</string>
     <string name="account_setup_options_mail_check_frequency_label" msgid="4824859792882810053">"Ukuhlola ukuvama kwebhokisi lemiyalezo engenayo"</string>