diff --git a/res/values-am/strings.xml b/res/values-am/strings.xml
index 76584f0f2..09605779c 100644
--- a/res/values-am/strings.xml
+++ b/res/values-am/strings.xml
@@ -125,9 +125,9 @@
     <string name="account_setup_incoming_security_ssl_label" msgid="2798501138420163861">"SSL/TLS"</string>
     <string name="account_setup_incoming_security_tls_trust_certificates_label" msgid="6149084428423662620">"STARTTLS (ሁሉንም ምስክሮች ተቀበል)"</string>
     <string name="account_setup_incoming_security_tls_label" msgid="6573498431821879660">"STARTTLS"</string>
-    <string name="account_setup_incoming_delete_policy_label" msgid="9213590134693857912">"ኢሜልል ከአገልጋይ ሰርዝ"</string>
+    <string name="account_setup_incoming_delete_policy_label" msgid="9213590134693857912">"ኢሜይል ከአገልጋይ ሰርዝ"</string>
     <string name="account_setup_incoming_delete_policy_never_label" msgid="3222897501875871041">"በፍፁም"</string>
-    <string name="account_setup_incoming_delete_policy_delete_label" msgid="222216840911785631">"ከገቢ መልዕክት ውስጥ ስሰርዘው"</string>
+    <string name="account_setup_incoming_delete_policy_delete_label" msgid="222216840911785631">"መቼ ነው ከገቢ መልዕክት ውስጥ የሚሰረዘው"</string>
     <string name="account_setup_incoming_imap_path_prefix_label" msgid="401167247072926810">"የIMAP ቅድመ ቅጥያዱካ"</string>
     <string name="account_setup_incoming_imap_path_prefix_hint" msgid="9190845919067906033">"አማራጭ"</string>
     <string name="account_setup_outgoing_title" msgid="7208495965665711539">"መለያ አዘጋጅ"</string>
diff --git a/res/values-ca/strings.xml b/res/values-ca/strings.xml
index 5eebe3a32..85900d2cd 100644
--- a/res/values-ca/strings.xml
+++ b/res/values-ca/strings.xml
@@ -49,7 +49,7 @@
     <string name="account_folder_list_summary_starred" msgid="3134312269246375723">"Destacats"</string>
     <string name="account_folder_list_summary_drafts" msgid="5514845993247300437">"Esborranys"</string>
     <string name="account_folder_list_summary_outbox" msgid="3059836696049399377">"Bústia de sortida"</string>
-    <string name="mailbox_list_account_selector_combined_view" msgid="1556327299894225044">"Vista combinada"</string>
+    <string name="mailbox_list_account_selector_combined_view" msgid="1556327299894225044">"Visualització combinada"</string>
     <string name="message_compose_fwd_header_fmt" msgid="5181300290654579434">\n\n"-------- Missatge original --------\nAssumpte: <xliff:g id="SUBJECT">%1$s</xliff:g>\nDe: <xliff:g id="SENDER">%2$s</xliff:g>\nPer a: <xliff:g id="TO">%3$s</xliff:g>\nCc: <xliff:g id="CC_0">%4$s</xliff:g>\n\n"</string>
     <string name="message_compose_insert_quick_response_list_title" msgid="5314107302508728189">"Inserció d\'una resposta ràpida"</string>
     <string name="message_compose_insert_quick_response_menu_title" msgid="5817075097532919955">"Insereix resposta ràpida"</string>
@@ -158,7 +158,7 @@
     <string name="account_setup_options_sync_contacts_label" msgid="276492345599531778">"Sincronitza els contactes d\'aquest compte"</string>
     <string name="account_setup_options_sync_calendar_label" msgid="3222151135467189411">"Sincronitza el calendari d\'aquest compte"</string>
     <string name="account_setup_options_sync_email_label" msgid="8585177128405004068">"Sincronitza el correu d\'aquest compte"</string>
-    <string name="account_setup_options_background_attachments_label" msgid="5247749298276451846">"Baixa automàticament els fitxers adjunts en connectar-te a Wi-Fi"</string>
+    <string name="account_setup_options_background_attachments_label" msgid="5247749298276451846">"Baixa els fitxers adjunts automàticament en connectar a una xarxa Wi-Fi"</string>
     <string name="account_setup_failed_dlg_title" msgid="9083263347962940552">"No s\'ha pogut acabar"</string>
     <string name="account_setup_options_mail_window_label" msgid="7603869690500525594">"Sincronitza els correus electrònics de:"</string>
     <string name="account_setup_options_mail_window_auto" msgid="4188895354366183790">"Automàtic"</string>
@@ -183,7 +183,7 @@
     <string name="account_setup_failed_tls_required" msgid="307030406688611327">"TLS necessari, però no compatible amb el servidor."</string>
     <string name="account_setup_failed_auth_required" msgid="6799839150250217566">"Els mètodes d\'autenticació no són compatibles amb el servidor."</string>
     <string name="account_setup_failed_security" msgid="925820957665764964">"No s\'ha pogut obrir la connexió al servidor a causa d\'un error de seguretat."</string>
-    <string name="account_setup_failed_ioerror" msgid="7802604687451830378">"No s\'ha pogut obrir la connexió amb el servidor."</string>
+    <string name="account_setup_failed_ioerror" msgid="7802604687451830378">"No s\'ha pogut establir la connexió amb el servidor."</string>
     <string name="account_setup_failed_protocol_unsupported" msgid="4607759927226943569">"Has introduït una adreça de servidor incorrecta o el servidor requereix una versió de protocol que el correu electrònic no admet."</string>
     <string name="account_setup_failed_access_denied" msgid="6835358740050287051">"No tens permís per sincronitzar amb aquest servidor. Contacta amb l\'administrador del servidor per obtenir més informació."</string>
     <string name="account_setup_security_required_title" msgid="1850321535870447468">"Administració de seguretat remota"</string>
@@ -247,11 +247,11 @@
     <string name="edit_quick_response_dialog" msgid="6479106007607928450">"Resposta ràpida"</string>
     <string name="save_action" msgid="1988862706623227093">"Desa"</string>
     <string name="account_settings_sync_contacts_enable" msgid="1369272986009573218">"Sincronitza els contactes"</string>
-    <string name="account_settings_sync_contacts_summary" msgid="816919452270997919">"Sincronitza contactes del compte"</string>
+    <string name="account_settings_sync_contacts_summary" msgid="816919452270997919">"Sincronitza els contactes del compte"</string>
     <string name="account_settings_sync_calendar_enable" msgid="6855333393468628003">"Sincronitza el calendari"</string>
-    <string name="account_settings_sync_calendar_summary" msgid="7606340353079301703">"Sincronitza esdeveniments del calendari per al compte"</string>
+    <string name="account_settings_sync_calendar_summary" msgid="7606340353079301703">"Sincronitza els esdeveniments del calendari del compte"</string>
     <string name="account_settings_sync_email_enable" msgid="3754115565685222477">"Sincronitza el correu electrònic"</string>
-    <string name="account_settings_sync_email_summary" msgid="262964076412310990">"Sincronitza correu del compte"</string>
+    <string name="account_settings_sync_email_summary" msgid="262964076412310990">"Sincronitza el correu del compte"</string>
     <string name="account_settings_vibrate_when_label" msgid="708477308761702671">"Vibra"</string>
     <string name="account_settings_ringtone" msgid="8229878374785575207">"Tria un so"</string>
     <string name="account_settings_servers" msgid="4925493817981624242">"Configuració del servidor"</string>
diff --git a/res/values-cs/strings.xml b/res/values-cs/strings.xml
index 96d36dd26..5250d12a6 100644
--- a/res/values-cs/strings.xml
+++ b/res/values-cs/strings.xml
@@ -105,7 +105,7 @@
     <string name="account_setup_ab_headline" msgid="7110531768613341908">"Potvrďte typ účtu"</string>
     <string name="account_setup_ab_instructions_format" msgid="2107254631013471380">"Uvedli jste, že účet <xliff:g id="EMAIL">%1$s</xliff:g> používá protokol <xliff:g id="USERPROTOCOL">%2$s</xliff:g>, je však možné, že používá protokol <xliff:g id="PROVIDERPROTOCOL">%3$s</xliff:g>."</string>
     <string name="account_setup_names_title" msgid="8483517350241119291">"Nastavení účtu"</string>
-    <string name="account_setup_names_headline" msgid="914858472109729140">"Váš účet je nastaven, e-mail je na cestě!"</string>
+    <string name="account_setup_names_headline" msgid="914858472109729140">"Váš účet je nastaven a e-mail je na cestě!"</string>
     <string name="account_setup_names_account_name_label" msgid="8033895024273259196">"Pojmenovat tento účet (nepovinné)"</string>
     <string name="account_setup_names_user_name_label" msgid="8967410178488604770">"Vaše jméno (zobr. na odchozích zprávách)"</string>
     <string name="account_setup_names_user_name_empty_error" msgid="6791427018325367364">"Toto pole nesmí být prázdné."</string>
@@ -168,7 +168,7 @@
     <string name="account_setup_options_mail_window_2weeks" msgid="3583478100026382495">"Poslední dva týdny"</string>
     <string name="account_setup_options_mail_window_1month" msgid="4289585173153789717">"Poslední měsíc"</string>
     <string name="account_setup_options_mail_window_all" msgid="5372861827683632364">"Vše"</string>
-    <string name="account_setup_options_mail_window_default" msgid="2540360826995543134">"Použít výchozí nast. účtu"</string>
+    <string name="account_setup_options_mail_window_default" msgid="2540360826995543134">"Použít výchozí nastavení účtu"</string>
     <string name="account_setup_failed_dlg_auth_message" msgid="426627755590431364">"Uživatelské jméno nebo heslo jsou nesprávné."</string>
     <string name="account_setup_failed_dlg_auth_message_fmt" msgid="2081384892947238930">"Přihlášení se nezdařilo.\n(<xliff:g id="ERROR">%s</xliff:g>)"</string>
     <string name="account_setup_autodiscover_dlg_authfail_title" msgid="7365992662150541370">"Problém s nastavením účtu"</string>
diff --git a/res/values-da/strings.xml b/res/values-da/strings.xml
index 39b6d2e25..ca052a0dc 100644
--- a/res/values-da/strings.xml
+++ b/res/values-da/strings.xml
@@ -19,16 +19,16 @@
     <string name="permission_read_attachment_label" msgid="9208086010625033590">"Læs vedhæftede filer i e-mails"</string>
     <string name="permission_read_attachment_desc" msgid="3394721085306308972">"Tillader, at appen kan læse vedhæftede filer i dine e-mails."</string>
     <string name="permission_access_provider_label" msgid="378256653525377586">"Få adgang til data om e-mailudbyder"</string>
-    <string name="permission_access_provider_desc" msgid="6296566558584670348">"Tillader, at denne app kan få adgang til din e-maildatabase, f.eks. modtagne beskeder, sendte beskeder, brugernavne og adgangskoder."</string>
+    <string name="permission_access_provider_desc" msgid="6296566558584670348">"Tillader, at denne app kan få adgang til din e-maildatabase, f.eks. modtagne meddelelser, sendte meddelelser, brugernavne og adgangskoder."</string>
     <string name="app_name" msgid="5815426892327290362">"E-mail"</string>
     <string name="debug_title" msgid="5175710493691536719">"Fejlretning"</string>
     <string name="next_action" msgid="3931301986364184415">"Næste"</string>
     <string name="previous_action" msgid="5181616311579820981">"Forrige"</string>
-    <string name="done_action" msgid="7497990549515580249">"Færdig"</string>
+    <string name="done_action" msgid="7497990549515580249">"Udfør"</string>
     <string name="create_action" msgid="3062715563215392251">"Opret nyt"</string>
     <string name="quick_responses_empty_view" msgid="3960050972306132367">"Ingen hurtige svar."</string>
     <string name="account_settings_action" msgid="4494079183315085171">"Indstillinger for konto"</string>
-    <string name="menu_folder_options" msgid="2871906096248843471">"Muligheder for synkronisering"</string>
+    <string name="menu_folder_options" msgid="2871906096248843471">"Indstillinger for synkronisering"</string>
     <string name="status_network_error" msgid="2611654064403817391">"Forbindelsesproblem."</string>
   <plurals name="move_messages">
     <item quantity="one" msgid="320885379869442589">"Flyt meddelelse"</item>
@@ -36,7 +36,7 @@
   </plurals>
     <string name="cannot_move_protocol_not_supported_toast" msgid="6558083148128616292">"Flytning understøttes ikke for POP3-konti."</string>
     <string name="cannot_move_multiple_accounts_toast" msgid="7922594026384944163">"Kan ikke flyttes, fordi det valgte indeholder flere konti."</string>
-    <string name="cannot_move_special_mailboxes_toast" msgid="7093107954841896970">"Beskeder i Kladder, Udbakke og Sendte kan ikke flyttes."</string>
+    <string name="cannot_move_special_mailboxes_toast" msgid="7093107954841896970">"Meddelelser i Kladder, Udbakke og Sendte kan ikke flyttes."</string>
     <string name="mailbox_name_display_inbox" msgid="3542327124749861736">"Indbakke"</string>
     <string name="mailbox_name_display_outbox" msgid="2826214174661417662">"Udbakke"</string>
     <string name="mailbox_name_display_drafts" msgid="4868718300700514319">"Kladder"</string>
@@ -53,9 +53,9 @@
     <string name="message_compose_fwd_header_fmt" msgid="5181300290654579434">\n\n"-------- Oprindelig meddelelse --------\nEmne: <xliff:g id="SUBJECT">%1$s</xliff:g>\nFra: <xliff:g id="SENDER">%2$s</xliff:g>\nTil: <xliff:g id="TO">%3$s</xliff:g>\nCC: <xliff:g id="CC_0">%4$s</xliff:g>\n\n"</string>
     <string name="message_compose_insert_quick_response_list_title" msgid="5314107302508728189">"Indsæt hurtigt svar"</string>
     <string name="message_compose_insert_quick_response_menu_title" msgid="5817075097532919955">"Indsæt hurtigt svar"</string>
-    <string name="message_view_attachment_background_load" msgid="7906875687519445185">"En eller flere vedhæftede filer i din videresendte besked downloades før afsendelse."</string>
+    <string name="message_view_attachment_background_load" msgid="7906875687519445185">"En eller flere vedhæftede filer i din videresendte meddelelse downloades før afsendelse."</string>
     <string name="attachment_not_found" msgid="7155322700141145123">"Den vedhæftede fil kunne ikke downloades."</string>
-    <string name="message_decode_error" msgid="5016042255170947834">"Der opstod en fejl under afkodning af beskeden."</string>
+    <string name="message_decode_error" msgid="5016042255170947834">"Der opstod en fejl under afkodning af meddelelsen."</string>
     <string name="forward_download_failed_ticker" msgid="6176608320359303255">"En eller flere vedhæftede filer kunne ikke videresendes."</string>
     <string name="forward_download_failed_title" msgid="6139701848515572511">"Vedhæftet fil er ikke sendt"</string>
     <string name="login_failed_ticker" msgid="2169365211566829350">"<xliff:g id="ACCOUNT_NAME">%s</xliff:g> kunne ikke logge ind."</string>
@@ -76,14 +76,14 @@
     <item quantity="one" msgid="6261986598249539093">"<xliff:g id="SIZE_IN_GIGABYTES">%d</xliff:g> Gb"</item>
     <item quantity="other" msgid="1041353825053598633">"<xliff:g id="SIZE_IN_GIGABYTES">%d</xliff:g> Gb"</item>
   </plurals>
-    <string name="account_setup_basics_title" msgid="3578333196594678422">"Kontoindstillinger"</string>
+    <string name="account_setup_basics_title" msgid="3578333196594678422">"Konfiguration af konto"</string>
     <string name="oauth_authentication_title" msgid="4096761972487140963">"Anmoder om tilladelse"</string>
     <string name="sign_in_title" msgid="8509755024484685915">"Log ind"</string>
     <string name="oauth_error_description" msgid="5257268852139229456">"Der kunne ikke godkendes"</string>
     <string name="password_warning_label" msgid="1479956455912041077">"E-mailadressen eller adgangskoden er forkert"</string>
     <string name="email_confirmation_label" msgid="1082319634606902954">"E-mailadresse:"</string>
     <string name="account_setup_basics_headline" msgid="6726590205905464015">"E-mailkonto"</string>
-    <string name="accounts_welcome" msgid="8337750045270269649">"Du kan nemt og hurtigt oprette din konto."</string>
+    <string name="accounts_welcome" msgid="8337750045270269649">"Du kan nemt og hurtigt konfigurere din konto."</string>
     <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>
@@ -93,7 +93,7 @@
     <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="8053852205391155912">"Manuel opsætning"</string>
+    <string name="account_setup_basics_manual_setup_action" msgid="8053852205391155912">"Manuel konfiguration"</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>
@@ -104,15 +104,15 @@
     <string name="account_setup_creating_account_msg" msgid="6235569720466839946">"Kontoen oprettes…"</string>
     <string name="account_setup_ab_headline" msgid="7110531768613341908">"Bekræft kontotypen"</string>
     <string name="account_setup_ab_instructions_format" msgid="2107254631013471380">"Du har angivet, at <xliff:g id="EMAIL">%1$s</xliff:g> bruger <xliff:g id="USERPROTOCOL">%2$s</xliff:g>, men kontoen bruger muligvis <xliff:g id="PROVIDERPROTOCOL">%3$s</xliff:g>"</string>
-    <string name="account_setup_names_title" msgid="8483517350241119291">"Kontoindstillinger"</string>
+    <string name="account_setup_names_title" msgid="8483517350241119291">"Konfiguration af konto"</string>
     <string name="account_setup_names_headline" msgid="914858472109729140">"Din konto er konfigureret, og der er e-mail på vej."</string>
     <string name="account_setup_names_account_name_label" msgid="8033895024273259196">"Giv kontoen et navn (valgfrit)"</string>
-    <string name="account_setup_names_user_name_label" msgid="8967410178488604770">"Dit navn (vist på udgående beskeder)"</string>
+    <string name="account_setup_names_user_name_label" msgid="8967410178488604770">"Dit navn (vises på udgående meddelelser)"</string>
     <string name="account_setup_names_user_name_empty_error" msgid="6791427018325367364">"Dette felt må ikke være tomt."</string>
-    <string name="account_setup_account_type_title" msgid="7156551693961182124">"Kontoindstillinger"</string>
+    <string name="account_setup_account_type_title" msgid="7156551693961182124">"Konfiguration af konto"</string>
     <string name="account_setup_account_type_headline" msgid="3574102329184831086">"Kontotype"</string>
     <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_title" msgid="6796626791039136005">"Konfiguration af konto"</string>
     <string name="account_setup_incoming_headline" msgid="6183711037633407184">"Indstillinger for indgående server"</string>
     <string name="account_setup_incoming_username_label" msgid="406939983633223354">"BRUGERNAVN"</string>
     <string name="account_setup_incoming_password_label" msgid="634540235479188709">"ADGANGSKODE"</string>
@@ -121,7 +121,7 @@
     <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_trust_certificates_label" msgid="6151855090123117538">"SSL/TLS (accepter alle certifikater)"</string>
     <string name="account_setup_incoming_security_ssl_label" msgid="2798501138420163861">"SSL/TLS"</string>
     <string name="account_setup_incoming_security_tls_trust_certificates_label" msgid="6149084428423662620">"STARTTLS (accepter alle certifikater)"</string>
     <string name="account_setup_incoming_security_tls_label" msgid="6573498431821879660">"STARTTLS"</string>
@@ -130,7 +130,7 @@
     <string name="account_setup_incoming_delete_policy_delete_label" msgid="222216840911785631">"Når jeg sletter fra Indbakke"</string>
     <string name="account_setup_incoming_imap_path_prefix_label" msgid="401167247072926810">"Præfiks for IMAP-sti"</string>
     <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_title" msgid="7208495965665711539">"Konfiguration af konto"</string>
     <string name="account_setup_outgoing_headline" msgid="2025001060935366394">"Indstillinger for udgående server"</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>
@@ -145,7 +145,7 @@
     <string name="account_setup_exchange_no_certificate" msgid="1119542961954780872">"Intet"</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_headline" msgid="4181274232835368085">"Valgmuligheder for konto"</string>
     <string name="account_setup_options_mail_check_frequency_label" msgid="8321552620846334354">"Synkroniseringshyppighed:"</string>
     <string name="account_setup_options_mail_check_frequency_never" msgid="287951859480505416">"Aldrig"</string>
     <string name="account_setup_options_mail_check_frequency_push" msgid="5934525907736008673">"Automatisk (Push)"</string>
@@ -187,7 +187,7 @@
     <string name="account_setup_failed_protocol_unsupported" msgid="4607759927226943569">"Du har indtastet en forkert serveradresse, eller serveren kræver en protokolversion, som E-mail ikke understøtter."</string>
     <string name="account_setup_failed_access_denied" msgid="6835358740050287051">"Du har ikke tilladelse til at synkronisere med denne server. Kontakt din servers administrator for at få flere oplysninger."</string>
     <string name="account_setup_security_required_title" msgid="1850321535870447468">"Ekstern sikkerhedsadministration"</string>
-    <string name="account_setup_security_policies_required_fmt" msgid="5410714107656671761">"Serveren <xliff:g id="SERVER">%s</xliff:g> kræver, at du giver den tilladelse til eksternt at kontrollere nogle af Android-enhedens sikkerhedsfunktioner. Vil du afslutte opsætning af denne konto?"</string>
+    <string name="account_setup_security_policies_required_fmt" msgid="5410714107656671761">"Serveren <xliff:g id="SERVER">%s</xliff:g> kræver, at du giver den tilladelse til eksternt at kontrollere nogle af Android-enhedens sikkerhedsfunktioner. Vil du afslutte konfigurationen af denne konto?"</string>
     <string name="account_setup_failed_security_policies_unsupported" msgid="3210264746877120355">"Denne server kræver sikkerhedsfunktioner, som din Android-enhed ikke understøtter, f.eks.: <xliff:g id="ERROR">%s</xliff:g>"</string>
     <string name="account_setup_username_uneditable_error" msgid="1618869759801584109">"Du kan ikke ændre brugernavnet på en konto. Hvis du vil tilføje en konto med et andet brugernavn, skal du trykke på Tilføj konto."</string>
     <string name="disable_admin_warning" msgid="6196985268695592382">"ADVARSEL! Hvis du deaktiverer appen E-mails tilladelse til at administrere din enhed, slettes alle konti i E-mail, der kræver dette, sammen med alle e-mails, kontaktpersoner, kalenderbegivenheder og andre data på disse konti."</string>
@@ -201,7 +201,7 @@
     <string name="security_notification_content_unsupported_title" msgid="7315219208043169233">"Politikker kan ikke opfyldes"</string>
     <string name="account_security_title" msgid="3511543138560418587">"Enhedssikkerhed"</string>
     <string name="account_security_policy_explanation_fmt" msgid="6932627044314460766">"Serveren <xliff:g id="SERVER">%s</xliff:g> kræver, at du giver den tilladelse til eksternt at kontrollere nogle af Android-enhedens sikkerhedsfunktioner."</string>
-    <string name="account_setup_failed_dlg_edit_details_action" msgid="5355993309841479360">"Rediger detaljer"</string>
+    <string name="account_setup_failed_dlg_edit_details_action" msgid="5355993309841479360">"Rediger oplysninger"</string>
     <string name="password_expire_warning_ticker_fmt" msgid="2459977229180023773">"\"<xliff:g id="ACCOUNT">%s</xliff:g>\" kræver, at du ændrer skærmlåsens pinkode eller adgangskode."</string>
     <string name="password_expire_warning_content_title" msgid="7174669014074849304">"Skærmlåskoden er ved at udløbe"</string>
     <string name="password_expired_ticker" msgid="4230570412974108968">"Pinkoden eller adgangskoden til skærmlåsen er udløbet."</string>
@@ -215,8 +215,8 @@
     <string name="account_settings_login_dialog_content_fmt" msgid="8849649646111167377">"Brugernavn eller adgangskode for <xliff:g id="ACCOUNT">%s</xliff:g> er forkert. Vil du opdatere dem nu?"</string>
     <string name="account_settings_login_dialog_reason_fmt" msgid="4266359321648406752">"Dit login på <xliff:g id="ACCOUNT">%s</xliff:g> mislykkedes. Serveren sagde: <xliff:g id="REASON">%s</xliff:g> Vil du opdatere dit brugernavn og/eller din adgangskode?"</string>
     <string name="account_settings_background_attachments_label" msgid="2980317599840958688">"Download vedhæftede filer"</string>
-    <string name="account_settings_background_attachments_summary" msgid="5954218549226189376">"Download autom. vedhæftede filer i de seneste beskeder via Wi-Fi"</string>
-    <string name="account_settings_notify_label" msgid="1630001017303007974">"E-mail-beskeder"</string>
+    <string name="account_settings_background_attachments_summary" msgid="5954218549226189376">"Download autom. vedhæftede filer i nye meddelelser via Wi-Fi"</string>
+    <string name="account_settings_notify_label" msgid="1630001017303007974">"Underretninger om e-mails"</string>
     <string name="account_settings_summary" msgid="8403582255413830007">"Synkroniseringsinterval, meddelelser osv."</string>
     <string name="account_settings_notify_summary" msgid="8134339460923068254">"Send en underretning ved nye e-mails"</string>
     <string name="account_settings_mail_check_frequency_label" msgid="4322235101687302250">"Synkroniseringshyppighed"</string>
@@ -234,7 +234,7 @@
     <string name="account_settings_name_label" msgid="8186406122590008449">"Dit navn"</string>
     <string name="account_settings_edit_quick_responses_label" msgid="3106019627675996480">"Hurtige svar"</string>
     <string name="account_settings_edit_quick_responses_summary" msgid="8056686122888722591">"Rediger tekst, som du ofte indsætter, når du skriver e-mails"</string>
-    <string name="account_settings_notifications" msgid="1042620094281375043">"Underretningsindstillinger"</string>
+    <string name="account_settings_notifications" msgid="1042620094281375043">"Indstillinger for underretninger"</string>
     <string name="account_settings_data_usage" msgid="6669107430575866736">"Dataforbrug"</string>
     <string name="account_settings_policies" msgid="6292833636418641840">"Sikkerhedspolitikker"</string>
     <string name="system_folders_title" msgid="2934406494244347991">"Systemmapper"</string>
@@ -274,7 +274,7 @@
     <string name="general_preference_confirm_delete_summary" msgid="6710240861010766643">"Meddelelser"</string>
     <string name="general_preference_confirm_send_label" msgid="4548277349553989930">"Bekræft før afsendelse"</string>
     <string name="general_preference_confirm_send_summary" msgid="2695471027185506093">"Meddelelser"</string>
-    <string name="general_preference_text_zoom_label" msgid="4021955890499565713">"Tekststørrelse i besked"</string>
+    <string name="general_preference_text_zoom_label" msgid="4021955890499565713">"Tekststørrelse i meddelelse"</string>
   <string-array name="general_preference_text_zoom_summary_array">
     <item msgid="4693576184223089069">"Lillebitte tekst"</item>
     <item msgid="4415205108584620118">"Lille tekst"</item>
@@ -282,7 +282,7 @@
     <item msgid="6227813549949219991">"Stor tekst"</item>
     <item msgid="1197917420815786571">"Stor tekst"</item>
   </string-array>
-    <string name="general_preference_text_zoom_dialog_title" msgid="7446841758331151643">"Tekststørrelse i besked"</string>
+    <string name="general_preference_text_zoom_dialog_title" msgid="7446841758331151643">"Tekststørrelse i meddelelse"</string>
     <string name="general_preference_text_zoom_tiny" msgid="2948174583663330937">"Lillebitte"</string>
     <string name="general_preference_text_zoom_small" msgid="6618520238223144876">"Lille"</string>
     <string name="general_preference_text_zoom_normal" msgid="1765540147950855479">"Normal"</string>
diff --git a/res/values-de/strings.xml b/res/values-de/strings.xml
index 988dbae43..92a3f27b0 100644
--- a/res/values-de/strings.xml
+++ b/res/values-de/strings.xml
@@ -25,7 +25,7 @@
     <string name="next_action" msgid="3931301986364184415">"Weiter"</string>
     <string name="previous_action" msgid="5181616311579820981">"Zurück"</string>
     <string name="done_action" msgid="7497990549515580249">"Fertig"</string>
-    <string name="create_action" msgid="3062715563215392251">"Neue erstellen"</string>
+    <string name="create_action" msgid="3062715563215392251">"Neue hinzufügen"</string>
     <string name="quick_responses_empty_view" msgid="3960050972306132367">"Keine Kurzantworten"</string>
     <string name="account_settings_action" msgid="4494079183315085171">"Kontoeinstellungen"</string>
     <string name="menu_folder_options" msgid="2871906096248843471">"Synchronisierungsoptionen"</string>
@@ -111,9 +111,9 @@
     <string name="account_setup_names_user_name_empty_error" msgid="6791427018325367364">"Dieses Feld darf nicht leer sein."</string>
     <string name="account_setup_account_type_title" msgid="7156551693961182124">"Kontoeinrichtung"</string>
     <string name="account_setup_account_type_headline" msgid="3574102329184831086">"Kontotyp"</string>
-    <string name="account_setup_account_type_instructions" msgid="114515540798408760">"Um welchen Kontotyp handelt es sich hierbei?"</string>
+    <string name="account_setup_account_type_instructions" msgid="114515540798408760">"Um welchen Kontotyp handelt es sich?"</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_headline" msgid="6183711037633407184">"Einstellungen des Eingangsservers"</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_password_subheading" msgid="2072179928666715013">"Passwort"</string>
@@ -146,7 +146,7 @@
     <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="8321552620846334354">"Synchronisierungshäufigkeit:"</string>
+    <string name="account_setup_options_mail_check_frequency_label" msgid="8321552620846334354">"Synchronisierung:"</string>
     <string name="account_setup_options_mail_check_frequency_never" msgid="287951859480505416">"Nie"</string>
     <string name="account_setup_options_mail_check_frequency_push" msgid="5934525907736008673">"Automatisch (Push)"</string>
     <string name="account_setup_options_mail_check_frequency_5min" msgid="6388939895878539307">"Alle 5 Minuten"</string>
@@ -160,7 +160,7 @@
     <string name="account_setup_options_sync_email_label" msgid="8585177128405004068">"E-Mails dieses Kontos synchronisieren"</string>
     <string name="account_setup_options_background_attachments_label" msgid="5247749298276451846">"Anhänge bei WLAN-Verbindung automatisch herunterladen"</string>
     <string name="account_setup_failed_dlg_title" msgid="9083263347962940552">"Fertigstellen nicht möglich"</string>
-    <string name="account_setup_options_mail_window_label" msgid="7603869690500525594">"E-Mails synchronisieren von:"</string>
+    <string name="account_setup_options_mail_window_label" msgid="7603869690500525594">"E-Mails synchronisieren ab:"</string>
     <string name="account_setup_options_mail_window_auto" msgid="4188895354366183790">"Automatisch"</string>
     <string name="account_setup_options_mail_window_1day" msgid="7727436096227637646">"Letzter Tag"</string>
     <string name="account_setup_options_mail_window_3days" msgid="1841106793912850270">"Letzte 3 Tage"</string>
diff --git a/res/values-es/strings.xml b/res/values-es/strings.xml
index 708b7c8d8..17178952f 100644
--- a/res/values-es/strings.xml
+++ b/res/values-es/strings.xml
@@ -154,7 +154,7 @@
     <string name="account_setup_options_mail_check_frequency_15min" msgid="5052776740089741793">"Cada 15 minutos"</string>
     <string name="account_setup_options_mail_check_frequency_30min" msgid="1097088928685931864">"Cada 30 minutos"</string>
     <string name="account_setup_options_mail_check_frequency_1hour" msgid="3767715356039692899">"Cada hora"</string>
-    <string name="account_setup_options_notify_label" msgid="7046146571560728829">"Notificarme cuando llegue un correo"</string>
+    <string name="account_setup_options_notify_label" msgid="7046146571560728829">"Notificar cuando llegue un correo"</string>
     <string name="account_setup_options_sync_contacts_label" msgid="276492345599531778">"Sincronizar contactos de esta cuenta"</string>
     <string name="account_setup_options_sync_calendar_label" msgid="3222151135467189411">"Sincronizar calendario de esta cuenta"</string>
     <string name="account_setup_options_sync_email_label" msgid="8585177128405004068">"Sincronizar correo de esta cuenta"</string>
@@ -164,7 +164,7 @@
     <string name="account_setup_options_mail_window_auto" msgid="4188895354366183790">"Automática"</string>
     <string name="account_setup_options_mail_window_1day" msgid="7727436096227637646">"Último día"</string>
     <string name="account_setup_options_mail_window_3days" msgid="1841106793912850270">"Los últimos tres días"</string>
-    <string name="account_setup_options_mail_window_1week" msgid="5804121771990249346">"La última pasada"</string>
+    <string name="account_setup_options_mail_window_1week" msgid="5804121771990249346">"La última semana"</string>
     <string name="account_setup_options_mail_window_2weeks" msgid="3583478100026382495">"Las últimas dos semanas"</string>
     <string name="account_setup_options_mail_window_1month" msgid="4289585173153789717">"El mes pasado"</string>
     <string name="account_setup_options_mail_window_all" msgid="5372861827683632364">"Todo"</string>
@@ -198,7 +198,7 @@
     <string name="security_changed_ticker_fmt" msgid="2609435447352755285">"Se ha modificado la configuración de seguridad de la cuenta \"<xliff:g id="ACCOUNT">%s</xliff:g>\" (no es necesaria la intervención del usuario)."</string>
     <string name="security_notification_content_update_title" msgid="2429762903228690154">"Actualización seguridad necesaria"</string>
     <string name="security_notification_content_change_title" msgid="443490921895642130">"Políticas de seguridad modificadas"</string>
-    <string name="security_notification_content_unsupported_title" msgid="7315219208043169233">"Error al cumplir políticas seguridad"</string>
+    <string name="security_notification_content_unsupported_title" msgid="7315219208043169233">"No se pueden cumplir las políticas de seguridad"</string>
     <string name="account_security_title" msgid="3511543138560418587">"Seguridad del dispositivo"</string>
     <string name="account_security_policy_explanation_fmt" msgid="6932627044314460766">"Es necesario que permitas que el servidor <xliff:g id="SERVER">%s</xliff:g> controle de forma remota algunas funciones de seguridad de tu dispositivo Android."</string>
     <string name="account_setup_failed_dlg_edit_details_action" msgid="5355993309841479360">"Aceptar"</string>
diff --git a/res/values-fa/strings.xml b/res/values-fa/strings.xml
index 1db4c4a4c..17793013a 100644
--- a/res/values-fa/strings.xml
+++ b/res/values-fa/strings.xml
@@ -146,7 +146,7 @@
     <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="8321552620846334354">"تکرار همگام‌سازی:"</string>
+    <string name="account_setup_options_mail_check_frequency_label" msgid="8321552620846334354">"تعداد دفعات همگام‌سازی:"</string>
     <string name="account_setup_options_mail_check_frequency_never" msgid="287951859480505416">"هرگز"</string>
     <string name="account_setup_options_mail_check_frequency_push" msgid="5934525907736008673">"خودکار (پیام سرویس)"</string>
     <string name="account_setup_options_mail_check_frequency_5min" msgid="6388939895878539307">"هر ۵ دقیقه"</string>
diff --git a/res/values-fi/strings.xml b/res/values-fi/strings.xml
index 4aa694ab4..de0ac1af3 100644
--- a/res/values-fi/strings.xml
+++ b/res/values-fi/strings.xml
@@ -158,7 +158,7 @@
     <string name="account_setup_options_sync_contacts_label" msgid="276492345599531778">"Synkronoi tämän tilin yhteystiedot"</string>
     <string name="account_setup_options_sync_calendar_label" msgid="3222151135467189411">"Synkronoi tämän tilin kalenteri"</string>
     <string name="account_setup_options_sync_email_label" msgid="8585177128405004068">"Synkronoi tämän tilin sähköpostit"</string>
-    <string name="account_setup_options_background_attachments_label" msgid="5247749298276451846">"Lataa liitteet automaattisesti wifi-yhteyden ollessa käytössä."</string>
+    <string name="account_setup_options_background_attachments_label" msgid="5247749298276451846">"Lataa liitteet automaattisesti WiFI-."</string>
     <string name="account_setup_failed_dlg_title" msgid="9083263347962940552">"Ei onnistunut"</string>
     <string name="account_setup_options_mail_window_label" msgid="7603869690500525594">"Synkronoi sähköpostit kohteesta:"</string>
     <string name="account_setup_options_mail_window_auto" msgid="4188895354366183790">"Automaattinen"</string>
@@ -215,15 +215,15 @@
     <string name="account_settings_login_dialog_content_fmt" msgid="8849649646111167377">"Tilin <xliff:g id="ACCOUNT">%s</xliff:g> käyttäjänimi tai salasana on virheellinen. Haluatko päivittää ne nyt?"</string>
     <string name="account_settings_login_dialog_reason_fmt" msgid="4266359321648406752">"Kirjautuminen tiliin <xliff:g id="ACCOUNT">%s</xliff:g> epäonnistui. Palvelimen ilmoittama syy: <xliff:g id="REASON">%s</xliff:g> Haluatko päivittää käyttäjänimesi ja/tai salasanasi?"</string>
     <string name="account_settings_background_attachments_label" msgid="2980317599840958688">"Lataa liitetiedostoja"</string>
-    <string name="account_settings_background_attachments_summary" msgid="5954218549226189376">"Lataa viimeaikaisten viestien liitteet wifi-yhteyden kautta."</string>
+    <string name="account_settings_background_attachments_summary" msgid="5954218549226189376">"Lataa viimeaikaisten viestien liitteet WiFi-yhteyden kautta."</string>
     <string name="account_settings_notify_label" msgid="1630001017303007974">"Sähköposti-ilmoitukset"</string>
     <string name="account_settings_summary" msgid="8403582255413830007">"Synkronoinnin tiheys, ilmoitukset jne."</string>
     <string name="account_settings_notify_summary" msgid="8134339460923068254">"Lähetä ilmoitus, kun sähköpostiviesti saapuu"</string>
     <string name="account_settings_mail_check_frequency_label" msgid="4322235101687302250">"Synkronoinnin tiheys"</string>
     <string name="account_settings_incoming_label" msgid="7858928031806297542">"Saapuvan postin asetukset"</string>
-    <string name="account_settings_incoming_summary" msgid="2923044634831881068">"Käyttäjänimi, salasana ja muut tulevat palvelimen asetukset"</string>
+    <string name="account_settings_incoming_summary" msgid="2923044634831881068">"Käyttäjänimi, salasana ja muut saapuvan postin palvelimen asetukset"</string>
     <string name="account_settings_outgoing_label" msgid="4464829249980026745">"Lähtevän postin asetukset"</string>
-    <string name="account_settings_outgoing_summary" msgid="3572093624332724311">"Käyttäjänimi, salasana ja muut lähtevät palvelimen asetukset"</string>
+    <string name="account_settings_outgoing_summary" msgid="3572093624332724311">"Käyttäjänimi, salasana ja muut lähtevän postin palvelimen asetukset"</string>
     <string name="account_settings_enforced_label" msgid="7429582254433588882">"Käytännöt otettu käyttöön"</string>
     <string name="account_settings_enforced_summary" msgid="8140860420440447771">"Ei mitään"</string>
     <string name="account_settings_unsupported_label" msgid="1954091071454235577">"Käytäntöjä ei tueta"</string>
diff --git a/res/values-hy-rAM/strings.xml b/res/values-hy-rAM/strings.xml
index 45c28180e..224ac3072 100644
--- a/res/values-hy-rAM/strings.xml
+++ b/res/values-hy-rAM/strings.xml
@@ -118,8 +118,7 @@
     <string name="account_setup_incoming_headline" msgid="6183711037633407184">"Մուտքային սերվերի կարգավորումներ"</string>
     <string name="account_setup_incoming_username_label" msgid="406939983633223354">"ՕԳՏԱՆՈՒՆ"</string>
     <string name="account_setup_incoming_password_label" msgid="634540235479188709">"ԳԱՂՏՆԱԲԱՌ"</string>
-    <!-- no translation found for account_setup_password_subheading (2072179928666715013) -->
-    <skip />
+    <string name="account_setup_password_subheading" msgid="2072179928666715013">"Գաղտնաբառ"</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>
@@ -149,8 +148,7 @@
     <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>
-    <!-- no translation found for account_setup_options_mail_check_frequency_label (8321552620846334354) -->
-    <skip />
+    <string name="account_setup_options_mail_check_frequency_label" msgid="8321552620846334354">"Համաժամեցման հաճախականությունը`"</string>
     <string name="account_setup_options_mail_check_frequency_never" msgid="287951859480505416">"Երբեք"</string>
     <string name="account_setup_options_mail_check_frequency_push" msgid="5934525907736008673">"Ավտոմատ (Սեղմել)"</string>
     <string name="account_setup_options_mail_check_frequency_5min" msgid="6388939895878539307">"Ամեն 5 րոպեն"</string>
@@ -164,8 +162,7 @@
     <string name="account_setup_options_sync_email_label" msgid="8585177128405004068">"Համաժամեցնել այս հաշվի էլփոստը"</string>
     <string name="account_setup_options_background_attachments_label" msgid="5247749298276451846">"Ավտոմատ ներբեռնել կցորդները, երբ Wi-Fi-ը միացված է"</string>
     <string name="account_setup_failed_dlg_title" msgid="9083263347962940552">"Չհաջողվեց ավարտել"</string>
-    <!-- no translation found for account_setup_options_mail_window_label (7603869690500525594) -->
-    <skip />
+    <string name="account_setup_options_mail_window_label" msgid="7603869690500525594">"Համաժամեցված նամակներ հետևյալից`"</string>
     <string name="account_setup_options_mail_window_auto" msgid="4188895354366183790">"Ավտոմատ"</string>
     <string name="account_setup_options_mail_window_1day" msgid="7727436096227637646">"Վերջին օրը"</string>
     <string name="account_setup_options_mail_window_3days" msgid="1841106793912850270">"Վերջին երեք օրը"</string>
diff --git a/res/values-ko/strings.xml b/res/values-ko/strings.xml
index 32018e965..dc4b0ef45 100644
--- a/res/values-ko/strings.xml
+++ b/res/values-ko/strings.xml
@@ -247,7 +247,7 @@
     <string name="edit_quick_response_dialog" msgid="6479106007607928450">"빠른 응답"</string>
     <string name="save_action" msgid="1988862706623227093">"저장"</string>
     <string name="account_settings_sync_contacts_enable" msgid="1369272986009573218">"연락처 동기화"</string>
-    <string name="account_settings_sync_contacts_summary" msgid="816919452270997919">"이 계정의 주소록을 동기화합니다."</string>
+    <string name="account_settings_sync_contacts_summary" msgid="816919452270997919">"이 계정의 연락처를 동기화합니다."</string>
     <string name="account_settings_sync_calendar_enable" msgid="6855333393468628003">"캘린더 동기화"</string>
     <string name="account_settings_sync_calendar_summary" msgid="7606340353079301703">"이 계정의 캘린더 일정을 동기화합니다."</string>
     <string name="account_settings_sync_email_enable" msgid="3754115565685222477">"이메일 동기화"</string>
diff --git a/res/values-ms-rMY/strings.xml b/res/values-ms-rMY/strings.xml
index 6fa205d98..e9ef1a089 100644
--- a/res/values-ms-rMY/strings.xml
+++ b/res/values-ms-rMY/strings.xml
@@ -116,8 +116,7 @@
     <string name="account_setup_incoming_headline" msgid="6183711037633407184">"Tetapan pelayan masuk"</string>
     <string name="account_setup_incoming_username_label" msgid="406939983633223354">"NAMA PENGGUNA"</string>
     <string name="account_setup_incoming_password_label" msgid="634540235479188709">"KATA LALUAN"</string>
-    <!-- no translation found for account_setup_password_subheading (2072179928666715013) -->
-    <skip />
+    <string name="account_setup_password_subheading" msgid="2072179928666715013">"Kata laluan"</string>
     <string name="account_setup_incoming_server_label" msgid="3528558488000638420">"PELAYAN"</string>
     <string name="account_setup_incoming_port_label" msgid="5311652277990186704">"PORT"</string>
     <string name="account_setup_incoming_security_label" msgid="1175710992470593691">"JENIS KESELAMATAN"</string>
@@ -147,8 +146,7 @@
     <string name="account_setup_exchange_device_id_label" msgid="5105898844003459657">"ID PERANTI MUDAH ALIH"</string>
     <string name="account_setup_options_title" msgid="9016600767888846051">"Tetapan akaun"</string>
     <string name="account_setup_options_headline" msgid="4181274232835368085">"Pilihan akaun"</string>
-    <!-- no translation found for account_setup_options_mail_check_frequency_label (8321552620846334354) -->
-    <skip />
+    <string name="account_setup_options_mail_check_frequency_label" msgid="8321552620846334354">"Kekerapan menyegerak:"</string>
     <string name="account_setup_options_mail_check_frequency_never" msgid="287951859480505416">"Jangan sekali-kali"</string>
     <string name="account_setup_options_mail_check_frequency_push" msgid="5934525907736008673">"Automatik (Tolak)"</string>
     <string name="account_setup_options_mail_check_frequency_5min" msgid="6388939895878539307">"Setiap 5 minit"</string>
@@ -162,8 +160,7 @@
     <string name="account_setup_options_sync_email_label" msgid="8585177128405004068">"Segerakkan e-mel dari akaun ini"</string>
     <string name="account_setup_options_background_attachments_label" msgid="5247749298276451846">"Muat turun lampiran secara automatik apabila disambungkan kepada Wi-Fi"</string>
     <string name="account_setup_failed_dlg_title" msgid="9083263347962940552">"Tidak boleh diselesaikan"</string>
-    <!-- no translation found for account_setup_options_mail_window_label (7603869690500525594) -->
-    <skip />
+    <string name="account_setup_options_mail_window_label" msgid="7603869690500525594">"Segerakkan e-mel daripada:"</string>
     <string name="account_setup_options_mail_window_auto" msgid="4188895354366183790">"Automatik"</string>
     <string name="account_setup_options_mail_window_1day" msgid="7727436096227637646">"Hari terakhir"</string>
     <string name="account_setup_options_mail_window_3days" msgid="1841106793912850270">"Tiga hari lalu"</string>
diff --git a/res/values-pt-rPT/strings.xml b/res/values-pt-rPT/strings.xml
index 125a0d106..fc1bacf7e 100644
--- a/res/values-pt-rPT/strings.xml
+++ b/res/values-pt-rPT/strings.xml
@@ -16,10 +16,10 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="permission_read_attachment_label" msgid="9208086010625033590">"Ler anexos de e-mail"</string>
-    <string name="permission_read_attachment_desc" msgid="3394721085306308972">"Permite à aplicação ler os anexos de e-mail."</string>
-    <string name="permission_access_provider_label" msgid="378256653525377586">"Aceder a dados do fornecedor de e-mail"</string>
-    <string name="permission_access_provider_desc" msgid="6296566558584670348">"Permite que a aplicação aceda à base de dados do e-mail, incluindo às mensagens recebidas, mensagens enviadas, nomes de utilizadores e palavras-passe."</string>
+    <string name="permission_read_attachment_label" msgid="9208086010625033590">"Ler anexos de email"</string>
+    <string name="permission_read_attachment_desc" msgid="3394721085306308972">"Permite à aplicação ler os anexos de email."</string>
+    <string name="permission_access_provider_label" msgid="378256653525377586">"Aceder a dados do fornecedor de email"</string>
+    <string name="permission_access_provider_desc" msgid="6296566558584670348">"Permite que a aplicação aceda à base de dados do email, incluindo às mensagens recebidas, mensagens enviadas, nomes de utilizadores e palavras-passe."</string>
     <string name="app_name" msgid="5815426892327290362">"Email"</string>
     <string name="debug_title" msgid="5175710493691536719">"Depuração"</string>
     <string name="next_action" msgid="3931301986364184415">"Seguinte"</string>
@@ -94,7 +94,7 @@
     <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="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_setup_username_password_toast" msgid="3968270274727947460">"Introduza um endereço de email 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>
     <string name="account_password_spaces_error" msgid="8928309156658903257">"Esta palavra-passe começa ou termina com um ou mais caracteres de espaço. Muitos servidores não suportam palavras-passe com espaços."</string>
@@ -105,15 +105,15 @@
     <string name="account_setup_ab_headline" msgid="7110531768613341908">"Confirmar tipo de conta"</string>
     <string name="account_setup_ab_instructions_format" msgid="2107254631013471380">"Indicou que <xliff:g id="EMAIL">%1$s</xliff:g> utiliza <xliff:g id="USERPROTOCOL">%2$s</xliff:g>, mas a conta poderá utilizar <xliff:g id="PROVIDERPROTOCOL">%3$s</xliff:g>"</string>
     <string name="account_setup_names_title" msgid="8483517350241119291">"Configuração da conta"</string>
-    <string name="account_setup_names_headline" msgid="914858472109729140">"A sua conta está configurada e o e-mail vai a caminho!"</string>
+    <string name="account_setup_names_headline" msgid="914858472109729140">"A sua conta está configurada e o email vai a caminho!"</string>
     <string name="account_setup_names_account_name_label" msgid="8033895024273259196">"Dar um nome a esta conta (opcional)"</string>
     <string name="account_setup_names_user_name_label" msgid="8967410178488604770">"O seu nome (apresentado nas mensagens enviadas)"</string>
     <string name="account_setup_names_user_name_empty_error" msgid="6791427018325367364">"Este campo não pode estar em branco."</string>
     <string name="account_setup_account_type_title" msgid="7156551693961182124">"Configuração da conta"</string>
     <string name="account_setup_account_type_headline" msgid="3574102329184831086">"Tipo de conta"</string>
-    <string name="account_setup_account_type_instructions" msgid="114515540798408760">"Que tipo de conta é este?"</string>
+    <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">"Definições do servidor de recepção"</string>
+    <string name="account_setup_incoming_headline" msgid="6183711037633407184">"Definições do servidor de receção"</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_password_subheading" msgid="2072179928666715013">"Palavra-passe"</string>
@@ -125,7 +125,7 @@
     <string name="account_setup_incoming_security_ssl_label" msgid="2798501138420163861">"SSL/TLS"</string>
     <string name="account_setup_incoming_security_tls_trust_certificates_label" msgid="6149084428423662620">"STARTTLS (aceitar todos os certificados)"</string>
     <string name="account_setup_incoming_security_tls_label" msgid="6573498431821879660">"STARTTLS"</string>
-    <string name="account_setup_incoming_delete_policy_label" msgid="9213590134693857912">"Eliminar e-mail do servidor"</string>
+    <string name="account_setup_incoming_delete_policy_label" msgid="9213590134693857912">"Eliminar email do servidor"</string>
     <string name="account_setup_incoming_delete_policy_never_label" msgid="3222897501875871041">"Nunca"</string>
     <string name="account_setup_incoming_delete_policy_delete_label" msgid="222216840911785631">"Quando elimino da pasta A Receber"</string>
     <string name="account_setup_incoming_imap_path_prefix_label" msgid="401167247072926810">"Prefixo de caminho IMAP"</string>
@@ -154,10 +154,10 @@
     <string name="account_setup_options_mail_check_frequency_15min" msgid="5052776740089741793">"De 15 em 15 minutos"</string>
     <string name="account_setup_options_mail_check_frequency_30min" msgid="1097088928685931864">"De 30 em 30 minutos"</string>
     <string name="account_setup_options_mail_check_frequency_1hour" msgid="3767715356039692899">"De hora em hora"</string>
-    <string name="account_setup_options_notify_label" msgid="7046146571560728829">"Receber notificação de e-mails novos"</string>
+    <string name="account_setup_options_notify_label" msgid="7046146571560728829">"Receber notificação de emails novos"</string>
     <string name="account_setup_options_sync_contacts_label" msgid="276492345599531778">"Sincronizar contactos a partir desta conta."</string>
     <string name="account_setup_options_sync_calendar_label" msgid="3222151135467189411">"Sincronizar o calendário a partir desta conta."</string>
-    <string name="account_setup_options_sync_email_label" msgid="8585177128405004068">"Sincronizar e-mail a partir desta conta."</string>
+    <string name="account_setup_options_sync_email_label" msgid="8585177128405004068">"Sincronizar email a partir desta conta."</string>
     <string name="account_setup_options_background_attachments_label" msgid="5247749298276451846">"Transferir automaticamente anexos quando ligado a uma rede Wi-Fi"</string>
     <string name="account_setup_failed_dlg_title" msgid="9083263347962940552">"Não foi possível concluir"</string>
     <string name="account_setup_options_mail_window_label" msgid="7603869690500525594">"Sincronizar emails de:"</string>
@@ -184,13 +184,13 @@
     <string name="account_setup_failed_auth_required" msgid="6799839150250217566">"Os métodos de autenticação não são suportados pelo servidor."</string>
     <string name="account_setup_failed_security" msgid="925820957665764964">"Não foi possível abrir ligação ao servidor devido a um erro de segurança."</string>
     <string name="account_setup_failed_ioerror" msgid="7802604687451830378">"Não foi possível abrir ligação ao servidor."</string>
-    <string name="account_setup_failed_protocol_unsupported" msgid="4607759927226943569">"Introduziu um endereço de servidor incorreto ou o servidor requer uma versão de protocolo que o E-mail não suporta."</string>
+    <string name="account_setup_failed_protocol_unsupported" msgid="4607759927226943569">"Introduziu um endereço de servidor incorreto ou o servidor requer uma versão de protocolo que o Email não suporta."</string>
     <string name="account_setup_failed_access_denied" msgid="6835358740050287051">"Não tem autorização para sincronizar com este servidor. Contacte o administrador do servidor para obter mais informações."</string>
     <string name="account_setup_security_required_title" msgid="1850321535870447468">"Administração de segurança remota"</string>
     <string name="account_setup_security_policies_required_fmt" msgid="5410714107656671761">"O servidor <xliff:g id="SERVER">%s</xliff:g> requer permissão para controlar remotamente algumas das funcionalidades de segurança do dispositivo Android. Pretende concluir a configuração desta conta?"</string>
     <string name="account_setup_failed_security_policies_unsupported" msgid="3210264746877120355">"Este servidor requer funcionalidades de segurança que o seu aparelho Android não suporta, incluindo: <xliff:g id="ERROR">%s</xliff:g>"</string>
     <string name="account_setup_username_uneditable_error" msgid="1618869759801584109">"Não é possível alterar o nome de utilizador de uma conta. Para adicionar uma conta com outro nome de utilizador, toque em Adicionar Conta."</string>
-    <string name="disable_admin_warning" msgid="6196985268695592382">"AVISO: a desativação da autorização da aplicação E-mail para administrar o aparelho eliminará todas as contas de e-mail que necessitam desta, juntamente com o respetivo e-mail, contactos, eventos de agenda e outros dados."</string>
+    <string name="disable_admin_warning" msgid="6196985268695592382">"AVISO: a desativação da autorização da aplicação Email para administrar o aparelho eliminará todas as contas de email que necessitam desta, juntamente com o respetivo email, contactos, eventos de agenda e outros dados."</string>
     <string name="account_security_dialog_title" msgid="430041952584831904">"Atualização de segurança"</string>
     <string name="account_security_dialog_content_fmt" msgid="8843806143923278214">"<xliff:g id="ACCOUNT">%s</xliff:g> requer a atualização das definições de segurança."</string>
     <string name="security_unsupported_ticker_fmt" msgid="5166579214529283975">"Não é possível sincronizar a conta \"<xliff:g id="ACCOUNT">%s</xliff:g>\" devido a requisitos de segurança."</string>
@@ -216,9 +216,9 @@
     <string name="account_settings_login_dialog_reason_fmt" msgid="4266359321648406752">"O seu início de sessão para <xliff:g id="ACCOUNT">%s</xliff:g> falhou; o servidor perguntou: <xliff:g id="REASON">%s</xliff:g> Pretende atualizar o seu nome de utilizador e/ou palavra-passe?"</string>
     <string name="account_settings_background_attachments_label" msgid="2980317599840958688">"Transferir anexos"</string>
     <string name="account_settings_background_attachments_summary" msgid="5954218549226189376">"Transferir automaticamente anexos de mensagens recentes p/ Wi-Fi"</string>
-    <string name="account_settings_notify_label" msgid="1630001017303007974">"Notificações de e-mail"</string>
+    <string name="account_settings_notify_label" msgid="1630001017303007974">"Notificações de email"</string>
     <string name="account_settings_summary" msgid="8403582255413830007">"Frequência da sincronização, notificações, etc."</string>
-    <string name="account_settings_notify_summary" msgid="8134339460923068254">"Enviar notificação quando chegar um e-mail"</string>
+    <string name="account_settings_notify_summary" msgid="8134339460923068254">"Enviar notificação quando chegar um email"</string>
     <string name="account_settings_mail_check_frequency_label" msgid="4322235101687302250">"Frequência de sincronização"</string>
     <string name="account_settings_incoming_label" msgid="7858928031806297542">"Definições de recepção"</string>
     <string name="account_settings_incoming_summary" msgid="2923044634831881068">"Nome de utiliz., palavra-passe e outras def. do serv. de receção"</string>
@@ -250,8 +250,8 @@
     <string name="account_settings_sync_contacts_summary" msgid="816919452270997919">"Sincronizar contactos para esta conta"</string>
     <string name="account_settings_sync_calendar_enable" msgid="6855333393468628003">"Sincronizar calendário"</string>
     <string name="account_settings_sync_calendar_summary" msgid="7606340353079301703">"Sinc. evento do cal. p. esta conta"</string>
-    <string name="account_settings_sync_email_enable" msgid="3754115565685222477">"Sincronizar e-mail"</string>
-    <string name="account_settings_sync_email_summary" msgid="262964076412310990">"Sincronizar e-mail para esta conta"</string>
+    <string name="account_settings_sync_email_enable" msgid="3754115565685222477">"Sincronizar email"</string>
+    <string name="account_settings_sync_email_summary" msgid="262964076412310990">"Sincronizar email para esta conta"</string>
     <string name="account_settings_vibrate_when_label" msgid="708477308761702671">"Vibrar"</string>
     <string name="account_settings_ringtone" msgid="8229878374785575207">"Escolher toque"</string>
     <string name="account_settings_servers" msgid="4925493817981624242">"Definições do servidor"</string>
@@ -262,7 +262,7 @@
     <string name="mailbox_settings_mailbox_sync_window_label" msgid="851180833264474141">"Dias de correio a sincronizar"</string>
     <string name="prefDialogTitle_conversationListIcon" msgid="4601797400885989153">"Imagem do remetente"</string>
     <string name="provider_note_live" msgid="2995297671709325333">"Apenas algumas contas “Plus” incluem acesso POP, permitindo a ligação deste programa. Se não conseguir iniciar sessão com o endereço de email e palavra-passe corretos, é possível que não tenha uma conta “Plus” paga. Inicie o navegador de Internet para obter acesso a essas contas de email."</string>
-    <string name="provider_note_t_online" msgid="1630642061431427894">"Antes de configurar esta conta de e-mail, visite o Web site T-Online e crie uma palavra-passe de acesso a e-mail POP3."</string>
+    <string name="provider_note_t_online" msgid="1630642061431427894">"Antes de configurar esta conta de email, visite o Web site T-Online e crie uma palavra-passe de acesso a e-mail POP3."</string>
     <string name="exchange_name" msgid="1190783774800310346">"Empresa"</string>
     <string name="exchange_name_alternate" msgid="5772529644749041052">"Microsoft Exchange ActiveSync"</string>
     <string name="system_account_create_failed" msgid="3673792980526246177">"Não foi possível criar a conta. Tente novamente."</string>
@@ -289,7 +289,7 @@
     <string name="general_preference_text_zoom_large" msgid="6874323663381586918">"Grande"</string>
     <string name="general_preference_text_zoom_huge" msgid="4270503132355963031">"Muito grande"</string>
     <string name="more_than_999" msgid="8704425397397918798">"999+"</string>
-    <string name="search_hint" msgid="2200412192574686497">"Pesquisar e-mail"</string>
+    <string name="search_hint" msgid="2200412192574686497">"Pesquisar email"</string>
     <string name="policy_dont_allow_camera" msgid="5744573062306937302">"Não perm. utilização câmara do aparelho"</string>
     <string name="policy_require_password" msgid="7177274900480984702">"Solicitar palavra-passe do aparelho"</string>
     <string name="policy_password_history" msgid="5743544498302303181">"Limitar reutilização pal.-passe recentes"</string>
diff --git a/res/values-ro/strings.xml b/res/values-ro/strings.xml
index 562868d14..7732607dd 100644
--- a/res/values-ro/strings.xml
+++ b/res/values-ro/strings.xml
@@ -116,8 +116,7 @@
     <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="406939983633223354">"NUME DE UTILIZATOR"</string>
     <string name="account_setup_incoming_password_label" msgid="634540235479188709">"PAROLĂ"</string>
-    <!-- no translation found for account_setup_password_subheading (2072179928666715013) -->
-    <skip />
+    <string name="account_setup_password_subheading" msgid="2072179928666715013">"Parolă"</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">"TIP DE SECURITATE"</string>
@@ -147,8 +146,7 @@
     <string name="account_setup_exchange_device_id_label" msgid="5105898844003459657">"ID DISPOZITIV MOBIL"</string>
     <string name="account_setup_options_title" msgid="9016600767888846051">"Setări cont"</string>
     <string name="account_setup_options_headline" msgid="4181274232835368085">"Opţiunile contului"</string>
-    <!-- no translation found for account_setup_options_mail_check_frequency_label (8321552620846334354) -->
-    <skip />
+    <string name="account_setup_options_mail_check_frequency_label" msgid="8321552620846334354">"Frecvența de sincronizare:"</string>
     <string name="account_setup_options_mail_check_frequency_never" msgid="287951859480505416">"Niciodată"</string>
     <string name="account_setup_options_mail_check_frequency_push" msgid="5934525907736008673">"Automat (Push)"</string>
     <string name="account_setup_options_mail_check_frequency_5min" msgid="6388939895878539307">"La fiecare 5 minute"</string>
@@ -162,8 +160,7 @@
     <string name="account_setup_options_sync_email_label" msgid="8585177128405004068">"Doresc sincronizarea mesajelor de e-mail din acest cont"</string>
     <string name="account_setup_options_background_attachments_label" msgid="5247749298276451846">"Doresc să se descarce automat ataşamentele când sunt conectat(ă) la Wi-Fi"</string>
     <string name="account_setup_failed_dlg_title" msgid="9083263347962940552">"Nu s-a putut finaliza"</string>
-    <!-- no translation found for account_setup_options_mail_window_label (7603869690500525594) -->
-    <skip />
+    <string name="account_setup_options_mail_window_label" msgid="7603869690500525594">"Sincronizați e-mailurile începând cu:"</string>
     <string name="account_setup_options_mail_window_auto" msgid="4188895354366183790">"Automat"</string>
     <string name="account_setup_options_mail_window_1day" msgid="7727436096227637646">"Ultima zi"</string>
     <string name="account_setup_options_mail_window_3days" msgid="1841106793912850270">"Ultimele trei zile"</string>
diff --git a/res/values-ru/strings.xml b/res/values-ru/strings.xml
index 82ca35b1b..38bb93e17 100644
--- a/res/values-ru/strings.xml
+++ b/res/values-ru/strings.xml
@@ -132,7 +132,7 @@
     <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="1164004960070541473">"СЕРВЕР SMTP"</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>
diff --git a/res/values-sk/strings.xml b/res/values-sk/strings.xml
index c9afd244d..3711dd456 100644
--- a/res/values-sk/strings.xml
+++ b/res/values-sk/strings.xml
@@ -20,15 +20,15 @@
     <string name="permission_read_attachment_desc" msgid="3394721085306308972">"Povoľuje aplikácii čítať prílohy vašich e-mailov."</string>
     <string name="permission_access_provider_label" msgid="378256653525377586">"Prístup k údajom poskytovateľa e-mailu"</string>
     <string name="permission_access_provider_desc" msgid="6296566558584670348">"Povoľuje aplikácii prístup do databázy e-mailu vrátane prijatých a odoslaných správ, používateľských mien a hesiel."</string>
-    <string name="app_name" msgid="5815426892327290362">"Email"</string>
+    <string name="app_name" msgid="5815426892327290362">"E-mail"</string>
     <string name="debug_title" msgid="5175710493691536719">"Ladiť"</string>
     <string name="next_action" msgid="3931301986364184415">"Ďalej"</string>
-    <string name="previous_action" msgid="5181616311579820981">"Predchádzajúce"</string>
+    <string name="previous_action" msgid="5181616311579820981">"Naspäť"</string>
     <string name="done_action" msgid="7497990549515580249">"Hotovo"</string>
     <string name="create_action" msgid="3062715563215392251">"Vytvoriť novú"</string>
     <string name="quick_responses_empty_view" msgid="3960050972306132367">"Žiadne rýchle odpovede."</string>
     <string name="account_settings_action" msgid="4494079183315085171">"Nastavenia účtu"</string>
-    <string name="menu_folder_options" msgid="2871906096248843471">"Možnosti synchronizácie"</string>
+    <string name="menu_folder_options" msgid="2871906096248843471">"Možnosti synchr."</string>
     <string name="status_network_error" msgid="2611654064403817391">"Problém s pripojením."</string>
   <plurals name="move_messages">
     <item quantity="one" msgid="320885379869442589">"Presunúť správu"</item>
@@ -53,7 +53,7 @@
     <string name="message_compose_fwd_header_fmt" msgid="5181300290654579434">\n\n"-------- Pôvodná správa --------\nPredmet: <xliff:g id="SUBJECT">%1$s</xliff:g>\nOdosielateľ: <xliff:g id="SENDER">%2$s</xliff:g>\nKomu: <xliff:g id="TO">%3$s</xliff:g>\nKópia: <xliff:g id="CC_0">%4$s</xliff:g>\n\n"</string>
     <string name="message_compose_insert_quick_response_list_title" msgid="5314107302508728189">"Vložiť rýchlu odpoveď"</string>
     <string name="message_compose_insert_quick_response_menu_title" msgid="5817075097532919955">"Vložiť rýchlu odpoveď"</string>
-    <string name="message_view_attachment_background_load" msgid="7906875687519445185">"Pred odoslaním sa prevezme jedna alebo viacero príloh zo správy posielanej ďalej."</string>
+    <string name="message_view_attachment_background_load" msgid="7906875687519445185">"Jedna alebo viac príloh zo správy posielanej ďalej budú pred odoslaním stiahnuté."</string>
     <string name="attachment_not_found" msgid="7155322700141145123">"Prílohu sa nepodarilo stiahnuť."</string>
     <string name="message_decode_error" msgid="5016042255170947834">"Pri dekódovaní správy sa vyskytla chyba."</string>
     <string name="forward_download_failed_ticker" msgid="6176608320359303255">"Nepodarilo sa poslať ďalej jednu alebo viac príloh."</string>
@@ -83,7 +83,7 @@
     <string name="password_warning_label" msgid="1479956455912041077">"E-mailová adresa alebo heslo sú nesprávne"</string>
     <string name="email_confirmation_label" msgid="1082319634606902954">"E-mailová adresa:"</string>
     <string name="account_setup_basics_headline" msgid="6726590205905464015">"E-mailový účet"</string>
-    <string name="accounts_welcome" msgid="8337750045270269649">"Účet si môžete nastaviť pomocou niekoľkých krokov."</string>
+    <string name="accounts_welcome" msgid="8337750045270269649">"Účet si nastavíte v niekoľkých jednoduchých krokoch."</string>
     <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>
@@ -99,14 +99,14 @@
     <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>
     <string name="account_password_spaces_error" msgid="8928309156658903257">"Toto heslo začína alebo končí aspoň jednou medzerou. Mnoho serverov nepodporuje heslá s medzerami."</string>
     <string name="account_setup_check_settings_retr_info_msg" msgid="4121970450267725664">"Načítavajú sa informácie o účte…"</string>
-    <string name="account_setup_check_settings_check_incoming_msg" msgid="2869198335297585862">"Overenie nastavení servera..."</string>
-    <string name="account_setup_check_settings_check_outgoing_msg" msgid="4566131393776891419">"Overovanie nastavení protokolu SMTP..."</string>
-    <string name="account_setup_creating_account_msg" msgid="6235569720466839946">"Prebieha vytváranie účtu..."</string>
+    <string name="account_setup_check_settings_check_incoming_msg" msgid="2869198335297585862">"Overujú sa nastavenia servera…"</string>
+    <string name="account_setup_check_settings_check_outgoing_msg" msgid="4566131393776891419">"Overujú sa nastavenia SMTP…"</string>
+    <string name="account_setup_creating_account_msg" msgid="6235569720466839946">"Účet sa vytvára…"</string>
     <string name="account_setup_ab_headline" msgid="7110531768613341908">"Potvrďte typ účtu"</string>
     <string name="account_setup_ab_instructions_format" msgid="2107254631013471380">"Uviedli ste, že účet <xliff:g id="EMAIL">%1$s</xliff:g> používa protokol <xliff:g id="USERPROTOCOL">%2$s</xliff:g>, ale môže používať aj protokol <xliff:g id="PROVIDERPROTOCOL">%3$s</xliff:g>"</string>
     <string name="account_setup_names_title" msgid="8483517350241119291">"Nastavenie účtu"</string>
-    <string name="account_setup_names_headline" msgid="914858472109729140">"Váš účet je nastavený a e-mail je na ceste!"</string>
-    <string name="account_setup_names_account_name_label" msgid="8033895024273259196">"Pomenovať tento účet (nepovinné)"</string>
+    <string name="account_setup_names_headline" msgid="914858472109729140">"Váš účet je nastavený a&amp;nbsp;pošta je na ceste!"</string>
+    <string name="account_setup_names_account_name_label" msgid="8033895024273259196">"Pomenujte tento účet (nepovinné)"</string>
     <string name="account_setup_names_user_name_label" msgid="8967410178488604770">"Vaše meno (zobrazované na odchádzajúcich správach)"</string>
     <string name="account_setup_names_user_name_empty_error" msgid="6791427018325367364">"Toto pole nesmie byť prázdne."</string>
     <string name="account_setup_account_type_title" msgid="7156551693961182124">"Nastavenie účtu"</string>
@@ -121,9 +121,9 @@
     <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_trust_certificates_label" msgid="6151855090123117538">"SSL/TLS (prijímať všetky certifikáty)"</string>
     <string name="account_setup_incoming_security_ssl_label" msgid="2798501138420163861">"SSL/TLS"</string>
-    <string name="account_setup_incoming_security_tls_trust_certificates_label" msgid="6149084428423662620">"STARTTLS (akceptovať všetky certifikáty)"</string>
+    <string name="account_setup_incoming_security_tls_trust_certificates_label" msgid="6149084428423662620">"STARTTLS (prijímať všetky certifikáty)"</string>
     <string name="account_setup_incoming_security_tls_label" msgid="6573498431821879660">"STARTTLS"</string>
     <string name="account_setup_incoming_delete_policy_label" msgid="9213590134693857912">"Odstraňovať e-maily zo servera"</string>
     <string name="account_setup_incoming_delete_policy_never_label" msgid="3222897501875871041">"Nikdy"</string>
@@ -148,7 +148,7 @@
     <string name="account_setup_options_headline" msgid="4181274232835368085">"Možnosti účtu"</string>
     <string name="account_setup_options_mail_check_frequency_label" msgid="8321552620846334354">"Frekvencia synchronizácie:"</string>
     <string name="account_setup_options_mail_check_frequency_never" msgid="287951859480505416">"Nikdy"</string>
-    <string name="account_setup_options_mail_check_frequency_push" msgid="5934525907736008673">"Automaticky (v prípade potreby)"</string>
+    <string name="account_setup_options_mail_check_frequency_push" msgid="5934525907736008673">"Automaticky (push)"</string>
     <string name="account_setup_options_mail_check_frequency_5min" msgid="6388939895878539307">"Každých 5 minút"</string>
     <string name="account_setup_options_mail_check_frequency_10min" msgid="5344463157247877480">"Každých 10 minút"</string>
     <string name="account_setup_options_mail_check_frequency_15min" msgid="5052776740089741793">"Každých 15 minút"</string>
@@ -157,16 +157,16 @@
     <string name="account_setup_options_notify_label" msgid="7046146571560728829">"Upozorniť ma na príchod e-mailu"</string>
     <string name="account_setup_options_sync_contacts_label" msgid="276492345599531778">"Synchronizovať kontakty z tohto účtu"</string>
     <string name="account_setup_options_sync_calendar_label" msgid="3222151135467189411">"Synchronizovať kalendár z tohto účtu"</string>
-    <string name="account_setup_options_sync_email_label" msgid="8585177128405004068">"Synchronizovať e-mail z tohto účtu"</string>
+    <string name="account_setup_options_sync_email_label" msgid="8585177128405004068">"Synchronizovať poštu z tohto účtu"</string>
     <string name="account_setup_options_background_attachments_label" msgid="5247749298276451846">"Automaticky sťahovať prílohy počas pripojenia k sieti Wi-Fi"</string>
-    <string name="account_setup_failed_dlg_title" msgid="9083263347962940552">"Nepodarilo sa dokončiť"</string>
+    <string name="account_setup_failed_dlg_title" msgid="9083263347962940552">"Nedá sa dokončiť"</string>
     <string name="account_setup_options_mail_window_label" msgid="7603869690500525594">"Synchronizovať e-maily zo služieb:"</string>
     <string name="account_setup_options_mail_window_auto" msgid="4188895354366183790">"Automaticky"</string>
     <string name="account_setup_options_mail_window_1day" msgid="7727436096227637646">"Posledný deň"</string>
     <string name="account_setup_options_mail_window_3days" msgid="1841106793912850270">"Posledné tri dni"</string>
-    <string name="account_setup_options_mail_window_1week" msgid="5804121771990249346">"Minulý týždeň"</string>
+    <string name="account_setup_options_mail_window_1week" msgid="5804121771990249346">"Posledný týždeň"</string>
     <string name="account_setup_options_mail_window_2weeks" msgid="3583478100026382495">"Posledné dva týždne"</string>
-    <string name="account_setup_options_mail_window_1month" msgid="4289585173153789717">"Minulý mesiac"</string>
+    <string name="account_setup_options_mail_window_1month" msgid="4289585173153789717">"Posledný mesiac"</string>
     <string name="account_setup_options_mail_window_all" msgid="5372861827683632364">"Všetky"</string>
     <string name="account_setup_options_mail_window_default" msgid="2540360826995543134">"Použiť predv. nast. účtu"</string>
     <string name="account_setup_failed_dlg_auth_message" msgid="426627755590431364">"Používateľské meno alebo heslo je nesprávne."</string>
@@ -187,7 +187,7 @@
     <string name="account_setup_failed_protocol_unsupported" msgid="4607759927226943569">"Zadali ste nesprávnu adresu servera alebo server vyžaduje verziu protokolu, ktorú aplikácia E-mail nepodporuje."</string>
     <string name="account_setup_failed_access_denied" msgid="6835358740050287051">"Nemáte povolenie na synchronizáciu s týmto serverom. Kontaktujte správcu servera a požiadajte ho o viac informácií."</string>
     <string name="account_setup_security_required_title" msgid="1850321535870447468">"Vzdialená správa zabezpečenia"</string>
-    <string name="account_setup_security_policies_required_fmt" msgid="5410714107656671761">"Server <xliff:g id="SERVER">%s</xliff:g> vyžaduje povolenie, aby mohol vzdialene ovládať niektoré funkcie zabezpečenia vášho zariadenia so systémom Android. Chcete dokončiť nastavenie tohto účtu?"</string>
+    <string name="account_setup_security_policies_required_fmt" msgid="5410714107656671761">"Server <xliff:g id="SERVER">%s</xliff:g> vyžaduje povolenie, aby mohol vzdialene ovládať niektoré funkcie zabezpečenia vášho zariadenia Android. Chcete dokončiť nastavenie tohto účtu?"</string>
     <string name="account_setup_failed_security_policies_unsupported" msgid="3210264746877120355">"Tento server vyžaduje bezpečnostné funkcie, ktoré vaše zariadenie so systémom Android nepodporuje (vrátane: <xliff:g id="ERROR">%s</xliff:g>)."</string>
     <string name="account_setup_username_uneditable_error" msgid="1618869759801584109">"Používateľské meno účtu nemôžete zmeniť. Ak chcete pridať účet s iným používateľským menom, dotknite sa možnosti Pridať účet."</string>
     <string name="disable_admin_warning" msgid="6196985268695592382">"UPOZORNENIE: Ak deaktivujete oprávnenie aplikácie E-mail spravovať toto zariadenie, budú odstránené všetky účty aplikácie E-mail, ktoré toto oprávnenie vyžadujú. Spoločne s týmito účtami budú odstránené aj všetky ich e-maily, kontakty, udalosti kalendára a ďalšie údaje."</string>
@@ -197,10 +197,10 @@
     <string name="security_needed_ticker_fmt" msgid="2120499087897133665">"Účet „<xliff:g id="ACCOUNT">%s</xliff:g>“ vyžaduje aktualizáciu nastavení zabezpečenia."</string>
     <string name="security_changed_ticker_fmt" msgid="2609435447352755285">"Účet „<xliff:g id="ACCOUNT">%s</xliff:g>“ zmenil svoje nastavenia zabezpečenia. Od používateľa sa nevyžaduje žiadna akcia."</string>
     <string name="security_notification_content_update_title" msgid="2429762903228690154">"Vyžaduje sa bezp. aktualizácia"</string>
-    <string name="security_notification_content_change_title" msgid="443490921895642130">"Pravidlá zabezp. sa zmenili"</string>
+    <string name="security_notification_content_change_title" msgid="443490921895642130">"Prav. zabezpečenia sa zmenili"</string>
     <string name="security_notification_content_unsupported_title" msgid="7315219208043169233">"Prav. zabezp. sa nedajú splniť"</string>
     <string name="account_security_title" msgid="3511543138560418587">"Zabezpečenie zariadenia"</string>
-    <string name="account_security_policy_explanation_fmt" msgid="6932627044314460766">"Server <xliff:g id="SERVER">%s</xliff:g> vyžaduje povolenie, aby mohol vzdialene ovládať niektoré funkcie zabezpečenia vášho zariadenia so systémom Android."</string>
+    <string name="account_security_policy_explanation_fmt" msgid="6932627044314460766">"Server <xliff:g id="SERVER">%s</xliff:g> vyžaduje povolenie, aby mohol vzdialene ovládať niektoré funkcie zabezpečenia vášho zariadenia Android."</string>
     <string name="account_setup_failed_dlg_edit_details_action" msgid="5355993309841479360">"Upraviť podrobnosti"</string>
     <string name="password_expire_warning_ticker_fmt" msgid="2459977229180023773">"Účet „<xliff:g id="ACCOUNT">%s</xliff:g>“ požaduje, aby ste zmenili kód PIN alebo heslo uzamknutia obrazovky."</string>
     <string name="password_expire_warning_content_title" msgid="7174669014074849304">"Uzamykacie heslo čoskoro vyprší"</string>
@@ -216,14 +216,14 @@
     <string name="account_settings_login_dialog_reason_fmt" msgid="4266359321648406752">"Prihlásenie do účtu <xliff:g id="ACCOUNT">%s</xliff:g> zlyhalo. Odpoveď servera: <xliff:g id="REASON">%s</xliff:g> Chcete aktualizovať svoje používateľské meno alebo heslo?"</string>
     <string name="account_settings_background_attachments_label" msgid="2980317599840958688">"Sťahovať všetky prílohy"</string>
     <string name="account_settings_background_attachments_summary" msgid="5954218549226189376">"Automaticky sťahovať prílohy najnovších správ prostredníctvom siete Wi-Fi"</string>
-    <string name="account_settings_notify_label" msgid="1630001017303007974">"E-mailové upozornenia"</string>
+    <string name="account_settings_notify_label" msgid="1630001017303007974">"Upozornenia na poštu"</string>
     <string name="account_settings_summary" msgid="8403582255413830007">"Frekvencia synchronizácie, oznámení atď."</string>
     <string name="account_settings_notify_summary" msgid="8134339460923068254">"Poslať upozornenie na príchod e-mailu"</string>
     <string name="account_settings_mail_check_frequency_label" msgid="4322235101687302250">"Frekvencia synchronizácie"</string>
     <string name="account_settings_incoming_label" msgid="7858928031806297542">"Nastavenia prichádzajúcej pošty"</string>
     <string name="account_settings_incoming_summary" msgid="2923044634831881068">"Používateľské meno, heslo a ďalšie nastavenia servera (prich.)"</string>
     <string name="account_settings_outgoing_label" msgid="4464829249980026745">"Nastavenia odchádzajúcej pošty"</string>
-    <string name="account_settings_outgoing_summary" msgid="3572093624332724311">"Používateľské meno, heslo a ďalšie nastavenia servera (odchádz.)"</string>
+    <string name="account_settings_outgoing_summary" msgid="3572093624332724311">"Používateľské meno, heslo a ďalšie nastavenia servera (odch.)"</string>
     <string name="account_settings_enforced_label" msgid="7429582254433588882">"Vynútené pravidlá"</string>
     <string name="account_settings_enforced_summary" msgid="8140860420440447771">"Žiadne"</string>
     <string name="account_settings_unsupported_label" msgid="1954091071454235577">"Nepodporované pravidlá"</string>
@@ -233,9 +233,9 @@
     <string name="account_settings_description_label" msgid="8894815221204511715">"Názov účtu"</string>
     <string name="account_settings_name_label" msgid="8186406122590008449">"Vaše meno"</string>
     <string name="account_settings_edit_quick_responses_label" msgid="3106019627675996480">"Rýchle odpovede"</string>
-    <string name="account_settings_edit_quick_responses_summary" msgid="8056686122888722591">"Upraviť text, ktorý často vkladáte pri písaní e-mailu"</string>
+    <string name="account_settings_edit_quick_responses_summary" msgid="8056686122888722591">"Upraviť texty, ktoré často vkladáte pri písaní e-mailov"</string>
     <string name="account_settings_notifications" msgid="1042620094281375043">"Nastavenia upozornení"</string>
-    <string name="account_settings_data_usage" msgid="6669107430575866736">"Spotreba dát"</string>
+    <string name="account_settings_data_usage" msgid="6669107430575866736">"Spotreba dátového pripojenia"</string>
     <string name="account_settings_policies" msgid="6292833636418641840">"Pravidlá zabezpečenia"</string>
     <string name="system_folders_title" msgid="2934406494244347991">"Systémové priečinky"</string>
     <string name="system_folders_trash_title" msgid="8470058000681188327">"Priečinok Kôš"</string>
@@ -246,12 +246,12 @@
     <string name="system_folders_sent_dlg" msgid="7071006714702094762">"Vyberte priečinok odoslaných položiek na vašom serveri"</string>
     <string name="edit_quick_response_dialog" msgid="6479106007607928450">"Rýchla odpoveď"</string>
     <string name="save_action" msgid="1988862706623227093">"Uložiť"</string>
-    <string name="account_settings_sync_contacts_enable" msgid="1369272986009573218">"Synchronizovať kontakty"</string>
-    <string name="account_settings_sync_contacts_summary" msgid="816919452270997919">"Synchr. kontakty pre tento účet."</string>
-    <string name="account_settings_sync_calendar_enable" msgid="6855333393468628003">"Synchronizovať kalendár"</string>
-    <string name="account_settings_sync_calendar_summary" msgid="7606340353079301703">"Synchr. udalosť kalendára pre účet"</string>
-    <string name="account_settings_sync_email_enable" msgid="3754115565685222477">"Synchroniz. e-mail"</string>
-    <string name="account_settings_sync_email_summary" msgid="262964076412310990">"Synchr. e-mail pre tento účet"</string>
+    <string name="account_settings_sync_contacts_enable" msgid="1369272986009573218">"Synchr. kontakty"</string>
+    <string name="account_settings_sync_contacts_summary" msgid="816919452270997919">"Synchr. kontakty pre tento účet"</string>
+    <string name="account_settings_sync_calendar_enable" msgid="6855333393468628003">"Synchr. kalendár"</string>
+    <string name="account_settings_sync_calendar_summary" msgid="7606340353079301703">"Synchr. udalosti kalendára pre účet"</string>
+    <string name="account_settings_sync_email_enable" msgid="3754115565685222477">"Synchr. poštu"</string>
+    <string name="account_settings_sync_email_summary" msgid="262964076412310990">"Synchr. poštu pre tento účet"</string>
     <string name="account_settings_vibrate_when_label" msgid="708477308761702671">"Vibrovať"</string>
     <string name="account_settings_ringtone" msgid="8229878374785575207">"Zvoliť tón zvonenia"</string>
     <string name="account_settings_servers" msgid="4925493817981624242">"Nastavenia servera"</string>
@@ -297,10 +297,10 @@
     <string name="policy_screen_timeout" msgid="414869965358468080">"Uzamk. obrazovky nečinného zariadenia"</string>
     <string name="policy_calendar_age" msgid="627405158087482302">"Obmedziť počet synchroniz. udalostí kalendára"</string>
     <string name="policy_email_age" msgid="7144148367145424963">"Obmedziť počet synchronizovaných e-mailov"</string>
-    <string name="quick_1" msgid="3426057697353380951">"Ďakujeme!"</string>
+    <string name="quick_1" msgid="3426057697353380951">"Ďakujem!"</string>
     <string name="quick_2" msgid="4188036352885736617">"To znie dobre!"</string>
-    <string name="quick_3" msgid="8061819976353395585">"Prečítam si to neskôr a dám vám vedieť."</string>
-    <string name="quick_4" msgid="3988974084396883051">"Dohodnime si schôdzku a prediskutujme to."</string>
+    <string name="quick_3" msgid="8061819976353395585">"Prečítam si to neskôr a ozvem sa."</string>
+    <string name="quick_4" msgid="3988974084396883051">"Môžeme si dohodnúť stretnutie, aby sme to prediskutovali."</string>
     <string name="require_manual_sync_message" msgid="7777357288642785955">"Synchronizácia na pozadí je pre tento účet v roamingu zakázaná."</string>
     <string name="confirm_response" msgid="9151965975158906286">"Odosiela sa odpoveď..."</string>
     <string name="no_conversations" msgid="5559527390337162819">"Žiadne správy."</string>
diff --git a/res/values-sv/strings.xml b/res/values-sv/strings.xml
index 4971b1223..9877fe799 100644
--- a/res/values-sv/strings.xml
+++ b/res/values-sv/strings.xml
@@ -162,7 +162,7 @@
     <string name="account_setup_failed_dlg_title" msgid="9083263347962940552">"Det gick inte att avsluta"</string>
     <string name="account_setup_options_mail_window_label" msgid="7603869690500525594">"Synkronisera e-post från:"</string>
     <string name="account_setup_options_mail_window_auto" msgid="4188895354366183790">"Automatisk"</string>
-    <string name="account_setup_options_mail_window_1day" msgid="7727436096227637646">"Sista dagen"</string>
+    <string name="account_setup_options_mail_window_1day" msgid="7727436096227637646">"Det senaste dygnet"</string>
     <string name="account_setup_options_mail_window_3days" msgid="1841106793912850270">"Senaste tre dagarna"</string>
     <string name="account_setup_options_mail_window_1week" msgid="5804121771990249346">"Förra veckan"</string>
     <string name="account_setup_options_mail_window_2weeks" msgid="3583478100026382495">"Senaste två veckorna"</string>
diff --git a/res/values-sw/strings.xml b/res/values-sw/strings.xml
index 78cdc6945..e95165176 100644
--- a/res/values-sw/strings.xml
+++ b/res/values-sw/strings.xml
@@ -28,7 +28,7 @@
     <string name="create_action" msgid="3062715563215392251">"Unda mpya"</string>
     <string name="quick_responses_empty_view" msgid="3960050972306132367">"Hakuna majibu ya haraka."</string>
     <string name="account_settings_action" msgid="4494079183315085171">"Mipangilio ya akaunti"</string>
-    <string name="menu_folder_options" msgid="2871906096248843471">"Chaguo za usawazishaji"</string>
+    <string name="menu_folder_options" msgid="2871906096248843471">"Chaguo za kusawazisha"</string>
     <string name="status_network_error" msgid="2611654064403817391">"Tatizo la kuunganisha."</string>
   <plurals name="move_messages">
     <item quantity="one" msgid="320885379869442589">"Hamisha ujumbe"</item>
@@ -100,8 +100,8 @@
     <string name="account_password_spaces_error" msgid="8928309156658903257">"Nenosiri hili linaanza au kumalizika na herufi moja ya nafasi. Seva nyingi hazikubali manenosiri yenye nafasi."</string>
     <string name="account_setup_check_settings_retr_info_msg" msgid="4121970450267725664">"Inaleta maelezo ya akaunti"</string>
     <string name="account_setup_check_settings_check_incoming_msg" msgid="2869198335297585862">"Inathibitisha mipangilio ya seva…"</string>
-    <string name="account_setup_check_settings_check_outgoing_msg" msgid="4566131393776891419">"Inahalalisha mipangilio ya smtp…"</string>
-    <string name="account_setup_creating_account_msg" msgid="6235569720466839946">"Inaunda akaunti…"</string>
+    <string name="account_setup_check_settings_check_outgoing_msg" msgid="4566131393776891419">"Inathibitisha mipangilio ya smtp…"</string>
+    <string name="account_setup_creating_account_msg" msgid="6235569720466839946">"Akaunti inafunguliwa…"</string>
     <string name="account_setup_ab_headline" msgid="7110531768613341908">"Thibitisha aina ya akaunti"</string>
     <string name="account_setup_ab_instructions_format" msgid="2107254631013471380">"Uliashiria kuwa <xliff:g id="EMAIL">%1$s</xliff:g> hutumia <xliff:g id="USERPROTOCOL">%2$s</xliff:g>, lakini huenda akaunti inatumia <xliff:g id="PROVIDERPROTOCOL">%3$s</xliff:g>"</string>
     <string name="account_setup_names_title" msgid="8483517350241119291">"Kufungua akaunti"</string>
@@ -125,7 +125,7 @@
     <string name="account_setup_incoming_security_ssl_label" msgid="2798501138420163861">"SSL/TLS"</string>
     <string name="account_setup_incoming_security_tls_trust_certificates_label" msgid="6149084428423662620">"STARTTLS (Kubali vyeti vyote)"</string>
     <string name="account_setup_incoming_security_tls_label" msgid="6573498431821879660">"STARTTLS"</string>
-    <string name="account_setup_incoming_delete_policy_label" msgid="9213590134693857912">"Futa barua pepe kutoka kwa seva"</string>
+    <string name="account_setup_incoming_delete_policy_label" msgid="9213590134693857912">"Futa barua pepe kutoka seva"</string>
     <string name="account_setup_incoming_delete_policy_never_label" msgid="3222897501875871041">"Katu"</string>
     <string name="account_setup_incoming_delete_policy_delete_label" msgid="222216840911785631">"Ninapofuta kutoka katika kikasha"</string>
     <string name="account_setup_incoming_imap_path_prefix_label" msgid="401167247072926810">"Kiambishi cha njia ya IMAP"</string>
@@ -146,7 +146,7 @@
     <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="8321552620846334354">"Marudio ya usawazishaji"</string>
+    <string name="account_setup_options_mail_check_frequency_label" msgid="8321552620846334354">"Marudio ya usawazishaji:"</string>
     <string name="account_setup_options_mail_check_frequency_never" msgid="287951859480505416">"Katu"</string>
     <string name="account_setup_options_mail_check_frequency_push" msgid="5934525907736008673">"Kiotomatiki"</string>
     <string name="account_setup_options_mail_check_frequency_5min" msgid="6388939895878539307">"Kila baada ya dakika 5"</string>
@@ -168,7 +168,7 @@
     <string name="account_setup_options_mail_window_2weeks" msgid="3583478100026382495">"Wiki mbili zilizopita"</string>
     <string name="account_setup_options_mail_window_1month" msgid="4289585173153789717">"Mwezi uliopita"</string>
     <string name="account_setup_options_mail_window_all" msgid="5372861827683632364">"Zote"</string>
-    <string name="account_setup_options_mail_window_default" msgid="2540360826995543134">"Tumia akaunti chaguo-msingi"</string>
+    <string name="account_setup_options_mail_window_default" msgid="2540360826995543134">"Tumia chaguo-msingi la akaunti"</string>
     <string name="account_setup_failed_dlg_auth_message" msgid="426627755590431364">"Jina la mtumiaji au nenosiri sio sahihi."</string>
     <string name="account_setup_failed_dlg_auth_message_fmt" msgid="2081384892947238930">"Kuingia kumeshindikana.\n(<xliff:g id="ERROR">%s</xliff:g>)"</string>
     <string name="account_setup_autodiscover_dlg_authfail_title" msgid="7365992662150541370">"Tatizo la kufungua akaunti"</string>
@@ -221,9 +221,9 @@
     <string name="account_settings_notify_summary" msgid="8134339460923068254">"Tuma arifa barua pepe inapoingia"</string>
     <string name="account_settings_mail_check_frequency_label" msgid="4322235101687302250">"Marudio ya usawazishaji"</string>
     <string name="account_settings_incoming_label" msgid="7858928031806297542">"Mipangilio ya kuingia"</string>
-    <string name="account_settings_incoming_summary" msgid="2923044634831881068">"Jina la mtumiaji, nenosiri, na mipangilio mingine ya seva inayoingia"</string>
+    <string name="account_settings_incoming_summary" msgid="2923044634831881068">"Jina la mtumiaji, nenosiri na mipangilio mingine ya seva inayoingia"</string>
     <string name="account_settings_outgoing_label" msgid="4464829249980026745">"Mipangilio ya kutoka"</string>
-    <string name="account_settings_outgoing_summary" msgid="3572093624332724311">"Jina la mmtumiaji, neneosiri na mipangilio mingine ya seva ya kutoka."</string>
+    <string name="account_settings_outgoing_summary" msgid="3572093624332724311">"Jina la mmtumiaji, neneosiri na mipangilio mingine ya seva ya kutoka"</string>
     <string name="account_settings_enforced_label" msgid="7429582254433588882">"Sera zimetekelezwa"</string>
     <string name="account_settings_enforced_summary" msgid="8140860420440447771">"Hamna"</string>
     <string name="account_settings_unsupported_label" msgid="1954091071454235577">"Sera zisizokubaliwa"</string>
@@ -258,7 +258,7 @@
     <string name="mailbox_settings_activity_title" msgid="4705845931573373274">"Chaguo za kusawazisha"</string>
     <string name="mailbox_settings_activity_title_with_mailbox" msgid="6485481250424219240">"Sawazisha chaguo ( <xliff:g id="MAILBOXX_NAME">%s</xliff:g> )"</string>
     <string name="mailbox_settings_sync_enabled_label" msgid="1180866791599296994">"Sawazisha folda hii"</string>
-    <string name="mailbox_settings_sync_enabled_summary" msgid="345878979425044320">"Ujumbe wote utapakuliwa itakapounganishwa"</string>
+    <string name="mailbox_settings_sync_enabled_summary" msgid="345878979425044320">"Barua pepe zote zitapakuliwa muunganisho wa intaneti utakaporejea"</string>
     <string name="mailbox_settings_mailbox_sync_window_label" msgid="851180833264474141">"Siku za kusawazisha barua"</string>
     <string name="prefDialogTitle_conversationListIcon" msgid="4601797400885989153">"Picha ya mtumaji"</string>
     <string name="provider_note_live" msgid="2995297671709325333">"Akaunti zingine za \"Plus\" tu ndizo zinazojumuisha ufikivu wa POP na kwa hivyo kuruhusu programu hii kuunganisha. Kama hauwezi kuingia kwa kutumia anwani yako ya barua pepe na nenosiri lako sahihi, huenda usiwe na akaunti iliyolipiwa ya \"Plus\". Tafadhali zindua Kivinjari cha Wavuti ili uweze kufikia akaunti hizi za barua pepe."</string>
diff --git a/res/values-tr/strings.xml b/res/values-tr/strings.xml
index 764ad2c23..2248419ed 100644
--- a/res/values-tr/strings.xml
+++ b/res/values-tr/strings.xml
@@ -220,9 +220,9 @@
     <string name="account_settings_summary" msgid="8403582255413830007">"Sıklığı, bildirimleri vs. senkronize et"</string>
     <string name="account_settings_notify_summary" msgid="8134339460923068254">"E-posta geldiğinde bildirim gönder"</string>
     <string name="account_settings_mail_check_frequency_label" msgid="4322235101687302250">"Senkronizasyon sıklığı"</string>
-    <string name="account_settings_incoming_label" msgid="7858928031806297542">"Gelen ayarlar"</string>
+    <string name="account_settings_incoming_label" msgid="7858928031806297542">"Gelen ayarları"</string>
     <string name="account_settings_incoming_summary" msgid="2923044634831881068">"Kullanıcı adı, şifre ve diğer gelen sunucu ayarları"</string>
-    <string name="account_settings_outgoing_label" msgid="4464829249980026745">"Giden ayarlar"</string>
+    <string name="account_settings_outgoing_label" msgid="4464829249980026745">"Giden ayarları"</string>
     <string name="account_settings_outgoing_summary" msgid="3572093624332724311">"Kullanıcı adı, şifre ve diğer giden sunucu ayarları"</string>
     <string name="account_settings_enforced_label" msgid="7429582254433588882">"Politikalar uygulandı"</string>
     <string name="account_settings_enforced_summary" msgid="8140860420440447771">"Hiçbiri"</string>
diff --git a/res/values-zh-rCN/strings.xml b/res/values-zh-rCN/strings.xml
index e2c70e5c7..4f716f685 100644
--- a/res/values-zh-rCN/strings.xml
+++ b/res/values-zh-rCN/strings.xml
@@ -34,7 +34,7 @@
     <item quantity="one" msgid="320885379869442589">"移动邮件"</item>
     <item quantity="other" msgid="371256717624461324">"移动邮件"</item>
   </plurals>
-    <string name="cannot_move_protocol_not_supported_toast" msgid="6558083148128616292">"POP3 帐户不支持移动邮件的操作。"</string>
+    <string name="cannot_move_protocol_not_supported_toast" msgid="6558083148128616292">"POP3帐户不支持移动邮件的操作。"</string>
     <string name="cannot_move_multiple_accounts_toast" msgid="7922594026384944163">"所选内容包含多个帐户的邮件，因此无法进行移动。"</string>
     <string name="cannot_move_special_mailboxes_toast" msgid="7093107954841896970">"无法移动“草稿”、“发件箱”和“已发邮件”中的邮件。"</string>
     <string name="mailbox_name_display_inbox" msgid="3542327124749861736">"收件箱"</string>
@@ -49,7 +49,7 @@
     <string name="account_folder_list_summary_starred" msgid="3134312269246375723">"已加星标的内容"</string>
     <string name="account_folder_list_summary_drafts" msgid="5514845993247300437">"草稿"</string>
     <string name="account_folder_list_summary_outbox" msgid="3059836696049399377">"发件箱"</string>
-    <string name="mailbox_list_account_selector_combined_view" msgid="1556327299894225044">"合并的视图"</string>
+    <string name="mailbox_list_account_selector_combined_view" msgid="1556327299894225044">"合并视图"</string>
     <string name="message_compose_fwd_header_fmt" msgid="5181300290654579434">\n\n"-------- 原始邮件 --------\n主题：<xliff:g id="SUBJECT">%1$s</xliff:g>\n发件人：<xliff:g id="SENDER">%2$s</xliff:g>\n收件人：<xliff:g id="TO">%3$s</xliff:g>\n抄送：<xliff:g id="CC_0">%4$s</xliff:g>\n\n"</string>
     <string name="message_compose_insert_quick_response_list_title" msgid="5314107302508728189">"插入快速回复"</string>
     <string name="message_compose_insert_quick_response_menu_title" msgid="5817075097532919955">"插入快速回复"</string>
@@ -100,7 +100,7 @@
     <string name="account_password_spaces_error" msgid="8928309156658903257">"该密码的开头或结尾存在一个或多个空格。很多服务器不支持带空格的密码。"</string>
     <string name="account_setup_check_settings_retr_info_msg" msgid="4121970450267725664">"正在检索帐户信息..."</string>
     <string name="account_setup_check_settings_check_incoming_msg" msgid="2869198335297585862">"正在验证服务器设置…"</string>
-    <string name="account_setup_check_settings_check_outgoing_msg" msgid="4566131393776891419">"正在验证 SMTP 设置…"</string>
+    <string name="account_setup_check_settings_check_outgoing_msg" msgid="4566131393776891419">"正在验证SMTP设置…"</string>
     <string name="account_setup_creating_account_msg" msgid="6235569720466839946">"正在创建帐户…"</string>
     <string name="account_setup_ab_headline" msgid="7110531768613341908">"确认帐户类型"</string>
     <string name="account_setup_ab_instructions_format" msgid="2107254631013471380">"您已指明<xliff:g id="EMAIL">%1$s</xliff:g>使用<xliff:g id="USERPROTOCOL">%2$s</xliff:g>，但该帐户使用的可能是<xliff:g id="PROVIDERPROTOCOL">%3$s</xliff:g>"</string>
@@ -116,8 +116,7 @@
     <string name="account_setup_incoming_headline" msgid="6183711037633407184">"接收服务器设置"</string>
     <string name="account_setup_incoming_username_label" msgid="406939983633223354">"用户名"</string>
     <string name="account_setup_incoming_password_label" msgid="634540235479188709">"密码"</string>
-    <!-- no translation found for account_setup_password_subheading (2072179928666715013) -->
-    <skip />
+    <string name="account_setup_password_subheading" msgid="2072179928666715013">"密码"</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>
@@ -129,7 +128,7 @@
     <string name="account_setup_incoming_delete_policy_label" msgid="9213590134693857912">"从服务器中删除电子邮件"</string>
     <string name="account_setup_incoming_delete_policy_never_label" msgid="3222897501875871041">"永不"</string>
     <string name="account_setup_incoming_delete_policy_delete_label" msgid="222216840911785631">"当我从收件箱中删除时"</string>
-    <string name="account_setup_incoming_imap_path_prefix_label" msgid="401167247072926810">"IMAP 路径前缀"</string>
+    <string name="account_setup_incoming_imap_path_prefix_label" msgid="401167247072926810">"IMAP路径前缀"</string>
     <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>
@@ -142,28 +141,26 @@
     <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_remove_certificate" msgid="5633249155510301766">"移除"</string>
     <string name="account_setup_exchange_no_certificate" msgid="1119542961954780872">"无"</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>
-    <!-- no translation found for account_setup_options_mail_check_frequency_label (8321552620846334354) -->
-    <skip />
+    <string name="account_setup_options_mail_check_frequency_label" msgid="8321552620846334354">"同步频率："</string>
     <string name="account_setup_options_mail_check_frequency_never" msgid="287951859480505416">"永不"</string>
     <string name="account_setup_options_mail_check_frequency_push" msgid="5934525907736008673">"自动（推送）"</string>
-    <string name="account_setup_options_mail_check_frequency_5min" msgid="6388939895878539307">"每隔 5 分钟"</string>
-    <string name="account_setup_options_mail_check_frequency_10min" msgid="5344463157247877480">"每隔 10 分钟"</string>
-    <string name="account_setup_options_mail_check_frequency_15min" msgid="5052776740089741793">"每隔 15 分钟"</string>
-    <string name="account_setup_options_mail_check_frequency_30min" msgid="1097088928685931864">"每隔 30 分钟"</string>
+    <string name="account_setup_options_mail_check_frequency_5min" msgid="6388939895878539307">"每隔5分钟"</string>
+    <string name="account_setup_options_mail_check_frequency_10min" msgid="5344463157247877480">"每隔10分钟"</string>
+    <string name="account_setup_options_mail_check_frequency_15min" msgid="5052776740089741793">"每隔15分钟"</string>
+    <string name="account_setup_options_mail_check_frequency_30min" msgid="1097088928685931864">"每隔30分钟"</string>
     <string name="account_setup_options_mail_check_frequency_1hour" msgid="3767715356039692899">"每小时"</string>
     <string name="account_setup_options_notify_label" msgid="7046146571560728829">"收到电子邮件时通知我"</string>
     <string name="account_setup_options_sync_contacts_label" msgid="276492345599531778">"同步此帐户中的联系人"</string>
     <string name="account_setup_options_sync_calendar_label" msgid="3222151135467189411">"同步此帐户中的日历"</string>
     <string name="account_setup_options_sync_email_label" msgid="8585177128405004068">"同步此帐户中的电子邮件"</string>
-    <string name="account_setup_options_background_attachments_label" msgid="5247749298276451846">"连接到 WLAN 后自动下载附件"</string>
+    <string name="account_setup_options_background_attachments_label" msgid="5247749298276451846">"连接到WLAN后自动下载附件"</string>
     <string name="account_setup_failed_dlg_title" msgid="9083263347962940552">"无法完成"</string>
-    <!-- no translation found for account_setup_options_mail_window_label (7603869690500525594) -->
-    <skip />
+    <string name="account_setup_options_mail_window_label" msgid="7603869690500525594">"同步最近多少天的邮件："</string>
     <string name="account_setup_options_mail_window_auto" msgid="4188895354366183790">"自动"</string>
     <string name="account_setup_options_mail_window_1day" msgid="7727436096227637646">"最近一天"</string>
     <string name="account_setup_options_mail_window_3days" msgid="1841106793912850270">"最近三天"</string>
@@ -190,8 +187,8 @@
     <string name="account_setup_failed_protocol_unsupported" msgid="4607759927226943569">"您键入的服务器地址不正确，或电子邮件服务不支持该服务器需要的协议版本。"</string>
     <string name="account_setup_failed_access_denied" msgid="6835358740050287051">"您没有与此服务器同步的权限。要了解详情，请与您服务器的管理员联系。"</string>
     <string name="account_setup_security_required_title" msgid="1850321535870447468">"远程安全管理"</string>
-    <string name="account_setup_security_policies_required_fmt" msgid="5410714107656671761">"“<xliff:g id="SERVER">%s</xliff:g>”服务器要求您允许其远程控制您 Android 设备的某些安全功能。您想要完成此帐户设置吗？"</string>
-    <string name="account_setup_failed_security_policies_unsupported" msgid="3210264746877120355">"您的 Android 设备不支持此服务器要求使用的安全功能，其中包括：<xliff:g id="ERROR">%s</xliff:g>"</string>
+    <string name="account_setup_security_policies_required_fmt" msgid="5410714107656671761">"<xliff:g id="SERVER">%s</xliff:g>服务器要求您允许其远程控制您Android设备的某些安全功能。您想要完成此帐户设置吗？"</string>
+    <string name="account_setup_failed_security_policies_unsupported" msgid="3210264746877120355">"您的Android设备不支持此服务器要求使用的安全功能，其中包括：<xliff:g id="ERROR">%s</xliff:g>"</string>
     <string name="account_setup_username_uneditable_error" msgid="1618869759801584109">"您无法更改帐户的用户名。要添加使用其他用户名的帐户，请触摸“添加帐户”。"</string>
     <string name="disable_admin_warning" msgid="6196985268695592382">"警告：撤消“电子邮件”应用管理您设备的权限会删除所有需要此权限的电子邮件帐户，以及这些帐户中的电子邮件、联系人、日历活动和其他数据。"</string>
     <string name="account_security_dialog_title" msgid="430041952584831904">"安全更新"</string>
@@ -200,11 +197,11 @@
     <string name="security_needed_ticker_fmt" msgid="2120499087897133665">"帐户“<xliff:g id="ACCOUNT">%s</xliff:g>”需要更新安全设置。"</string>
     <string name="security_changed_ticker_fmt" msgid="2609435447352755285">"帐户“<xliff:g id="ACCOUNT">%s</xliff:g>”已更改其安全设置，用户无需进行任何操作。"</string>
     <string name="security_notification_content_update_title" msgid="2429762903228690154">"需要进行安全更新"</string>
-    <string name="security_notification_content_change_title" msgid="443490921895642130">"安全政策已更改"</string>
-    <string name="security_notification_content_unsupported_title" msgid="7315219208043169233">"无法满足安全政策的要求"</string>
+    <string name="security_notification_content_change_title" msgid="443490921895642130">"安全策略已更改"</string>
+    <string name="security_notification_content_unsupported_title" msgid="7315219208043169233">"无法满足安全策略的要求"</string>
     <string name="account_security_title" msgid="3511543138560418587">"设备安全性"</string>
-    <string name="account_security_policy_explanation_fmt" msgid="6932627044314460766">"“<xliff:g id="SERVER">%s</xliff:g>”服务器要求您允许其远程控制您 Android 设备的某些安全功能。"</string>
-    <string name="account_setup_failed_dlg_edit_details_action" msgid="5355993309841479360">"编辑详情"</string>
+    <string name="account_security_policy_explanation_fmt" msgid="6932627044314460766">"<xliff:g id="SERVER">%s</xliff:g>服务器要求您允许其远程控制您Android设备的某些安全功能。"</string>
+    <string name="account_setup_failed_dlg_edit_details_action" msgid="5355993309841479360">"修改详细信息"</string>
     <string name="password_expire_warning_ticker_fmt" msgid="2459977229180023773">"“<xliff:g id="ACCOUNT">%s</xliff:g>”要求更改锁定屏幕 PIN 或密码。"</string>
     <string name="password_expire_warning_content_title" msgid="7174669014074849304">"锁定屏幕密码即将过期"</string>
     <string name="password_expired_ticker" msgid="4230570412974108968">"您的锁定屏幕 PIN 或密码已过期。"</string>
@@ -218,7 +215,7 @@
     <string name="account_settings_login_dialog_content_fmt" msgid="8849649646111167377">"<xliff:g id="ACCOUNT">%s</xliff:g> 的用户名或密码不正确。要立即更新吗？"</string>
     <string name="account_settings_login_dialog_reason_fmt" msgid="4266359321648406752">"无法登录 <xliff:g id="ACCOUNT">%s</xliff:g>；服务器提示：<xliff:g id="REASON">%s</xliff:g>。您要更新自己的用户名和/或密码吗？"</string>
     <string name="account_settings_background_attachments_label" msgid="2980317599840958688">"下载附件"</string>
-    <string name="account_settings_background_attachments_summary" msgid="5954218549226189376">"通过 WLAN 自动下载最新邮件的附件"</string>
+    <string name="account_settings_background_attachments_summary" msgid="5954218549226189376">"通过WLAN自动下载最新邮件的附件"</string>
     <string name="account_settings_notify_label" msgid="1630001017303007974">"电子邮件通知"</string>
     <string name="account_settings_summary" msgid="8403582255413830007">"同步频率、通知等。"</string>
     <string name="account_settings_notify_summary" msgid="8134339460923068254">"收到电子邮件时发送通知"</string>
@@ -227,9 +224,9 @@
     <string name="account_settings_incoming_summary" msgid="2923044634831881068">"用户名、密码和其他接收服务器设置"</string>
     <string name="account_settings_outgoing_label" msgid="4464829249980026745">"外发设置"</string>
     <string name="account_settings_outgoing_summary" msgid="3572093624332724311">"用户名、密码和其他外发服务器设置"</string>
-    <string name="account_settings_enforced_label" msgid="7429582254433588882">"政策已执行"</string>
+    <string name="account_settings_enforced_label" msgid="7429582254433588882">"已执行策略"</string>
     <string name="account_settings_enforced_summary" msgid="8140860420440447771">"无"</string>
-    <string name="account_settings_unsupported_label" msgid="1954091071454235577">"不支持的政策"</string>
+    <string name="account_settings_unsupported_label" msgid="1954091071454235577">"不支持的策略"</string>
     <string name="account_settings_unsupported_summary" msgid="2107633813351863608">"无"</string>
     <string name="account_settings_retry_label" msgid="1104680719299842829">"尝试同步"</string>
     <string name="account_settings_retry_summary" msgid="2703599639846201913">"触摸此处以同步此帐户"</string>
@@ -239,7 +236,7 @@
     <string name="account_settings_edit_quick_responses_summary" msgid="8056686122888722591">"编辑您在写电子邮件时经常插入的文本"</string>
     <string name="account_settings_notifications" msgid="1042620094281375043">"通知设置"</string>
     <string name="account_settings_data_usage" msgid="6669107430575866736">"数据使用"</string>
-    <string name="account_settings_policies" msgid="6292833636418641840">"安全政策"</string>
+    <string name="account_settings_policies" msgid="6292833636418641840">"安全策略"</string>
     <string name="system_folders_title" msgid="2934406494244347991">"系统文件夹"</string>
     <string name="system_folders_trash_title" msgid="8470058000681188327">"已删除邮件文件夹"</string>
     <string name="system_folders_trash_summary" msgid="1258919809198485244">"选择您在服务器上的已删除邮件文件夹"</string>
@@ -250,11 +247,11 @@
     <string name="edit_quick_response_dialog" msgid="6479106007607928450">"快速回复"</string>
     <string name="save_action" msgid="1988862706623227093">"保存"</string>
     <string name="account_settings_sync_contacts_enable" msgid="1369272986009573218">"同步联系人"</string>
-    <string name="account_settings_sync_contacts_summary" msgid="816919452270997919">"同步此帐户的联系人"</string>
+    <string name="account_settings_sync_contacts_summary" msgid="816919452270997919">"同步此帐户中的联系人"</string>
     <string name="account_settings_sync_calendar_enable" msgid="6855333393468628003">"同步日历"</string>
-    <string name="account_settings_sync_calendar_summary" msgid="7606340353079301703">"同步此帐户的日历活动"</string>
+    <string name="account_settings_sync_calendar_summary" msgid="7606340353079301703">"同步此帐户中的日历活动"</string>
     <string name="account_settings_sync_email_enable" msgid="3754115565685222477">"同步电子邮件"</string>
-    <string name="account_settings_sync_email_summary" msgid="262964076412310990">"同步此帐户的电子邮件"</string>
+    <string name="account_settings_sync_email_summary" msgid="262964076412310990">"同步此帐户中的电子邮件"</string>
     <string name="account_settings_vibrate_when_label" msgid="708477308761702671">"振动"</string>
     <string name="account_settings_ringtone" msgid="8229878374785575207">"选择铃声"</string>
     <string name="account_settings_servers" msgid="4925493817981624242">"服务器设置"</string>
@@ -265,12 +262,12 @@
     <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">"只有某些“Plus”帐户支持 POP 访问而允许此程序进行连接。如果您使用正确的电子邮件地址和密码无法登录，则可能还未开通付费的“Plus”帐户。请启动网络浏览器以获取对这些电子邮件帐户的访问权限。"</string>
-    <string name="provider_note_t_online" msgid="1630642061431427894">"在设置该电子邮件帐户之前，请访问 T-Online 网站，为访问 POP3 电子邮件创建密码。"</string>
+    <string name="provider_note_t_online" msgid="1630642061431427894">"在设置该电子邮件帐户之前，请访问T-Online网站创建密码，以便使用POP3电子邮件功能。"</string>
     <string name="exchange_name" msgid="1190783774800310346">"公司"</string>
     <string name="exchange_name_alternate" msgid="5772529644749041052">"Microsoft Exchange ActiveSync"</string>
     <string name="system_account_create_failed" msgid="3673792980526246177">"无法创建帐户，请重试。"</string>
     <string name="device_admin_label" msgid="8680224994637869414">"电子邮件"</string>
-    <string name="device_admin_description" msgid="426727923791430306">"启用指定服务器的安全政策"</string>
+    <string name="device_admin_description" msgid="426727923791430306">"启用服务器专有的安全策略"</string>
     <string name="settings_activity_title" msgid="5185915603716333904">"设置"</string>
     <string name="header_label_general_preferences" msgid="8243724566056800991">"常规设置"</string>
     <string name="general_preference_confirm_delete_label" msgid="1863245465244241907">"删除前先确认"</string>
diff --git a/res/values-zh-rTW/strings.xml b/res/values-zh-rTW/strings.xml
index a88e4e979..4fa5a2d2a 100644
--- a/res/values-zh-rTW/strings.xml
+++ b/res/values-zh-rTW/strings.xml
@@ -217,7 +217,7 @@
     <string name="account_settings_background_attachments_label" msgid="2980317599840958688">"下載附件"</string>
     <string name="account_settings_background_attachments_summary" msgid="5954218549226189376">"透過 Wi-Fi 自動下載最新郵件的附件"</string>
     <string name="account_settings_notify_label" msgid="1630001017303007974">"電子郵件通知"</string>
-    <string name="account_settings_summary" msgid="8403582255413830007">"同步處理頻率和通知等其他設定"</string>
+    <string name="account_settings_summary" msgid="8403582255413830007">"同步處理頻率和通知等設定"</string>
     <string name="account_settings_notify_summary" msgid="8134339460923068254">"收到電子郵件時傳送通知"</string>
     <string name="account_settings_mail_check_frequency_label" msgid="4322235101687302250">"同步處理頻率"</string>
     <string name="account_settings_incoming_label" msgid="7858928031806297542">"內收設定"</string>
diff --git a/res/values-zu/strings.xml b/res/values-zu/strings.xml
index 238410a7f..c65ba52a9 100644
--- a/res/values-zu/strings.xml
+++ b/res/values-zu/strings.xml
@@ -100,7 +100,7 @@
     <string name="account_password_spaces_error" msgid="8928309156658903257">"Le phasiwedi iqala noma igcina ngezimpawu"</string>
     <string name="account_setup_check_settings_retr_info_msg" msgid="4121970450267725664">"Ilanda ulwazi le-akhawunti..."</string>
     <string name="account_setup_check_settings_check_incoming_msg" msgid="2869198335297585862">"Iqinisekisa izilungiselelo zeseva…"</string>
-    <string name="account_setup_check_settings_check_outgoing_msg" msgid="4566131393776891419">"Iqinisekisa amasethingi e-smtp…"</string>
+    <string name="account_setup_check_settings_check_outgoing_msg" msgid="4566131393776891419">"Iqinisekisa izilungiselelo ze-smtp…"</string>
     <string name="account_setup_creating_account_msg" msgid="6235569720466839946">"Idala i-akhawunti…"</string>
     <string name="account_setup_ab_headline" msgid="7110531768613341908">"Qinisekisa uhlobo lwe-akhawunti yakho"</string>
     <string name="account_setup_ab_instructions_format" msgid="2107254631013471380">"Ukhombe i-<xliff:g id="EMAIL">%1$s</xliff:g> isebenzisa u-<xliff:g id="USERPROTOCOL">%2$s</xliff:g>, kodwa i-akhawunti ingase isebenzisa u-<xliff:g id="PROVIDERPROTOCOL">%3$s</xliff:g>"</string>
@@ -129,7 +129,7 @@
     <string name="account_setup_incoming_delete_policy_never_label" msgid="3222897501875871041">"Akusoze"</string>
     <string name="account_setup_incoming_delete_policy_delete_label" msgid="222216840911785631">"Lapho ngisusa Ebhokisini lokungenayo"</string>
     <string name="account_setup_incoming_imap_path_prefix_label" msgid="401167247072926810">"Isiqalo sendlela ye-IMAP"</string>
-    <string name="account_setup_incoming_imap_path_prefix_hint" msgid="9190845919067906033">"Okokuzithandela"</string>
+    <string name="account_setup_incoming_imap_path_prefix_hint" msgid="9190845919067906033">"Inketho"</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="1164004960070541473">"ISEVA YE-SMTP"</string>
@@ -188,18 +188,18 @@
     <string name="account_setup_failed_access_denied" msgid="6835358740050287051">"Awunayo imvume yokuvumelanisa ngalesisiphakeli. Thintana nomqondisi wesiphakeli sakho ukuze uthole ukwazisa okuningi."</string>
     <string name="account_setup_security_required_title" msgid="1850321535870447468">"Ukuphatha ukuphepha kokulawula okukude"</string>
     <string name="account_setup_security_policies_required_fmt" msgid="5410714107656671761">"Iseva<xliff:g id="SERVER">%s</xliff:g> idinga ukuba uyivumele ukuba ilawule kude ezinye izici zokuphepha zedivayisi ye-Android yakho.  Ingabe ufuna ukuqedela ukumisa le-akhawunti?"</string>
-    <string name="account_setup_failed_security_policies_unsupported" msgid="3210264746877120355">"Lesi siphakeli sidinga izici zokuphepha ezingasekelwa idivayisi yakho ye-Android, kuhlanganisa: <xliff:g id="ERROR">%s</xliff:g>"</string>
+    <string name="account_setup_failed_security_policies_unsupported" msgid="3210264746877120355">"Le seva idinga izici zokuphepha ezingasekelwa idivayisi yakho ye-Android, kuhlanganisa: <xliff:g id="ERROR">%s</xliff:g>"</string>
     <string name="account_setup_username_uneditable_error" msgid="1618869759801584109">"Awukwazi ukushintsha igama lomsebenzi le-akhawunti. Ukuze wengeze i-akhawunti ngegama lomsebenzi elihlukile, thinta Faka i-akhawunti."</string>
     <string name="disable_admin_warning" msgid="6196985268695592382">"ISEXWAYISO: Yenza kungasebenzi imvume yohlelo lokusebenza lwe-Imeyli ukubhalisa idivaysi yakho kuzosusa wonke ama-akhawunti e-Imeyli ayidingayo, kuhlanganise ne-imeyli yayo, othintana nabo, amakhalenda, izenzakalo, neminye imininingo."</string>
     <string name="account_security_dialog_title" msgid="430041952584831904">"Okwakamuva kwezokuphepha"</string>
-    <string name="account_security_dialog_content_fmt" msgid="8843806143923278214">"<xliff:g id="ACCOUNT">%s</xliff:g> idinga ukuba ubuyekeze izilungiselelo zakho zokuzivikela."</string>
+    <string name="account_security_dialog_content_fmt" msgid="8843806143923278214">"<xliff:g id="ACCOUNT">%s</xliff:g> idinga ubuyekeze izilungiselelo zakho zokuphepha."</string>
     <string name="security_unsupported_ticker_fmt" msgid="5166579214529283975">"I-Akhawuni \"<xliff:g id="ACCOUNT">%s</xliff:g>\" ayikwazi ukuvumelanisa ngenxa yezimfuneko sokuphepha."</string>
     <string name="security_needed_ticker_fmt" msgid="2120499087897133665">"I-Akhawunti \"<xliff:g id="ACCOUNT">%s</xliff:g>\" idinga ukubuyekeza izilungiselelo zokuphepha."</string>
     <string name="security_changed_ticker_fmt" msgid="2609435447352755285">"I-Akhawunti \"<xliff:g id="ACCOUNT">%s</xliff:g>\" ishintshe izilungiselelo zayo zokuphepha; asikho isenzo somsebenzisi esidingekayo."</string>
     <string name="security_notification_content_update_title" msgid="2429762903228690154">"Ukubuyekeza ezokuphepha kuyadingeka"</string>
     <string name="security_notification_content_change_title" msgid="443490921895642130">"Izinqubomgomo zokuphepha zishintshiwe"</string>
     <string name="security_notification_content_unsupported_title" msgid="7315219208043169233">"Izinqubomgomo zokuphepha azikwazi ukuhlangabezwa"</string>
-    <string name="account_security_title" msgid="3511543138560418587">"Ukuphepha kweDivaysi"</string>
+    <string name="account_security_title" msgid="3511543138560418587">"Ukuphepha kwedivaysi"</string>
     <string name="account_security_policy_explanation_fmt" msgid="6932627044314460766">"Iseva <xliff:g id="SERVER">%s</xliff:g> idinga ukuba uyivumele ukuba ilawule kude ezinye izici zokuphepha kwedivayisi ye-Android."</string>
     <string name="account_setup_failed_dlg_edit_details_action" msgid="5355993309841479360">"Hlela imininingwane"</string>
     <string name="password_expire_warning_ticker_fmt" msgid="2459977229180023773">"\"<xliff:g id="ACCOUNT">%s</xliff:g>\" idinga ukuba ushintshe iphinikhodi yokuvala isikrini noma iphasiwedi"</string>
@@ -254,7 +254,7 @@
     <string name="account_settings_sync_email_summary" msgid="262964076412310990">"Vumelanisa i-imeyli yale akhawunti"</string>
     <string name="account_settings_vibrate_when_label" msgid="708477308761702671">"Dlidliza"</string>
     <string name="account_settings_ringtone" msgid="8229878374785575207">"Khetha ithoni yokukhala"</string>
-    <string name="account_settings_servers" msgid="4925493817981624242">"Izilungiselelo Zeseva"</string>
+    <string name="account_settings_servers" msgid="4925493817981624242">"Izilungiselelo zeseva"</string>
     <string name="mailbox_settings_activity_title" msgid="4705845931573373274">"Vumelanisa okukhethwa kukho"</string>
     <string name="mailbox_settings_activity_title_with_mailbox" msgid="6485481250424219240">"Vumelanisa okukhethwa kukho (<xliff:g id="MAILBOXX_NAME">%s</xliff:g>)"</string>
     <string name="mailbox_settings_sync_enabled_label" msgid="1180866791599296994">"Vumelanisa le folda"</string>
@@ -291,7 +291,7 @@
     <string name="more_than_999" msgid="8704425397397918798">"999+"</string>
     <string name="search_hint" msgid="2200412192574686497">"Sesha i-imeyli"</string>
     <string name="policy_dont_allow_camera" msgid="5744573062306937302">"Ungavumeli ukusebenza kwekhamera yedivayisi"</string>
-    <string name="policy_require_password" msgid="7177274900480984702">"Idinga iphasiwedi yedivayisi"</string>
+    <string name="policy_require_password" msgid="7177274900480984702">"Dinga iphasiwedi yedivayisi"</string>
     <string name="policy_password_history" msgid="5743544498302303181">"Khawulela ukusetshenziswa kabusha kwamaphasiwedi wakamuva"</string>
     <string name="policy_password_expiration" msgid="1248123255253649199">"Cela ukuthi amaphasiwedi aphalwe isikhathi"</string>
     <string name="policy_screen_timeout" msgid="414869965358468080">"Dinga idivayisi yokumisa ukukhiya isikrini sayo"</string>