diff --git a/res/values-cs/strings.xml b/res/values-cs/strings.xml
index efa80ae..fa105b6 100644
--- a/res/values-cs/strings.xml
+++ b/res/values-cs/strings.xml
@@ -15,13 +15,10 @@
 -->
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <!-- no translation found for read_attachment_label (1162255191991555285) -->
-    <skip />
+    <string name="read_attachment_label" msgid="1162255191991555285">"Číst přílohy e-mailů"</string>
     <string name="read_attachment_desc" msgid="7594746717616308643">"Umožňuje této aplikaci čtení e-mailových příloh."</string>
-    <!-- no translation found for permission_access_provider_label (4274353114641168675) -->
-    <skip />
-    <!-- no translation found for permission_access_provider_desc (1513898266889541617) -->
-    <skip />
+    <string name="permission_access_provider_label" msgid="4274353114641168675">"Přístup k datům poskytovatele e-mailu"</string>
+    <string name="permission_access_provider_desc" msgid="1513898266889541617">"Povoluje této aplikaci přístup do databáze aplikace Email, včetně přijatých a odeslaných zpráv, uživatelských jmen a hesel."</string>
     <string name="app_name" msgid="5815426892327290362">"E-mail"</string>
     <string name="accounts_title" msgid="6622149231904649210">"E-mail"</string>
     <string name="compose_title" msgid="427986915662706899">"Nová"</string>
@@ -38,19 +35,14 @@
     <string name="discard_action" msgid="6532206074859505968">"Zrušit"</string>
     <string name="save_draft_action" msgid="812855865552028622">"Uložit jako koncept"</string>
     <string name="read_unread_action" msgid="4721446664849165077">"Přečtené/nepřečtené"</string>
-    <!-- no translation found for read_action (4701484794504781686) -->
-    <skip />
-    <!-- no translation found for unread_action (6280399049357552826) -->
-    <skip />
+    <string name="read_action" msgid="4701484794504781686">"Označit jako přečtené"</string>
+    <string name="unread_action" msgid="6280399049357552826">"Označit jako nepřečtené"</string>
     <string name="favorite_action" msgid="2911296685862420689">"Oblíbené"</string>
-    <!-- no translation found for set_star_action (4660317166196258160) -->
-    <skip />
-    <!-- no translation found for remove_star_action (6689770999647007163) -->
-    <skip />
+    <string name="set_star_action" msgid="4660317166196258160">"Přidat hvězdičku"</string>
+    <string name="remove_star_action" msgid="6689770999647007163">"Odebrat hvězdičku"</string>
     <string name="refresh_action" msgid="5951383001436708175">"Obnovit"</string>
     <string name="add_account_action" msgid="8835736309476033727">"Přidat účet"</string>
-    <!-- no translation found for deselect_all_action (253663239459688238) -->
-    <skip />
+    <string name="deselect_all_action" msgid="253663239459688238">"Zrušit výběr všech"</string>
     <string name="compose_action" msgid="4045702519637388045">"Nová"</string>
     <string name="search_action" msgid="6325101454876682308">"Hledat"</string>
     <string name="open_action" msgid="936766723989190816">"Otevřít"</string>
@@ -60,7 +52,7 @@
     <string name="accounts_action" msgid="901105887272231493">"Účty"</string>
     <string name="mark_as_read_action" msgid="5031651846998842419">"Označit jako přečtené"</string>
     <string name="mark_as_unread_action" msgid="3766298115778767554">"Označit jako nepřečtené"</string>
-    <string name="add_cc_bcc_action" msgid="5569074812077509737">"Přidat příjemce kopie/skryté kopie"</string>
+    <string name="add_cc_bcc_action" msgid="5569074812077509737">"Přidat kopii/skrytou"</string>
     <string name="add_attachment_action" msgid="2696013743130573897">"Připojit přílohu"</string>
     <string name="dump_settings_action" msgid="4478192525236169829">"Nastavení výpisu"</string>
     <string name="choose_attachment_dialog_title" msgid="81937507117528954">"Výběr přílohy"</string>
@@ -71,8 +63,7 @@
     <string name="status_sending_messages_failed" msgid="7975009558738692407">"Nový pokus o odeslání zpráv"</string>
     <string name="status_loading_more_failed" msgid="1629172047185323">"Opakovat načítání dalších zpráv"</string>
     <string name="notification_new_title" msgid="2200257910380529139">"Nový e-mail"</string>
-    <!-- no translation found for error_loading_message_body (2265140604109272914) -->
-    <skip />
+    <string name="error_loading_message_body" msgid="2265140604109272914">"Během načítání textu zprávy došlo k neočekávané chybě. Zpráva je možná příliš velká a proto ji nelze zobrazit."</string>
   <plurals name="notification_new_one_account_fmt">
     <item quantity="one" msgid="3422945912787702191">"<xliff:g id="UNREAD_MESSAGE_COUNT">%d</xliff:g> nepřečtená zpráva (<xliff:g id="ACCOUNT">%s</xliff:g>)"</item>
     <item quantity="few" msgid="6543078667692990869">"Nepřečtené zprávy: <xliff:g id="UNREAD_MESSAGE_COUNT">%d</xliff:g> (<xliff:g id="ACCOUNT">%s</xliff:g>)"</item>
@@ -82,25 +73,17 @@
     <item quantity="few" msgid="1991747245324120305">"v(e) <xliff:g id="NUMBER_ACCOUNTS">%d</xliff:g> účtech"</item>
     <item quantity="other" msgid="2723797835410343458">"v(e) <xliff:g id="NUMBER_ACCOUNTS">%d</xliff:g> účtech"</item>
   </plurals>
-    <!-- no translation found for mailbox_name_display_inbox (3542327124749861736) -->
-    <skip />
-    <!-- no translation found for mailbox_name_display_outbox (2826214174661417662) -->
-    <skip />
-    <!-- no translation found for mailbox_name_display_drafts (4868718300700514319) -->
-    <skip />
-    <!-- no translation found for mailbox_name_display_trash (9139069064580630647) -->
-    <skip />
-    <!-- no translation found for mailbox_name_display_sent (3426058998191869523) -->
-    <skip />
-    <!-- no translation found for mailbox_name_display_junk (9046762505977999288) -->
-    <skip />
+    <string name="mailbox_name_display_inbox" msgid="3542327124749861736">"Doručená pošta"</string>
+    <string name="mailbox_name_display_outbox" msgid="2826214174661417662">"Pošta k odeslání"</string>
+    <string name="mailbox_name_display_drafts" msgid="4868718300700514319">"Koncepty"</string>
+    <string name="mailbox_name_display_trash" msgid="9139069064580630647">"Koš"</string>
+    <string name="mailbox_name_display_sent" msgid="3426058998191869523">"Odeslaná pošta"</string>
+    <string name="mailbox_name_display_junk" msgid="9046762505977999288">"Nevyžádaná pošta"</string>
     <string name="debug_version_fmt" msgid="6160213145745376955">"Verze: <xliff:g id="VERSION">%s</xliff:g>"</string>
     <string name="account_folder_list_separator_accounts" msgid="7568820182396669244">"Účty"</string>
-    <!-- no translation found for account_folder_list_summary_inbox (5790553737870057607) -->
-    <skip />
+    <string name="account_folder_list_summary_inbox" msgid="5790553737870057607">"Všechny složky Doručená pošta"</string>
     <string name="account_folder_list_summary_unread" msgid="1200755158196002928">"Nepřečtené"</string>
-    <!-- no translation found for account_folder_list_summary_starred (3134312269246375723) -->
-    <skip />
+    <string name="account_folder_list_summary_starred" msgid="3134312269246375723">"Označené hvězdičkou"</string>
     <string name="account_folder_list_summary_drafts" msgid="5514845993247300437">"Koncepty"</string>
     <string name="account_folder_list_summary_outbox" msgid="3059836696049399377">"Pošta k odeslání"</string>
     <string name="mailbox_list_title" msgid="8299608543467211089">"E-mailová schránka"</string>
@@ -137,10 +120,8 @@
     <string name="add_contact_dlg_message_fmt" msgid="4470846346726847478">"Přidat „<xliff:g id="EMAIL">%s</xliff:g>“ do kontaktů"</string>
     <string name="message_view_display_attachment_toast" msgid="6096315816776330821">"Tuto přílohu nelze zobrazit."</string>
     <string name="account_setup_basics_title" msgid="3969856368228940980">"Nastavit e-mail"</string>
-    <!-- no translation found for accounts_welcome (5901437782383439370) -->
-    <skip />
-    <!-- no translation found for accounts_welcome_exchange (4414121583987233733) -->
-    <skip />
+    <string name="accounts_welcome" msgid="5901437782383439370">"Většinu e-mailových účtů můžete nakonfigurovat v několika snadných krocích."</string>
+    <string name="accounts_welcome_exchange" msgid="4414121583987233733">"Účet Exchange můžete nakonfigurovat v několika snadných krocích."</string>
     <!-- no translation found for account_setup_basics_instructions (3126077748322815504) -->
     <skip />
     <string name="account_setup_basics_email_hint" msgid="7414269319207261120">"E-mailová adresa"</string>
@@ -148,10 +129,8 @@
     <string name="account_setup_basics_default_label" msgid="5924790142029806711">"Ve výchozím nastavení odesílat e-maily z tohoto účtu."</string>
     <string name="account_setup_basics_manual_setup_action" msgid="8053852205391155912">"Ruční nastavení"</string>
     <string name="account_setup_username_password_toast" msgid="4441448542557889481">"Zadejte platnou e-mailovou adresu a heslo."</string>
-    <!-- no translation found for account_duplicate_dlg_title (3176749833792312641) -->
-    <skip />
-    <!-- no translation found for account_duplicate_dlg_message_fmt (1920726613701479851) -->
-    <skip />
+    <string name="account_duplicate_dlg_title" msgid="3176749833792312641">"Duplikace účtu"</string>
+    <string name="account_duplicate_dlg_message_fmt" msgid="1920726613701479851">"Tyto přihlašovací údaje již používá účet <xliff:g id="DUPLICATE">%s</xliff:g>."</string>
     <string name="account_setup_check_settings_retr_info_msg" msgid="4121970450267725664">"Načítání informací o účtu..."</string>
     <string name="account_setup_check_settings_check_incoming_msg" msgid="5356212700221438863">"Kontrola nastavení serveru příchozí pošty..."</string>
     <string name="account_setup_check_settings_check_outgoing_msg" msgid="4033015234096725343">"Kontrola nastavení serveru odchozí pošty..."</string>
@@ -170,14 +149,10 @@
     <string name="account_setup_incoming_port_label" msgid="8214738923690447796">"Port"</string>
     <string name="account_setup_incoming_security_label" msgid="2110260791086007424">"Typ zabezpečení"</string>
     <string name="account_setup_incoming_security_none_label" msgid="8300169413118264895">"Žádné"</string>
-    <!-- no translation found for account_setup_incoming_security_ssl_trust_certificates_label (3581382268191377346) -->
-    <skip />
-    <!-- no translation found for account_setup_incoming_security_ssl_label (8886698397743061682) -->
-    <skip />
-    <!-- no translation found for account_setup_incoming_security_tls_trust_certificates_label (1089227022489257055) -->
-    <skip />
-    <!-- no translation found for account_setup_incoming_security_tls_label (8638006172590036487) -->
-    <skip />
+    <string name="account_setup_incoming_security_ssl_trust_certificates_label" msgid="3581382268191377346">"SSL (Přijímat všechny certifikáty)"</string>
+    <string name="account_setup_incoming_security_ssl_label" msgid="8886698397743061682">"SSL"</string>
+    <string name="account_setup_incoming_security_tls_trust_certificates_label" msgid="1089227022489257055">"TLS (Přijímat všechny certifikáty)"</string>
+    <string name="account_setup_incoming_security_tls_label" msgid="8638006172590036487">"TLS"</string>
     <string name="account_setup_incoming_delete_policy_label" msgid="9213590134693857912">"Mazat e-maily ze serveru"</string>
     <string name="account_setup_incoming_delete_policy_never_label" msgid="3222897501875871041">"Nikdy"</string>
     <string name="account_setup_incoming_delete_policy_delete_label" msgid="222216840911785631">"Při smazání z Doručené pošty"</string>
@@ -190,15 +165,15 @@
     <string name="account_setup_outgoing_require_login_label" msgid="6371514297854287948">"Požadovat přihlášení"</string>
     <string name="account_setup_outgoing_username_label" msgid="3309680794731596981">"Uživatelské jméno"</string>
     <string name="account_setup_outgoing_password_label" msgid="227844585493317550">"Heslo"</string>
-    <string name="account_setup_exchange_title" msgid="247933841122558059">"Nastavení serveru Exchange"</string>
-    <string name="account_setup_exchange_server_label" msgid="5390359659749339317">"Exchange Server"</string>
-    <!-- no translation found for account_setup_exchange_username_label (6517176180828983060) -->
+    <!-- no translation found for account_setup_exchange_title (2492853474738063453) -->
     <skip />
+    <!-- no translation found for account_setup_exchange_server_label (795137797983360826) -->
+    <skip />
+    <string name="account_setup_exchange_username_label" msgid="6517176180828983060">"Doména\\Uživatelské jméno"</string>
     <string name="account_setup_exchange_domain_label" msgid="3584668050727667045">"Doména"</string>
     <string name="account_setup_exchange_domain_hint" msgid="350372033916025287">"Sem zadejte doménu"</string>
     <string name="account_setup_exchange_ssl_label" msgid="6704105469083211236">"Použít zabezpečené připojení (SSL)"</string>
-    <!-- no translation found for account_setup_exchange_trust_certificates_label (6232880757633882678) -->
-    <skip />
+    <string name="account_setup_exchange_trust_certificates_label" msgid="6232880757633882678">"Přijímat všechny certifikáty protokolu SSL"</string>
     <string name="account_setup_options_title" msgid="8995162193118880993">"Možnosti účtu"</string>
     <string name="account_setup_options_mail_check_frequency_label" msgid="4598023962234986194">"Četnost kontrol e-mailů"</string>
     <string name="account_setup_options_mail_check_frequency_never" msgid="287951859480505416">"Nikdy"</string>
@@ -229,13 +204,13 @@
     <string name="account_setup_failed_auth_required" msgid="1676242821459638150">"Server nepodporuje metody ověření."</string>
     <string name="account_setup_failed_security" msgid="6142264248671379943">"Nelze navázat připojení k serveru z důvodu chyby zabezpečení."</string>
     <string name="account_setup_failed_ioerror" msgid="7391458717708933095">"Nelze navázat připojení k serveru."</string>
+    <string name="account_setup_failed_security_policies_required" msgid="3567420384516656976">"Tento server Exchange ActiveSync vyžaduje funkce zabezpečení, které váš telefon nepodporuje."</string>
     <string name="account_setup_failed_dlg_edit_details_action" msgid="5355993309841479360">"Upravit podrobnosti"</string>
     <string name="account_settings_title_fmt" msgid="1702058877284382340">"Obecná nastavení"</string>
     <string name="account_settings_default_label" msgid="3575963379680943640">"Výchozí účet"</string>
     <string name="account_settings_default_summary" msgid="1531901438624688482">"Ve výchozím nastavení odesílat e-maily z tohoto účtu"</string>
     <string name="account_settings_notify_label" msgid="1630001017303007974">"Upozornění na e-maily"</string>
-    <!-- no translation found for account_settings_exchange_summary (8498451479029626317) -->
-    <skip />
+    <string name="account_settings_exchange_summary" msgid="8498451479029626317">"Frekvence synchronizace, oznámení apod."</string>
     <string name="account_settings_notify_summary" msgid="6609224590300639887">"Zobrazit upozornění na příchozí e-mail na stavovém řádku"</string>
     <string name="account_settings_mail_check_frequency_label" msgid="2067835530563849675">"Četnost kontrol e-mailů"</string>
     <string name="account_settings_incoming_label" msgid="7858928031806297542">"Nastavení příchozí pošty"</string>
@@ -244,21 +219,18 @@
     <string name="account_settings_description_label" msgid="8894815221204511715">"Název účtu"</string>
     <string name="account_settings_name_label" msgid="8186406122590008449">"Vaše jméno"</string>
     <string name="account_settings_notifications" msgid="1042620094281375043">"Nastavení upozornění"</string>
-    <!-- no translation found for account_settings_sync_contacts_enable (1369272986009573218) -->
-    <skip />
-    <!-- no translation found for account_settings_sync_contacts_summary (8901452720940015928) -->
-    <skip />
+    <string name="account_settings_sync_contacts_enable" msgid="1369272986009573218">"Synchronizovat kontakty"</string>
+    <string name="account_settings_sync_contacts_summary" msgid="8901452720940015928">"Synchronizovat kontakty také z tohoto účtu"</string>
     <string name="account_settings_vibrate_enable" msgid="8045133290388856478">"Vibrovat"</string>
     <string name="account_settings_vibrate_summary" msgid="3690631050585589365">"Při obdržení e-mailu také vibrovat"</string>
     <string name="account_settings_ringtone" msgid="7922187231467500404">"Zvolit vyzváněcí tón"</string>
-    <string name="account_settings_servers" msgid="4925493817981624242">"Nastavení serveru"</string>
+    <string name="account_settings_servers" msgid="4925493817981624242">"Nastavení serverů"</string>
     <string name="account_delete_dlg_title" msgid="6806087520856396608">"Odebrat účet"</string>
     <string name="account_delete_dlg_instructions_fmt" msgid="8236846322040271280">"Účet <xliff:g id="ACCOUNT">%s</xliff:g> bude z aplikace Email odebrán."</string>
     <string name="provider_note_yahoo" msgid="8762024183024261236">"Přístup do schránky není u některých poštovních účtů Yahoo! podporován. Pokud máte problémy s připojením, získáte další informace na webové stránce yahoo.com."</string>
     <string name="provider_note_yahoo_uk" msgid="2055976404478603298">"Před nastavením tohoto e-mailového účtu přejděte na web Yahoo! a povolte u tohoto účtu e-mailový přístup POP3."</string>
     <string name="provider_note_live" msgid="3584841823811425060">"Pouze některé účty typu Plus obsahují přístup POP umožňující připojení tohoto programu. Pokud se nemůžete přihlásit se správnou e-mailovou adresou a heslem, pravděpodobně nemáte placený účet Plus. Spusťte webový prohlížeč a vyhledejte přístup k těmto poštovním účtům."</string>
     <string name="provider_note_t_online" msgid="1973701903400232774">"Před nastavením tohoto e-mailového účtu navštivte web T-Online a vytvořte heslo pro e-mailový přístup POP3."</string>
-    <!-- no translation found for exchange_name (1190783774800310346) -->
-    <skip />
+    <string name="exchange_name" msgid="1190783774800310346">"Firemní"</string>
     <string name="system_account_create_failed" msgid="4917162302393971752">"Správci účtů se nepodařilo vytvořit účet. Zkuste to prosím znovu."</string>
 </resources>
diff --git a/res/values-da/strings.xml b/res/values-da/strings.xml
index cf6c4c6..94d5d3d 100644
--- a/res/values-da/strings.xml
+++ b/res/values-da/strings.xml
@@ -15,13 +15,10 @@
 -->
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <!-- no translation found for read_attachment_label (1162255191991555285) -->
-    <skip />
-    <string name="read_attachment_desc" msgid="7594746717616308643">"Tillader dette program at læse dine E-mail-vedhæftninger."</string>
-    <!-- no translation found for permission_access_provider_label (4274353114641168675) -->
-    <skip />
-    <!-- no translation found for permission_access_provider_desc (1513898266889541617) -->
-    <skip />
+    <string name="read_attachment_label" msgid="1162255191991555285">"Læs vedhæftede filer i e-mails"</string>
+    <string name="read_attachment_desc" msgid="7594746717616308643">"Tillader, at dette program læser dine e-mail-vedhæftninger."</string>
+    <string name="permission_access_provider_label" msgid="4274353114641168675">"Få adgang til data om e-mail-udbyder"</string>
+    <string name="permission_access_provider_desc" msgid="1513898266889541617">"Giver dette program adgang til din e-mail-database, herunder modtagne og sendte beskeder, brugernavne og adgangskoder."</string>
     <string name="app_name" msgid="5815426892327290362">"E-mail"</string>
     <string name="accounts_title" msgid="6622149231904649210">"E-mail"</string>
     <string name="compose_title" msgid="427986915662706899">"Skriv"</string>
@@ -34,27 +31,22 @@
     <string name="reply_all_action" msgid="6192179825726332152">"Svar alle"</string>
     <string name="delete_action" msgid="8421026208288857155">"Slet"</string>
     <string name="forward_action" msgid="669174181042344116">"Videresend"</string>
-    <string name="done_action" msgid="7497990549515580249">"Færdig"</string>
+    <string name="done_action" msgid="7497990549515580249">"Udfør"</string>
     <string name="discard_action" msgid="6532206074859505968">"Kassér"</string>
     <string name="save_draft_action" msgid="812855865552028622">"Gem som kladde"</string>
     <string name="read_unread_action" msgid="4721446664849165077">"Læst/ulæst"</string>
-    <!-- no translation found for read_action (4701484794504781686) -->
-    <skip />
-    <!-- no translation found for unread_action (6280399049357552826) -->
-    <skip />
+    <string name="read_action" msgid="4701484794504781686">"Marker som læst"</string>
+    <string name="unread_action" msgid="6280399049357552826">"Marker som ulæst"</string>
     <string name="favorite_action" msgid="2911296685862420689">"Favorit"</string>
-    <!-- no translation found for set_star_action (4660317166196258160) -->
-    <skip />
-    <!-- no translation found for remove_star_action (6689770999647007163) -->
-    <skip />
+    <string name="set_star_action" msgid="4660317166196258160">"Tilføj stjerne"</string>
+    <string name="remove_star_action" msgid="6689770999647007163">"Fjern stjerne"</string>
     <string name="refresh_action" msgid="5951383001436708175">"Opdater"</string>
     <string name="add_account_action" msgid="8835736309476033727">"Tilføj konto"</string>
-    <!-- no translation found for deselect_all_action (253663239459688238) -->
-    <skip />
+    <string name="deselect_all_action" msgid="253663239459688238">"Fravælg alle"</string>
     <string name="compose_action" msgid="4045702519637388045">"Skriv"</string>
     <string name="search_action" msgid="6325101454876682308">"Søg"</string>
     <string name="open_action" msgid="936766723989190816">"Åbn"</string>
-    <string name="account_settings_action" msgid="4494079183315085171">"Kontoindstillinger"</string>
+    <string name="account_settings_action" msgid="4494079183315085171">"Indstillinger for konto"</string>
     <string name="remove_account_action" msgid="3789169090601376209">"Fjern konto"</string>
     <string name="folders_action" msgid="7502431531355227666">"Mapper"</string>
     <string name="accounts_action" msgid="901105887272231493">"Konti"</string>
@@ -64,43 +56,34 @@
     <string name="add_attachment_action" msgid="2696013743130573897">"Tilføj vedhæftet fil"</string>
     <string name="dump_settings_action" msgid="4478192525236169829">"Kassér indstillinger"</string>
     <string name="choose_attachment_dialog_title" msgid="81937507117528954">"Vælg vedhæftet fil"</string>
-    <string name="accounts_context_menu_title" msgid="1053701760934475027">"Kontovalgmuligheder"</string>
+    <string name="accounts_context_menu_title" msgid="1053701760934475027">"Indstillinger for konto"</string>
     <string name="status_loading_more" msgid="1580386959044617884">"Indlæser beskeder ..."</string>
     <string name="status_sending_messages" msgid="3971880826111264523">"Sender beskeder ..."</string>
     <string name="status_network_error" msgid="6045933332005067021">"Forbindelsesfejl"</string>
     <string name="status_sending_messages_failed" msgid="7975009558738692407">"Prøv at sende beskeder igen"</string>
     <string name="status_loading_more_failed" msgid="1629172047185323">"Prøv at indlæse beskeder igen"</string>
     <string name="notification_new_title" msgid="2200257910380529139">"Ny e-mail"</string>
-    <!-- no translation found for error_loading_message_body (2265140604109272914) -->
-    <skip />
+    <string name="error_loading_message_body" msgid="2265140604109272914">"Der opstod en uventet fejl under indlæsning af beskedteksten. Beskeden er muligvis for stor til at blive vist."</string>
   <plurals name="notification_new_one_account_fmt">
     <item quantity="one" msgid="3422945912787702191">"<xliff:g id="UNREAD_MESSAGE_COUNT">%d</xliff:g> ulæste (<xliff:g id="ACCOUNT">%s</xliff:g>)"</item>
     <item quantity="few" msgid="6543078667692990869">"<xliff:g id="UNREAD_MESSAGE_COUNT">%d</xliff:g> ulæste (<xliff:g id="ACCOUNT">%s</xliff:g>)"</item>
     <item quantity="other" msgid="6937673814351448076">"<xliff:g id="UNREAD_MESSAGE_COUNT">%d</xliff:g> ulæste (<xliff:g id="ACCOUNT">%s</xliff:g>)"</item>
   </plurals>
   <plurals name="notification_new_multi_account_fmt">
-    <item quantity="few" msgid="1991747245324120305">"i <xliff:g id="NUMBER_ACCOUNTS">%d</xliff:g> konti"</item>
+    <item quantity="few" msgid="1991747245324120305">"på <xliff:g id="NUMBER_ACCOUNTS">%d</xliff:g> konti"</item>
     <item quantity="other" msgid="2723797835410343458">"i <xliff:g id="NUMBER_ACCOUNTS">%d</xliff:g> konti"</item>
   </plurals>
-    <!-- no translation found for mailbox_name_display_inbox (3542327124749861736) -->
-    <skip />
-    <!-- no translation found for mailbox_name_display_outbox (2826214174661417662) -->
-    <skip />
-    <!-- no translation found for mailbox_name_display_drafts (4868718300700514319) -->
-    <skip />
-    <!-- no translation found for mailbox_name_display_trash (9139069064580630647) -->
-    <skip />
-    <!-- no translation found for mailbox_name_display_sent (3426058998191869523) -->
-    <skip />
-    <!-- no translation found for mailbox_name_display_junk (9046762505977999288) -->
-    <skip />
+    <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>
+    <string name="mailbox_name_display_trash" msgid="9139069064580630647">"Papirkurv"</string>
+    <string name="mailbox_name_display_sent" msgid="3426058998191869523">"Sendt"</string>
+    <string name="mailbox_name_display_junk" msgid="9046762505977999288">"Junk"</string>
     <string name="debug_version_fmt" msgid="6160213145745376955">"Version: <xliff:g id="VERSION">%s</xliff:g>"</string>
     <string name="account_folder_list_separator_accounts" msgid="7568820182396669244">"Konti"</string>
-    <!-- no translation found for account_folder_list_summary_inbox (5790553737870057607) -->
-    <skip />
+    <string name="account_folder_list_summary_inbox" msgid="5790553737870057607">"Kombineret indbakke"</string>
     <string name="account_folder_list_summary_unread" msgid="1200755158196002928">"Ulæste"</string>
-    <!-- no translation found for account_folder_list_summary_starred (3134312269246375723) -->
-    <skip />
+    <string name="account_folder_list_summary_starred" msgid="3134312269246375723">"Stjernemarkerede"</string>
     <string name="account_folder_list_summary_drafts" msgid="5514845993247300437">"Kladder"</string>
     <string name="account_folder_list_summary_outbox" msgid="3059836696049399377">"Udbakke"</string>
     <string name="mailbox_list_title" msgid="8299608543467211089">"Postkasse"</string>
@@ -112,10 +95,10 @@
     <string name="message_compose_bcc_hint" msgid="9177337492358841680">"Bcc"</string>
     <string name="message_compose_subject_hint" msgid="6993487234024160782">"Emne"</string>
     <string name="message_compose_body_hint" msgid="7575406246484103697">"Skriv mail"</string>
-    <string name="message_compose_fwd_header_fmt" msgid="5181300290654579434">\n\n"-------- Oprindelig meddelelse --------"\n"Emne: <xliff:g id="SUBJECT">%s</xliff:g>"\n"Fra: <xliff:g id="SENDER">%s</xliff:g>"\n"Til: <xliff:g id="TO">%s</xliff:g>"\n"CC: <xliff:g id="CC_0">%s</xliff:g>"\n\n</string>
+    <string name="message_compose_fwd_header_fmt" msgid="5181300290654579434">\n\n"-------- Oprindelig besked --------"\n"Emne: <xliff:g id="SUBJECT">%s</xliff:g>"\n"Fra: <xliff:g id="SENDER">%s</xliff:g>"\n"Til: <xliff:g id="TO">%s</xliff:g>"\n"CC: <xliff:g id="CC_0">%s</xliff:g>"\n\n</string>
     <string name="message_compose_reply_header_fmt" msgid="8815624773273454573">\n\n"<xliff:g id="SENDER">%s</xliff:g> skrev:"\n\n</string>
     <string name="message_compose_quoted_text_label" msgid="5722467956990009520">"Citeret tekst"</string>
-    <string name="message_compose_error_no_recipients" msgid="4903715888250785486">"Du skal tilføje mindst en modtager."</string>
+    <string name="message_compose_error_no_recipients" msgid="4903715888250785486">"Du skal tilføje mindst én modtager."</string>
     <string name="message_compose_error_invalid_email" msgid="1817633338629885643">"Nogle e-mail-adresser er ugyldige."</string>
     <string name="message_compose_attachments_skipped_toast" msgid="5611815773808423460">"Nogle vedhæftede filer kan ikke videresendes, fordi de ikke er blevet downloadet."</string>
     <string name="message_compose_attachment_size" msgid="4401081828287333647">"Filen er for stor til at vedhæfte."</string>
@@ -124,42 +107,38 @@
     <string name="message_view_cc_label" msgid="6322992216371163122">"Cc:"</string>
     <string name="message_view_attachment_view_action" msgid="5353550848340829134">"Åbn"</string>
     <string name="message_view_attachment_download_action" msgid="7552530274014544406">"Gem"</string>
-    <string name="message_view_status_attachment_saved" msgid="2802843795251453632">"Vedhæftet fil er gemt til SD-kort som <xliff:g id="FILENAME">%s</xliff:g>."</string>
+    <string name="message_view_status_attachment_saved" msgid="2802843795251453632">"Den vedhæftede fil er gemt på SD-kortet som <xliff:g id="FILENAME">%s</xliff:g>."</string>
     <string name="message_view_status_attachment_not_saved" msgid="5039599647697750874">"Den vedhæftede fil kunne ikke gemmes på SD-kortet."</string>
     <string name="message_view_show_pictures_instructions" msgid="1156525837417031085">"Vælg \"Vis billeder\" for at vise indsatte billeder."</string>
     <string name="message_view_show_pictures_action" msgid="5059936981743072545">"Vis billeder"</string>
     <string name="message_view_fetching_attachment_toast" msgid="8812363375155391184">"Henter vedhæftet fil."</string>
-    <string name="message_view_fetching_attachment_progress" msgid="8238550182655758164">"Henter vedhæftet fil <xliff:g id="FILENAME">%s</xliff:g>"</string>
-    <string name="message_deleted_toast" msgid="1554845060991758649">"Besked slettet."</string>
-    <string name="message_discarded_toast" msgid="3891461729325584026">"Besked kasseret."</string>
+    <string name="message_view_fetching_attachment_progress" msgid="8238550182655758164">"Henter den vedhæftede fil <xliff:g id="FILENAME">%s</xliff:g>"</string>
+    <string name="message_deleted_toast" msgid="1554845060991758649">"Beskeden er slettet."</string>
+    <string name="message_discarded_toast" msgid="3891461729325584026">"Beskeden er kasseret."</string>
     <string name="message_saved_toast" msgid="8443125659172627665">"Beskeden er gemt som kladde."</string>
     <string name="add_contact_dlg_title" msgid="7424641029188006580">"Tilføj kontakt"</string>
     <string name="add_contact_dlg_message_fmt" msgid="4470846346726847478">"Føj \"<xliff:g id="EMAIL">%s</xliff:g>\" til kontakter"</string>
     <string name="message_view_display_attachment_toast" msgid="6096315816776330821">"Denne vedhæftede fil kan ikke vises."</string>
-    <string name="account_setup_basics_title" msgid="3969856368228940980">"Opsæt e-mail"</string>
-    <!-- no translation found for accounts_welcome (5901437782383439370) -->
-    <skip />
-    <!-- no translation found for accounts_welcome_exchange (4414121583987233733) -->
-    <skip />
+    <string name="account_setup_basics_title" msgid="3969856368228940980">"Konfiguration af e-mail"</string>
+    <string name="accounts_welcome" msgid="5901437782383439370">"Du kan konfigurere e-mail til de fleste konti med blot nogle få trin."</string>
+    <string name="accounts_welcome_exchange" msgid="4414121583987233733">"Du kan konfigurere en Exchange-konto i nogle få trin."</string>
     <!-- no translation found for account_setup_basics_instructions (3126077748322815504) -->
     <skip />
     <string name="account_setup_basics_email_hint" msgid="7414269319207261120">"E-mail-adresse"</string>
     <string name="account_setup_basics_password_hint" msgid="410210049040536870">"Adgangskode"</string>
     <string name="account_setup_basics_default_label" msgid="5924790142029806711">"Send e-mail fra denne konto som standard."</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="4441448542557889481">"Indtast en gyldig e-mail-adresse og adgangskode."</string>
-    <!-- no translation found for account_duplicate_dlg_title (3176749833792312641) -->
-    <skip />
-    <!-- no translation found for account_duplicate_dlg_message_fmt (1920726613701479851) -->
-    <skip />
+    <string name="account_duplicate_dlg_title" msgid="3176749833792312641">"Dobbeltforekomst af konto"</string>
+    <string name="account_duplicate_dlg_message_fmt" msgid="1920726613701479851">"Dette login bruges allerede til kontoen \"<xliff:g id="DUPLICATE">%s</xliff:g>\"."</string>
     <string name="account_setup_check_settings_retr_info_msg" msgid="4121970450267725664">"Henter kontooplysninger ..."</string>
     <string name="account_setup_check_settings_check_incoming_msg" msgid="5356212700221438863">"Kontrollerer indstillinger for indgående server ..."</string>
     <string name="account_setup_check_settings_check_outgoing_msg" msgid="4033015234096725343">"Kontrollerer indstillinger for udgående server ..."</string>
     <string name="account_setup_check_settings_canceling_msg" msgid="5077315503721883906">"Annullerer ..."</string>
-    <string name="account_setup_names_title" msgid="8875040521875381849">"Opsæt e-mail"</string>
-    <string name="account_setup_names_instructions" msgid="2880279273965835007">"Din konto er opsat, og der er e-mail på vej!"</string>
+    <string name="account_setup_names_title" msgid="8875040521875381849">"Konfiguration af e-mail"</string>
+    <string name="account_setup_names_instructions" msgid="2880279273965835007">"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 beskeder)"</string>
     <string name="account_setup_account_type_title" msgid="6645576356752495504">"Tilføj ny e-mail-konto"</string>
     <string name="account_setup_account_type_instructions" msgid="114515540798408760">"Hvilken slags konto er dette?"</string>
     <string name="account_setup_incoming_title" msgid="6862032674547580337">"Indstillinger for indgående server"</string>
@@ -170,15 +149,11 @@
     <string name="account_setup_incoming_port_label" msgid="8214738923690447796">"Port"</string>
     <string name="account_setup_incoming_security_label" msgid="2110260791086007424">"Sikkerhedstype"</string>
     <string name="account_setup_incoming_security_none_label" msgid="8300169413118264895">"Ingen"</string>
-    <!-- no translation found for account_setup_incoming_security_ssl_trust_certificates_label (3581382268191377346) -->
-    <skip />
-    <!-- no translation found for account_setup_incoming_security_ssl_label (8886698397743061682) -->
-    <skip />
-    <!-- no translation found for account_setup_incoming_security_tls_trust_certificates_label (1089227022489257055) -->
-    <skip />
-    <!-- no translation found for account_setup_incoming_security_tls_label (8638006172590036487) -->
-    <skip />
-    <string name="account_setup_incoming_delete_policy_label" msgid="9213590134693857912">"Slet e-mail fra server"</string>
+    <string name="account_setup_incoming_security_ssl_trust_certificates_label" msgid="3581382268191377346">"SSL (Accepter alle certifikater)"</string>
+    <string name="account_setup_incoming_security_ssl_label" msgid="8886698397743061682">"SSL"</string>
+    <string name="account_setup_incoming_security_tls_trust_certificates_label" msgid="1089227022489257055">"TLS (Accepter alle certifikater)"</string>
+    <string name="account_setup_incoming_security_tls_label" msgid="8638006172590036487">"TLS"</string>
+    <string name="account_setup_incoming_delete_policy_label" msgid="9213590134693857912">"Slet e-mail på server"</string>
     <string name="account_setup_incoming_delete_policy_never_label" msgid="3222897501875871041">"Aldrig"</string>
     <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>
@@ -187,19 +162,19 @@
     <string name="account_setup_outgoing_smtp_server_label" msgid="6035137446691195177">"SMTP-server"</string>
     <string name="account_setup_outgoing_port_label" msgid="7573207437835827876">"Port"</string>
     <string name="account_setup_outgoing_security_label" msgid="911398071120720589">"Sikkerhedstype"</string>
-    <string name="account_setup_outgoing_require_login_label" msgid="6371514297854287948">"Kræver login"</string>
+    <string name="account_setup_outgoing_require_login_label" msgid="6371514297854287948">"Kræver login."</string>
     <string name="account_setup_outgoing_username_label" msgid="3309680794731596981">"Brugernavn"</string>
     <string name="account_setup_outgoing_password_label" msgid="227844585493317550">"Adgangskode"</string>
-    <string name="account_setup_exchange_title" msgid="247933841122558059">"Indstillinger for Exchange-server"</string>
-    <string name="account_setup_exchange_server_label" msgid="5390359659749339317">"Exchange-server"</string>
-    <!-- no translation found for account_setup_exchange_username_label (6517176180828983060) -->
+    <!-- no translation found for account_setup_exchange_title (2492853474738063453) -->
     <skip />
+    <!-- no translation found for account_setup_exchange_server_label (795137797983360826) -->
+    <skip />
+    <string name="account_setup_exchange_username_label" msgid="6517176180828983060">"Domæne\\brugernavn"</string>
     <string name="account_setup_exchange_domain_label" msgid="3584668050727667045">"Domæne"</string>
     <string name="account_setup_exchange_domain_hint" msgid="350372033916025287">"Indtast domæne her"</string>
     <string name="account_setup_exchange_ssl_label" msgid="6704105469083211236">"Brug sikker forbindelse (SSL)"</string>
-    <!-- no translation found for account_setup_exchange_trust_certificates_label (6232880757633882678) -->
-    <skip />
-    <string name="account_setup_options_title" msgid="8995162193118880993">"Kontovalgmuligheder"</string>
+    <string name="account_setup_exchange_trust_certificates_label" msgid="6232880757633882678">"Accepter alle SSL-certifikater"</string>
+    <string name="account_setup_options_title" msgid="8995162193118880993">"Indstillinger for konto"</string>
     <string name="account_setup_options_mail_check_frequency_label" msgid="4598023962234986194">"Kontrolfrekvens for e-mail"</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>
@@ -209,56 +184,53 @@
     <string name="account_setup_options_mail_check_frequency_30min" msgid="1097088928685931864">"Hvert 30. minut"</string>
     <string name="account_setup_options_mail_check_frequency_1hour" msgid="3767715356039692899">"Hver time"</string>
     <string name="account_setup_options_default_label" msgid="8869166381331276697">"Send e-mail fra denne konto som standard."</string>
-    <string name="account_setup_options_notify_label" msgid="1247525794828820038">"Underret mig, når der kommer e-mail."</string>
-    <string name="account_setup_options_sync_contacts_label" msgid="7467467090023434271">"Synkroniser kontaktpersoner fra denne konto."</string>
-    <string name="account_setup_failed_dlg_title" msgid="7827583313117521383">"Opsætningen kunne ikke afsluttes"</string>
+    <string name="account_setup_options_notify_label" msgid="1247525794828820038">"Fortæl mig, når der kommer ny e-mail."</string>
+    <string name="account_setup_options_sync_contacts_label" msgid="7467467090023434271">"Synkroniser kontakter fra denne konto."</string>
+    <string name="account_setup_failed_dlg_title" msgid="7827583313117521383">"Konfigurationen kunne ikke fuldføres"</string>
     <string name="account_setup_options_mail_window_label" msgid="8764417340954006086">"Mængde, der skal synkroniseres"</string>
     <string name="account_setup_options_mail_window_1day" msgid="3965715241135811407">"En dag"</string>
     <string name="account_setup_options_mail_window_3days" msgid="736181102295878114">"Tre dage"</string>
     <string name="account_setup_options_mail_window_1week" msgid="5639718031108023741">"En uge"</string>
     <string name="account_setup_options_mail_window_2weeks" msgid="4567049268124213035">"To uger"</string>
     <string name="account_setup_options_mail_window_1month" msgid="5846359669750047081">"En måned"</string>
-    <string name="account_setup_options_mail_window_all" msgid="5383858972681926166">"Al mail"</string>
-    <string name="account_setup_failed_dlg_auth_message" msgid="42827150104879570">"Brugernavn eller adgangskode er forkert."</string>
-    <string name="account_setup_failed_dlg_auth_message_fmt" msgid="8598560266430207606">"Brugernavn eller adgangskode er forkert."\n"(<xliff:g id="ERROR">%s</xliff:g>)"</string>
+    <string name="account_setup_options_mail_window_all" msgid="5383858972681926166">"Al e-mail"</string>
+    <string name="account_setup_failed_dlg_auth_message" msgid="42827150104879570">"Brugernavnet eller adgangskoden er forkert."</string>
+    <string name="account_setup_failed_dlg_auth_message_fmt" msgid="8598560266430207606">"Brugernavnet eller adgangskoden er forkert."\n"(<xliff:g id="ERROR">%s</xliff:g>)"</string>
     <string name="account_setup_failed_dlg_certificate_message" msgid="961843413600482906">"Der kan ikke oprettes en sikker forbindelse til serveren."</string>
     <string name="account_setup_failed_dlg_certificate_message_fmt" msgid="2609150986774736900">"Der kan ikke oprettes en sikker forbindelse til serveren."\n"(<xliff:g id="ERROR">%s</xliff:g>)"</string>
     <string name="account_setup_failed_dlg_server_message" msgid="1828270369532779265">"Der kan ikke oprettes forbindelse til serveren."</string>
     <string name="account_setup_failed_dlg_server_message_fmt" msgid="5956976504788732779">"Der kan ikke oprettes forbindelse til serveren."\n"(<xliff:g id="ERROR">%s</xliff:g>)"</string>
     <string name="account_setup_failed_tls_required" msgid="307030406688611327">"TLS er påkrævet, men understøttes ikke af serveren."</string>
-    <string name="account_setup_failed_auth_required" msgid="1676242821459638150">"Godkendelsesmetoder understøttes ikke af serveren."</string>
+    <string name="account_setup_failed_auth_required" msgid="1676242821459638150">"Godkendelsesmetoderne understøttes ikke af serveren."</string>
     <string name="account_setup_failed_security" msgid="6142264248671379943">"Der kunne ikke åbnes en forbindelse til serveren på grund af en sikkerhedsfejl."</string>
     <string name="account_setup_failed_ioerror" msgid="7391458717708933095">"Der kunne ikke åbnes en forbindelse til serveren."</string>
+    <string name="account_setup_failed_security_policies_required" msgid="3567420384516656976">"Denne Exchange ActiveSync-server kræver sikkerhedsfunktioner, som telefonen ikke understøtter."</string>
     <string name="account_setup_failed_dlg_edit_details_action" msgid="5355993309841479360">"Rediger detaljer"</string>
     <string name="account_settings_title_fmt" msgid="1702058877284382340">"Generelle indstillinger"</string>
     <string name="account_settings_default_label" msgid="3575963379680943640">"Standardkonto"</string>
     <string name="account_settings_default_summary" msgid="1531901438624688482">"Send e-mail fra denne konto som standard"</string>
-    <string name="account_settings_notify_label" msgid="1630001017303007974">"E-mail-beskeder"</string>
-    <!-- no translation found for account_settings_exchange_summary (8498451479029626317) -->
-    <skip />
-    <string name="account_settings_notify_summary" msgid="6609224590300639887">"Underret i statuslinjen, når der kommer en e-mail"</string>
+    <string name="account_settings_notify_label" msgid="1630001017303007974">"E-mail-meddelelser"</string>
+    <string name="account_settings_exchange_summary" msgid="8498451479029626317">"Synkroniseringsinterval, meddelelser osv."</string>
+    <string name="account_settings_notify_summary" msgid="6609224590300639887">"Vis i statuslinjen, når der kommer en e-mail"</string>
     <string name="account_settings_mail_check_frequency_label" msgid="2067835530563849675">"Kontrolfrekvens for e-mail"</string>
-    <string name="account_settings_incoming_label" msgid="7858928031806297542">"Indgående indstillinger"</string>
-    <string name="account_settings_outgoing_label" msgid="4464829249980026745">"Udgående indstillinger"</string>
+    <string name="account_settings_incoming_label" msgid="7858928031806297542">"Indstillinger for indgående"</string>
+    <string name="account_settings_outgoing_label" msgid="4464829249980026745">"Indstillinger for udgående"</string>
     <string name="account_settings_add_account_label" msgid="63971622405360050">"Tilføj en konto mere"</string>
     <string name="account_settings_description_label" msgid="8894815221204511715">"Kontonavn"</string>
     <string name="account_settings_name_label" msgid="8186406122590008449">"Dit navn"</string>
-    <string name="account_settings_notifications" msgid="1042620094281375043">"Meddelelsesindstillinger"</string>
-    <!-- no translation found for account_settings_sync_contacts_enable (1369272986009573218) -->
-    <skip />
-    <!-- no translation found for account_settings_sync_contacts_summary (8901452720940015928) -->
-    <skip />
-    <string name="account_settings_vibrate_enable" msgid="8045133290388856478">"Vibrer"</string>
-    <string name="account_settings_vibrate_summary" msgid="3690631050585589365">"Vibrer også, når der kommer e-mail"</string>
+    <string name="account_settings_notifications" msgid="1042620094281375043">"Indstillinger for meddelelser"</string>
+    <string name="account_settings_sync_contacts_enable" msgid="1369272986009573218">"Synkroniser kontakter"</string>
+    <string name="account_settings_sync_contacts_summary" msgid="8901452720940015928">"Synkroniser også kontakter fra denne konto"</string>
+    <string name="account_settings_vibrate_enable" msgid="8045133290388856478">"Vibration"</string>
+    <string name="account_settings_vibrate_summary" msgid="3690631050585589365">"Vibration ved ny e-mail"</string>
     <string name="account_settings_ringtone" msgid="7922187231467500404">"Vælg ringetone"</string>
-    <string name="account_settings_servers" msgid="4925493817981624242">"Serverindstillinger"</string>
+    <string name="account_settings_servers" msgid="4925493817981624242">"Indstillinger for server"</string>
     <string name="account_delete_dlg_title" msgid="6806087520856396608">"Fjern konto"</string>
     <string name="account_delete_dlg_instructions_fmt" msgid="8236846322040271280">"Kontoen \"<xliff:g id="ACCOUNT">%s</xliff:g>\" fjernes fra E-mail."</string>
     <string name="provider_note_yahoo" msgid="8762024183024261236">"Adgang til postkasse er ikke understøttet for nogle typer af Yahoo!-mailkonti. Hvis du har problemer med at oprette forbindelse, skal du gå til yahoo.com for at få flere oplysninger."</string>
-    <string name="provider_note_yahoo_uk" msgid="2055976404478603298">"Inden du sætter denne e-mail-konto op, skal du gå til Yahoo!-webstedet og aktivere POP3-e-mail-adgang for denne konto."</string>
-    <string name="provider_note_live" msgid="3584841823811425060">"Det er kun nogle \"Plus\"-konti, der indeholder POP-adgang, som tillader dette program at oprette forbindelse. Hvis du ikke er i stand til at logge ind med din rigtige e-mail-adresse og adgangskode, har du muligvis ikke en betalt \"Plus\"-konto. Start webbrowseren igen for at få adgang til disse mail-konti."</string>
-    <string name="provider_note_t_online" msgid="1973701903400232774">"Inden du opsætter denne e-mail-konto, skal du gå til T-Onlines websted og oprette en adgangskode for POP3-e-mail-adgang."</string>
-    <!-- no translation found for exchange_name (1190783774800310346) -->
-    <skip />
+    <string name="provider_note_yahoo_uk" msgid="2055976404478603298">"Inden du konfigurerer denne e-mail-konto, skal du gå til Yahoo!-webstedet og aktivere POP3-e-mail-adgang for denne konto."</string>
+    <string name="provider_note_live" msgid="3584841823811425060">"Det er kun nogle \"Plus\"-konti med POP-adgang, som giver dette program mulighed for at oprette forbindelse. Hvis du ikke kan logge ind med din rigtige e-mail-adresse og adgangskode, har du muligvis ikke en betalt \"Plus\"-konto. Start webbrowseren igen for at få adgang til disse mail-konti."</string>
+    <string name="provider_note_t_online" msgid="1973701903400232774">"Inden du konfigurerer denne e-mail-konto, skal du gå til T-Onlines websted og oprette en adgangskode for POP3-e-mail-adgang."</string>
+    <string name="exchange_name" msgid="1190783774800310346">"Virksomhed"</string>
     <string name="system_account_create_failed" msgid="4917162302393971752">"Kontoadministratoren kunne ikke oprette kontoen. Prøv igen."</string>
 </resources>
diff --git a/res/values-de/strings.xml b/res/values-de/strings.xml
index 5bb59c5..417c5b5 100644
--- a/res/values-de/strings.xml
+++ b/res/values-de/strings.xml
@@ -15,13 +15,10 @@
 -->
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <!-- no translation found for read_attachment_label (1162255191991555285) -->
-    <skip />
+    <string name="read_attachment_label" msgid="1162255191991555285">"Anhänge lesen"</string>
     <string name="read_attachment_desc" msgid="7594746717616308643">"Erlaubt der Anwendung, Ihre Anhänge zu lesen."</string>
-    <!-- no translation found for permission_access_provider_label (4274353114641168675) -->
-    <skip />
-    <!-- no translation found for permission_access_provider_desc (1513898266889541617) -->
-    <skip />
+    <string name="permission_access_provider_label" msgid="4274353114641168675">"Auf Daten des E-Mail-Providers zugreifen"</string>
+    <string name="permission_access_provider_desc" msgid="1513898266889541617">"Erlaubt dieser Anwendung, auf Ihre E-Mail-Datenbank zuzugreifen, einschließlich erhaltener Nachrichten, gesendeter Nachrichten, Nutzernamen und Passwörtern."</string>
     <string name="app_name" msgid="5815426892327290362">"E-Mail"</string>
     <string name="accounts_title" msgid="6622149231904649210">"E-Mail"</string>
     <string name="compose_title" msgid="427986915662706899">"E-Mail schreiben"</string>
@@ -35,22 +32,17 @@
     <string name="delete_action" msgid="8421026208288857155">"Löschen"</string>
     <string name="forward_action" msgid="669174181042344116">"Weiterleiten"</string>
     <string name="done_action" msgid="7497990549515580249">"Fertig"</string>
-    <string name="discard_action" msgid="6532206074859505968">"Löschen"</string>
+    <string name="discard_action" msgid="6532206074859505968">"Verwerfen"</string>
     <string name="save_draft_action" msgid="812855865552028622">"Als Entwurf speichern"</string>
     <string name="read_unread_action" msgid="4721446664849165077">"Gelesen/ungelesen"</string>
-    <!-- no translation found for read_action (4701484794504781686) -->
-    <skip />
-    <!-- no translation found for unread_action (6280399049357552826) -->
-    <skip />
+    <string name="read_action" msgid="4701484794504781686">"Als gelesen markieren"</string>
+    <string name="unread_action" msgid="6280399049357552826">"Als ungelesen markieren"</string>
     <string name="favorite_action" msgid="2911296685862420689">"Favorit"</string>
-    <!-- no translation found for set_star_action (4660317166196258160) -->
-    <skip />
-    <!-- no translation found for remove_star_action (6689770999647007163) -->
-    <skip />
+    <string name="set_star_action" msgid="4660317166196258160">"Markierung hinzufügen"</string>
+    <string name="remove_star_action" msgid="6689770999647007163">"Markierung entfernen"</string>
     <string name="refresh_action" msgid="5951383001436708175">"Aktualisieren"</string>
     <string name="add_account_action" msgid="8835736309476033727">"Konto hinzufügen"</string>
-    <!-- no translation found for deselect_all_action (253663239459688238) -->
-    <skip />
+    <string name="deselect_all_action" msgid="253663239459688238">"Auswahl für alle aufheben"</string>
     <string name="compose_action" msgid="4045702519637388045">"E-Mail schreiben"</string>
     <string name="search_action" msgid="6325101454876682308">"Suchen"</string>
     <string name="open_action" msgid="936766723989190816">"Öffnen"</string>
@@ -71,8 +63,7 @@
     <string name="status_sending_messages_failed" msgid="7975009558738692407">"Nachrichtenübermittlung wiederholen"</string>
     <string name="status_loading_more_failed" msgid="1629172047185323">"Laden weiterer Nachrichten erneut versuchen"</string>
     <string name="notification_new_title" msgid="2200257910380529139">"Neue E-Mail"</string>
-    <!-- no translation found for error_loading_message_body (2265140604109272914) -->
-    <skip />
+    <string name="error_loading_message_body" msgid="2265140604109272914">"Unerwarteter Fehler beim Laden des Nachrichtentextes aufgetreten. Die Nachricht ist möglicherweise zu lang, um angezeigt zu werden."</string>
   <plurals name="notification_new_one_account_fmt">
     <item quantity="one" msgid="3422945912787702191">"<xliff:g id="UNREAD_MESSAGE_COUNT">%d</xliff:g> ungelesen (<xliff:g id="ACCOUNT">%s</xliff:g>)"</item>
     <item quantity="few" msgid="6543078667692990869">"<xliff:g id="UNREAD_MESSAGE_COUNT">%d</xliff:g> ungelesen (<xliff:g id="ACCOUNT">%s</xliff:g>)"</item>
@@ -82,25 +73,17 @@
     <item quantity="few" msgid="1991747245324120305">"in <xliff:g id="NUMBER_ACCOUNTS">%d</xliff:g> E-Mail-Konten"</item>
     <item quantity="other" msgid="2723797835410343458">"in <xliff:g id="NUMBER_ACCOUNTS">%d</xliff:g> E-Mail-Konten"</item>
   </plurals>
-    <!-- no translation found for mailbox_name_display_inbox (3542327124749861736) -->
-    <skip />
-    <!-- no translation found for mailbox_name_display_outbox (2826214174661417662) -->
-    <skip />
-    <!-- no translation found for mailbox_name_display_drafts (4868718300700514319) -->
-    <skip />
-    <!-- no translation found for mailbox_name_display_trash (9139069064580630647) -->
-    <skip />
-    <!-- no translation found for mailbox_name_display_sent (3426058998191869523) -->
-    <skip />
-    <!-- no translation found for mailbox_name_display_junk (9046762505977999288) -->
-    <skip />
+    <string name="mailbox_name_display_inbox" msgid="3542327124749861736">"Posteingang"</string>
+    <string name="mailbox_name_display_outbox" msgid="2826214174661417662">"Postausgang"</string>
+    <string name="mailbox_name_display_drafts" msgid="4868718300700514319">"Entwürfe"</string>
+    <string name="mailbox_name_display_trash" msgid="9139069064580630647">"Papierkorb"</string>
+    <string name="mailbox_name_display_sent" msgid="3426058998191869523">"Gesendet"</string>
+    <string name="mailbox_name_display_junk" msgid="9046762505977999288">"Junk"</string>
     <string name="debug_version_fmt" msgid="6160213145745376955">"Version: <xliff:g id="VERSION">%s</xliff:g>"</string>
     <string name="account_folder_list_separator_accounts" msgid="7568820182396669244">"Konten"</string>
-    <!-- no translation found for account_folder_list_summary_inbox (5790553737870057607) -->
-    <skip />
+    <string name="account_folder_list_summary_inbox" msgid="5790553737870057607">"Kombinierter Posteingang"</string>
     <string name="account_folder_list_summary_unread" msgid="1200755158196002928">"Ungelesen"</string>
-    <!-- no translation found for account_folder_list_summary_starred (3134312269246375723) -->
-    <skip />
+    <string name="account_folder_list_summary_starred" msgid="3134312269246375723">"Markiert"</string>
     <string name="account_folder_list_summary_drafts" msgid="5514845993247300437">"Entwürfe"</string>
     <string name="account_folder_list_summary_outbox" msgid="3059836696049399377">"Postausgang"</string>
     <string name="mailbox_list_title" msgid="8299608543467211089">"Postfach"</string>
@@ -137,10 +120,8 @@
     <string name="add_contact_dlg_message_fmt" msgid="4470846346726847478">"\"<xliff:g id="EMAIL">%s</xliff:g>\" zu den Kontakten hinzufügen"</string>
     <string name="message_view_display_attachment_toast" msgid="6096315816776330821">"Dieser Anhang kann nicht angezeigt werden."</string>
     <string name="account_setup_basics_title" msgid="3969856368228940980">"E-Mail einrichten"</string>
-    <!-- no translation found for accounts_welcome (5901437782383439370) -->
-    <skip />
-    <!-- no translation found for accounts_welcome_exchange (4414121583987233733) -->
-    <skip />
+    <string name="accounts_welcome" msgid="5901437782383439370">"Bei den meisten Konten können Sie die E-Mail-Adresse in nur wenigen Schritten konfigurieren."</string>
+    <string name="accounts_welcome_exchange" msgid="4414121583987233733">"Sie können ein Exchange-Konto in nur wenigen Schritten konfigurieren."</string>
     <!-- no translation found for account_setup_basics_instructions (3126077748322815504) -->
     <skip />
     <string name="account_setup_basics_email_hint" msgid="7414269319207261120">"E-Mail-Adresse"</string>
@@ -148,10 +129,8 @@
     <string name="account_setup_basics_default_label" msgid="5924790142029806711">"E-Mails standardmäßig von diesem Konto senden"</string>
     <string name="account_setup_basics_manual_setup_action" msgid="8053852205391155912">"Manuelle Einrichtung"</string>
     <string name="account_setup_username_password_toast" msgid="4441448542557889481">"Geben Sie eine gültige E-Mail-Adresse und ein gültiges Passwort ein."</string>
-    <!-- no translation found for account_duplicate_dlg_title (3176749833792312641) -->
-    <skip />
-    <!-- no translation found for account_duplicate_dlg_message_fmt (1920726613701479851) -->
-    <skip />
+    <string name="account_duplicate_dlg_title" msgid="3176749833792312641">"Konto duplizieren"</string>
+    <string name="account_duplicate_dlg_message_fmt" msgid="1920726613701479851">"Dieses Login wird bereits für das Konto \"<xliff:g id="DUPLICATE">%s</xliff:g>\" verwendet."</string>
     <string name="account_setup_check_settings_retr_info_msg" msgid="4121970450267725664">"Kontoinformationen werden abgerufen..."</string>
     <string name="account_setup_check_settings_check_incoming_msg" msgid="5356212700221438863">"Einstellungen des Eingangsservers werden überprüft..."</string>
     <string name="account_setup_check_settings_check_outgoing_msg" msgid="4033015234096725343">"Einstellungen des Ausgangsservers werden überprüft..."</string>
@@ -170,14 +149,10 @@
     <string name="account_setup_incoming_port_label" msgid="8214738923690447796">"Port"</string>
     <string name="account_setup_incoming_security_label" msgid="2110260791086007424">"Sicherheitstyp"</string>
     <string name="account_setup_incoming_security_none_label" msgid="8300169413118264895">"Keine"</string>
-    <!-- no translation found for account_setup_incoming_security_ssl_trust_certificates_label (3581382268191377346) -->
-    <skip />
-    <!-- no translation found for account_setup_incoming_security_ssl_label (8886698397743061682) -->
-    <skip />
-    <!-- no translation found for account_setup_incoming_security_tls_trust_certificates_label (1089227022489257055) -->
-    <skip />
-    <!-- no translation found for account_setup_incoming_security_tls_label (8638006172590036487) -->
-    <skip />
+    <string name="account_setup_incoming_security_ssl_trust_certificates_label" msgid="3581382268191377346">"SSL (Alle Zertifikate akzeptieren)"</string>
+    <string name="account_setup_incoming_security_ssl_label" msgid="8886698397743061682">"SSL"</string>
+    <string name="account_setup_incoming_security_tls_trust_certificates_label" msgid="1089227022489257055">"TLS (Alle Zertifikate akzeptieren)"</string>
+    <string name="account_setup_incoming_security_tls_label" msgid="8638006172590036487">"TLS"</string>
     <string name="account_setup_incoming_delete_policy_label" msgid="9213590134693857912">"E-Mail von Server löschen"</string>
     <string name="account_setup_incoming_delete_policy_never_label" msgid="3222897501875871041">"Nie"</string>
     <string name="account_setup_incoming_delete_policy_delete_label" msgid="222216840911785631">"Wenn ich sie aus dem Posteingang lösche"</string>
@@ -190,15 +165,15 @@
     <string name="account_setup_outgoing_require_login_label" msgid="6371514297854287948">"Anmeldung erforderlich"</string>
     <string name="account_setup_outgoing_username_label" msgid="3309680794731596981">"Nutzername"</string>
     <string name="account_setup_outgoing_password_label" msgid="227844585493317550">"Passwort"</string>
-    <string name="account_setup_exchange_title" msgid="247933841122558059">"Exchange-Server-Einstellungen"</string>
-    <string name="account_setup_exchange_server_label" msgid="5390359659749339317">"Exchange-Server"</string>
-    <!-- no translation found for account_setup_exchange_username_label (6517176180828983060) -->
+    <!-- no translation found for account_setup_exchange_title (2492853474738063453) -->
     <skip />
+    <!-- no translation found for account_setup_exchange_server_label (795137797983360826) -->
+    <skip />
+    <string name="account_setup_exchange_username_label" msgid="6517176180828983060">"Domain-/Nutzername"</string>
     <string name="account_setup_exchange_domain_label" msgid="3584668050727667045">"Domain"</string>
     <string name="account_setup_exchange_domain_hint" msgid="350372033916025287">"Domain hier eingeben"</string>
     <string name="account_setup_exchange_ssl_label" msgid="6704105469083211236">"Sichere Verbindung (SSL) verwenden"</string>
-    <!-- no translation found for account_setup_exchange_trust_certificates_label (6232880757633882678) -->
-    <skip />
+    <string name="account_setup_exchange_trust_certificates_label" msgid="6232880757633882678">"Alle SSL-Zertifikate akzeptieren"</string>
     <string name="account_setup_options_title" msgid="8995162193118880993">"Kontooptionen"</string>
     <string name="account_setup_options_mail_check_frequency_label" msgid="4598023962234986194">"Abrufhäufigkeit"</string>
     <string name="account_setup_options_mail_check_frequency_never" msgid="287951859480505416">"Nie"</string>
@@ -229,13 +204,13 @@
     <string name="account_setup_failed_auth_required" msgid="1676242821459638150">"Authentifizierungsmethoden nicht von Server unterstützt"</string>
     <string name="account_setup_failed_security" msgid="6142264248671379943">"Verbindung zu Server kann aufgrund eines Sicherheitsfehlers nicht geöffnet werden."</string>
     <string name="account_setup_failed_ioerror" msgid="7391458717708933095">"Verbindung zu Server kann nicht geöffnet werden"</string>
+    <string name="account_setup_failed_security_policies_required" msgid="3567420384516656976">"Für diesen Exchange ActiveSync-Server sind Sicherheitsfunktionen erforderlich, die von Ihrem Telefon nicht unterstützt werden."</string>
     <string name="account_setup_failed_dlg_edit_details_action" msgid="5355993309841479360">"Details bearbeiten"</string>
     <string name="account_settings_title_fmt" msgid="1702058877284382340">"Allgemeine Einstellungen"</string>
     <string name="account_settings_default_label" msgid="3575963379680943640">"Standardkonto"</string>
     <string name="account_settings_default_summary" msgid="1531901438624688482">"E-Mails standardmäßig von diesem Konto senden"</string>
     <string name="account_settings_notify_label" msgid="1630001017303007974">"E-Mail-Benachrichtigung"</string>
-    <!-- no translation found for account_settings_exchange_summary (8498451479029626317) -->
-    <skip />
+    <string name="account_settings_exchange_summary" msgid="8498451479029626317">"Synchronisierungshäufigkeit, Benachrichtigungen usw."</string>
     <string name="account_settings_notify_summary" msgid="6609224590300639887">"Bei E-Mail-Eingang Benachrichtigung in der Statusleiste"</string>
     <string name="account_settings_mail_check_frequency_label" msgid="2067835530563849675">"Abrufhäufigkeit"</string>
     <string name="account_settings_incoming_label" msgid="7858928031806297542">"Eingehende Nachrichten"</string>
@@ -244,10 +219,8 @@
     <string name="account_settings_description_label" msgid="8894815221204511715">"Kontoname"</string>
     <string name="account_settings_name_label" msgid="8186406122590008449">"Ihr Name"</string>
     <string name="account_settings_notifications" msgid="1042620094281375043">"Benachrichtigungseinstellungen"</string>
-    <!-- no translation found for account_settings_sync_contacts_enable (1369272986009573218) -->
-    <skip />
-    <!-- no translation found for account_settings_sync_contacts_summary (8901452720940015928) -->
-    <skip />
+    <string name="account_settings_sync_contacts_enable" msgid="1369272986009573218">"Kontakte synchronisieren"</string>
+    <string name="account_settings_sync_contacts_summary" msgid="8901452720940015928">"Kontakte dieses Kontos ebenfalls synchronisieren"</string>
     <string name="account_settings_vibrate_enable" msgid="8045133290388856478">"Vibration"</string>
     <string name="account_settings_vibrate_summary" msgid="3690631050585589365">"Bei E-Mail-Eingang zusätzlich vibrieren"</string>
     <string name="account_settings_ringtone" msgid="7922187231467500404">"Klingelton auswählen"</string>
@@ -258,7 +231,6 @@
     <string name="provider_note_yahoo_uk" msgid="2055976404478603298">"Vor Eröffnung dieses E-Mail-Kontos bitte die Website von Yahoo! besuchen und E-Mail-Zugang über POP3 für dieses Konto aktivieren."</string>
     <string name="provider_note_live" msgid="3584841823811425060">"Nur einige \"Plus\"-Konten ermöglichen einen POP-Zugang und damit diesem Programm, eine Verbindung aufzubauen. Sollten Sie nicht dazu in der Lage sein, sich mit Ihrer korrekten E-Mail-Adresse und dem richtigen Password anzumelden, verfügen Sie möglicherweise nicht über ein kostenpflichtiges \"Plus\"-Konto. Starten Sie Ihren Webbrowser, um Zugriff auf diese Konten zu erlangen."</string>
     <string name="provider_note_t_online" msgid="1973701903400232774">"Vor Erstellung des E-Mail Kontos bitte \\\"eMail-Passwort\\\" für den POP3-Zugang auf der T-Online Homepage einrichten."</string>
-    <!-- no translation found for exchange_name (1190783774800310346) -->
-    <skip />
+    <string name="exchange_name" msgid="1190783774800310346">"Geschäftlich"</string>
     <string name="system_account_create_failed" msgid="4917162302393971752">"Der Account Manager konnte das Konto nicht erstellen. Versuchen Sie es erneut."</string>
 </resources>
diff --git a/res/values-el/strings.xml b/res/values-el/strings.xml
index 790f5a8..66ccef3 100644
--- a/res/values-el/strings.xml
+++ b/res/values-el/strings.xml
@@ -15,13 +15,10 @@
 -->
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <!-- no translation found for read_attachment_label (1162255191991555285) -->
-    <skip />
+    <string name="read_attachment_label" msgid="1162255191991555285">"Ανάγνωση επισυνάψεων μηνύματος ηλεκτρονικού ταχυδρομείου"</string>
     <string name="read_attachment_desc" msgid="7594746717616308643">"Επιτρέπει σε αυτήν την εφαρμογή την ανάγνωση των επισυνάψεων των μηνυμάτων ηλεκτρονικού ταχυδρομείου."</string>
-    <!-- no translation found for permission_access_provider_label (4274353114641168675) -->
-    <skip />
-    <!-- no translation found for permission_access_provider_desc (1513898266889541617) -->
-    <skip />
+    <string name="permission_access_provider_label" msgid="4274353114641168675">"Πρόσβαση στα δεδομένα παρόχου ηλεκτρονικού ταχυδρομείου"</string>
+    <string name="permission_access_provider_desc" msgid="1513898266889541617">"Επιτρέπει στην εφαρμογή να έχει πρόσβαση στη βάση δεδομένων του ηλεκτρονικού ταχυδρομείου σας, συμπεριλαμβανομένων των ληφθέντων μηνυμάτων, των απεσταλμένων, ονομάτων χρηστών και κωδικών πρόσβασης."</string>
     <string name="app_name" msgid="5815426892327290362">"Email"</string>
     <string name="accounts_title" msgid="6622149231904649210">"Διεύθυνση ηλεκτρονικού ταχυδρομείου"</string>
     <string name="compose_title" msgid="427986915662706899">"Σύνθεση"</string>
@@ -38,19 +35,14 @@
     <string name="discard_action" msgid="6532206074859505968">"Απόρριψη"</string>
     <string name="save_draft_action" msgid="812855865552028622">"Αποθ.ως πρόχειρο"</string>
     <string name="read_unread_action" msgid="4721446664849165077">"Αναγνωσμένες/Μη αναγνωσμένες"</string>
-    <!-- no translation found for read_action (4701484794504781686) -->
-    <skip />
-    <!-- no translation found for unread_action (6280399049357552826) -->
-    <skip />
+    <string name="read_action" msgid="4701484794504781686">"Επισήμανση ως αναγνωσμένων"</string>
+    <string name="unread_action" msgid="6280399049357552826">"Επισήμανση ως μη αναγνωσμένα"</string>
     <string name="favorite_action" msgid="2911296685862420689">"Αγαπημένο"</string>
-    <!-- no translation found for set_star_action (4660317166196258160) -->
-    <skip />
-    <!-- no translation found for remove_star_action (6689770999647007163) -->
-    <skip />
+    <string name="set_star_action" msgid="4660317166196258160">"Προσθήκη αστεριού"</string>
+    <string name="remove_star_action" msgid="6689770999647007163">"Κατάργηση αστεριού"</string>
     <string name="refresh_action" msgid="5951383001436708175">"Ανανέωση"</string>
     <string name="add_account_action" msgid="8835736309476033727">"Προσθήκη λογαριασμού"</string>
-    <!-- no translation found for deselect_all_action (253663239459688238) -->
-    <skip />
+    <string name="deselect_all_action" msgid="253663239459688238">"Κατάργηση επιλογής όλων"</string>
     <string name="compose_action" msgid="4045702519637388045">"Σύνθεση"</string>
     <string name="search_action" msgid="6325101454876682308">"Αναζήτηση"</string>
     <string name="open_action" msgid="936766723989190816">"Άνοιγμα"</string>
@@ -71,8 +63,7 @@
     <string name="status_sending_messages_failed" msgid="7975009558738692407">"Επανάληψη αποστολής μηνυμάτων"</string>
     <string name="status_loading_more_failed" msgid="1629172047185323">"Επανάληψη φόρτωσης περισσότερων μηνυμάτων"</string>
     <string name="notification_new_title" msgid="2200257910380529139">"Νέο μήνυμα ηλεκτρονικού ταχυδρομείου"</string>
-    <!-- no translation found for error_loading_message_body (2265140604109272914) -->
-    <skip />
+    <string name="error_loading_message_body" msgid="2265140604109272914">"Μη αναμενόμενο σφάλμα κατά τη φόρτωση κειμένου μηνύματος. Το μήνυμα ενδέχεται να είναι πολύ μεγάλο για προβολή."</string>
   <plurals name="notification_new_one_account_fmt">
     <item quantity="one" msgid="3422945912787702191">"<xliff:g id="UNREAD_MESSAGE_COUNT">%d</xliff:g> μη αναγνωσμένα (<xliff:g id="ACCOUNT">%s</xliff:g>)"</item>
     <item quantity="few" msgid="6543078667692990869">"<xliff:g id="UNREAD_MESSAGE_COUNT">%d</xliff:g> μη αναγνωσμένα (<xliff:g id="ACCOUNT">%s</xliff:g>)"</item>
@@ -82,25 +73,17 @@
     <item quantity="few" msgid="1991747245324120305">"σε <xliff:g id="NUMBER_ACCOUNTS">%d</xliff:g> λογαριασμούς"</item>
     <item quantity="other" msgid="2723797835410343458">"σε <xliff:g id="NUMBER_ACCOUNTS">%d</xliff:g> λογαριασμούς"</item>
   </plurals>
-    <!-- no translation found for mailbox_name_display_inbox (3542327124749861736) -->
-    <skip />
-    <!-- no translation found for mailbox_name_display_outbox (2826214174661417662) -->
-    <skip />
-    <!-- no translation found for mailbox_name_display_drafts (4868718300700514319) -->
-    <skip />
-    <!-- no translation found for mailbox_name_display_trash (9139069064580630647) -->
-    <skip />
-    <!-- no translation found for mailbox_name_display_sent (3426058998191869523) -->
-    <skip />
-    <!-- no translation found for mailbox_name_display_junk (9046762505977999288) -->
-    <skip />
+    <string name="mailbox_name_display_inbox" msgid="3542327124749861736">"Εισερχόμενα"</string>
+    <string name="mailbox_name_display_outbox" msgid="2826214174661417662">"Εξερχόμενα"</string>
+    <string name="mailbox_name_display_drafts" msgid="4868718300700514319">"Πρόχειρα"</string>
+    <string name="mailbox_name_display_trash" msgid="9139069064580630647">"Κάδος απορριμμάτων"</string>
+    <string name="mailbox_name_display_sent" msgid="3426058998191869523">"Απεσταλμένα"</string>
+    <string name="mailbox_name_display_junk" msgid="9046762505977999288">"Ανεπιθύμητα"</string>
     <string name="debug_version_fmt" msgid="6160213145745376955">"Έκδοση: <xliff:g id="VERSION">%s</xliff:g>"</string>
     <string name="account_folder_list_separator_accounts" msgid="7568820182396669244">"Λογαριασμοί"</string>
-    <!-- no translation found for account_folder_list_summary_inbox (5790553737870057607) -->
-    <skip />
+    <string name="account_folder_list_summary_inbox" msgid="5790553737870057607">"Συνδυασμένη προβολή εισερχομένων"</string>
     <string name="account_folder_list_summary_unread" msgid="1200755158196002928">"Μη αναγνωσμένα"</string>
-    <!-- no translation found for account_folder_list_summary_starred (3134312269246375723) -->
-    <skip />
+    <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_title" msgid="8299608543467211089">"Θυρίδες αλληλογραφίας"</string>
@@ -137,10 +120,8 @@
     <string name="add_contact_dlg_message_fmt" msgid="4470846346726847478">"Προσθήκη του \"<xliff:g id="EMAIL">%s</xliff:g>\" στις επαφές"</string>
     <string name="message_view_display_attachment_toast" msgid="6096315816776330821">"Δεν είναι δυνατή η προβολή αυτής της επισύναψης."</string>
     <string name="account_setup_basics_title" msgid="3969856368228940980">"Ρύθμιση ηλεκτρονικού ταχυδρομείου"</string>
-    <!-- no translation found for accounts_welcome (5901437782383439370) -->
-    <skip />
-    <!-- no translation found for accounts_welcome_exchange (4414121583987233733) -->
-    <skip />
+    <string name="accounts_welcome" msgid="5901437782383439370">"Μπορείτε να ολοκληρώσετε τη διαμόρφωση ηλεκτρονικού ταχυδρομείου για τους περισσότερους λογαριασμούς σε λίγα μόλις βήματα."</string>
+    <string name="accounts_welcome_exchange" msgid="4414121583987233733">"Μπορείτε να διαμορφώσετε έναν λογαριασμό Exchange σε λίγα μόλις βήματα."</string>
     <!-- no translation found for account_setup_basics_instructions (3126077748322815504) -->
     <skip />
     <string name="account_setup_basics_email_hint" msgid="7414269319207261120">"Διεύθυνση ηλεκτρονικού ταχυδρομείου"</string>
@@ -148,10 +129,8 @@
     <string name="account_setup_basics_default_label" msgid="5924790142029806711">"Αποστολή μηνυμάτων ηλεκτρονικού ταχυδρομείου από αυτόν το λογαριασμό από προεπιλογή."</string>
     <string name="account_setup_basics_manual_setup_action" msgid="8053852205391155912">"Μη αυτόματη ρύθμιση"</string>
     <string name="account_setup_username_password_toast" msgid="4441448542557889481">"Πληκτρολογήστε μια έγκυρη διεύθυνση ηλεκτρονικού ταχυδρομείου και έναν έγκυρο κωδικό πρόσβασης."</string>
-    <!-- no translation found for account_duplicate_dlg_title (3176749833792312641) -->
-    <skip />
-    <!-- no translation found for account_duplicate_dlg_message_fmt (1920726613701479851) -->
-    <skip />
+    <string name="account_duplicate_dlg_title" msgid="3176749833792312641">"Διπλότυπος λογαριασμός"</string>
+    <string name="account_duplicate_dlg_message_fmt" msgid="1920726613701479851">"Αυτή η σύνδεση χρησιμοποιείται ήδη για τον λογαριασμό \"<xliff:g id="DUPLICATE">%s</xliff:g>\"."</string>
     <string name="account_setup_check_settings_retr_info_msg" msgid="4121970450267725664">"Ανάκτηση στοιχείων λογαριασμού..."</string>
     <string name="account_setup_check_settings_check_incoming_msg" msgid="5356212700221438863">"Έλεγχος ρυθμίσεων διακομιστή εισερχομένων..."</string>
     <string name="account_setup_check_settings_check_outgoing_msg" msgid="4033015234096725343">"Έλεγχος ρυθμίσεων διακομιστή εξερχομένων..."</string>
@@ -170,14 +149,10 @@
     <string name="account_setup_incoming_port_label" msgid="8214738923690447796">"Θύρα"</string>
     <string name="account_setup_incoming_security_label" msgid="2110260791086007424">"Τύπος ασφάλειας"</string>
     <string name="account_setup_incoming_security_none_label" msgid="8300169413118264895">"Κανένα"</string>
-    <!-- no translation found for account_setup_incoming_security_ssl_trust_certificates_label (3581382268191377346) -->
-    <skip />
-    <!-- no translation found for account_setup_incoming_security_ssl_label (8886698397743061682) -->
-    <skip />
-    <!-- no translation found for account_setup_incoming_security_tls_trust_certificates_label (1089227022489257055) -->
-    <skip />
-    <!-- no translation found for account_setup_incoming_security_tls_label (8638006172590036487) -->
-    <skip />
+    <string name="account_setup_incoming_security_ssl_trust_certificates_label" msgid="3581382268191377346">"SSL (Αποδοχή όλων των πιστοποιητικών)"</string>
+    <string name="account_setup_incoming_security_ssl_label" msgid="8886698397743061682">"SSL"</string>
+    <string name="account_setup_incoming_security_tls_trust_certificates_label" msgid="1089227022489257055">"TLS (Αποδοχή όλων των πιστοποιητικών)"</string>
+    <string name="account_setup_incoming_security_tls_label" msgid="8638006172590036487">"TLS"</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>
@@ -190,15 +165,15 @@
     <string name="account_setup_outgoing_require_login_label" msgid="6371514297854287948">"Να απαιτείται σύνδεση."</string>
     <string name="account_setup_outgoing_username_label" msgid="3309680794731596981">"Όνομα χρήστη"</string>
     <string name="account_setup_outgoing_password_label" msgid="227844585493317550">"Κωδικός πρόσβασης"</string>
-    <string name="account_setup_exchange_title" msgid="247933841122558059">"Ρυθμίσεις του διακομιστή Exchange"</string>
-    <string name="account_setup_exchange_server_label" msgid="5390359659749339317">"Exchange Server"</string>
-    <!-- no translation found for account_setup_exchange_username_label (6517176180828983060) -->
+    <!-- no translation found for account_setup_exchange_title (2492853474738063453) -->
     <skip />
+    <!-- no translation found for account_setup_exchange_server_label (795137797983360826) -->
+    <skip />
+    <string name="account_setup_exchange_username_label" msgid="6517176180828983060">"Τομέας διαδικτύου\\Όνομα χρήστη"</string>
     <string name="account_setup_exchange_domain_label" msgid="3584668050727667045">"Τομέας διαδικτύου"</string>
     <string name="account_setup_exchange_domain_hint" msgid="350372033916025287">"Καταχώριση τομέας διαδικτύου εδώ"</string>
     <string name="account_setup_exchange_ssl_label" msgid="6704105469083211236">"Χρήση ασφαλούς σύνδεσης (SSL)"</string>
-    <!-- no translation found for account_setup_exchange_trust_certificates_label (6232880757633882678) -->
-    <skip />
+    <string name="account_setup_exchange_trust_certificates_label" msgid="6232880757633882678">"Αποδοχή όλων των πιστοποιητικών SSL"</string>
     <string name="account_setup_options_title" msgid="8995162193118880993">"Επιλογές λογαριασμού"</string>
     <string name="account_setup_options_mail_check_frequency_label" msgid="4598023962234986194">"Συχνότητα ελέγχου μηνυμάτων ηλεκτρονικού ταχυδρομείου"</string>
     <string name="account_setup_options_mail_check_frequency_never" msgid="287951859480505416">"Ποτέ"</string>
@@ -229,13 +204,13 @@
     <string name="account_setup_failed_auth_required" msgid="1676242821459638150">"Οι μέθοδοι ελέγχου ταυτότητας δεν υποστηρίζονται από τον διακομιστή."</string>
     <string name="account_setup_failed_security" msgid="6142264248671379943">"Δεν ήταν δυνατή η σύνδεση με τον διακομιστή επειδή προέκυψε σφάλμα ασφάλειας."</string>
     <string name="account_setup_failed_ioerror" msgid="7391458717708933095">"Δεν ήταν δυνατό το άνοιγμα σύνδεσης με τον διακομιστή."</string>
+    <string name="account_setup_failed_security_policies_required" msgid="3567420384516656976">"Για αυτόν τον διακομιστή Exchange ActiveSync απαιτούνται λειτουργίες ασφαλείας που δεν υποστηρίζονται από το τηλέφωνό σας."</string>
     <string name="account_setup_failed_dlg_edit_details_action" msgid="5355993309841479360">"Επεξεργασία λεπτομερειών"</string>
     <string name="account_settings_title_fmt" msgid="1702058877284382340">"Γενικές ρυθμίσεις"</string>
     <string name="account_settings_default_label" msgid="3575963379680943640">"Προεπιλεγμένος λογαριασμός"</string>
     <string name="account_settings_default_summary" msgid="1531901438624688482">"Αποστολή μηνυμάτων ηλεκτρονικού ταχυδρομείου από αυτόν τον λογαριασμό από προεπιλογή"</string>
     <string name="account_settings_notify_label" msgid="1630001017303007974">"Ειδοποιήσεις μηνυμάτων ηλεκτρονικού ταχυδρομείου"</string>
-    <!-- no translation found for account_settings_exchange_summary (8498451479029626317) -->
-    <skip />
+    <string name="account_settings_exchange_summary" msgid="8498451479029626317">"Συχνότητα συγχρονισμού, ειδοποιήσεις, κτλ."</string>
     <string name="account_settings_notify_summary" msgid="6609224590300639887">"Να εμφανίζεται ειδοποίηση στη γραμμή κατάστασης όταν γίνεται λήψη μηνύματος ηλεκτρονικού ταχυδρομείου"</string>
     <string name="account_settings_mail_check_frequency_label" msgid="2067835530563849675">"Συχνότητα ελέγχου μηνυμάτων ηλεκτρονικού ταχυδρομείου"</string>
     <string name="account_settings_incoming_label" msgid="7858928031806297542">"Ρυθμίσεις εισερχομένων"</string>
@@ -244,10 +219,8 @@
     <string name="account_settings_description_label" msgid="8894815221204511715">"Όνομα λογαριασμού"</string>
     <string name="account_settings_name_label" msgid="8186406122590008449">"Το όνομά σας"</string>
     <string name="account_settings_notifications" msgid="1042620094281375043">"Ρυθμίσεις ειδοποιήσεων"</string>
-    <!-- no translation found for account_settings_sync_contacts_enable (1369272986009573218) -->
-    <skip />
-    <!-- no translation found for account_settings_sync_contacts_summary (8901452720940015928) -->
-    <skip />
+    <string name="account_settings_sync_contacts_enable" msgid="1369272986009573218">"Συγχρονισμός επαφών"</string>
+    <string name="account_settings_sync_contacts_summary" msgid="8901452720940015928">"Επίσης, συγχρονισμός επαφών από αυτόν τον λογαριασμό"</string>
     <string name="account_settings_vibrate_enable" msgid="8045133290388856478">"Δόνηση"</string>
     <string name="account_settings_vibrate_summary" msgid="3690631050585589365">"Δόνηση κατά τη λήψη μηνύματος ηλεκτρονικού ταχυδρομείου"</string>
     <string name="account_settings_ringtone" msgid="7922187231467500404">"Επιλογή ήχου κλήσης"</string>
@@ -258,7 +231,6 @@
     <string name="provider_note_yahoo_uk" msgid="2055976404478603298">"Πριν ρυθμίσετε αυτόν τον λογαριασμό ηλεκτρονικού ταχυδρομείου, επισκεφθείτε τον ιστότοπο Yahoo! και ενεργοποιήστε την πρόσβαση ηλεκτρονικού ταχυδρομείου POP3 για αυτόν τον λογαριασμό."</string>
     <string name="provider_note_live" msgid="3584841823811425060">"Μόνο ορισμένοι λογαριασμοί \"Plus\" περιλαμβάνουν πρόσβαση POP και επιτρέπουν στο πρόγραμμα αυτό να συνδεθεί. Εάν δεν μπορείτε να συνδεθείτε με τη σωστή διεύθυνση ηλεκτρονικού ταχυδρομείου και τον κωδικό πρόσβασης, ενδέχεται να μην έχετε πληρωμένο λογαριασμό \"Plus\". Εκκινήστε το πρόγραμμα περιήγησης ιστού, για να αποκτήσετε πρόσβαση σε αυτούς τους λογαριασμούς ηλεκτρονικού ταχυδρομείου."</string>
     <string name="provider_note_t_online" msgid="1973701903400232774">"Πριν ρυθμίσετε αυτόν το λογαριασμό ηλεκτρονικού ταχυδρομείου, επισκεφτείτε τον ιστότοπο T-Online και δημιουργήστε έναν κωδικό πρόσβασης για πρόσβαση σε ηλεκτρονικό ταχυδρομείο POP3."</string>
-    <!-- no translation found for exchange_name (1190783774800310346) -->
-    <skip />
+    <string name="exchange_name" msgid="1190783774800310346">"Εταιρικός"</string>
     <string name="system_account_create_failed" msgid="4917162302393971752">"Δεν ήταν δυνατή η δημιουργία λογαριασμού από τον διαχειριστή λογαριασμών. Δοκιμάστε ξανά."</string>
 </resources>
diff --git a/res/values-es-rUS/strings.xml b/res/values-es-rUS/strings.xml
index 6caa972..63401b6 100644
--- a/res/values-es-rUS/strings.xml
+++ b/res/values-es-rUS/strings.xml
@@ -121,7 +121,7 @@
     <string name="message_view_display_attachment_toast" msgid="6096315816776330821">"No se puede mostrar este archivo adjunto."</string>
     <string name="account_setup_basics_title" msgid="3969856368228940980">"Configurar correo electrónico"</string>
     <string name="accounts_welcome" msgid="5901437782383439370">"Puedes configurar el correo electrónico de la mayoría de las cuentas en sólo algunos pasos."</string>
-    <string name="accounts_welcome_exchange" msgid="4414121583987233733">"Puedes configurar una cuenta de intercambio en sólo algunos pasos."</string>
+    <string name="accounts_welcome_exchange" msgid="4414121583987233733">"Puedes configurar una cuenta de Exchange en sólo algunos pasos."</string>
     <!-- no translation found for account_setup_basics_instructions (3126077748322815504) -->
     <skip />
     <string name="account_setup_basics_email_hint" msgid="7414269319207261120">"Dirección de correo electrónico"</string>
@@ -165,8 +165,10 @@
     <string name="account_setup_outgoing_require_login_label" msgid="6371514297854287948">"Requiere inicio de sesión."</string>
     <string name="account_setup_outgoing_username_label" msgid="3309680794731596981">"Nombre de usuario"</string>
     <string name="account_setup_outgoing_password_label" msgid="227844585493317550">"Contraseña"</string>
-    <string name="account_setup_exchange_title" msgid="247933841122558059">"Configuración del servidor Exchange"</string>
-    <string name="account_setup_exchange_server_label" msgid="5390359659749339317">"Servidor Exchange"</string>
+    <!-- no translation found for account_setup_exchange_title (2492853474738063453) -->
+    <skip />
+    <!-- no translation found for account_setup_exchange_server_label (795137797983360826) -->
+    <skip />
     <string name="account_setup_exchange_username_label" msgid="6517176180828983060">"Dominio\\Nombre de usuario"</string>
     <string name="account_setup_exchange_domain_label" msgid="3584668050727667045">"Dominio"</string>
     <string name="account_setup_exchange_domain_hint" msgid="350372033916025287">"Ingresa el dominio aquí"</string>
@@ -202,6 +204,7 @@
     <string name="account_setup_failed_auth_required" msgid="1676242821459638150">"El servidor no admite los métodos de autenticación."</string>
     <string name="account_setup_failed_security" msgid="6142264248671379943">"No es posible iniciar la conexión al servidor debido a un error de seguridad."</string>
     <string name="account_setup_failed_ioerror" msgid="7391458717708933095">"No es posible iniciar la conexión a tu servidor."</string>
+    <string name="account_setup_failed_security_policies_required" msgid="3567420384516656976">"Este servidor Exchange ActiveSync requiere funciones de seguridad no compatibles con tu teléfono."</string>
     <string name="account_setup_failed_dlg_edit_details_action" msgid="5355993309841479360">"Editar detalles"</string>
     <string name="account_settings_title_fmt" msgid="1702058877284382340">"Configuración general"</string>
     <string name="account_settings_default_label" msgid="3575963379680943640">"Cuenta predeterminada"</string>
@@ -220,7 +223,7 @@
     <string name="account_settings_sync_contacts_summary" msgid="8901452720940015928">"También sincronizar contactos desde esta cuenta"</string>
     <string name="account_settings_vibrate_enable" msgid="8045133290388856478">"Vibrar"</string>
     <string name="account_settings_vibrate_summary" msgid="3690631050585589365">"Vibrar también cuando llegue un mensaje de correo electrónico"</string>
-    <string name="account_settings_ringtone" msgid="7922187231467500404">"Seleccionar tono de llamada"</string>
+    <string name="account_settings_ringtone" msgid="7922187231467500404">"Selecc. tono de llam."</string>
     <string name="account_settings_servers" msgid="4925493817981624242">"Configuración del servidor"</string>
     <string name="account_delete_dlg_title" msgid="6806087520856396608">"Eliminar cuenta"</string>
     <string name="account_delete_dlg_instructions_fmt" msgid="8236846322040271280">"La cuenta \"<xliff:g id="ACCOUNT">%s</xliff:g>\" se eliminará de correo electrónico."</string>
diff --git a/res/values-es/strings.xml b/res/values-es/strings.xml
index 8c1a16f..67871a8 100644
--- a/res/values-es/strings.xml
+++ b/res/values-es/strings.xml
@@ -15,13 +15,10 @@
 -->
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <!-- no translation found for read_attachment_label (1162255191991555285) -->
-    <skip />
+    <string name="read_attachment_label" msgid="1162255191991555285">"Leer los archivos adjuntos del mensaje"</string>
     <string name="read_attachment_desc" msgid="7594746717616308643">"Permite que esta aplicación lea los archivos adjuntos del correo electrónico."</string>
-    <!-- no translation found for permission_access_provider_label (4274353114641168675) -->
-    <skip />
-    <!-- no translation found for permission_access_provider_desc (1513898266889541617) -->
-    <skip />
+    <string name="permission_access_provider_label" msgid="4274353114641168675">"Acceder a los datos del proveedor de servicios de correo"</string>
+    <string name="permission_access_provider_desc" msgid="1513898266889541617">"Permite que la aplicación acceda a la base de datos de tu correo electrónico, incluidos los mensajes recibidos, los mensajes enviados, los nombres de usuario y las contraseñas."</string>
     <string name="app_name" msgid="5815426892327290362">"Email"</string>
     <string name="accounts_title" msgid="6622149231904649210">"Correo electrónico"</string>
     <string name="compose_title" msgid="427986915662706899">"Redactar"</string>
@@ -38,19 +35,14 @@
     <string name="discard_action" msgid="6532206074859505968">"Descartar"</string>
     <string name="save_draft_action" msgid="812855865552028622">"Guardar como borrador"</string>
     <string name="read_unread_action" msgid="4721446664849165077">"Leído/no leído"</string>
-    <!-- no translation found for read_action (4701484794504781686) -->
-    <skip />
-    <!-- no translation found for unread_action (6280399049357552826) -->
-    <skip />
+    <string name="read_action" msgid="4701484794504781686">"Marcar como leído"</string>
+    <string name="unread_action" msgid="6280399049357552826">"Marcar como no leído"</string>
     <string name="favorite_action" msgid="2911296685862420689">"Favoritos"</string>
-    <!-- no translation found for set_star_action (4660317166196258160) -->
-    <skip />
-    <!-- no translation found for remove_star_action (6689770999647007163) -->
-    <skip />
+    <string name="set_star_action" msgid="4660317166196258160">"Añadir estrella"</string>
+    <string name="remove_star_action" msgid="6689770999647007163">"Eliminar estrella"</string>
     <string name="refresh_action" msgid="5951383001436708175">"Actualizar"</string>
     <string name="add_account_action" msgid="8835736309476033727">"Añadir cuenta"</string>
-    <!-- no translation found for deselect_all_action (253663239459688238) -->
-    <skip />
+    <string name="deselect_all_action" msgid="253663239459688238">"Desmarcar todo"</string>
     <string name="compose_action" msgid="4045702519637388045">"Redactar"</string>
     <string name="search_action" msgid="6325101454876682308">"Buscar"</string>
     <string name="open_action" msgid="936766723989190816">"Abrir"</string>
@@ -59,7 +51,7 @@
     <string name="folders_action" msgid="7502431531355227666">"Carpetas"</string>
     <string name="accounts_action" msgid="901105887272231493">"Cuentas"</string>
     <string name="mark_as_read_action" msgid="5031651846998842419">"Marcar como leída"</string>
-    <string name="mark_as_unread_action" msgid="3766298115778767554">"Marcar como no leída"</string>
+    <string name="mark_as_unread_action" msgid="3766298115778767554">"Marcar como no leído"</string>
     <string name="add_cc_bcc_action" msgid="5569074812077509737">"Añadir Cc/CCO"</string>
     <string name="add_attachment_action" msgid="2696013743130573897">"Añadir archivo adjunto"</string>
     <string name="dump_settings_action" msgid="4478192525236169829">"Configuración de volcado"</string>
@@ -71,8 +63,7 @@
     <string name="status_sending_messages_failed" msgid="7975009558738692407">"Reintentar envío de mensajes"</string>
     <string name="status_loading_more_failed" msgid="1629172047185323">"Intentar cargar más mensajes"</string>
     <string name="notification_new_title" msgid="2200257910380529139">"Nuevo mensaje"</string>
-    <!-- no translation found for error_loading_message_body (2265140604109272914) -->
-    <skip />
+    <string name="error_loading_message_body" msgid="2265140604109272914">"Se ha producido un error inesperado durante la carga del mensaje de texto. Es posible que el mensaje sea demasiado grande para mostrarse."</string>
   <plurals name="notification_new_one_account_fmt">
     <item quantity="one" msgid="3422945912787702191">"<xliff:g id="UNREAD_MESSAGE_COUNT">%d</xliff:g> no leídos (<xliff:g id="ACCOUNT">%s</xliff:g>)"</item>
     <item quantity="few" msgid="6543078667692990869">"<xliff:g id="UNREAD_MESSAGE_COUNT">%d</xliff:g> no leídos (<xliff:g id="ACCOUNT">%s</xliff:g>)"</item>
@@ -82,25 +73,17 @@
     <item quantity="few" msgid="1991747245324120305">"en <xliff:g id="NUMBER_ACCOUNTS">%d</xliff:g> cuentas"</item>
     <item quantity="other" msgid="2723797835410343458">"en <xliff:g id="NUMBER_ACCOUNTS">%d</xliff:g> cuentas"</item>
   </plurals>
-    <!-- no translation found for mailbox_name_display_inbox (3542327124749861736) -->
-    <skip />
-    <!-- no translation found for mailbox_name_display_outbox (2826214174661417662) -->
-    <skip />
-    <!-- no translation found for mailbox_name_display_drafts (4868718300700514319) -->
-    <skip />
-    <!-- no translation found for mailbox_name_display_trash (9139069064580630647) -->
-    <skip />
-    <!-- no translation found for mailbox_name_display_sent (3426058998191869523) -->
-    <skip />
-    <!-- no translation found for mailbox_name_display_junk (9046762505977999288) -->
-    <skip />
+    <string name="mailbox_name_display_inbox" msgid="3542327124749861736">"Bandeja de entrada"</string>
+    <string name="mailbox_name_display_outbox" msgid="2826214174661417662">"Enviados"</string>
+    <string name="mailbox_name_display_drafts" msgid="4868718300700514319">"Borradores"</string>
+    <string name="mailbox_name_display_trash" msgid="9139069064580630647">"Papelera"</string>
+    <string name="mailbox_name_display_sent" msgid="3426058998191869523">"Enviados"</string>
+    <string name="mailbox_name_display_junk" msgid="9046762505977999288">"Correo basura"</string>
     <string name="debug_version_fmt" msgid="6160213145745376955">"Versión: <xliff:g id="VERSION">%s</xliff:g>"</string>
     <string name="account_folder_list_separator_accounts" msgid="7568820182396669244">"Cuentas"</string>
-    <!-- no translation found for account_folder_list_summary_inbox (5790553737870057607) -->
-    <skip />
+    <string name="account_folder_list_summary_inbox" msgid="5790553737870057607">"Bandeja de entrada combinada"</string>
     <string name="account_folder_list_summary_unread" msgid="1200755158196002928">"No leídos"</string>
-    <!-- no translation found for account_folder_list_summary_starred (3134312269246375723) -->
-    <skip />
+    <string name="account_folder_list_summary_starred" msgid="3134312269246375723">"Destacados"</string>
     <string name="account_folder_list_summary_drafts" msgid="5514845993247300437">"Borradores"</string>
     <string name="account_folder_list_summary_outbox" msgid="3059836696049399377">"Enviados"</string>
     <string name="mailbox_list_title" msgid="8299608543467211089">"Buzón de correo"</string>
@@ -126,7 +109,7 @@
     <string name="message_view_attachment_download_action" msgid="7552530274014544406">"Guardar"</string>
     <string name="message_view_status_attachment_saved" msgid="2802843795251453632">"El archivo adjunto se ha guardado en una tarjeta SD como <xliff:g id="FILENAME">%s</xliff:g>."</string>
     <string name="message_view_status_attachment_not_saved" msgid="5039599647697750874">"No es posible guardar el archivo adjunto en la tarjeta SD."</string>
-    <string name="message_view_show_pictures_instructions" msgid="1156525837417031085">"Selecciona \"Mostrar imágenes\" para visualizar las imágenes incrustadas."</string>
+    <string name="message_view_show_pictures_instructions" msgid="1156525837417031085">"Selecciona \"Mostrar imágenes\" para visualizar las imágenes insertadas."</string>
     <string name="message_view_show_pictures_action" msgid="5059936981743072545">"Mostrar imágenes"</string>
     <string name="message_view_fetching_attachment_toast" msgid="8812363375155391184">"Obteniendo archivo adjunto"</string>
     <string name="message_view_fetching_attachment_progress" msgid="8238550182655758164">"Extrayendo archivo adjunto <xliff:g id="FILENAME">%s</xliff:g>"</string>
@@ -137,10 +120,8 @@
     <string name="add_contact_dlg_message_fmt" msgid="4470846346726847478">"Añadir \"<xliff:g id="EMAIL">%s</xliff:g>\" a los contactos"</string>
     <string name="message_view_display_attachment_toast" msgid="6096315816776330821">"No se puede mostrar el archivo adjunto."</string>
     <string name="account_setup_basics_title" msgid="3969856368228940980">"Configurar correo electrónico"</string>
-    <!-- no translation found for accounts_welcome (5901437782383439370) -->
-    <skip />
-    <!-- no translation found for accounts_welcome_exchange (4414121583987233733) -->
-    <skip />
+    <string name="accounts_welcome" msgid="5901437782383439370">"Puedes configurar el correo electrónico para la mayoría de las cuentas en pocos pasos."</string>
+    <string name="accounts_welcome_exchange" msgid="4414121583987233733">"Puedes configurar una cuenta de Exchange en pocos pasos."</string>
     <!-- no translation found for account_setup_basics_instructions (3126077748322815504) -->
     <skip />
     <string name="account_setup_basics_email_hint" msgid="7414269319207261120">"Dirección de correo electrónico"</string>
@@ -148,16 +129,14 @@
     <string name="account_setup_basics_default_label" msgid="5924790142029806711">"Enviar correo electrónico desde esta cuenta de forma predeterminada"</string>
     <string name="account_setup_basics_manual_setup_action" msgid="8053852205391155912">"Configuración manual"</string>
     <string name="account_setup_username_password_toast" msgid="4441448542557889481">"Introduce una dirección de correo electrónico y una contraseña válidas."</string>
-    <!-- no translation found for account_duplicate_dlg_title (3176749833792312641) -->
-    <skip />
-    <!-- no translation found for account_duplicate_dlg_message_fmt (1920726613701479851) -->
-    <skip />
+    <string name="account_duplicate_dlg_title" msgid="3176749833792312641">"Cuenta duplicada"</string>
+    <string name="account_duplicate_dlg_message_fmt" msgid="1920726613701479851">"Estas claves de acceso ya se utilizan para la cuenta \"<xliff:g id="DUPLICATE">%s</xliff:g>\"."</string>
     <string name="account_setup_check_settings_retr_info_msg" msgid="4121970450267725664">"Recuperando la información de la cuenta..."</string>
     <string name="account_setup_check_settings_check_incoming_msg" msgid="5356212700221438863">"Comprobando la configuración del servidor de entrada..."</string>
     <string name="account_setup_check_settings_check_outgoing_msg" msgid="4033015234096725343">"Comprobando la configuración del servidor de salida..."</string>
     <string name="account_setup_check_settings_canceling_msg" msgid="5077315503721883906">"Cancelando..."</string>
     <string name="account_setup_names_title" msgid="8875040521875381849">"Configurar correo electrónico"</string>
-    <string name="account_setup_names_instructions" msgid="2880279273965835007">"Tu cuenta ya está configurada y el correo electrónico está por llegar."</string>
+    <string name="account_setup_names_instructions" msgid="2880279273965835007">"Tu cuenta ya está configurada y en breve verás tu correo."</string>
     <string name="account_setup_names_account_name_label" msgid="8033895024273259196">"Asignar un nombre a esta cuenta (opcional)"</string>
     <string name="account_setup_names_user_name_label" msgid="8967410178488604770">"Tu nombre (aparece en los mensajes salientes)"</string>
     <string name="account_setup_account_type_title" msgid="6645576356752495504">"Añadir una cuenta de correo electrónico nueva"</string>
@@ -170,17 +149,13 @@
     <string name="account_setup_incoming_port_label" msgid="8214738923690447796">"Puerto"</string>
     <string name="account_setup_incoming_security_label" msgid="2110260791086007424">"Tipo de seguridad"</string>
     <string name="account_setup_incoming_security_none_label" msgid="8300169413118264895">"Ninguna"</string>
-    <!-- no translation found for account_setup_incoming_security_ssl_trust_certificates_label (3581382268191377346) -->
-    <skip />
-    <!-- no translation found for account_setup_incoming_security_ssl_label (8886698397743061682) -->
-    <skip />
-    <!-- no translation found for account_setup_incoming_security_tls_trust_certificates_label (1089227022489257055) -->
-    <skip />
-    <!-- no translation found for account_setup_incoming_security_tls_label (8638006172590036487) -->
-    <skip />
+    <string name="account_setup_incoming_security_ssl_trust_certificates_label" msgid="3581382268191377346">"SSL (aceptar todos los certificados)"</string>
+    <string name="account_setup_incoming_security_ssl_label" msgid="8886698397743061682">"SSL"</string>
+    <string name="account_setup_incoming_security_tls_trust_certificates_label" msgid="1089227022489257055">"TLS (aceptar todos los certificados)"</string>
+    <string name="account_setup_incoming_security_tls_label" msgid="8638006172590036487">"TLS"</string>
     <string name="account_setup_incoming_delete_policy_label" msgid="9213590134693857912">"Suprimir correo electrónico del 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">"Cuando suprimo algún mensaje de \"Recibidos\""</string>
+    <string name="account_setup_incoming_delete_policy_delete_label" msgid="222216840911785631">"Cuando suprimo algún mensaje de \"Bandeja de entrada\""</string>
     <string name="account_setup_incoming_imap_path_prefix_label" msgid="401167247072926810">"Prefijo de ruta IMAP"</string>
     <string name="account_setup_incoming_imap_path_prefix_hint" msgid="9190845919067906033">"Opcional"</string>
     <string name="account_setup_outgoing_title" msgid="7437215562885986394">"Configuración del servidor de salida"</string>
@@ -190,15 +165,15 @@
     <string name="account_setup_outgoing_require_login_label" msgid="6371514297854287948">"Acceso obligatorio"</string>
     <string name="account_setup_outgoing_username_label" msgid="3309680794731596981">"Nombre de usuario"</string>
     <string name="account_setup_outgoing_password_label" msgid="227844585493317550">"Contraseña"</string>
-    <string name="account_setup_exchange_title" msgid="247933841122558059">"Configuración de servidor de Exchange"</string>
-    <string name="account_setup_exchange_server_label" msgid="5390359659749339317">"Servidor de Exchange"</string>
-    <!-- no translation found for account_setup_exchange_username_label (6517176180828983060) -->
+    <!-- no translation found for account_setup_exchange_title (2492853474738063453) -->
     <skip />
+    <!-- no translation found for account_setup_exchange_server_label (795137797983360826) -->
+    <skip />
+    <string name="account_setup_exchange_username_label" msgid="6517176180828983060">"Dominio\\nombre de usuario"</string>
     <string name="account_setup_exchange_domain_label" msgid="3584668050727667045">"Dominio"</string>
     <string name="account_setup_exchange_domain_hint" msgid="350372033916025287">"Introducir dominio aquí"</string>
     <string name="account_setup_exchange_ssl_label" msgid="6704105469083211236">"Utilizar conexión segura (SSL)"</string>
-    <!-- no translation found for account_setup_exchange_trust_certificates_label (6232880757633882678) -->
-    <skip />
+    <string name="account_setup_exchange_trust_certificates_label" msgid="6232880757633882678">"Aceptar todos los certificados SSL"</string>
     <string name="account_setup_options_title" msgid="8995162193118880993">"Opciones de cuenta"</string>
     <string name="account_setup_options_mail_check_frequency_label" msgid="4598023962234986194">"Frecuencia de comprobación"</string>
     <string name="account_setup_options_mail_check_frequency_never" msgid="287951859480505416">"Nunca"</string>
@@ -229,13 +204,13 @@
     <string name="account_setup_failed_auth_required" msgid="1676242821459638150">"El servidor no admite los métodos de autenticación."</string>
     <string name="account_setup_failed_security" msgid="6142264248671379943">"No se puede abrir la conexión con el servidor debido a un error de seguridad."</string>
     <string name="account_setup_failed_ioerror" msgid="7391458717708933095">"No se puede abrir la conexión con el servidor."</string>
+    <string name="account_setup_failed_security_policies_required" msgid="3567420384516656976">"Este servidor Exchange ActiveSync necesita funciones de seguridad que no son compatibles con el teléfono."</string>
     <string name="account_setup_failed_dlg_edit_details_action" msgid="5355993309841479360">"Editar detalles"</string>
     <string name="account_settings_title_fmt" msgid="1702058877284382340">"Configuración general"</string>
     <string name="account_settings_default_label" msgid="3575963379680943640">"Cuenta predeterminada"</string>
     <string name="account_settings_default_summary" msgid="1531901438624688482">"Enviar correo electrónico desde esta cuenta de forma predeterminada"</string>
     <string name="account_settings_notify_label" msgid="1630001017303007974">"Notificaciones de correo"</string>
-    <!-- no translation found for account_settings_exchange_summary (8498451479029626317) -->
-    <skip />
+    <string name="account_settings_exchange_summary" msgid="8498451479029626317">"Frecuencia de sincronización, notificaciones, etc."</string>
     <string name="account_settings_notify_summary" msgid="6609224590300639887">"Notificar en la barra de estado cuando llegue un mensaje"</string>
     <string name="account_settings_mail_check_frequency_label" msgid="2067835530563849675">"Frecuencia de comprobación del correo"</string>
     <string name="account_settings_incoming_label" msgid="7858928031806297542">"Configuración entrante"</string>
@@ -244,10 +219,8 @@
     <string name="account_settings_description_label" msgid="8894815221204511715">"Nombre de cuenta"</string>
     <string name="account_settings_name_label" msgid="8186406122590008449">"Tu nombre"</string>
     <string name="account_settings_notifications" msgid="1042620094281375043">"Configuración de la notificación"</string>
-    <!-- no translation found for account_settings_sync_contacts_enable (1369272986009573218) -->
-    <skip />
-    <!-- no translation found for account_settings_sync_contacts_summary (8901452720940015928) -->
-    <skip />
+    <string name="account_settings_sync_contacts_enable" msgid="1369272986009573218">"Sincronizar contactos"</string>
+    <string name="account_settings_sync_contacts_summary" msgid="8901452720940015928">"Sincronizar también contactos de esta cuenta"</string>
     <string name="account_settings_vibrate_enable" msgid="8045133290388856478">"Vibrar"</string>
     <string name="account_settings_vibrate_summary" msgid="3690631050585589365">"Vibrar también cuando llegue un mensaje"</string>
     <string name="account_settings_ringtone" msgid="7922187231467500404">"Seleccionar tono de llamada"</string>
@@ -258,7 +231,6 @@
     <string name="provider_note_yahoo_uk" msgid="2055976404478603298">"Antes de configurar esta cuenta de correo electrónico, visita el sitio web de Yahoo! y habilita el acceso al correo electrónico POP3 para esta cuenta."</string>
     <string name="provider_note_live" msgid="3584841823811425060">"Sólo algunas cuentas \"Plus\" incluyen el acceso POP, que permite que este programa se conecte. Si no puedes acceder con la dirección de correo electrónico y la contraseña adecuadas, es posible que no dispongas de una cuenta \"Plus\" de pago. Usa el navegador web para acceder a estas cuentas de correo."</string>
     <string name="provider_note_t_online" msgid="1973701903400232774">"Antes de configurar esta cuenta de correo electrónico, visita el sitio web de T-Online y crea una contraseña para el acceso al correo electrónico POP3."</string>
-    <!-- no translation found for exchange_name (1190783774800310346) -->
-    <skip />
+    <string name="exchange_name" msgid="1190783774800310346">"Cuenta de trabajo"</string>
     <string name="system_account_create_failed" msgid="4917162302393971752">"El administrador de cuentas no puede crear la cuenta. Inténtalo de nuevo."</string>
 </resources>
diff --git a/res/values-fr/strings.xml b/res/values-fr/strings.xml
index 10ca152..8ad33fd 100644
--- a/res/values-fr/strings.xml
+++ b/res/values-fr/strings.xml
@@ -15,13 +15,10 @@
 -->
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <!-- no translation found for read_attachment_label (1162255191991555285) -->
-    <skip />
+    <string name="read_attachment_label" msgid="1162255191991555285">"Lire les pièces jointes"</string>
     <string name="read_attachment_desc" msgid="7594746717616308643">"Permet à cette application de lire les pièces jointes aux e-mails."</string>
-    <!-- no translation found for permission_access_provider_label (4274353114641168675) -->
-    <skip />
-    <!-- no translation found for permission_access_provider_desc (1513898266889541617) -->
-    <skip />
+    <string name="permission_access_provider_label" msgid="4274353114641168675">"Accéder aux données du client de messagerie"</string>
+    <string name="permission_access_provider_desc" msgid="1513898266889541617">"Autorise l\'application à accéder à la base de données de votre messagerie électronique, y compris aux messages reçus et envoyés, aux noms d\'utilisateur et aux mots de passe."</string>
     <string name="app_name" msgid="5815426892327290362">"E-mail"</string>
     <string name="accounts_title" msgid="6622149231904649210">"E-mail"</string>
     <string name="compose_title" msgid="427986915662706899">"Nouveau message"</string>
@@ -37,20 +34,15 @@
     <string name="done_action" msgid="7497990549515580249">"OK"</string>
     <string name="discard_action" msgid="6532206074859505968">"Supprimer"</string>
     <string name="save_draft_action" msgid="812855865552028622">"Enregistrer"</string>
-    <string name="read_unread_action" msgid="4721446664849165077">"Lire/Ne pas lire"</string>
-    <!-- no translation found for read_action (4701484794504781686) -->
-    <skip />
-    <!-- no translation found for unread_action (6280399049357552826) -->
-    <skip />
+    <string name="read_unread_action" msgid="4721446664849165077">"Lus/non lus"</string>
+    <string name="read_action" msgid="4701484794504781686">"Marquer comme lu"</string>
+    <string name="unread_action" msgid="6280399049357552826">"Marquer comme non lu"</string>
     <string name="favorite_action" msgid="2911296685862420689">"Favori"</string>
-    <!-- no translation found for set_star_action (4660317166196258160) -->
-    <skip />
-    <!-- no translation found for remove_star_action (6689770999647007163) -->
-    <skip />
+    <string name="set_star_action" msgid="4660317166196258160">"Activer le suivi"</string>
+    <string name="remove_star_action" msgid="6689770999647007163">"Désactiver le suivi"</string>
     <string name="refresh_action" msgid="5951383001436708175">"Actualiser"</string>
     <string name="add_account_action" msgid="8835736309476033727">"Ajouter un compte"</string>
-    <!-- no translation found for deselect_all_action (253663239459688238) -->
-    <skip />
+    <string name="deselect_all_action" msgid="253663239459688238">"Tout désélectionner"</string>
     <string name="compose_action" msgid="4045702519637388045">"Nouveau message"</string>
     <string name="search_action" msgid="6325101454876682308">"Rechercher"</string>
     <string name="open_action" msgid="936766723989190816">"Ouvrir"</string>
@@ -63,7 +55,7 @@
     <string name="add_cc_bcc_action" msgid="5569074812077509737">"Ajouter Cc/CCi"</string>
     <string name="add_attachment_action" msgid="2696013743130573897">"Ajouter une pièce jointe"</string>
     <string name="dump_settings_action" msgid="4478192525236169829">"Paramètres d\'image mémoire"</string>
-    <string name="choose_attachment_dialog_title" msgid="81937507117528954">"Choisir·une·pièce·jointe"</string>
+    <string name="choose_attachment_dialog_title" msgid="81937507117528954">"Choisir une pièce jointe"</string>
     <string name="accounts_context_menu_title" msgid="1053701760934475027">"Options de compte"</string>
     <string name="status_loading_more" msgid="1580386959044617884">"Chargement des messages..."</string>
     <string name="status_sending_messages" msgid="3971880826111264523">"Envoi des messages en cours"</string>
@@ -71,8 +63,7 @@
     <string name="status_sending_messages_failed" msgid="7975009558738692407">"Essayez de renvoyer les messages."</string>
     <string name="status_loading_more_failed" msgid="1629172047185323">"Essayer de charger plus de messages"</string>
     <string name="notification_new_title" msgid="2200257910380529139">"Nouvel e-mail"</string>
-    <!-- no translation found for error_loading_message_body (2265140604109272914) -->
-    <skip />
+    <string name="error_loading_message_body" msgid="2265140604109272914">"Une erreur inattendue s\'est produite lors du chargement du message. Il se peut que ce dernier soit trop volumineux."</string>
   <plurals name="notification_new_one_account_fmt">
     <item quantity="one" msgid="3422945912787702191">"<xliff:g id="UNREAD_MESSAGE_COUNT">%d</xliff:g> non lu (<xliff:g id="ACCOUNT">%s</xliff:g>)"</item>
     <item quantity="few" msgid="6543078667692990869">"<xliff:g id="UNREAD_MESSAGE_COUNT">%d</xliff:g> non lus (<xliff:g id="ACCOUNT">%s</xliff:g>)"</item>
@@ -82,25 +73,17 @@
     <item quantity="few" msgid="1991747245324120305">"dans <xliff:g id="NUMBER_ACCOUNTS">%d</xliff:g> comptes"</item>
     <item quantity="other" msgid="2723797835410343458">"dans <xliff:g id="NUMBER_ACCOUNTS">%d</xliff:g> comptes"</item>
   </plurals>
-    <!-- no translation found for mailbox_name_display_inbox (3542327124749861736) -->
-    <skip />
-    <!-- no translation found for mailbox_name_display_outbox (2826214174661417662) -->
-    <skip />
-    <!-- no translation found for mailbox_name_display_drafts (4868718300700514319) -->
-    <skip />
-    <!-- no translation found for mailbox_name_display_trash (9139069064580630647) -->
-    <skip />
-    <!-- no translation found for mailbox_name_display_sent (3426058998191869523) -->
-    <skip />
-    <!-- no translation found for mailbox_name_display_junk (9046762505977999288) -->
-    <skip />
+    <string name="mailbox_name_display_inbox" msgid="3542327124749861736">"Boîte de réception"</string>
+    <string name="mailbox_name_display_outbox" msgid="2826214174661417662">"Boîte d\'envoi"</string>
+    <string name="mailbox_name_display_drafts" msgid="4868718300700514319">"Brouillons"</string>
+    <string name="mailbox_name_display_trash" msgid="9139069064580630647">"Corbeille"</string>
+    <string name="mailbox_name_display_sent" msgid="3426058998191869523">"Éléments envoyés"</string>
+    <string name="mailbox_name_display_junk" msgid="9046762505977999288">"Spam"</string>
     <string name="debug_version_fmt" msgid="6160213145745376955">"Version : <xliff:g id="VERSION">%s</xliff:g>"</string>
     <string name="account_folder_list_separator_accounts" msgid="7568820182396669244">"Comptes"</string>
-    <!-- no translation found for account_folder_list_summary_inbox (5790553737870057607) -->
-    <skip />
+    <string name="account_folder_list_summary_inbox" msgid="5790553737870057607">"Boîte de réception combinée"</string>
     <string name="account_folder_list_summary_unread" msgid="1200755158196002928">"Non lus"</string>
-    <!-- no translation found for account_folder_list_summary_starred (3134312269246375723) -->
-    <skip />
+    <string name="account_folder_list_summary_starred" msgid="3134312269246375723">"Suivis"</string>
     <string name="account_folder_list_summary_drafts" msgid="5514845993247300437">"Brouillons"</string>
     <string name="account_folder_list_summary_outbox" msgid="3059836696049399377">"Boîte d\'envoi"</string>
     <string name="mailbox_list_title" msgid="8299608543467211089">"Boîtes aux lettres"</string>
@@ -136,11 +119,9 @@
     <string name="add_contact_dlg_title" msgid="7424641029188006580">"Ajouter un contact"</string>
     <string name="add_contact_dlg_message_fmt" msgid="4470846346726847478">"Ajouter \"<xliff:g id="EMAIL">%s</xliff:g>\" aux contacts"</string>
     <string name="message_view_display_attachment_toast" msgid="6096315816776330821">"Impossible d\'afficher cette pièce jointe."</string>
-    <string name="account_setup_basics_title" msgid="3969856368228940980">"Configurer la messagerie électronique"</string>
-    <!-- no translation found for accounts_welcome (5901437782383439370) -->
-    <skip />
-    <!-- no translation found for accounts_welcome_exchange (4414121583987233733) -->
-    <skip />
+    <string name="account_setup_basics_title" msgid="3969856368228940980">"Configuration de votre messagerie"</string>
+    <string name="accounts_welcome" msgid="5901437782383439370">"Configurez votre messagerie en quelques étapes simples. Compatible avec la plupart des comptes."</string>
+    <string name="accounts_welcome_exchange" msgid="4414121583987233733">"Configurez un compte Exchange en un clin d\'œil."</string>
     <!-- no translation found for account_setup_basics_instructions (3126077748322815504) -->
     <skip />
     <string name="account_setup_basics_email_hint" msgid="7414269319207261120">"Adresse e-mail"</string>
@@ -148,17 +129,15 @@
     <string name="account_setup_basics_default_label" msgid="5924790142029806711">"Par défaut, envoyer les e-mails avec ce compte"</string>
     <string name="account_setup_basics_manual_setup_action" msgid="8053852205391155912">"Configuration manuelle"</string>
     <string name="account_setup_username_password_toast" msgid="4441448542557889481">"Veuillez saisir une adresse e-mail et un mot de passe corrects."</string>
-    <!-- no translation found for account_duplicate_dlg_title (3176749833792312641) -->
-    <skip />
-    <!-- no translation found for account_duplicate_dlg_message_fmt (1920726613701479851) -->
-    <skip />
+    <string name="account_duplicate_dlg_title" msgid="3176749833792312641">"Dupliquer le compte"</string>
+    <string name="account_duplicate_dlg_message_fmt" msgid="1920726613701479851">"Ces informations de connexion sont déjà utilisées pour le compte \"<xliff:g id="DUPLICATE">%s</xliff:g>\"."</string>
     <string name="account_setup_check_settings_retr_info_msg" msgid="4121970450267725664">"Récupération des informations sur le compte…"</string>
     <string name="account_setup_check_settings_check_incoming_msg" msgid="5356212700221438863">"Vérification des paramètres de serveur entrant…"</string>
     <string name="account_setup_check_settings_check_outgoing_msg" msgid="4033015234096725343">"Vérification des paramètres de serveur sortant…"</string>
     <string name="account_setup_check_settings_canceling_msg" msgid="5077315503721883906">"Annulation..."</string>
-    <string name="account_setup_names_title" msgid="8875040521875381849">"Configurer la messagerie électronique"</string>
-    <string name="account_setup_names_instructions" msgid="2880279273965835007">"Votre compte est configuré et votre messagerie est active !"</string>
-    <string name="account_setup_names_account_name_label" msgid="8033895024273259196">"Donner un nom à ce compte (facultatif)"</string>
+    <string name="account_setup_names_title" msgid="8875040521875381849">"Configuration de votre messagerie"</string>
+    <string name="account_setup_names_instructions" msgid="2880279273965835007">"Votre compte est configuré et votre messagerie a été activée !"</string>
+    <string name="account_setup_names_account_name_label" msgid="8033895024273259196">"Nom du compte (facultatif)"</string>
     <string name="account_setup_names_user_name_label" msgid="8967410178488604770">"Votre nom (affiché sur les messages sortants)"</string>
     <string name="account_setup_account_type_title" msgid="6645576356752495504">"Ajouter un compte de messagerie"</string>
     <string name="account_setup_account_type_instructions" msgid="114515540798408760">"De quel type de compte s\'agit-il ?"</string>
@@ -170,14 +149,10 @@
     <string name="account_setup_incoming_port_label" msgid="8214738923690447796">"Port"</string>
     <string name="account_setup_incoming_security_label" msgid="2110260791086007424">"Type de sécurité"</string>
     <string name="account_setup_incoming_security_none_label" msgid="8300169413118264895">"Aucun protocole"</string>
-    <!-- no translation found for account_setup_incoming_security_ssl_trust_certificates_label (3581382268191377346) -->
-    <skip />
-    <!-- no translation found for account_setup_incoming_security_ssl_label (8886698397743061682) -->
-    <skip />
-    <!-- no translation found for account_setup_incoming_security_tls_trust_certificates_label (1089227022489257055) -->
-    <skip />
-    <!-- no translation found for account_setup_incoming_security_tls_label (8638006172590036487) -->
-    <skip />
+    <string name="account_setup_incoming_security_ssl_trust_certificates_label" msgid="3581382268191377346">"SSL (accepter tous les certificats)"</string>
+    <string name="account_setup_incoming_security_ssl_label" msgid="8886698397743061682">"SSL"</string>
+    <string name="account_setup_incoming_security_tls_trust_certificates_label" msgid="1089227022489257055">"TLS (accepter tous les certificats)"</string>
+    <string name="account_setup_incoming_security_tls_label" msgid="8638006172590036487">"TLS"</string>
     <string name="account_setup_incoming_delete_policy_label" msgid="9213590134693857912">"Supprimer les e-mails du serveur"</string>
     <string name="account_setup_incoming_delete_policy_never_label" msgid="3222897501875871041">"Jamais"</string>
     <string name="account_setup_incoming_delete_policy_delete_label" msgid="222216840911785631">"Si messages suppr. de boîte de récep."</string>
@@ -190,15 +165,15 @@
     <string name="account_setup_outgoing_require_login_label" msgid="6371514297854287948">"Connexion obligatoire."</string>
     <string name="account_setup_outgoing_username_label" msgid="3309680794731596981">"Nom d\'utilisateur"</string>
     <string name="account_setup_outgoing_password_label" msgid="227844585493317550">"Mot de passe"</string>
-    <string name="account_setup_exchange_title" msgid="247933841122558059">"Paramètres Exchange Server"</string>
-    <string name="account_setup_exchange_server_label" msgid="5390359659749339317">"Exchange Server"</string>
-    <!-- no translation found for account_setup_exchange_username_label (6517176180828983060) -->
+    <!-- no translation found for account_setup_exchange_title (2492853474738063453) -->
     <skip />
+    <!-- no translation found for account_setup_exchange_server_label (795137797983360826) -->
+    <skip />
+    <string name="account_setup_exchange_username_label" msgid="6517176180828983060">"Domaine\\Nom d\'utilisateur"</string>
     <string name="account_setup_exchange_domain_label" msgid="3584668050727667045">"Domaine"</string>
     <string name="account_setup_exchange_domain_hint" msgid="350372033916025287">"Saisir le nom de domaine ici"</string>
     <string name="account_setup_exchange_ssl_label" msgid="6704105469083211236">"Utiliser une connexion sécurisée (SSL)"</string>
-    <!-- no translation found for account_setup_exchange_trust_certificates_label (6232880757633882678) -->
-    <skip />
+    <string name="account_setup_exchange_trust_certificates_label" msgid="6232880757633882678">"Accepter tous les certificats SSL"</string>
     <string name="account_setup_options_title" msgid="8995162193118880993">"Options de compte"</string>
     <string name="account_setup_options_mail_check_frequency_label" msgid="4598023962234986194">"Vérification des e-mails"</string>
     <string name="account_setup_options_mail_check_frequency_never" msgid="287951859480505416">"Jamais"</string>
@@ -229,14 +204,14 @@
     <string name="account_setup_failed_auth_required" msgid="1676242821459638150">"Les méthodes d\'authentification ne sont pas prises en charge par le serveur."</string>
     <string name="account_setup_failed_security" msgid="6142264248671379943">"Impossible d\'établir une connexion avec le serveur en raison d\'une erreur de sécurité."</string>
     <string name="account_setup_failed_ioerror" msgid="7391458717708933095">"Impossible d\'établir une connexion avec le serveur."</string>
+    <string name="account_setup_failed_security_policies_required" msgid="3567420384516656976">"Ce serveur Exchange ActiveSync nécessite des fonctionnalités de sécurité que votre téléphone ne prend pas en charge."</string>
     <string name="account_setup_failed_dlg_edit_details_action" msgid="5355993309841479360">"Modifier les infos"</string>
     <string name="account_settings_title_fmt" msgid="1702058877284382340">"Paramètres généraux"</string>
     <string name="account_settings_default_label" msgid="3575963379680943640">"Compte par défaut"</string>
     <string name="account_settings_default_summary" msgid="1531901438624688482">"Par défaut, envoyer les e-mails avec ce compte"</string>
-    <string name="account_settings_notify_label" msgid="1630001017303007974">"Notifications d\'e-mails"</string>
-    <!-- no translation found for account_settings_exchange_summary (8498451479029626317) -->
-    <skip />
-    <string name="account_settings_notify_summary" msgid="6609224590300639887">"Afficher une notification dans la barre d\'état lors de la réception d\'un e-mail"</string>
+    <string name="account_settings_notify_label" msgid="1630001017303007974">"Notifications"</string>
+    <string name="account_settings_exchange_summary" msgid="8498451479029626317">"Fréquence de synchronisation, notifications, etc."</string>
+    <string name="account_settings_notify_summary" msgid="6609224590300639887">"Afficher notification dans barre d\'état lors de la réception d\'un e-mail"</string>
     <string name="account_settings_mail_check_frequency_label" msgid="2067835530563849675">"Fréquence de vérification"</string>
     <string name="account_settings_incoming_label" msgid="7858928031806297542">"Paramètres de réception"</string>
     <string name="account_settings_outgoing_label" msgid="4464829249980026745">"Paramètres d\'envoi"</string>
@@ -244,13 +219,11 @@
     <string name="account_settings_description_label" msgid="8894815221204511715">"Nom du compte"</string>
     <string name="account_settings_name_label" msgid="8186406122590008449">"Votre nom"</string>
     <string name="account_settings_notifications" msgid="1042620094281375043">"Paramètres de notification"</string>
-    <!-- no translation found for account_settings_sync_contacts_enable (1369272986009573218) -->
-    <skip />
-    <!-- no translation found for account_settings_sync_contacts_summary (8901452720940015928) -->
-    <skip />
+    <string name="account_settings_sync_contacts_enable" msgid="1369272986009573218">"Synchroniser les contacts"</string>
+    <string name="account_settings_sync_contacts_summary" msgid="8901452720940015928">"Synchroniser également les contacts issus de ce compte"</string>
     <string name="account_settings_vibrate_enable" msgid="8045133290388856478">"Vibreur"</string>
     <string name="account_settings_vibrate_summary" msgid="3690631050585589365">"Vibrer à la réception d\'un e-mail"</string>
-    <string name="account_settings_ringtone" msgid="7922187231467500404">"Sélectionner la sonnerie"</string>
+    <string name="account_settings_ringtone" msgid="7922187231467500404">"Sonnerie"</string>
     <string name="account_settings_servers" msgid="4925493817981624242">"Paramètres du serveur"</string>
     <string name="account_delete_dlg_title" msgid="6806087520856396608">"Supprimer le compte"</string>
     <string name="account_delete_dlg_instructions_fmt" msgid="8236846322040271280">"Le compte \"<xliff:g id="ACCOUNT">%s</xliff:g>\" va être supprimé de votre messagerie."</string>
@@ -258,7 +231,6 @@
     <string name="provider_note_yahoo_uk" msgid="2055976404478603298">"Avant de configurer ce compte de messagerie, veuillez consulter le site de Yahoo! et activer l\'accès POP3 pour ce compte."</string>
     <string name="provider_note_live" msgid="3584841823811425060">"Seuls certains comptes \"Plus\" comportent un accès POP permettant à ce programme de se connecter. Si vous ne parvenez pas à vous connecter avec l\'adresse e-mail et le mot de passe corrects, vous ne disposez peut-être pas d\'un compte payant \"Plus\". Pour accéder à ces comptes de messagerie, lancez votre navigateur Web."</string>
     <string name="provider_note_t_online" msgid="1973701903400232774">"Avant de configurer ce compte de messagerie, veuillez consulter le site de T-Online et créer un mot de passe de messagerie POP3."</string>
-    <!-- no translation found for exchange_name (1190783774800310346) -->
-    <skip />
+    <string name="exchange_name" msgid="1190783774800310346">"Entreprise"</string>
     <string name="system_account_create_failed" msgid="4917162302393971752">"Le gestionnaire de comptes n\'a pas pu créer le compte ; veuillez réessayer."</string>
 </resources>
diff --git a/res/values-it/strings.xml b/res/values-it/strings.xml
index 9d49175..6ca1aee 100644
--- a/res/values-it/strings.xml
+++ b/res/values-it/strings.xml
@@ -15,13 +15,10 @@
 -->
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <!-- no translation found for read_attachment_label (1162255191991555285) -->
-    <skip />
+    <string name="read_attachment_label" msgid="1162255191991555285">"Lettura allegati email"</string>
     <string name="read_attachment_desc" msgid="7594746717616308643">"Consente all\'applicazione di leggere i tuoi allegati email."</string>
-    <!-- no translation found for permission_access_provider_label (4274353114641168675) -->
-    <skip />
-    <!-- no translation found for permission_access_provider_desc (1513898266889541617) -->
-    <skip />
+    <string name="permission_access_provider_label" msgid="4274353114641168675">"Accesso ai dati del provider di posta"</string>
+    <string name="permission_access_provider_desc" msgid="1513898266889541617">"Consente a questa applicazione di accedere al database della tua posta, inclusi i messaggi ricevuti e inviati, i nomi utente e le password."</string>
     <string name="app_name" msgid="5815426892327290362">"Email"</string>
     <string name="accounts_title" msgid="6622149231904649210">"Email"</string>
     <string name="compose_title" msgid="427986915662706899">"Scrivi"</string>
@@ -38,19 +35,14 @@
     <string name="discard_action" msgid="6532206074859505968">"Elimina"</string>
     <string name="save_draft_action" msgid="812855865552028622">"Salva come bozza"</string>
     <string name="read_unread_action" msgid="4721446664849165077">"Letti/Da leggere"</string>
-    <!-- no translation found for read_action (4701484794504781686) -->
-    <skip />
-    <!-- no translation found for unread_action (6280399049357552826) -->
-    <skip />
+    <string name="read_action" msgid="4701484794504781686">"Segna come già letto"</string>
+    <string name="unread_action" msgid="6280399049357552826">"Segna come da leggere"</string>
     <string name="favorite_action" msgid="2911296685862420689">"Preferito"</string>
-    <!-- no translation found for set_star_action (4660317166196258160) -->
-    <skip />
-    <!-- no translation found for remove_star_action (6689770999647007163) -->
-    <skip />
+    <string name="set_star_action" msgid="4660317166196258160">"Aggiungi a Speciali"</string>
+    <string name="remove_star_action" msgid="6689770999647007163">"Rimuovi da Speciali"</string>
     <string name="refresh_action" msgid="5951383001436708175">"Aggiorna"</string>
     <string name="add_account_action" msgid="8835736309476033727">"Aggiungi account"</string>
-    <!-- no translation found for deselect_all_action (253663239459688238) -->
-    <skip />
+    <string name="deselect_all_action" msgid="253663239459688238">"Deseleziona tutto"</string>
     <string name="compose_action" msgid="4045702519637388045">"Scrivi"</string>
     <string name="search_action" msgid="6325101454876682308">"Cerca"</string>
     <string name="open_action" msgid="936766723989190816">"Apri"</string>
@@ -71,8 +63,7 @@
     <string name="status_sending_messages_failed" msgid="7975009558738692407">"Riprova a inviare i messaggi"</string>
     <string name="status_loading_more_failed" msgid="1629172047185323">"Prova nuovamente a caricare altri messaggi"</string>
     <string name="notification_new_title" msgid="2200257910380529139">"Nuova email"</string>
-    <!-- no translation found for error_loading_message_body (2265140604109272914) -->
-    <skip />
+    <string name="error_loading_message_body" msgid="2265140604109272914">"Errore inaspettato durante il caricamento del testo del messaggio. La dimensione del messaggio potrebbe essere troppo grande per la visualizzazione."</string>
   <plurals name="notification_new_one_account_fmt">
     <item quantity="one" msgid="3422945912787702191">"<xliff:g id="UNREAD_MESSAGE_COUNT">%d</xliff:g> da leggere (<xliff:g id="ACCOUNT">%s</xliff:g>)"</item>
     <item quantity="few" msgid="6543078667692990869">"<xliff:g id="UNREAD_MESSAGE_COUNT">%d</xliff:g> da leggere (<xliff:g id="ACCOUNT">%s</xliff:g>)"</item>
@@ -82,25 +73,17 @@
     <item quantity="few" msgid="1991747245324120305">"in <xliff:g id="NUMBER_ACCOUNTS">%d</xliff:g> account"</item>
     <item quantity="other" msgid="2723797835410343458">"in <xliff:g id="NUMBER_ACCOUNTS">%d</xliff:g> account"</item>
   </plurals>
-    <!-- no translation found for mailbox_name_display_inbox (3542327124749861736) -->
-    <skip />
-    <!-- no translation found for mailbox_name_display_outbox (2826214174661417662) -->
-    <skip />
-    <!-- no translation found for mailbox_name_display_drafts (4868718300700514319) -->
-    <skip />
-    <!-- no translation found for mailbox_name_display_trash (9139069064580630647) -->
-    <skip />
-    <!-- no translation found for mailbox_name_display_sent (3426058998191869523) -->
-    <skip />
-    <!-- no translation found for mailbox_name_display_junk (9046762505977999288) -->
-    <skip />
+    <string name="mailbox_name_display_inbox" msgid="3542327124749861736">"Posta in arrivo"</string>
+    <string name="mailbox_name_display_outbox" msgid="2826214174661417662">"Posta in uscita"</string>
+    <string name="mailbox_name_display_drafts" msgid="4868718300700514319">"Bozze"</string>
+    <string name="mailbox_name_display_trash" msgid="9139069064580630647">"Cestino"</string>
+    <string name="mailbox_name_display_sent" msgid="3426058998191869523">"Inviati"</string>
+    <string name="mailbox_name_display_junk" msgid="9046762505977999288">"Posta indesiderata"</string>
     <string name="debug_version_fmt" msgid="6160213145745376955">"Versione: <xliff:g id="VERSION">%s</xliff:g>"</string>
     <string name="account_folder_list_separator_accounts" msgid="7568820182396669244">"Account"</string>
-    <!-- no translation found for account_folder_list_summary_inbox (5790553737870057607) -->
-    <skip />
+    <string name="account_folder_list_summary_inbox" msgid="5790553737870057607">"Posta in arrivo combinata"</string>
     <string name="account_folder_list_summary_unread" msgid="1200755158196002928">"Da leggere"</string>
-    <!-- no translation found for account_folder_list_summary_starred (3134312269246375723) -->
-    <skip />
+    <string name="account_folder_list_summary_starred" msgid="3134312269246375723">"Speciali"</string>
     <string name="account_folder_list_summary_drafts" msgid="5514845993247300437">"Bozze"</string>
     <string name="account_folder_list_summary_outbox" msgid="3059836696049399377">"Posta in uscita"</string>
     <string name="mailbox_list_title" msgid="8299608543467211089">"Casella di posta"</string>
@@ -137,10 +120,8 @@
     <string name="add_contact_dlg_message_fmt" msgid="4470846346726847478">"Aggiungi \"<xliff:g id="EMAIL">%s</xliff:g>\" ai contatti"</string>
     <string name="message_view_display_attachment_toast" msgid="6096315816776330821">"Impossibile visualizzare questo allegato."</string>
     <string name="account_setup_basics_title" msgid="3969856368228940980">"Imposta email"</string>
-    <!-- no translation found for accounts_welcome (5901437782383439370) -->
-    <skip />
-    <!-- no translation found for accounts_welcome_exchange (4414121583987233733) -->
-    <skip />
+    <string name="accounts_welcome" msgid="5901437782383439370">"Puoi configurare la posta per la maggior parte degli account con pochi passaggi."</string>
+    <string name="accounts_welcome_exchange" msgid="4414121583987233733">"Puoi configurare un account Exchange con pochi passaggi."</string>
     <!-- no translation found for account_setup_basics_instructions (3126077748322815504) -->
     <skip />
     <string name="account_setup_basics_email_hint" msgid="7414269319207261120">"Indirizzo email"</string>
@@ -148,10 +129,8 @@
     <string name="account_setup_basics_default_label" msgid="5924790142029806711">"Invia email da questo account per impostazione predefinita."</string>
     <string name="account_setup_basics_manual_setup_action" msgid="8053852205391155912">"Configurazione manuale"</string>
     <string name="account_setup_username_password_toast" msgid="4441448542557889481">"Digita un indirizzo email e una password validi."</string>
-    <!-- no translation found for account_duplicate_dlg_title (3176749833792312641) -->
-    <skip />
-    <!-- no translation found for account_duplicate_dlg_message_fmt (1920726613701479851) -->
-    <skip />
+    <string name="account_duplicate_dlg_title" msgid="3176749833792312641">"Duplica account"</string>
+    <string name="account_duplicate_dlg_message_fmt" msgid="1920726613701479851">"Questo accesso è già in uso per l\'account \"<xliff:g id="DUPLICATE">%s</xliff:g>\"."</string>
     <string name="account_setup_check_settings_retr_info_msg" msgid="4121970450267725664">"Recupero informazioni sull\'account in corso…"</string>
     <string name="account_setup_check_settings_check_incoming_msg" msgid="5356212700221438863">"Verifica delle impostazioni del server della posta in arrivo in corso…"</string>
     <string name="account_setup_check_settings_check_outgoing_msg" msgid="4033015234096725343">"Verifica impostazioni server posta in uscita…"</string>
@@ -170,14 +149,10 @@
     <string name="account_setup_incoming_port_label" msgid="8214738923690447796">"Porta"</string>
     <string name="account_setup_incoming_security_label" msgid="2110260791086007424">"Tipo di protezione"</string>
     <string name="account_setup_incoming_security_none_label" msgid="8300169413118264895">"Nessuna"</string>
-    <!-- no translation found for account_setup_incoming_security_ssl_trust_certificates_label (3581382268191377346) -->
-    <skip />
-    <!-- no translation found for account_setup_incoming_security_ssl_label (8886698397743061682) -->
-    <skip />
-    <!-- no translation found for account_setup_incoming_security_tls_trust_certificates_label (1089227022489257055) -->
-    <skip />
-    <!-- no translation found for account_setup_incoming_security_tls_label (8638006172590036487) -->
-    <skip />
+    <string name="account_setup_incoming_security_ssl_trust_certificates_label" msgid="3581382268191377346">"SSL (Accetta tutti i certificati)"</string>
+    <string name="account_setup_incoming_security_ssl_label" msgid="8886698397743061682">"SSL"</string>
+    <string name="account_setup_incoming_security_tls_trust_certificates_label" msgid="1089227022489257055">"TLS (Accetta tutti i certificati)"</string>
+    <string name="account_setup_incoming_security_tls_label" msgid="8638006172590036487">"TLS"</string>
     <string name="account_setup_incoming_delete_policy_label" msgid="9213590134693857912">"Elimina email da server"</string>
     <string name="account_setup_incoming_delete_policy_never_label" msgid="3222897501875871041">"Mai"</string>
     <string name="account_setup_incoming_delete_policy_delete_label" msgid="222216840911785631">"Quando elimino da Posta in arrivo"</string>
@@ -190,17 +165,17 @@
     <string name="account_setup_outgoing_require_login_label" msgid="6371514297854287948">"Richiedi accesso"</string>
     <string name="account_setup_outgoing_username_label" msgid="3309680794731596981">"Nome utente"</string>
     <string name="account_setup_outgoing_password_label" msgid="227844585493317550">"Password"</string>
-    <string name="account_setup_exchange_title" msgid="247933841122558059">"Impostazioni Server Exchange"</string>
-    <string name="account_setup_exchange_server_label" msgid="5390359659749339317">"Server Exchange"</string>
-    <!-- no translation found for account_setup_exchange_username_label (6517176180828983060) -->
+    <!-- no translation found for account_setup_exchange_title (2492853474738063453) -->
     <skip />
+    <!-- no translation found for account_setup_exchange_server_label (795137797983360826) -->
+    <skip />
+    <string name="account_setup_exchange_username_label" msgid="6517176180828983060">"Dominio/nome utente"</string>
     <string name="account_setup_exchange_domain_label" msgid="3584668050727667045">"Dominio"</string>
     <string name="account_setup_exchange_domain_hint" msgid="350372033916025287">"Inserisci dominio qui"</string>
     <string name="account_setup_exchange_ssl_label" msgid="6704105469083211236">"Utilizza connessione sicura (SSL)"</string>
-    <!-- no translation found for account_setup_exchange_trust_certificates_label (6232880757633882678) -->
-    <skip />
+    <string name="account_setup_exchange_trust_certificates_label" msgid="6232880757633882678">"Accetta tutti i certificati SSL"</string>
     <string name="account_setup_options_title" msgid="8995162193118880993">"Opzioni account"</string>
-    <string name="account_setup_options_mail_check_frequency_label" msgid="4598023962234986194">"Frequenza di controllo email"</string>
+    <string name="account_setup_options_mail_check_frequency_label" msgid="4598023962234986194">"Frequenza contr. email"</string>
     <string name="account_setup_options_mail_check_frequency_never" msgid="287951859480505416">"Mai"</string>
     <string name="account_setup_options_mail_check_frequency_push" msgid="5934525907736008673">"Automatico (push)"</string>
     <string name="account_setup_options_mail_check_frequency_5min" msgid="6388939895878539307">"Ogni 5 minuti"</string>
@@ -229,25 +204,23 @@
     <string name="account_setup_failed_auth_required" msgid="1676242821459638150">"I metodi di autenticazione non sono supportati dal server."</string>
     <string name="account_setup_failed_security" msgid="6142264248671379943">"Impossibile aprire la connessione al server a causa di un errore di protezione."</string>
     <string name="account_setup_failed_ioerror" msgid="7391458717708933095">"Impossibile aprire la connessione al server."</string>
+    <string name="account_setup_failed_security_policies_required" msgid="3567420384516656976">"Per questo server Exchange ActiveSync sono richieste funzionalità di protezione non supportate dal tuo telefono."</string>
     <string name="account_setup_failed_dlg_edit_details_action" msgid="5355993309841479360">"Modifica dettagli"</string>
     <string name="account_settings_title_fmt" msgid="1702058877284382340">"Impostazioni generali"</string>
     <string name="account_settings_default_label" msgid="3575963379680943640">"Account predefinito"</string>
     <string name="account_settings_default_summary" msgid="1531901438624688482">"Invia email da questo account per impostazione predefinita"</string>
     <string name="account_settings_notify_label" msgid="1630001017303007974">"Notifiche email"</string>
-    <!-- no translation found for account_settings_exchange_summary (8498451479029626317) -->
-    <skip />
+    <string name="account_settings_exchange_summary" msgid="8498451479029626317">"Frequenza sincronizzazione, notifiche e altro."</string>
     <string name="account_settings_notify_summary" msgid="6609224590300639887">"Notifica sulla barra di stato l\'arrivo di email"</string>
-    <string name="account_settings_mail_check_frequency_label" msgid="2067835530563849675">"Frequenza di controllo email"</string>
+    <string name="account_settings_mail_check_frequency_label" msgid="2067835530563849675">"Frequenza contr. email"</string>
     <string name="account_settings_incoming_label" msgid="7858928031806297542">"Impost. posta in arrivo"</string>
     <string name="account_settings_outgoing_label" msgid="4464829249980026745">"Impost. posta in uscita"</string>
     <string name="account_settings_add_account_label" msgid="63971622405360050">"Aggiungi altro account"</string>
     <string name="account_settings_description_label" msgid="8894815221204511715">"Nome account"</string>
     <string name="account_settings_name_label" msgid="8186406122590008449">"Nome"</string>
     <string name="account_settings_notifications" msgid="1042620094281375043">"Impostazioni notifica"</string>
-    <!-- no translation found for account_settings_sync_contacts_enable (1369272986009573218) -->
-    <skip />
-    <!-- no translation found for account_settings_sync_contacts_summary (8901452720940015928) -->
-    <skip />
+    <string name="account_settings_sync_contacts_enable" msgid="1369272986009573218">"Sincronizza contatti"</string>
+    <string name="account_settings_sync_contacts_summary" msgid="8901452720940015928">"Sincronizza anche contatti da questo account"</string>
     <string name="account_settings_vibrate_enable" msgid="8045133290388856478">"Vibrazione"</string>
     <string name="account_settings_vibrate_summary" msgid="3690631050585589365">"Attiva anche vibrazione all\'arrivo di email"</string>
     <string name="account_settings_ringtone" msgid="7922187231467500404">"Seleziona suoneria"</string>
@@ -258,7 +231,6 @@
     <string name="provider_note_yahoo_uk" msgid="2055976404478603298">"Prima di impostare questo account email, visita il sito web Yahoo! e attiva l\'accesso email POP3 per questo account."</string>
     <string name="provider_note_live" msgid="3584841823811425060">"Solo alcuni account \"Plus\" includono l\'accesso POP che consente la connessione del programma. Se non riesci ad accedere con l\'indirizzo email e la password corretti, potresti non disporre di un account \"Plus\" a pagamento. Avvia il browser web per avere accesso a questi account di posta."</string>
     <string name="provider_note_t_online" msgid="1973701903400232774">"Prima di impostare questo account email, visita il sito web T-Online e crea una password per l\'accesso email POP3."</string>
-    <!-- no translation found for exchange_name (1190783774800310346) -->
-    <skip />
+    <string name="exchange_name" msgid="1190783774800310346">"Aziendale"</string>
     <string name="system_account_create_failed" msgid="4917162302393971752">"Impossibile creare l\'account con AccountManager. Riprova."</string>
 </resources>
diff --git a/res/values-ja/strings.xml b/res/values-ja/strings.xml
index 2fb9233..687a448 100644
--- a/res/values-ja/strings.xml
+++ b/res/values-ja/strings.xml
@@ -15,13 +15,10 @@
 -->
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <!-- no translation found for read_attachment_label (1162255191991555285) -->
-    <skip />
+    <string name="read_attachment_label" msgid="1162255191991555285">"メール添付ファイルの読み取り"</string>
     <string name="read_attachment_desc" msgid="7594746717616308643">"Eメールの添付ファイルの読取表示をこのアプリケーションに許可します。"</string>
-    <!-- no translation found for permission_access_provider_label (4274353114641168675) -->
-    <skip />
-    <!-- no translation found for permission_access_provider_desc (1513898266889541617) -->
-    <skip />
+    <string name="permission_access_provider_label" msgid="4274353114641168675">"メールプロバイダデータへのアクセス"</string>
+    <string name="permission_access_provider_desc" msgid="1513898266889541617">"このアプリケーションにメールデータベース（受信および送信したメッセージ、ユーザー名、パスワードを含む）へのアクセスを許可します。"</string>
     <string name="app_name" msgid="5815426892327290362">"メール"</string>
     <string name="accounts_title" msgid="6622149231904649210">"メール"</string>
     <string name="compose_title" msgid="427986915662706899">"作成"</string>
@@ -38,19 +35,14 @@
     <string name="discard_action" msgid="6532206074859505968">"破棄"</string>
     <string name="save_draft_action" msgid="812855865552028622">"下書き保存"</string>
     <string name="read_unread_action" msgid="4721446664849165077">"既読/未読"</string>
-    <!-- no translation found for read_action (4701484794504781686) -->
-    <skip />
-    <!-- no translation found for unread_action (6280399049357552826) -->
-    <skip />
+    <string name="read_action" msgid="4701484794504781686">"既読にする"</string>
+    <string name="unread_action" msgid="6280399049357552826">"未読にする"</string>
     <string name="favorite_action" msgid="2911296685862420689">"お気に入り"</string>
-    <!-- no translation found for set_star_action (4660317166196258160) -->
-    <skip />
-    <!-- no translation found for remove_star_action (6689770999647007163) -->
-    <skip />
+    <string name="set_star_action" msgid="4660317166196258160">"スターを付ける"</string>
+    <string name="remove_star_action" msgid="6689770999647007163">"スターをはずす"</string>
     <string name="refresh_action" msgid="5951383001436708175">"更新"</string>
     <string name="add_account_action" msgid="8835736309476033727">"アカウントを追加"</string>
-    <!-- no translation found for deselect_all_action (253663239459688238) -->
-    <skip />
+    <string name="deselect_all_action" msgid="253663239459688238">"選択をすべて解除"</string>
     <string name="compose_action" msgid="4045702519637388045">"作成"</string>
     <string name="search_action" msgid="6325101454876682308">"検索"</string>
     <string name="open_action" msgid="936766723989190816">"開く"</string>
@@ -71,8 +63,7 @@
     <string name="status_sending_messages_failed" msgid="7975009558738692407">"メッセージを送信し直してください"</string>
     <string name="status_loading_more_failed" msgid="1629172047185323">"追加のメールを読み込み直す"</string>
     <string name="notification_new_title" msgid="2200257910380529139">"新着メール"</string>
-    <!-- no translation found for error_loading_message_body (2265140604109272914) -->
-    <skip />
+    <string name="error_loading_message_body" msgid="2265140604109272914">"メッセージテキストの読み込み中に予期しないエラーが発生しました。メッセージが表示できないほど大きい可能性があります。"</string>
   <plurals name="notification_new_one_account_fmt">
     <item quantity="one" msgid="3422945912787702191">"未読<xliff:g id="UNREAD_MESSAGE_COUNT">%d</xliff:g>件 (<xliff:g id="ACCOUNT">%s</xliff:g>)"</item>
     <item quantity="few" msgid="6543078667692990869">"未読<xliff:g id="UNREAD_MESSAGE_COUNT">%d</xliff:g>件 (<xliff:g id="ACCOUNT">%s</xliff:g>)"</item>
@@ -82,25 +73,17 @@
     <item quantity="few" msgid="1991747245324120305">"（<xliff:g id="NUMBER_ACCOUNTS">%d</xliff:g>個のアカウント）"</item>
     <item quantity="other" msgid="2723797835410343458">"（<xliff:g id="NUMBER_ACCOUNTS">%d</xliff:g>個のアカウント）"</item>
   </plurals>
-    <!-- no translation found for mailbox_name_display_inbox (3542327124749861736) -->
-    <skip />
-    <!-- no translation found for mailbox_name_display_outbox (2826214174661417662) -->
-    <skip />
-    <!-- no translation found for mailbox_name_display_drafts (4868718300700514319) -->
-    <skip />
-    <!-- no translation found for mailbox_name_display_trash (9139069064580630647) -->
-    <skip />
-    <!-- no translation found for mailbox_name_display_sent (3426058998191869523) -->
-    <skip />
-    <!-- no translation found for mailbox_name_display_junk (9046762505977999288) -->
-    <skip />
+    <string name="mailbox_name_display_inbox" msgid="3542327124749861736">"受信トレイ"</string>
+    <string name="mailbox_name_display_outbox" msgid="2826214174661417662">"送信トレイ"</string>
+    <string name="mailbox_name_display_drafts" msgid="4868718300700514319">"下書き"</string>
+    <string name="mailbox_name_display_trash" msgid="9139069064580630647">"ゴミ箱"</string>
+    <string name="mailbox_name_display_sent" msgid="3426058998191869523">"送信済み"</string>
+    <string name="mailbox_name_display_junk" msgid="9046762505977999288">"迷惑メール"</string>
     <string name="debug_version_fmt" msgid="6160213145745376955">"バージョン: <xliff:g id="VERSION">%s</xliff:g>"</string>
     <string name="account_folder_list_separator_accounts" msgid="7568820182396669244">"アカウント"</string>
-    <!-- no translation found for account_folder_list_summary_inbox (5790553737870057607) -->
-    <skip />
+    <string name="account_folder_list_summary_inbox" msgid="5790553737870057607">"統合受信トレイ"</string>
     <string name="account_folder_list_summary_unread" msgid="1200755158196002928">"未読"</string>
-    <!-- no translation found for account_folder_list_summary_starred (3134312269246375723) -->
-    <skip />
+    <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_title" msgid="8299608543467211089">"メールボックス"</string>
@@ -137,10 +120,8 @@
     <string name="add_contact_dlg_message_fmt" msgid="4470846346726847478">"<xliff:g id="EMAIL">%s</xliff:g> を連絡先に追加する"</string>
     <string name="message_view_display_attachment_toast" msgid="6096315816776330821">"この添付ファイルは表示できません。"</string>
     <string name="account_setup_basics_title" msgid="3969856368228940980">"メールアカウントの登録"</string>
-    <!-- no translation found for accounts_welcome (5901437782383439370) -->
-    <skip />
-    <!-- no translation found for accounts_welcome_exchange (4414121583987233733) -->
-    <skip />
+    <string name="accounts_welcome" msgid="5901437782383439370">"ほとんどのメールアカウントを簡単な操作で設定できます。"</string>
+    <string name="accounts_welcome_exchange" msgid="4414121583987233733">"Exchangeアカウントのメール設定は簡単な操作で完了します。"</string>
     <!-- no translation found for account_setup_basics_instructions (3126077748322815504) -->
     <skip />
     <string name="account_setup_basics_email_hint" msgid="7414269319207261120">"メールアドレス"</string>
@@ -148,10 +129,8 @@
     <string name="account_setup_basics_default_label" msgid="5924790142029806711">"いつもこのアカウントでメールを送信"</string>
     <string name="account_setup_basics_manual_setup_action" msgid="8053852205391155912">"手動セットアップ"</string>
     <string name="account_setup_username_password_toast" msgid="4441448542557889481">"有効なメールアドレスとパスワードを入力してください。"</string>
-    <!-- no translation found for account_duplicate_dlg_title (3176749833792312641) -->
-    <skip />
-    <!-- no translation found for account_duplicate_dlg_message_fmt (1920726613701479851) -->
-    <skip />
+    <string name="account_duplicate_dlg_title" msgid="3176749833792312641">"重複するアカウント"</string>
+    <string name="account_duplicate_dlg_message_fmt" msgid="1920726613701479851">"このログインはアカウント「<xliff:g id="DUPLICATE">%s</xliff:g>」によって既に使用されています。"</string>
     <string name="account_setup_check_settings_retr_info_msg" msgid="4121970450267725664">"アカウント情報を取得中..."</string>
     <string name="account_setup_check_settings_check_incoming_msg" msgid="5356212700221438863">"受信サーバーの設定を確認中..."</string>
     <string name="account_setup_check_settings_check_outgoing_msg" msgid="4033015234096725343">"送信サーバーの設定を確認中..."</string>
@@ -170,14 +149,10 @@
     <string name="account_setup_incoming_port_label" msgid="8214738923690447796">"ポート"</string>
     <string name="account_setup_incoming_security_label" msgid="2110260791086007424">"セキュリティの種類"</string>
     <string name="account_setup_incoming_security_none_label" msgid="8300169413118264895">"なし"</string>
-    <!-- no translation found for account_setup_incoming_security_ssl_trust_certificates_label (3581382268191377346) -->
-    <skip />
-    <!-- no translation found for account_setup_incoming_security_ssl_label (8886698397743061682) -->
-    <skip />
-    <!-- no translation found for account_setup_incoming_security_tls_trust_certificates_label (1089227022489257055) -->
-    <skip />
-    <!-- no translation found for account_setup_incoming_security_tls_label (8638006172590036487) -->
-    <skip />
+    <string name="account_setup_incoming_security_ssl_trust_certificates_label" msgid="3581382268191377346">"SSL（証明書をすべて承認）"</string>
+    <string name="account_setup_incoming_security_ssl_label" msgid="8886698397743061682">"SSL"</string>
+    <string name="account_setup_incoming_security_tls_trust_certificates_label" msgid="1089227022489257055">"TLS（証明書をすべて承認）"</string>
+    <string name="account_setup_incoming_security_tls_label" msgid="8638006172590036487">"TLS"</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>
@@ -190,15 +165,15 @@
     <string name="account_setup_outgoing_require_login_label" msgid="6371514297854287948">"ログインが必要"</string>
     <string name="account_setup_outgoing_username_label" msgid="3309680794731596981">"ユーザー名"</string>
     <string name="account_setup_outgoing_password_label" msgid="227844585493317550">"パスワード"</string>
-    <string name="account_setup_exchange_title" msgid="247933841122558059">"Exchange Serverの設定"</string>
-    <string name="account_setup_exchange_server_label" msgid="5390359659749339317">"Exchange Server"</string>
-    <!-- no translation found for account_setup_exchange_username_label (6517176180828983060) -->
+    <!-- no translation found for account_setup_exchange_title (2492853474738063453) -->
     <skip />
+    <!-- no translation found for account_setup_exchange_server_label (795137797983360826) -->
+    <skip />
+    <string name="account_setup_exchange_username_label" msgid="6517176180828983060">"ドメイン\\ユーザー名"</string>
     <string name="account_setup_exchange_domain_label" msgid="3584668050727667045">"ドメイン"</string>
     <string name="account_setup_exchange_domain_hint" msgid="350372033916025287">"ここにドメインを入力します"</string>
     <string name="account_setup_exchange_ssl_label" msgid="6704105469083211236">"安全な接続（SSL）を使用する"</string>
-    <!-- no translation found for account_setup_exchange_trust_certificates_label (6232880757633882678) -->
-    <skip />
+    <string name="account_setup_exchange_trust_certificates_label" msgid="6232880757633882678">"すべてのSSL証明書を承認"</string>
     <string name="account_setup_options_title" msgid="8995162193118880993">"アカウントのオプション"</string>
     <string name="account_setup_options_mail_check_frequency_label" msgid="4598023962234986194">"新着メール自動確認"</string>
     <string name="account_setup_options_mail_check_frequency_never" msgid="287951859480505416">"自動確認しない"</string>
@@ -229,13 +204,13 @@
     <string name="account_setup_failed_auth_required" msgid="1676242821459638150">"認証方法がサーバーでサポートされていません。"</string>
     <string name="account_setup_failed_security" msgid="6142264248671379943">"セキュリティエラーのためサーバーに接続できません。"</string>
     <string name="account_setup_failed_ioerror" msgid="7391458717708933095">"サーバーに接続できません。"</string>
+    <string name="account_setup_failed_security_policies_required" msgid="3567420384516656976">"このExchange ActiveSyncサーバーにはお使いの携帯端末でサポートされていないセキュリティ機能が必要です。"</string>
     <string name="account_setup_failed_dlg_edit_details_action" msgid="5355993309841479360">"設定を編集"</string>
     <string name="account_settings_title_fmt" msgid="1702058877284382340">"全般設定"</string>
     <string name="account_settings_default_label" msgid="3575963379680943640">"優先アカウントにする"</string>
     <string name="account_settings_default_summary" msgid="1531901438624688482">"いつもこのアカウントでメールを送信"</string>
     <string name="account_settings_notify_label" msgid="1630001017303007974">"メール着信通知"</string>
-    <!-- no translation found for account_settings_exchange_summary (8498451479029626317) -->
-    <skip />
+    <string name="account_settings_exchange_summary" msgid="8498451479029626317">"自動確認や通知などを同期"</string>
     <string name="account_settings_notify_summary" msgid="6609224590300639887">"メール受信: ステータスバーで通知"</string>
     <string name="account_settings_mail_check_frequency_label" msgid="2067835530563849675">"新着メール自動確認"</string>
     <string name="account_settings_incoming_label" msgid="7858928031806297542">"受信設定"</string>
@@ -244,10 +219,8 @@
     <string name="account_settings_description_label" msgid="8894815221204511715">"アカウント名"</string>
     <string name="account_settings_name_label" msgid="8186406122590008449">"名前"</string>
     <string name="account_settings_notifications" msgid="1042620094281375043">"通知設定"</string>
-    <!-- no translation found for account_settings_sync_contacts_enable (1369272986009573218) -->
-    <skip />
-    <!-- no translation found for account_settings_sync_contacts_summary (8901452720940015928) -->
-    <skip />
+    <string name="account_settings_sync_contacts_enable" msgid="1369272986009573218">"連絡先を同期"</string>
+    <string name="account_settings_sync_contacts_summary" msgid="8901452720940015928">"このアカウントからも連絡先を同期"</string>
     <string name="account_settings_vibrate_enable" msgid="8045133290388856478">"バイブレーション"</string>
     <string name="account_settings_vibrate_summary" msgid="3690631050585589365">"メール受信: バイブレーションON"</string>
     <string name="account_settings_ringtone" msgid="7922187231467500404">"着信音を選択"</string>
@@ -258,7 +231,6 @@
     <string name="provider_note_yahoo_uk" msgid="2055976404478603298">"このメールアカウントを設定する前に、Yahoo!サイトでこのアカウントのPOP3メールアクセスを有効にしてください。"</string>
     <string name="provider_note_live" msgid="3584841823811425060">"このプログラムでPOPアクセスが許可されているのは一部の「Plus」アカウントだけです。有料の「Plus」アカウントがなければ、正しいメールアドレスとパスワードを入力してもログインできません。これらのアカウントにはブラウザからアクセスしてください。"</string>
     <string name="provider_note_t_online" msgid="1973701903400232774">"このメールアカウントを設定する前にT-Onlineサイトにアクセスして、POP3メールアクセス用のパスワードを作成してください。"</string>
-    <!-- no translation found for exchange_name (1190783774800310346) -->
-    <skip />
+    <string name="exchange_name" msgid="1190783774800310346">"コーポレート"</string>
     <string name="system_account_create_failed" msgid="4917162302393971752">"AccountManagerがアカウントを作成できませんでした。もう一度やり直してください。"</string>
 </resources>
diff --git a/res/values-ko/strings.xml b/res/values-ko/strings.xml
index 1ab5501..22a702b 100644
--- a/res/values-ko/strings.xml
+++ b/res/values-ko/strings.xml
@@ -15,13 +15,10 @@
 -->
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <!-- no translation found for read_attachment_label (1162255191991555285) -->
-    <skip />
+    <string name="read_attachment_label" msgid="1162255191991555285">"이메일 첨부파일 읽기"</string>
     <string name="read_attachment_desc" msgid="7594746717616308643">"응용프로그램이 이메일 첨부파일을 읽도록 허용합니다."</string>
-    <!-- no translation found for permission_access_provider_label (4274353114641168675) -->
-    <skip />
-    <!-- no translation found for permission_access_provider_desc (1513898266889541617) -->
-    <skip />
+    <string name="permission_access_provider_label" msgid="4274353114641168675">"이메일 제공업체 데이터 액세스"</string>
+    <string name="permission_access_provider_desc" msgid="1513898266889541617">"응용프로그램이 받은 메일, 보낸 메일, 사용자 이름 및 비밀번호를 비롯하여 이메일 데이터베이스에 액세스하도록 합니다."</string>
     <string name="app_name" msgid="5815426892327290362">"이메일"</string>
     <string name="accounts_title" msgid="6622149231904649210">"이메일"</string>
     <string name="compose_title" msgid="427986915662706899">"편지쓰기"</string>
@@ -38,19 +35,14 @@
     <string name="discard_action" msgid="6532206074859505968">"삭제"</string>
     <string name="save_draft_action" msgid="812855865552028622">"임시보관함에 저장"</string>
     <string name="read_unread_action" msgid="4721446664849165077">"읽음/읽지않음"</string>
-    <!-- no translation found for read_action (4701484794504781686) -->
-    <skip />
-    <!-- no translation found for unread_action (6280399049357552826) -->
-    <skip />
+    <string name="read_action" msgid="4701484794504781686">"읽음으로 표시"</string>
+    <string name="unread_action" msgid="6280399049357552826">"읽지않음으로 표시"</string>
     <string name="favorite_action" msgid="2911296685862420689">"즐겨찾기"</string>
-    <!-- no translation found for set_star_action (4660317166196258160) -->
-    <skip />
-    <!-- no translation found for remove_star_action (6689770999647007163) -->
-    <skip />
+    <string name="set_star_action" msgid="4660317166196258160">"별표 표시"</string>
+    <string name="remove_star_action" msgid="6689770999647007163">"별표 삭제"</string>
     <string name="refresh_action" msgid="5951383001436708175">"새로고침"</string>
     <string name="add_account_action" msgid="8835736309476033727">"계정 추가"</string>
-    <!-- no translation found for deselect_all_action (253663239459688238) -->
-    <skip />
+    <string name="deselect_all_action" msgid="253663239459688238">"모두 선택취소"</string>
     <string name="compose_action" msgid="4045702519637388045">"편지쓰기"</string>
     <string name="search_action" msgid="6325101454876682308">"검색"</string>
     <string name="open_action" msgid="936766723989190816">"열기"</string>
@@ -71,8 +63,7 @@
     <string name="status_sending_messages_failed" msgid="7975009558738692407">"메시지 전송 재시도 중"</string>
     <string name="status_loading_more_failed" msgid="1629172047185323">"추가 메시지 로드 재시도"</string>
     <string name="notification_new_title" msgid="2200257910380529139">"새 이메일"</string>
-    <!-- no translation found for error_loading_message_body (2265140604109272914) -->
-    <skip />
+    <string name="error_loading_message_body" msgid="2265140604109272914">"문자 메시지를 로드하는 중에 예기치 못한 오류가 발생했습니다. 메시지가 너무 커서 표시할 수 없기 때문일 수 있습니다."</string>
   <plurals name="notification_new_one_account_fmt">
     <item quantity="one" msgid="3422945912787702191">"읽지 않은 메일 <xliff:g id="UNREAD_MESSAGE_COUNT">%d</xliff:g>개(<xliff:g id="ACCOUNT">%s</xliff:g>)"</item>
     <item quantity="few" msgid="6543078667692990869">"읽지 않은 메일 <xliff:g id="UNREAD_MESSAGE_COUNT">%d</xliff:g>개(<xliff:g id="ACCOUNT">%s</xliff:g>)"</item>
@@ -82,25 +73,17 @@
     <item quantity="few" msgid="1991747245324120305">"<xliff:g id="NUMBER_ACCOUNTS">%d</xliff:g>개 계정"</item>
     <item quantity="other" msgid="2723797835410343458">"(<xliff:g id="NUMBER_ACCOUNTS">%d</xliff:g>개 계정)"</item>
   </plurals>
-    <!-- no translation found for mailbox_name_display_inbox (3542327124749861736) -->
-    <skip />
-    <!-- no translation found for mailbox_name_display_outbox (2826214174661417662) -->
-    <skip />
-    <!-- no translation found for mailbox_name_display_drafts (4868718300700514319) -->
-    <skip />
-    <!-- no translation found for mailbox_name_display_trash (9139069064580630647) -->
-    <skip />
-    <!-- no translation found for mailbox_name_display_sent (3426058998191869523) -->
-    <skip />
-    <!-- no translation found for mailbox_name_display_junk (9046762505977999288) -->
-    <skip />
+    <string name="mailbox_name_display_inbox" msgid="3542327124749861736">"받은편지함"</string>
+    <string name="mailbox_name_display_outbox" msgid="2826214174661417662">"보낼편지함"</string>
+    <string name="mailbox_name_display_drafts" msgid="4868718300700514319">"임시보관함"</string>
+    <string name="mailbox_name_display_trash" msgid="9139069064580630647">"휴지통"</string>
+    <string name="mailbox_name_display_sent" msgid="3426058998191869523">"보낸편지함"</string>
+    <string name="mailbox_name_display_junk" msgid="9046762505977999288">"스팸"</string>
     <string name="debug_version_fmt" msgid="6160213145745376955">"버전: <xliff:g id="VERSION">%s</xliff:g>"</string>
     <string name="account_folder_list_separator_accounts" msgid="7568820182396669244">"계정"</string>
-    <!-- no translation found for account_folder_list_summary_inbox (5790553737870057607) -->
-    <skip />
+    <string name="account_folder_list_summary_inbox" msgid="5790553737870057607">"모든 받은편지함"</string>
     <string name="account_folder_list_summary_unread" msgid="1200755158196002928">"읽지않음"</string>
-    <!-- no translation found for account_folder_list_summary_starred (3134312269246375723) -->
-    <skip />
+    <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_title" msgid="8299608543467211089">"편지함"</string>
@@ -119,7 +102,7 @@
     <string name="message_compose_error_invalid_email" msgid="1817633338629885643">"일부 이메일 주소가 올바르지 않습니다."</string>
     <string name="message_compose_attachments_skipped_toast" msgid="5611815773808423460">"일부 첨부파일이 다운로드되지 않았기 때문에 전달할 수 없습니다."</string>
     <string name="message_compose_attachment_size" msgid="4401081828287333647">"파일이 너무 커서 첨부할 수 없습니다."</string>
-    <string name="message_compose_display_name" msgid="6415258924917140704">"<xliff:g id="NAME">%1$s</xliff:g> 및 다른 연락처 <xliff:g id="NUMBER">%2$d</xliff:g>개"</string>
+    <string name="message_compose_display_name" msgid="6415258924917140704">"<xliff:g id="NAME">%1$s</xliff:g> 외 <xliff:g id="NUMBER">%2$d</xliff:g>명"</string>
     <string name="message_view_to_label" msgid="6485191743265527381">"받는사람:"</string>
     <string name="message_view_cc_label" msgid="6322992216371163122">"참조:"</string>
     <string name="message_view_attachment_view_action" msgid="5353550848340829134">"열기"</string>
@@ -137,10 +120,8 @@
     <string name="add_contact_dlg_message_fmt" msgid="4470846346726847478">"\'<xliff:g id="EMAIL">%s</xliff:g>\'을(를) 주소록에 추가"</string>
     <string name="message_view_display_attachment_toast" msgid="6096315816776330821">"첨부파일을 표시할 수 없습니다."</string>
     <string name="account_setup_basics_title" msgid="3969856368228940980">"이메일 설정"</string>
-    <!-- no translation found for accounts_welcome (5901437782383439370) -->
-    <skip />
-    <!-- no translation found for accounts_welcome_exchange (4414121583987233733) -->
-    <skip />
+    <string name="accounts_welcome" msgid="5901437782383439370">"간단한 몇 단계를 거쳐 대부분의 계정에 대해 이메일을 구성할 수 있습니다."</string>
+    <string name="accounts_welcome_exchange" msgid="4414121583987233733">"간단한 몇 단계를 거쳐 Exchange 계정을 구성할 수 있습니다."</string>
     <!-- no translation found for account_setup_basics_instructions (3126077748322815504) -->
     <skip />
     <string name="account_setup_basics_email_hint" msgid="7414269319207261120">"이메일 주소"</string>
@@ -148,10 +129,8 @@
     <string name="account_setup_basics_default_label" msgid="5924790142029806711">"이 계정에서 이메일을 보냅니다(기본값)."</string>
     <string name="account_setup_basics_manual_setup_action" msgid="8053852205391155912">"수동 설정"</string>
     <string name="account_setup_username_password_toast" msgid="4441448542557889481">"올바른 이메일 주소와 비밀번호를 입력하세요."</string>
-    <!-- no translation found for account_duplicate_dlg_title (3176749833792312641) -->
-    <skip />
-    <!-- no translation found for account_duplicate_dlg_message_fmt (1920726613701479851) -->
-    <skip />
+    <string name="account_duplicate_dlg_title" msgid="3176749833792312641">"중복 계정"</string>
+    <string name="account_duplicate_dlg_message_fmt" msgid="1920726613701479851">"이 로그인은 이미 \'<xliff:g id="DUPLICATE">%s</xliff:g>\' 계정에서 사용 중입니다."</string>
     <string name="account_setup_check_settings_retr_info_msg" msgid="4121970450267725664">"계정 정보 검색 중..."</string>
     <string name="account_setup_check_settings_check_incoming_msg" msgid="5356212700221438863">"받는 서버 설정 확인 중..."</string>
     <string name="account_setup_check_settings_check_outgoing_msg" msgid="4033015234096725343">"보내는 서버 설정 확인 중..."</string>
@@ -170,14 +149,10 @@
     <string name="account_setup_incoming_port_label" msgid="8214738923690447796">"포트"</string>
     <string name="account_setup_incoming_security_label" msgid="2110260791086007424">"보안 유형"</string>
     <string name="account_setup_incoming_security_none_label" msgid="8300169413118264895">"없음"</string>
-    <!-- no translation found for account_setup_incoming_security_ssl_trust_certificates_label (3581382268191377346) -->
-    <skip />
-    <!-- no translation found for account_setup_incoming_security_ssl_label (8886698397743061682) -->
-    <skip />
-    <!-- no translation found for account_setup_incoming_security_tls_trust_certificates_label (1089227022489257055) -->
-    <skip />
-    <!-- no translation found for account_setup_incoming_security_tls_label (8638006172590036487) -->
-    <skip />
+    <string name="account_setup_incoming_security_ssl_trust_certificates_label" msgid="3581382268191377346">"SSL(모든 인증서 수락)"</string>
+    <string name="account_setup_incoming_security_ssl_label" msgid="8886698397743061682">"SSL"</string>
+    <string name="account_setup_incoming_security_tls_trust_certificates_label" msgid="1089227022489257055">"TLS(모든 인증서 수락)"</string>
+    <string name="account_setup_incoming_security_tls_label" msgid="8638006172590036487">"TLS"</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>
@@ -190,15 +165,15 @@
     <string name="account_setup_outgoing_require_login_label" msgid="6371514297854287948">"로그인해야 합니다."</string>
     <string name="account_setup_outgoing_username_label" msgid="3309680794731596981">"사용자 이름"</string>
     <string name="account_setup_outgoing_password_label" msgid="227844585493317550">"비밀번호"</string>
-    <string name="account_setup_exchange_title" msgid="247933841122558059">"Exchange 서버 설정"</string>
-    <string name="account_setup_exchange_server_label" msgid="5390359659749339317">"Exchange Server"</string>
-    <!-- no translation found for account_setup_exchange_username_label (6517176180828983060) -->
+    <!-- no translation found for account_setup_exchange_title (2492853474738063453) -->
     <skip />
+    <!-- no translation found for account_setup_exchange_server_label (795137797983360826) -->
+    <skip />
+    <string name="account_setup_exchange_username_label" msgid="6517176180828983060">"도메인\\사용자 이름"</string>
     <string name="account_setup_exchange_domain_label" msgid="3584668050727667045">"도메인"</string>
     <string name="account_setup_exchange_domain_hint" msgid="350372033916025287">"여기에 도메인 입력"</string>
     <string name="account_setup_exchange_ssl_label" msgid="6704105469083211236">"보안 연결(SSL) 사용"</string>
-    <!-- no translation found for account_setup_exchange_trust_certificates_label (6232880757633882678) -->
-    <skip />
+    <string name="account_setup_exchange_trust_certificates_label" msgid="6232880757633882678">"모든 SSL 인증서 수락"</string>
     <string name="account_setup_options_title" msgid="8995162193118880993">"계정 옵션"</string>
     <string name="account_setup_options_mail_check_frequency_label" msgid="4598023962234986194">"이메일 확인 빈도"</string>
     <string name="account_setup_options_mail_check_frequency_never" msgid="287951859480505416">"안함"</string>
@@ -229,13 +204,13 @@
     <string name="account_setup_failed_auth_required" msgid="1676242821459638150">"인증 방법이 서버에서 지원되지 않습니다."</string>
     <string name="account_setup_failed_security" msgid="6142264248671379943">"보안 오류 때문에 서버에 연결할 수 없습니다."</string>
     <string name="account_setup_failed_ioerror" msgid="7391458717708933095">"서버에 연결할 수 없습니다."</string>
+    <string name="account_setup_failed_security_policies_required" msgid="3567420384516656976">"휴대전화에서 Exchange ActiveSync 서버를 사용하기 위해 필요한 보안 기능을 지원하지 않습니다."</string>
     <string name="account_setup_failed_dlg_edit_details_action" msgid="5355993309841479360">"세부정보 수정"</string>
     <string name="account_settings_title_fmt" msgid="1702058877284382340">"일반 설정"</string>
     <string name="account_settings_default_label" msgid="3575963379680943640">"기본 계정"</string>
     <string name="account_settings_default_summary" msgid="1531901438624688482">"기본적으로 이 계정에서 이메일 전송"</string>
     <string name="account_settings_notify_label" msgid="1630001017303007974">"이메일 알림"</string>
-    <!-- no translation found for account_settings_exchange_summary (8498451479029626317) -->
-    <skip />
+    <string name="account_settings_exchange_summary" msgid="8498451479029626317">"빈도, 알림 등을 동기화합니다."</string>
     <string name="account_settings_notify_summary" msgid="6609224590300639887">"이메일이 오면 상태 표시줄에 알림"</string>
     <string name="account_settings_mail_check_frequency_label" msgid="2067835530563849675">"이메일 확인 빈도"</string>
     <string name="account_settings_incoming_label" msgid="7858928031806297542">"수신 설정"</string>
@@ -244,10 +219,8 @@
     <string name="account_settings_description_label" msgid="8894815221204511715">"계정 이름"</string>
     <string name="account_settings_name_label" msgid="8186406122590008449">"이름"</string>
     <string name="account_settings_notifications" msgid="1042620094281375043">"알림 설정"</string>
-    <!-- no translation found for account_settings_sync_contacts_enable (1369272986009573218) -->
-    <skip />
-    <!-- no translation found for account_settings_sync_contacts_summary (8901452720940015928) -->
-    <skip />
+    <string name="account_settings_sync_contacts_enable" msgid="1369272986009573218">"연락처 동기화"</string>
+    <string name="account_settings_sync_contacts_summary" msgid="8901452720940015928">"또한 이 계정에서 연락처 동기화"</string>
     <string name="account_settings_vibrate_enable" msgid="8045133290388856478">"진동"</string>
     <string name="account_settings_vibrate_summary" msgid="3690631050585589365">"이메일이 오면 진동도 함께 울림"</string>
     <string name="account_settings_ringtone" msgid="7922187231467500404">"벨소리 선택"</string>
@@ -258,7 +231,6 @@
     <string name="provider_note_yahoo_uk" msgid="2055976404478603298">"이메일 계정을 설정하기 전에 Yahoo! 웹사이트를 방문하여 이 계정에 대한 POP3 이메일 액세스를 사용하도록 설정하세요."</string>
     <string name="provider_note_live" msgid="3584841823811425060">"일부 \'Plus\' 계정에만 이 프로그램에 연결할 수 있는 POP 액세스 권한이 있습니다. 올바른 이메일 주소와 비밀번호를 입력해도 로그인이 되지 않으면 유료 \'Plus\' 계정이 없기 때문일 수 있습니다. 이러한 메일 계정에 액세스하려면 웹브라우저를 실행하세요."</string>
     <string name="provider_note_t_online" msgid="1973701903400232774">"이메일 계정을 설정하기 전에 T-온라인 웹사이트를 방문하고 POP3 이메일 액세스용 비밀번호를 만드세요."</string>
-    <!-- no translation found for exchange_name (1190783774800310346) -->
-    <skip />
+    <string name="exchange_name" msgid="1190783774800310346">"회사"</string>
     <string name="system_account_create_failed" msgid="4917162302393971752">"AccountManager가 계정을 만들 수 없습니다. 다시 시도해 보세요."</string>
 </resources>
diff --git a/res/values-nb/strings.xml b/res/values-nb/strings.xml
index 3a6eeb5..fff1950 100644
--- a/res/values-nb/strings.xml
+++ b/res/values-nb/strings.xml
@@ -15,13 +15,10 @@
 -->
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <!-- no translation found for read_attachment_label (1162255191991555285) -->
-    <skip />
+    <string name="read_attachment_label" msgid="1162255191991555285">"lese e-post-vedlegg"</string>
     <string name="read_attachment_desc" msgid="7594746717616308643">"Tillat applikasjonen å lese e-post-vedleggene dine."</string>
-    <!-- no translation found for permission_access_provider_label (4274353114641168675) -->
-    <skip />
-    <!-- no translation found for permission_access_provider_desc (1513898266889541617) -->
-    <skip />
+    <string name="permission_access_provider_label" msgid="4274353114641168675">"få tilgang til epostleverandørdata"</string>
+    <string name="permission_access_provider_desc" msgid="1513898266889541617">"Gir applikasjonen tilgang til epostdatabasen, inkludert mottatte meldinger, sendte meldinger, brukernavn og passord."</string>
     <string name="app_name" msgid="5815426892327290362">"E-post"</string>
     <string name="accounts_title" msgid="6622149231904649210">"E-post"</string>
     <string name="compose_title" msgid="427986915662706899">"Skriv e-post"</string>
@@ -38,19 +35,14 @@
     <string name="discard_action" msgid="6532206074859505968">"Forkast"</string>
     <string name="save_draft_action" msgid="812855865552028622">"Lagre som utkast"</string>
     <string name="read_unread_action" msgid="4721446664849165077">"Lest/ikke lest"</string>
-    <!-- no translation found for read_action (4701484794504781686) -->
-    <skip />
-    <!-- no translation found for unread_action (6280399049357552826) -->
-    <skip />
+    <string name="read_action" msgid="4701484794504781686">"Merk som lest"</string>
+    <string name="unread_action" msgid="6280399049357552826">"Merk som ulest"</string>
     <string name="favorite_action" msgid="2911296685862420689">"Favoritt"</string>
-    <!-- no translation found for set_star_action (4660317166196258160) -->
-    <skip />
-    <!-- no translation found for remove_star_action (6689770999647007163) -->
-    <skip />
+    <string name="set_star_action" msgid="4660317166196258160">"Legg til stjerne"</string>
+    <string name="remove_star_action" msgid="6689770999647007163">"Fjern stjerne"</string>
     <string name="refresh_action" msgid="5951383001436708175">"Oppdater"</string>
     <string name="add_account_action" msgid="8835736309476033727">"Legg til konto"</string>
-    <!-- no translation found for deselect_all_action (253663239459688238) -->
-    <skip />
+    <string name="deselect_all_action" msgid="253663239459688238">"Avmerk alle"</string>
     <string name="compose_action" msgid="4045702519637388045">"Skriv e-post"</string>
     <string name="search_action" msgid="6325101454876682308">"Søk"</string>
     <string name="open_action" msgid="936766723989190816">"Åpne"</string>
@@ -62,7 +54,7 @@
     <string name="mark_as_unread_action" msgid="3766298115778767554">"Merk som ulest"</string>
     <string name="add_cc_bcc_action" msgid="5569074812077509737">"Legg til kopi/blindkopi"</string>
     <string name="add_attachment_action" msgid="2696013743130573897">"Legg til vedlegg"</string>
-    <string name="dump_settings_action" msgid="4478192525236169829">"Dump settings"</string>
+    <string name="dump_settings_action" msgid="4478192525236169829">"Dump innstillinger"</string>
     <string name="choose_attachment_dialog_title" msgid="81937507117528954">"Velg vedlegg"</string>
     <string name="accounts_context_menu_title" msgid="1053701760934475027">"Kontoinnstillinger"</string>
     <string name="status_loading_more" msgid="1580386959044617884">"Henter meldinger…"</string>
@@ -71,8 +63,7 @@
     <string name="status_sending_messages_failed" msgid="7975009558738692407">"Forsøk å sende meldinger på nytt"</string>
     <string name="status_loading_more_failed" msgid="1629172047185323">"Prøv på nytt å hente flere meldinger"</string>
     <string name="notification_new_title" msgid="2200257910380529139">"Ny e-post"</string>
-    <!-- no translation found for error_loading_message_body (2265140604109272914) -->
-    <skip />
+    <string name="error_loading_message_body" msgid="2265140604109272914">"Uventet feil under lastingen av meldingstekst. Det kan være meldingen er for stor."</string>
   <plurals name="notification_new_one_account_fmt">
     <item quantity="one" msgid="3422945912787702191">"<xliff:g id="UNREAD_MESSAGE_COUNT">%d</xliff:g> ulest (<xliff:g id="ACCOUNT">%s</xliff:g>)"</item>
     <item quantity="few" msgid="6543078667692990869">"<xliff:g id="UNREAD_MESSAGE_COUNT">%d</xliff:g> uleste (<xliff:g id="ACCOUNT">%s</xliff:g>)"</item>
@@ -82,25 +73,17 @@
     <item quantity="few" msgid="1991747245324120305">"i <xliff:g id="NUMBER_ACCOUNTS">%d</xliff:g> kontoer"</item>
     <item quantity="other" msgid="2723797835410343458">"i <xliff:g id="NUMBER_ACCOUNTS">%d</xliff:g> kontoer"</item>
   </plurals>
-    <!-- no translation found for mailbox_name_display_inbox (3542327124749861736) -->
-    <skip />
-    <!-- no translation found for mailbox_name_display_outbox (2826214174661417662) -->
-    <skip />
-    <!-- no translation found for mailbox_name_display_drafts (4868718300700514319) -->
-    <skip />
-    <!-- no translation found for mailbox_name_display_trash (9139069064580630647) -->
-    <skip />
-    <!-- no translation found for mailbox_name_display_sent (3426058998191869523) -->
-    <skip />
-    <!-- no translation found for mailbox_name_display_junk (9046762505977999288) -->
-    <skip />
-    <string name="debug_version_fmt" msgid="6160213145745376955">"Version: <xliff:g id="VERSION">%s</xliff:g>"</string>
+    <string name="mailbox_name_display_inbox" msgid="3542327124749861736">"Innboks"</string>
+    <string name="mailbox_name_display_outbox" msgid="2826214174661417662">"Utboks"</string>
+    <string name="mailbox_name_display_drafts" msgid="4868718300700514319">"Utkast"</string>
+    <string name="mailbox_name_display_trash" msgid="9139069064580630647">"Papirkurv"</string>
+    <string name="mailbox_name_display_sent" msgid="3426058998191869523">"Sendt"</string>
+    <string name="mailbox_name_display_junk" msgid="9046762505977999288">"Nettsøppel"</string>
+    <string name="debug_version_fmt" msgid="6160213145745376955">"Versjon: <xliff:g id="VERSION">%s</xliff:g>"</string>
     <string name="account_folder_list_separator_accounts" msgid="7568820182396669244">"Kontoer"</string>
-    <!-- no translation found for account_folder_list_summary_inbox (5790553737870057607) -->
-    <skip />
+    <string name="account_folder_list_summary_inbox" msgid="5790553737870057607">"Innboks"</string>
     <string name="account_folder_list_summary_unread" msgid="1200755158196002928">"Ikke lest"</string>
-    <!-- no translation found for account_folder_list_summary_starred (3134312269246375723) -->
-    <skip />
+    <string name="account_folder_list_summary_starred" msgid="3134312269246375723">"Stjernemerket"</string>
     <string name="account_folder_list_summary_drafts" msgid="5514845993247300437">"Utkast"</string>
     <string name="account_folder_list_summary_outbox" msgid="3059836696049399377">"Utboks"</string>
     <string name="mailbox_list_title" msgid="8299608543467211089">"Postboks"</string>
@@ -137,10 +120,8 @@
     <string name="add_contact_dlg_message_fmt" msgid="4470846346726847478">"Legg til «<xliff:g id="EMAIL">%s</xliff:g>» som kontakt"</string>
     <string name="message_view_display_attachment_toast" msgid="6096315816776330821">"Kan ikke vise vedlegget."</string>
     <string name="account_setup_basics_title" msgid="3969856368228940980">"Sett opp e-post"</string>
-    <!-- no translation found for accounts_welcome (5901437782383439370) -->
-    <skip />
-    <!-- no translation found for accounts_welcome_exchange (4414121583987233733) -->
-    <skip />
+    <string name="accounts_welcome" msgid="5901437782383439370">"Velkommen til oppsett av e-post!BREAK_0BREAK_1Du kan bruke en hvilken som helst e-postkonto. De mest populære e-postkontoene kan settes opp i to trinn!"</string>
+    <string name="accounts_welcome_exchange" msgid="4414121583987233733">"Du kan sette opp en Exchange-konto med bare noen få enkle steg."</string>
     <!-- no translation found for account_setup_basics_instructions (3126077748322815504) -->
     <skip />
     <string name="account_setup_basics_email_hint" msgid="7414269319207261120">"E-postadresse"</string>
@@ -148,10 +129,8 @@
     <string name="account_setup_basics_default_label" msgid="5924790142029806711">"Bruk denne kontoen som standard for utgående e-post."</string>
     <string name="account_setup_basics_manual_setup_action" msgid="8053852205391155912">"Manuelt oppsett"</string>
     <string name="account_setup_username_password_toast" msgid="4441448542557889481">"Skriv inn en gyldig e-postadresse og passord."</string>
-    <!-- no translation found for account_duplicate_dlg_title (3176749833792312641) -->
-    <skip />
-    <!-- no translation found for account_duplicate_dlg_message_fmt (1920726613701479851) -->
-    <skip />
+    <string name="account_duplicate_dlg_title" msgid="3176749833792312641">"Duplikatkonto"</string>
+    <string name="account_duplicate_dlg_message_fmt" msgid="1920726613701479851">"Denne innloggingen er allerede i bruk for kontoen «<xliff:g id="DUPLICATE">%s</xliff:g>»"</string>
     <string name="account_setup_check_settings_retr_info_msg" msgid="4121970450267725664">"Henter kontoinformasjon…"</string>
     <string name="account_setup_check_settings_check_incoming_msg" msgid="5356212700221438863">"Sjekker tjenerinnstillinger for inngående e-post…"</string>
     <string name="account_setup_check_settings_check_outgoing_msg" msgid="4033015234096725343">"Sjekker tjenerinnstillinger for utgående e-post…"</string>
@@ -170,14 +149,10 @@
     <string name="account_setup_incoming_port_label" msgid="8214738923690447796">"Port"</string>
     <string name="account_setup_incoming_security_label" msgid="2110260791086007424">"Sikkerhetstype"</string>
     <string name="account_setup_incoming_security_none_label" msgid="8300169413118264895">"Ingen"</string>
-    <!-- no translation found for account_setup_incoming_security_ssl_trust_certificates_label (3581382268191377346) -->
-    <skip />
-    <!-- no translation found for account_setup_incoming_security_ssl_label (8886698397743061682) -->
-    <skip />
-    <!-- no translation found for account_setup_incoming_security_tls_trust_certificates_label (1089227022489257055) -->
-    <skip />
-    <!-- no translation found for account_setup_incoming_security_tls_label (8638006172590036487) -->
-    <skip />
+    <string name="account_setup_incoming_security_ssl_trust_certificates_label" msgid="3581382268191377346">"SSL (godta alle sertifikater)"</string>
+    <string name="account_setup_incoming_security_ssl_label" msgid="8886698397743061682">"SSL (alltid)"</string>
+    <string name="account_setup_incoming_security_tls_trust_certificates_label" msgid="1089227022489257055">"TLS (godta alle sertifikater)"</string>
+    <string name="account_setup_incoming_security_tls_label" msgid="8638006172590036487">"TLS (alltid)"</string>
     <string name="account_setup_incoming_delete_policy_label" msgid="9213590134693857912">"Slett e-post fra tjener"</string>
     <string name="account_setup_incoming_delete_policy_never_label" msgid="3222897501875871041">"Aldri"</string>
     <string name="account_setup_incoming_delete_policy_delete_label" msgid="222216840911785631">"Når jeg sletter den fra innboksen"</string>
@@ -187,18 +162,18 @@
     <string name="account_setup_outgoing_smtp_server_label" msgid="6035137446691195177">"SMTP-tjener"</string>
     <string name="account_setup_outgoing_port_label" msgid="7573207437835827876">"Port"</string>
     <string name="account_setup_outgoing_security_label" msgid="911398071120720589">"Sikkerhetstype"</string>
-    <string name="account_setup_outgoing_require_login_label" msgid="6371514297854287948">"Krev pålogging"</string>
+    <string name="account_setup_outgoing_require_login_label" msgid="6371514297854287948">"Krev pålogging."</string>
     <string name="account_setup_outgoing_username_label" msgid="3309680794731596981">"Brukernavn"</string>
     <string name="account_setup_outgoing_password_label" msgid="227844585493317550">"Passord"</string>
-    <string name="account_setup_exchange_title" msgid="247933841122558059">"Innstillinger for Exchange Server"</string>
-    <string name="account_setup_exchange_server_label" msgid="5390359659749339317">"Exchange Server"</string>
-    <!-- no translation found for account_setup_exchange_username_label (6517176180828983060) -->
+    <!-- no translation found for account_setup_exchange_title (2492853474738063453) -->
     <skip />
+    <!-- no translation found for account_setup_exchange_server_label (795137797983360826) -->
+    <skip />
+    <string name="account_setup_exchange_username_label" msgid="6517176180828983060">"Domene\\brukernavn"</string>
     <string name="account_setup_exchange_domain_label" msgid="3584668050727667045">"Domene"</string>
     <string name="account_setup_exchange_domain_hint" msgid="350372033916025287">"Oppgi domene her"</string>
     <string name="account_setup_exchange_ssl_label" msgid="6704105469083211236">"Bruk sikker tilkobling (SSL)"</string>
-    <!-- no translation found for account_setup_exchange_trust_certificates_label (6232880757633882678) -->
-    <skip />
+    <string name="account_setup_exchange_trust_certificates_label" msgid="6232880757633882678">"Godkjenn alle SSL-sertifikater"</string>
     <string name="account_setup_options_title" msgid="8995162193118880993">"Kontoinnstillinger"</string>
     <string name="account_setup_options_mail_check_frequency_label" msgid="4598023962234986194">"Hvor ofte e-post skal sjekkes"</string>
     <string name="account_setup_options_mail_check_frequency_never" msgid="287951859480505416">"Aldri"</string>
@@ -229,13 +204,13 @@
     <string name="account_setup_failed_auth_required" msgid="1676242821459638150">"Tjeneren støtter ikke de påkrevde autentiseringsmetodene."</string>
     <string name="account_setup_failed_security" msgid="6142264248671379943">"Kunne ikke koble til tjeneren på grunn av sikkerhetsfeil."</string>
     <string name="account_setup_failed_ioerror" msgid="7391458717708933095">"Kunne ikke koble til tjeneren."</string>
+    <string name="account_setup_failed_security_policies_required" msgid="3567420384516656976">"Denne tjeneren for Exchange ActiveSync krever sikkerhetsfunksjoner som denne telefonen ikke håndterer."</string>
     <string name="account_setup_failed_dlg_edit_details_action" msgid="5355993309841479360">"Rediger detaljer"</string>
     <string name="account_settings_title_fmt" msgid="1702058877284382340">"Generelle innstillinger"</string>
     <string name="account_settings_default_label" msgid="3575963379680943640">"Standardkonto"</string>
     <string name="account_settings_default_summary" msgid="1531901438624688482">"Bruk denne kontoen som standard for utgående e-post."</string>
     <string name="account_settings_notify_label" msgid="1630001017303007974">"Varsling om e-post"</string>
-    <!-- no translation found for account_settings_exchange_summary (8498451479029626317) -->
-    <skip />
+    <string name="account_settings_exchange_summary" msgid="8498451479029626317">"Synkroniseringsfrekvens, varslinger, osv."</string>
     <string name="account_settings_notify_summary" msgid="6609224590300639887">"Varsle i statusfeltet når det kommer e-post"</string>
     <string name="account_settings_mail_check_frequency_label" msgid="2067835530563849675">"Hvor ofte skal e-post sjekkes"</string>
     <string name="account_settings_incoming_label" msgid="7858928031806297542">"Inngående innstillinger"</string>
@@ -244,10 +219,8 @@
     <string name="account_settings_description_label" msgid="8894815221204511715">"Kontonavn"</string>
     <string name="account_settings_name_label" msgid="8186406122590008449">"Ditt navn"</string>
     <string name="account_settings_notifications" msgid="1042620094281375043">"Innstillinger for varsling"</string>
-    <!-- no translation found for account_settings_sync_contacts_enable (1369272986009573218) -->
-    <skip />
-    <!-- no translation found for account_settings_sync_contacts_summary (8901452720940015928) -->
-    <skip />
+    <string name="account_settings_sync_contacts_enable" msgid="1369272986009573218">"Synkroniser kontakter"</string>
+    <string name="account_settings_sync_contacts_summary" msgid="8901452720940015928">"Synkroniser kontakter fra denne kontoen"</string>
     <string name="account_settings_vibrate_enable" msgid="8045133290388856478">"Vibrer"</string>
     <string name="account_settings_vibrate_summary" msgid="3690631050585589365">"Vibrer når det kommer e-post"</string>
     <string name="account_settings_ringtone" msgid="7922187231467500404">"Velg ringetone"</string>
@@ -258,7 +231,6 @@
     <string name="provider_note_yahoo_uk" msgid="2055976404478603298">"Før du setter opp denne e-postkontoen, må du gå til Yahoo!-nettstedet og slå på POP3-tilgang for den."</string>
     <string name="provider_note_live" msgid="3584841823811425060">"Bare noen «pluss-kontoer» tilbyr POP-tilgang som dette programmet trenger for å koble til. Hvis du ikke klarer å logge på med riktig e-postadresse og passord, kan det være du ikke har en betalt «pluss»-tilgang. Start nettleseren for å få tilgang til slike e-postkontoer."</string>
     <string name="provider_note_t_online" msgid="1973701903400232774">"Før du setter opp denne e-postkontoen, besøk T-Online-nettstedet og velg et passord for e-posttilgang via POP3."</string>
-    <!-- no translation found for exchange_name (1190783774800310346) -->
-    <skip />
+    <string name="exchange_name" msgid="1190783774800310346">"Exchange"</string>
     <string name="system_account_create_failed" msgid="4917162302393971752">"Kontobehandleren kunne ikke opprette noen konto, prøv på nytt."</string>
 </resources>
diff --git a/res/values-nl/strings.xml b/res/values-nl/strings.xml
index e9c746b..7a8aae6 100644
--- a/res/values-nl/strings.xml
+++ b/res/values-nl/strings.xml
@@ -15,13 +15,10 @@
 -->
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <!-- no translation found for read_attachment_label (1162255191991555285) -->
-    <skip />
+    <string name="read_attachment_label" msgid="1162255191991555285">"Bijlagen van e-mail lezen"</string>
     <string name="read_attachment_desc" msgid="7594746717616308643">"Staat deze toepassing toe om uw e-mailbijlagen te lezen."</string>
-    <!-- no translation found for permission_access_provider_label (4274353114641168675) -->
-    <skip />
-    <!-- no translation found for permission_access_provider_desc (1513898266889541617) -->
-    <skip />
+    <string name="permission_access_provider_label" msgid="4274353114641168675">"Gegevens e-mailprovider openen"</string>
+    <string name="permission_access_provider_desc" msgid="1513898266889541617">"Hiermee geeft u deze toepassing toegang tot uw e-maildatabase, inclusief ontvangen berichten, verzonden berichten, gebruikersnamen en wachtwoorden."</string>
     <string name="app_name" msgid="5815426892327290362">"E-mail"</string>
     <string name="accounts_title" msgid="6622149231904649210">"E-mail"</string>
     <string name="compose_title" msgid="427986915662706899">"Opstellen"</string>
@@ -38,19 +35,14 @@
     <string name="discard_action" msgid="6532206074859505968">"Verwijderen"</string>
     <string name="save_draft_action" msgid="812855865552028622">"Opslaan als concept"</string>
     <string name="read_unread_action" msgid="4721446664849165077">"Gelezen/ongelezen"</string>
-    <!-- no translation found for read_action (4701484794504781686) -->
-    <skip />
-    <!-- no translation found for unread_action (6280399049357552826) -->
-    <skip />
+    <string name="read_action" msgid="4701484794504781686">"Markeren als gelezen"</string>
+    <string name="unread_action" msgid="6280399049357552826">"Markeren als ongelezen"</string>
     <string name="favorite_action" msgid="2911296685862420689">"Favoriet"</string>
-    <!-- no translation found for set_star_action (4660317166196258160) -->
-    <skip />
-    <!-- no translation found for remove_star_action (6689770999647007163) -->
-    <skip />
+    <string name="set_star_action" msgid="4660317166196258160">"Ster toevoegen"</string>
+    <string name="remove_star_action" msgid="6689770999647007163">"Ster verwijderen"</string>
     <string name="refresh_action" msgid="5951383001436708175">"Vernieuwen"</string>
     <string name="add_account_action" msgid="8835736309476033727">"Account toevoegen"</string>
-    <!-- no translation found for deselect_all_action (253663239459688238) -->
-    <skip />
+    <string name="deselect_all_action" msgid="253663239459688238">"Selectie van alle items ongedaan maken"</string>
     <string name="compose_action" msgid="4045702519637388045">"Opstellen"</string>
     <string name="search_action" msgid="6325101454876682308">"Zoeken"</string>
     <string name="open_action" msgid="936766723989190816">"Openen"</string>
@@ -71,8 +63,7 @@
     <string name="status_sending_messages_failed" msgid="7975009558738692407">"Verzenden van berichten opnieuw proberen"</string>
     <string name="status_loading_more_failed" msgid="1629172047185323">"Probeer opnieuw meer berichten te laden"</string>
     <string name="notification_new_title" msgid="2200257910380529139">"Nieuwe e-mail"</string>
-    <!-- no translation found for error_loading_message_body (2265140604109272914) -->
-    <skip />
+    <string name="error_loading_message_body" msgid="2265140604109272914">"Onverwachte fout bij laden van berichttekst. Bericht is mogelijk te groot om weer te geven."</string>
   <plurals name="notification_new_one_account_fmt">
     <item quantity="one" msgid="3422945912787702191">"<xliff:g id="UNREAD_MESSAGE_COUNT">%d</xliff:g> ongelezen (<xliff:g id="ACCOUNT">%s</xliff:g>)"</item>
     <item quantity="few" msgid="6543078667692990869">"<xliff:g id="UNREAD_MESSAGE_COUNT">%d</xliff:g> ongelezen (<xliff:g id="ACCOUNT">%s</xliff:g>)"</item>
@@ -82,25 +73,17 @@
     <item quantity="few" msgid="1991747245324120305">"in <xliff:g id="NUMBER_ACCOUNTS">%d</xliff:g> accounts"</item>
     <item quantity="other" msgid="2723797835410343458">"in <xliff:g id="NUMBER_ACCOUNTS">%d</xliff:g> accounts"</item>
   </plurals>
-    <!-- no translation found for mailbox_name_display_inbox (3542327124749861736) -->
-    <skip />
-    <!-- no translation found for mailbox_name_display_outbox (2826214174661417662) -->
-    <skip />
-    <!-- no translation found for mailbox_name_display_drafts (4868718300700514319) -->
-    <skip />
-    <!-- no translation found for mailbox_name_display_trash (9139069064580630647) -->
-    <skip />
-    <!-- no translation found for mailbox_name_display_sent (3426058998191869523) -->
-    <skip />
-    <!-- no translation found for mailbox_name_display_junk (9046762505977999288) -->
-    <skip />
+    <string name="mailbox_name_display_inbox" msgid="3542327124749861736">"Postvak IN"</string>
+    <string name="mailbox_name_display_outbox" msgid="2826214174661417662">"Postvak UIT"</string>
+    <string name="mailbox_name_display_drafts" msgid="4868718300700514319">"Concepten"</string>
+    <string name="mailbox_name_display_trash" msgid="9139069064580630647">"Prullenbak"</string>
+    <string name="mailbox_name_display_sent" msgid="3426058998191869523">"Verzonden"</string>
+    <string name="mailbox_name_display_junk" msgid="9046762505977999288">"Ongewenst"</string>
     <string name="debug_version_fmt" msgid="6160213145745376955">"Versie: <xliff:g id="VERSION">%s</xliff:g>"</string>
     <string name="account_folder_list_separator_accounts" msgid="7568820182396669244">"Accounts"</string>
-    <!-- no translation found for account_folder_list_summary_inbox (5790553737870057607) -->
-    <skip />
+    <string name="account_folder_list_summary_inbox" msgid="5790553737870057607">"Gecombineerd Postvak IN"</string>
     <string name="account_folder_list_summary_unread" msgid="1200755158196002928">"Ongelezen"</string>
-    <!-- no translation found for account_folder_list_summary_starred (3134312269246375723) -->
-    <skip />
+    <string name="account_folder_list_summary_starred" msgid="3134312269246375723">"Met ster"</string>
     <string name="account_folder_list_summary_drafts" msgid="5514845993247300437">"Concepten"</string>
     <string name="account_folder_list_summary_outbox" msgid="3059836696049399377">"Postvak UIT"</string>
     <string name="mailbox_list_title" msgid="8299608543467211089">"Mailbox"</string>
@@ -137,10 +120,8 @@
     <string name="add_contact_dlg_message_fmt" msgid="4470846346726847478">"Voeg \"<xliff:g id="EMAIL">%s</xliff:g>\" toe aan contacten"</string>
     <string name="message_view_display_attachment_toast" msgid="6096315816776330821">"Deze bijlage kan niet worden weergegeven."</string>
     <string name="account_setup_basics_title" msgid="3969856368228940980">"E-mail instellen"</string>
-    <!-- no translation found for accounts_welcome (5901437782383439370) -->
-    <skip />
-    <!-- no translation found for accounts_welcome_exchange (4414121583987233733) -->
-    <skip />
+    <string name="accounts_welcome" msgid="5901437782383439370">"U kunt E-mail voor de meeste accounts in enkele stappen configureren."</string>
+    <string name="accounts_welcome_exchange" msgid="4414121583987233733">"U kunt een Exchange-account in enkele stappen configureren."</string>
     <!-- no translation found for account_setup_basics_instructions (3126077748322815504) -->
     <skip />
     <string name="account_setup_basics_email_hint" msgid="7414269319207261120">"E-mailadres"</string>
@@ -148,10 +129,8 @@
     <string name="account_setup_basics_default_label" msgid="5924790142029806711">"E-mail standaard vanaf dit account verzenden"</string>
     <string name="account_setup_basics_manual_setup_action" msgid="8053852205391155912">"Handmatig instellen"</string>
     <string name="account_setup_username_password_toast" msgid="4441448542557889481">"Typ een geldig e-mailadres en wachtwoord"</string>
-    <!-- no translation found for account_duplicate_dlg_title (3176749833792312641) -->
-    <skip />
-    <!-- no translation found for account_duplicate_dlg_message_fmt (1920726613701479851) -->
-    <skip />
+    <string name="account_duplicate_dlg_title" msgid="3176749833792312641">"Kopie van account maken"</string>
+    <string name="account_duplicate_dlg_message_fmt" msgid="1920726613701479851">"Deze aanmeldnaam wordt al gebruikt voor het account \'<xliff:g id="DUPLICATE">%s</xliff:g>\'."</string>
     <string name="account_setup_check_settings_retr_info_msg" msgid="4121970450267725664">"Accountinformatie ophalen..."</string>
     <string name="account_setup_check_settings_check_incoming_msg" msgid="5356212700221438863">"Serverinstellingen inkomende e-mail controleren..."</string>
     <string name="account_setup_check_settings_check_outgoing_msg" msgid="4033015234096725343">"Serverinstellingen uitgaande e-mail controleren..."</string>
@@ -170,14 +149,10 @@
     <string name="account_setup_incoming_port_label" msgid="8214738923690447796">"Poort"</string>
     <string name="account_setup_incoming_security_label" msgid="2110260791086007424">"Beveiligingstype"</string>
     <string name="account_setup_incoming_security_none_label" msgid="8300169413118264895">"Geen"</string>
-    <!-- no translation found for account_setup_incoming_security_ssl_trust_certificates_label (3581382268191377346) -->
-    <skip />
-    <!-- no translation found for account_setup_incoming_security_ssl_label (8886698397743061682) -->
-    <skip />
-    <!-- no translation found for account_setup_incoming_security_tls_trust_certificates_label (1089227022489257055) -->
-    <skip />
-    <!-- no translation found for account_setup_incoming_security_tls_label (8638006172590036487) -->
-    <skip />
+    <string name="account_setup_incoming_security_ssl_trust_certificates_label" msgid="3581382268191377346">"SSL (alle certificaten accepteren)"</string>
+    <string name="account_setup_incoming_security_ssl_label" msgid="8886698397743061682">"SSL"</string>
+    <string name="account_setup_incoming_security_tls_trust_certificates_label" msgid="1089227022489257055">"TLS (alle certificaten accepteren)"</string>
+    <string name="account_setup_incoming_security_tls_label" msgid="8638006172590036487">"TLS"</string>
     <string name="account_setup_incoming_delete_policy_label" msgid="9213590134693857912">"E-mail verwijderen van server"</string>
     <string name="account_setup_incoming_delete_policy_never_label" msgid="3222897501875871041">"Nooit"</string>
     <string name="account_setup_incoming_delete_policy_delete_label" msgid="222216840911785631">"Als ik verwijder uit mijn Postvak IN"</string>
@@ -190,15 +165,15 @@
     <string name="account_setup_outgoing_require_login_label" msgid="6371514297854287948">"Aanmelden vereist"</string>
     <string name="account_setup_outgoing_username_label" msgid="3309680794731596981">"Gebruikersnaam"</string>
     <string name="account_setup_outgoing_password_label" msgid="227844585493317550">"Wachtwoord"</string>
-    <string name="account_setup_exchange_title" msgid="247933841122558059">"Instellingen voor Exchange-server"</string>
-    <string name="account_setup_exchange_server_label" msgid="5390359659749339317">"Exchange-server"</string>
-    <!-- no translation found for account_setup_exchange_username_label (6517176180828983060) -->
+    <!-- no translation found for account_setup_exchange_title (2492853474738063453) -->
     <skip />
+    <!-- no translation found for account_setup_exchange_server_label (795137797983360826) -->
+    <skip />
+    <string name="account_setup_exchange_username_label" msgid="6517176180828983060">"Domein/gebruikersnaam"</string>
     <string name="account_setup_exchange_domain_label" msgid="3584668050727667045">"Domein"</string>
     <string name="account_setup_exchange_domain_hint" msgid="350372033916025287">"Geef hier het domein op"</string>
     <string name="account_setup_exchange_ssl_label" msgid="6704105469083211236">"Beveiligde verbinding (SSL) gebruiken"</string>
-    <!-- no translation found for account_setup_exchange_trust_certificates_label (6232880757633882678) -->
-    <skip />
+    <string name="account_setup_exchange_trust_certificates_label" msgid="6232880757633882678">"Alle SSL-certificaten accepteren"</string>
     <string name="account_setup_options_title" msgid="8995162193118880993">"Accountopties"</string>
     <string name="account_setup_options_mail_check_frequency_label" msgid="4598023962234986194">"Frequentie voor controle op nieuwe berichten"</string>
     <string name="account_setup_options_mail_check_frequency_never" msgid="287951859480505416">"Nooit"</string>
@@ -229,13 +204,13 @@
     <string name="account_setup_failed_auth_required" msgid="1676242821459638150">"Verificatiemethoden worden niet ondersteund door de server."</string>
     <string name="account_setup_failed_security" msgid="6142264248671379943">"Kan geen verbinding maken met de server wegens een beveiligingsfout."</string>
     <string name="account_setup_failed_ioerror" msgid="7391458717708933095">"Kan geen verbinding met de server maken."</string>
+    <string name="account_setup_failed_security_policies_required" msgid="3567420384516656976">"Voor deze Exchange ActiveSync-server zijn beveiligingsfuncties nodig die uw telefoon niet ondersteunt."</string>
     <string name="account_setup_failed_dlg_edit_details_action" msgid="5355993309841479360">"Details bewerken"</string>
     <string name="account_settings_title_fmt" msgid="1702058877284382340">"Algemene instellingen"</string>
     <string name="account_settings_default_label" msgid="3575963379680943640">"Standaardaccount"</string>
     <string name="account_settings_default_summary" msgid="1531901438624688482">"E-mail standaard vanaf dit account verzenden"</string>
     <string name="account_settings_notify_label" msgid="1630001017303007974">"Meldingen via e-mail"</string>
-    <!-- no translation found for account_settings_exchange_summary (8498451479029626317) -->
-    <skip />
+    <string name="account_settings_exchange_summary" msgid="8498451479029626317">"Synchonisatiefrequentie, meldingen, enzovoort"</string>
     <string name="account_settings_notify_summary" msgid="6609224590300639887">"Melding in statusbalk als e-mail binnenkomt"</string>
     <string name="account_settings_mail_check_frequency_label" msgid="2067835530563849675">"Frequentie voor controle op nieuwe e-mail"</string>
     <string name="account_settings_incoming_label" msgid="7858928031806297542">"Instellingen inkomende e-mail"</string>
@@ -244,10 +219,8 @@
     <string name="account_settings_description_label" msgid="8894815221204511715">"Accountnaam"</string>
     <string name="account_settings_name_label" msgid="8186406122590008449">"Uw naam"</string>
     <string name="account_settings_notifications" msgid="1042620094281375043">"Instellingen voor meldingen"</string>
-    <!-- no translation found for account_settings_sync_contacts_enable (1369272986009573218) -->
-    <skip />
-    <!-- no translation found for account_settings_sync_contacts_summary (8901452720940015928) -->
-    <skip />
+    <string name="account_settings_sync_contacts_enable" msgid="1369272986009573218">"Contacten synchroniseren"</string>
+    <string name="account_settings_sync_contacts_summary" msgid="8901452720940015928">"Contacten van dit account eveneens synchroniseren"</string>
     <string name="account_settings_vibrate_enable" msgid="8045133290388856478">"Trillen"</string>
     <string name="account_settings_vibrate_summary" msgid="3690631050585589365">"Ook trillen bij ontvangst van e-mail"</string>
     <string name="account_settings_ringtone" msgid="7922187231467500404">"Beltoon selecteren"</string>
@@ -258,7 +231,6 @@
     <string name="provider_note_yahoo_uk" msgid="2055976404478603298">"Ga voordat u dit e-mailaccount instelt naar de website van Yahoo! en schakel toegang met POP3 in voor dit account."</string>
     <string name="provider_note_live" msgid="3584841823811425060">"Alleen sommige Plus-accounts hebben POP-toegang waarmee dit programma verbinding kan maken. Als u zich niet kunt aanmelden met het juiste e-mailadres en wachtwoord, heeft u mogelijk niet betaald voor uw Plus-account. Start de webbrowser voor toegang tot deze e-mailaccounts."</string>
     <string name="provider_note_t_online" msgid="1973701903400232774">"Voordat u dit e-mailaccount instelt, gaat u naar de website van T-Online en maakt u een wachtwoord voor toegang tot e-mail via POP3."</string>
-    <!-- no translation found for exchange_name (1190783774800310346) -->
-    <skip />
+    <string name="exchange_name" msgid="1190783774800310346">"Zakelijk"</string>
     <string name="system_account_create_failed" msgid="4917162302393971752">"De AccountManager kan het account niet maken, probeer het opnieuw."</string>
 </resources>
diff --git a/res/values-pl/strings.xml b/res/values-pl/strings.xml
index 03f95ac..9944728 100644
--- a/res/values-pl/strings.xml
+++ b/res/values-pl/strings.xml
@@ -15,13 +15,10 @@
 -->
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <!-- no translation found for read_attachment_label (1162255191991555285) -->
-    <skip />
+    <string name="read_attachment_label" msgid="1162255191991555285">"Odczytaj załączniki w wiadomościach e-mail"</string>
     <string name="read_attachment_desc" msgid="7594746717616308643">"Umożliwia tej aplikacji odczyt załączników poczty e-mail."</string>
-    <!-- no translation found for permission_access_provider_label (4274353114641168675) -->
-    <skip />
-    <!-- no translation found for permission_access_provider_desc (1513898266889541617) -->
-    <skip />
+    <string name="permission_access_provider_label" msgid="4274353114641168675">"Dostęp do danych dostawcy poczty elektronicznej"</string>
+    <string name="permission_access_provider_desc" msgid="1513898266889541617">"Zezwala tej aplikacji na uzyskiwanie dostępu do bazy danych poczty elektronicznej, w tym odebranych i wysłanych wiadomości, nazw użytkowników i haseł."</string>
     <string name="app_name" msgid="5815426892327290362">"Poczta"</string>
     <string name="accounts_title" msgid="6622149231904649210">"Adres e-mail"</string>
     <string name="compose_title" msgid="427986915662706899">"Utwórz"</string>
@@ -38,19 +35,14 @@
     <string name="discard_action" msgid="6532206074859505968">"Odrzuć"</string>
     <string name="save_draft_action" msgid="812855865552028622">"Zapisz wersję roboczą"</string>
     <string name="read_unread_action" msgid="4721446664849165077">"Przeczytane/nieprzeczytane"</string>
-    <!-- no translation found for read_action (4701484794504781686) -->
-    <skip />
-    <!-- no translation found for unread_action (6280399049357552826) -->
-    <skip />
+    <string name="read_action" msgid="4701484794504781686">"Zaznacz jako przeczytane"</string>
+    <string name="unread_action" msgid="6280399049357552826">"Zaznacz jako nieprzeczytane"</string>
     <string name="favorite_action" msgid="2911296685862420689">"Dodaj do ulubionych"</string>
-    <!-- no translation found for set_star_action (4660317166196258160) -->
-    <skip />
-    <!-- no translation found for remove_star_action (6689770999647007163) -->
-    <skip />
+    <string name="set_star_action" msgid="4660317166196258160">"Dodaj gwiazdkę"</string>
+    <string name="remove_star_action" msgid="6689770999647007163">"Usuń oznaczenie gwiazdką"</string>
     <string name="refresh_action" msgid="5951383001436708175">"Odśwież"</string>
     <string name="add_account_action" msgid="8835736309476033727">"Dodaj konto"</string>
-    <!-- no translation found for deselect_all_action (253663239459688238) -->
-    <skip />
+    <string name="deselect_all_action" msgid="253663239459688238">"Usuń zaznaczenie wszystkich"</string>
     <string name="compose_action" msgid="4045702519637388045">"Utwórz"</string>
     <string name="search_action" msgid="6325101454876682308">"Szukaj"</string>
     <string name="open_action" msgid="936766723989190816">"Otwórz"</string>
@@ -71,8 +63,7 @@
     <string name="status_sending_messages_failed" msgid="7975009558738692407">"Ponów wysyłanie wiadomości"</string>
     <string name="status_loading_more_failed" msgid="1629172047185323">"Ponów próbę załadowania większej liczby wiadomości"</string>
     <string name="notification_new_title" msgid="2200257910380529139">"Nowa wiadomość e-mail"</string>
-    <!-- no translation found for error_loading_message_body (2265140604109272914) -->
-    <skip />
+    <string name="error_loading_message_body" msgid="2265140604109272914">"Nieoczekiwany błąd podczas wczytywania tekstu wiadomości. Wiadomość może być zbyt duża do wyświetlenia."</string>
   <plurals name="notification_new_one_account_fmt">
     <item quantity="one" msgid="3422945912787702191">"Nieprzeczytane: <xliff:g id="UNREAD_MESSAGE_COUNT">%d</xliff:g> (<xliff:g id="ACCOUNT">%s</xliff:g>)"</item>
     <item quantity="few" msgid="6543078667692990869">"Nieprzeczytane: <xliff:g id="UNREAD_MESSAGE_COUNT">%d</xliff:g> (<xliff:g id="ACCOUNT">%s</xliff:g>)"</item>
@@ -82,25 +73,17 @@
     <item quantity="few" msgid="1991747245324120305">"na <xliff:g id="NUMBER_ACCOUNTS">%d</xliff:g> kontach"</item>
     <item quantity="other" msgid="2723797835410343458">"na <xliff:g id="NUMBER_ACCOUNTS">%d</xliff:g> kontach"</item>
   </plurals>
-    <!-- no translation found for mailbox_name_display_inbox (3542327124749861736) -->
-    <skip />
-    <!-- no translation found for mailbox_name_display_outbox (2826214174661417662) -->
-    <skip />
-    <!-- no translation found for mailbox_name_display_drafts (4868718300700514319) -->
-    <skip />
-    <!-- no translation found for mailbox_name_display_trash (9139069064580630647) -->
-    <skip />
-    <!-- no translation found for mailbox_name_display_sent (3426058998191869523) -->
-    <skip />
-    <!-- no translation found for mailbox_name_display_junk (9046762505977999288) -->
-    <skip />
+    <string name="mailbox_name_display_inbox" msgid="3542327124749861736">"Odebrane"</string>
+    <string name="mailbox_name_display_outbox" msgid="2826214174661417662">"Do wysłania"</string>
+    <string name="mailbox_name_display_drafts" msgid="4868718300700514319">"Kopie robocze"</string>
+    <string name="mailbox_name_display_trash" msgid="9139069064580630647">"Kosz"</string>
+    <string name="mailbox_name_display_sent" msgid="3426058998191869523">"Wysłane"</string>
+    <string name="mailbox_name_display_junk" msgid="9046762505977999288">"Wiadomości-śmieci"</string>
     <string name="debug_version_fmt" msgid="6160213145745376955">"Wersja: <xliff:g id="VERSION">%s</xliff:g>"</string>
     <string name="account_folder_list_separator_accounts" msgid="7568820182396669244">"Konta"</string>
-    <!-- no translation found for account_folder_list_summary_inbox (5790553737870057607) -->
-    <skip />
+    <string name="account_folder_list_summary_inbox" msgid="5790553737870057607">"Wszystkie skrzynki odbiorcze"</string>
     <string name="account_folder_list_summary_unread" msgid="1200755158196002928">"Nieprzeczytane"</string>
-    <!-- no translation found for account_folder_list_summary_starred (3134312269246375723) -->
-    <skip />
+    <string name="account_folder_list_summary_starred" msgid="3134312269246375723">"Oznaczone gwiazdkami"</string>
     <string name="account_folder_list_summary_drafts" msgid="5514845993247300437">"Kopie robocze"</string>
     <string name="account_folder_list_summary_outbox" msgid="3059836696049399377">"Do wysłania"</string>
     <string name="mailbox_list_title" msgid="8299608543467211089">"Skrzynka pocztowa"</string>
@@ -137,10 +120,8 @@
     <string name="add_contact_dlg_message_fmt" msgid="4470846346726847478">"Dodaj adres „<xliff:g id="EMAIL">%s</xliff:g>” do kontaktów"</string>
     <string name="message_view_display_attachment_toast" msgid="6096315816776330821">"Nie można wyświetlić tego załącznika."</string>
     <string name="account_setup_basics_title" msgid="3969856368228940980">"Skonfiguruj konto e-mail"</string>
-    <!-- no translation found for accounts_welcome (5901437782383439370) -->
-    <skip />
-    <!-- no translation found for accounts_welcome_exchange (4414121583987233733) -->
-    <skip />
+    <string name="accounts_welcome" msgid="5901437782383439370">"Możesz skonfigurować pocztę elektroniczną w ramach większości kont, wykonując zaledwie kilka czynności."</string>
+    <string name="accounts_welcome_exchange" msgid="4414121583987233733">"Możesz skonfigurować konto Exchange, wykonując zaledwie kilka czynności."</string>
     <!-- no translation found for account_setup_basics_instructions (3126077748322815504) -->
     <skip />
     <string name="account_setup_basics_email_hint" msgid="7414269319207261120">"Adres e-mail"</string>
@@ -148,10 +129,8 @@
     <string name="account_setup_basics_default_label" msgid="5924790142029806711">"Domyślnie wysyłaj wiadomości e-mail z tego konta"</string>
     <string name="account_setup_basics_manual_setup_action" msgid="8053852205391155912">"Konfiguracja ręczna"</string>
     <string name="account_setup_username_password_toast" msgid="4441448542557889481">"Podaj prawidłowy adres e-mail i hasło."</string>
-    <!-- no translation found for account_duplicate_dlg_title (3176749833792312641) -->
-    <skip />
-    <!-- no translation found for account_duplicate_dlg_message_fmt (1920726613701479851) -->
-    <skip />
+    <string name="account_duplicate_dlg_title" msgid="3176749833792312641">"Powielone konto"</string>
+    <string name="account_duplicate_dlg_message_fmt" msgid="1920726613701479851">"Ten login jest już używany w przypadku konta „<xliff:g id="DUPLICATE">%s</xliff:g>”."</string>
     <string name="account_setup_check_settings_retr_info_msg" msgid="4121970450267725664">"Pobieranie informacji o koncie…"</string>
     <string name="account_setup_check_settings_check_incoming_msg" msgid="5356212700221438863">"Sprawdzanie ustawień serwera poczty przychodzącej…"</string>
     <string name="account_setup_check_settings_check_outgoing_msg" msgid="4033015234096725343">"Sprawdzanie ustawień serwera poczty wychodzącej…"</string>
@@ -170,14 +149,10 @@
     <string name="account_setup_incoming_port_label" msgid="8214738923690447796">"Port"</string>
     <string name="account_setup_incoming_security_label" msgid="2110260791086007424">"Typ zabezpieczeń"</string>
     <string name="account_setup_incoming_security_none_label" msgid="8300169413118264895">"Brak"</string>
-    <!-- no translation found for account_setup_incoming_security_ssl_trust_certificates_label (3581382268191377346) -->
-    <skip />
-    <!-- no translation found for account_setup_incoming_security_ssl_label (8886698397743061682) -->
-    <skip />
-    <!-- no translation found for account_setup_incoming_security_tls_trust_certificates_label (1089227022489257055) -->
-    <skip />
-    <!-- no translation found for account_setup_incoming_security_tls_label (8638006172590036487) -->
-    <skip />
+    <string name="account_setup_incoming_security_ssl_trust_certificates_label" msgid="3581382268191377346">"SSL (akceptuj wszystkie certyfikaty)"</string>
+    <string name="account_setup_incoming_security_ssl_label" msgid="8886698397743061682">"SSL"</string>
+    <string name="account_setup_incoming_security_tls_trust_certificates_label" msgid="1089227022489257055">"TLS (akceptuj wszystkie certyfikaty)"</string>
+    <string name="account_setup_incoming_security_tls_label" msgid="8638006172590036487">"TLS"</string>
     <string name="account_setup_incoming_delete_policy_label" msgid="9213590134693857912">"Usuń wiadomości e-mail z serwera"</string>
     <string name="account_setup_incoming_delete_policy_never_label" msgid="3222897501875871041">"Nigdy"</string>
     <string name="account_setup_incoming_delete_policy_delete_label" msgid="222216840911785631">"Po usunięciu z folderu Odebrane"</string>
@@ -190,15 +165,15 @@
     <string name="account_setup_outgoing_require_login_label" msgid="6371514297854287948">"Wymagaj zalogowania się."</string>
     <string name="account_setup_outgoing_username_label" msgid="3309680794731596981">"Nazwa użytkownika"</string>
     <string name="account_setup_outgoing_password_label" msgid="227844585493317550">"Hasło"</string>
-    <string name="account_setup_exchange_title" msgid="247933841122558059">"Ustawienia serwera Exchange"</string>
-    <string name="account_setup_exchange_server_label" msgid="5390359659749339317">"Serwer Exchange"</string>
-    <!-- no translation found for account_setup_exchange_username_label (6517176180828983060) -->
+    <!-- no translation found for account_setup_exchange_title (2492853474738063453) -->
     <skip />
+    <!-- no translation found for account_setup_exchange_server_label (795137797983360826) -->
+    <skip />
+    <string name="account_setup_exchange_username_label" msgid="6517176180828983060">"Domena\\nazwa użytkownika"</string>
     <string name="account_setup_exchange_domain_label" msgid="3584668050727667045">"Domena"</string>
     <string name="account_setup_exchange_domain_hint" msgid="350372033916025287">"Tutaj wprowadź domenę"</string>
     <string name="account_setup_exchange_ssl_label" msgid="6704105469083211236">"Użyj bezpiecznego połączenia (SSL)"</string>
-    <!-- no translation found for account_setup_exchange_trust_certificates_label (6232880757633882678) -->
-    <skip />
+    <string name="account_setup_exchange_trust_certificates_label" msgid="6232880757633882678">"Akceptuj wszystkie certyfikaty SSL"</string>
     <string name="account_setup_options_title" msgid="8995162193118880993">"Opcje konta"</string>
     <string name="account_setup_options_mail_check_frequency_label" msgid="4598023962234986194">"Sprawdzanie poczty"</string>
     <string name="account_setup_options_mail_check_frequency_never" msgid="287951859480505416">"Nigdy"</string>
@@ -229,13 +204,13 @@
     <string name="account_setup_failed_auth_required" msgid="1676242821459638150">"Serwer nie obsługuje metod uwierzytelniania."</string>
     <string name="account_setup_failed_security" msgid="6142264248671379943">"Nie można nawiązać połączenia z serwerem z powodu błędu zabezpieczeń."</string>
     <string name="account_setup_failed_ioerror" msgid="7391458717708933095">"Nie można nawiązać połączenia z serwerem."</string>
+    <string name="account_setup_failed_security_policies_required" msgid="3567420384516656976">"Ten serwer Exchange ActiveSync wymaga funkcji zabezpieczeń, których Twój telefon nie obsługuje."</string>
     <string name="account_setup_failed_dlg_edit_details_action" msgid="5355993309841479360">"Edytuj szczegóły"</string>
     <string name="account_settings_title_fmt" msgid="1702058877284382340">"Ustawienia ogólne"</string>
     <string name="account_settings_default_label" msgid="3575963379680943640">"Domyślne konto"</string>
     <string name="account_settings_default_summary" msgid="1531901438624688482">"Domyślnie wysyłaj wiadomości e-mail z tego konta"</string>
     <string name="account_settings_notify_label" msgid="1630001017303007974">"Powiadomienia e-mail"</string>
-    <!-- no translation found for account_settings_exchange_summary (8498451479029626317) -->
-    <skip />
+    <string name="account_settings_exchange_summary" msgid="8498451479029626317">"Częstotliwość synchronizacji, powiadomienia itd."</string>
     <string name="account_settings_notify_summary" msgid="6609224590300639887">"Wyświetl powiadomienie na pasku stanu po otrzymaniu e-maila"</string>
     <string name="account_settings_mail_check_frequency_label" msgid="2067835530563849675">"Sprawdzanie poczty"</string>
     <string name="account_settings_incoming_label" msgid="7858928031806297542">"Poczta przychodząca"</string>
@@ -244,12 +219,10 @@
     <string name="account_settings_description_label" msgid="8894815221204511715">"Nazwa konta"</string>
     <string name="account_settings_name_label" msgid="8186406122590008449">"Imię i nazwisko"</string>
     <string name="account_settings_notifications" msgid="1042620094281375043">"Ustawienia powiadomień"</string>
-    <!-- no translation found for account_settings_sync_contacts_enable (1369272986009573218) -->
-    <skip />
-    <!-- no translation found for account_settings_sync_contacts_summary (8901452720940015928) -->
-    <skip />
+    <string name="account_settings_sync_contacts_enable" msgid="1369272986009573218">"Synchronizuj kontakty"</string>
+    <string name="account_settings_sync_contacts_summary" msgid="8901452720940015928">"Synchronizuj również kontakty na tym koncie"</string>
     <string name="account_settings_vibrate_enable" msgid="8045133290388856478">"Wibracje"</string>
-    <string name="account_settings_vibrate_summary" msgid="3690631050585589365">"Sygnalizuj otrzymanie wiadomości e-mail wibracją"</string>
+    <string name="account_settings_vibrate_summary" msgid="3690631050585589365">"Sygnalizuj otrzymanie e-maila wibracją"</string>
     <string name="account_settings_ringtone" msgid="7922187231467500404">"Wybierz dzwonek"</string>
     <string name="account_settings_servers" msgid="4925493817981624242">"Ustawienia serwera"</string>
     <string name="account_delete_dlg_title" msgid="6806087520856396608">"Usuń konto"</string>
@@ -258,7 +231,6 @@
     <string name="provider_note_yahoo_uk" msgid="2055976404478603298">"Przed skonfigurowaniem tego konta e-mail odwiedź witrynę usługi Yahoo! i włącz dostęp do poczty POP3."</string>
     <string name="provider_note_live" msgid="3584841823811425060">"Tylko niektóre konta typu Plus zawierają funkcję dostępu POP, która umożliwia nawiązywanie połączenia za pomocą tego programu. Jeśli nie możesz zalogować się przy użyciu poprawnego adresu e-mail i hasła, to być może nie posiadasz płatnego konta typu Plus. Uruchom przeglądarkę internetową, aby uzyskać dostęp do tych kont pocztowych."</string>
     <string name="provider_note_t_online" msgid="1973701903400232774">"Przed skonfigurowaniem tego konta e-mail odwiedź witrynę usługi T-Online i utwórz hasło na potrzeby dostępu do poczty POP3."</string>
-    <!-- no translation found for exchange_name (1190783774800310346) -->
-    <skip />
+    <string name="exchange_name" msgid="1190783774800310346">"Firma"</string>
     <string name="system_account_create_failed" msgid="4917162302393971752">"Usługa AccountManager nie może utworzyć konta. Spróbuj ponownie."</string>
 </resources>
diff --git a/res/values-pt-rPT/strings.xml b/res/values-pt-rPT/strings.xml
index 0aac209..dfb9aad 100644
--- a/res/values-pt-rPT/strings.xml
+++ b/res/values-pt-rPT/strings.xml
@@ -15,13 +15,10 @@
 -->
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <!-- no translation found for read_attachment_label (1162255191991555285) -->
-    <skip />
+    <string name="read_attachment_label" msgid="1162255191991555285">"Ler anexos de e-mail"</string>
     <string name="read_attachment_desc" msgid="7594746717616308643">"Permite que esta aplicação leia os seus anexos de e-mail."</string>
-    <!-- no translation found for permission_access_provider_label (4274353114641168675) -->
-    <skip />
-    <!-- no translation found for permission_access_provider_desc (1513898266889541617) -->
-    <skip />
+    <string name="permission_access_provider_label" msgid="4274353114641168675">"Aceder a dados do fornecedor de e-mail"</string>
+    <string name="permission_access_provider_desc" msgid="1513898266889541617">"Permite que esta aplicação aceda à base de dados do e-mail, incluindo mensagens recebidas, mensagens enviadas, nomes de utilizadores e palavras-passe."</string>
     <string name="app_name" msgid="5815426892327290362">"E-mail"</string>
     <string name="accounts_title" msgid="6622149231904649210">"E-mail"</string>
     <string name="compose_title" msgid="427986915662706899">"Redigir"</string>
@@ -38,19 +35,14 @@
     <string name="discard_action" msgid="6532206074859505968">"Rejeitar"</string>
     <string name="save_draft_action" msgid="812855865552028622">"Guardar como rascunho"</string>
     <string name="read_unread_action" msgid="4721446664849165077">"Lida/Não lida"</string>
-    <!-- no translation found for read_action (4701484794504781686) -->
-    <skip />
-    <!-- no translation found for unread_action (6280399049357552826) -->
-    <skip />
+    <string name="read_action" msgid="4701484794504781686">"Marcar como lida"</string>
+    <string name="unread_action" msgid="6280399049357552826">"Marcar como não lida"</string>
     <string name="favorite_action" msgid="2911296685862420689">"Favorito"</string>
-    <!-- no translation found for set_star_action (4660317166196258160) -->
-    <skip />
-    <!-- no translation found for remove_star_action (6689770999647007163) -->
-    <skip />
+    <string name="set_star_action" msgid="4660317166196258160">"Adicionar estrela"</string>
+    <string name="remove_star_action" msgid="6689770999647007163">"Remover estrela"</string>
     <string name="refresh_action" msgid="5951383001436708175">"Actualizar"</string>
     <string name="add_account_action" msgid="8835736309476033727">"Adicionar conta"</string>
-    <!-- no translation found for deselect_all_action (253663239459688238) -->
-    <skip />
+    <string name="deselect_all_action" msgid="253663239459688238">"Desmarcar tudo"</string>
     <string name="compose_action" msgid="4045702519637388045">"Redigir"</string>
     <string name="search_action" msgid="6325101454876682308">"Pesquisar"</string>
     <string name="open_action" msgid="936766723989190816">"Abrir"</string>
@@ -71,8 +63,7 @@
     <string name="status_sending_messages_failed" msgid="7975009558738692407">"Tentar enviar as mensagens novamente"</string>
     <string name="status_loading_more_failed" msgid="1629172047185323">"Tentar novamente carregar mais mensagens"</string>
     <string name="notification_new_title" msgid="2200257910380529139">"Novo e-mail"</string>
-    <!-- no translation found for error_loading_message_body (2265140604109272914) -->
-    <skip />
+    <string name="error_loading_message_body" msgid="2265140604109272914">"Erro inesperado durante o carregamento do texto da mensagem. É possível que a mensagem seja demasiado extensa para visualização."</string>
   <plurals name="notification_new_one_account_fmt">
     <item quantity="one" msgid="3422945912787702191">"<xliff:g id="UNREAD_MESSAGE_COUNT">%d</xliff:g> não lidas (<xliff:g id="ACCOUNT">%s</xliff:g>)"</item>
     <item quantity="few" msgid="6543078667692990869">"<xliff:g id="UNREAD_MESSAGE_COUNT">%d</xliff:g> não lidas (<xliff:g id="ACCOUNT">%s</xliff:g>)"</item>
@@ -82,25 +73,17 @@
     <item quantity="few" msgid="1991747245324120305">"em <xliff:g id="NUMBER_ACCOUNTS">%d</xliff:g> contas"</item>
     <item quantity="other" msgid="2723797835410343458">"em <xliff:g id="NUMBER_ACCOUNTS">%d</xliff:g> contas"</item>
   </plurals>
-    <!-- no translation found for mailbox_name_display_inbox (3542327124749861736) -->
-    <skip />
-    <!-- no translation found for mailbox_name_display_outbox (2826214174661417662) -->
-    <skip />
-    <!-- no translation found for mailbox_name_display_drafts (4868718300700514319) -->
-    <skip />
-    <!-- no translation found for mailbox_name_display_trash (9139069064580630647) -->
-    <skip />
-    <!-- no translation found for mailbox_name_display_sent (3426058998191869523) -->
-    <skip />
-    <!-- no translation found for mailbox_name_display_junk (9046762505977999288) -->
-    <skip />
+    <string name="mailbox_name_display_inbox" msgid="3542327124749861736">"Caixa de entrada"</string>
+    <string name="mailbox_name_display_outbox" msgid="2826214174661417662">"Caixa de saída"</string>
+    <string name="mailbox_name_display_drafts" msgid="4868718300700514319">"Rascunhos"</string>
+    <string name="mailbox_name_display_trash" msgid="9139069064580630647">"Lixo"</string>
+    <string name="mailbox_name_display_sent" msgid="3426058998191869523">"Enviada"</string>
+    <string name="mailbox_name_display_junk" msgid="9046762505977999288">"Correio electrónico não solicitado"</string>
     <string name="debug_version_fmt" msgid="6160213145745376955">"Versão: <xliff:g id="VERSION">%s</xliff:g>"</string>
     <string name="account_folder_list_separator_accounts" msgid="7568820182396669244">"Contas"</string>
-    <!-- no translation found for account_folder_list_summary_inbox (5790553737870057607) -->
-    <skip />
+    <string name="account_folder_list_summary_inbox" msgid="5790553737870057607">"Caixa de entrada combinada"</string>
     <string name="account_folder_list_summary_unread" msgid="1200755158196002928">"Não lida"</string>
-    <!-- no translation found for account_folder_list_summary_starred (3134312269246375723) -->
-    <skip />
+    <string name="account_folder_list_summary_starred" msgid="3134312269246375723">"Marcado com estrela"</string>
     <string name="account_folder_list_summary_drafts" msgid="5514845993247300437">"Rascunhos"</string>
     <string name="account_folder_list_summary_outbox" msgid="3059836696049399377">"Caixa de saída"</string>
     <string name="mailbox_list_title" msgid="8299608543467211089">"Caixa de correio"</string>
@@ -137,10 +120,8 @@
     <string name="add_contact_dlg_message_fmt" msgid="4470846346726847478">"Adicionar \"<xliff:g id="EMAIL">%s</xliff:g>\" aos contactos"</string>
     <string name="message_view_display_attachment_toast" msgid="6096315816776330821">"Este anexo não pode ser apresentado."</string>
     <string name="account_setup_basics_title" msgid="3969856368228940980">"Configurar e-mail"</string>
-    <!-- no translation found for accounts_welcome (5901437782383439370) -->
-    <skip />
-    <!-- no translation found for accounts_welcome_exchange (4414121583987233733) -->
-    <skip />
+    <string name="accounts_welcome" msgid="5901437782383439370">"Pode configurar o e-mail para a maioria das contas em apenas alguns passos."</string>
+    <string name="accounts_welcome_exchange" msgid="4414121583987233733">"Pode configurar uma conta do Exchange em apenas alguns passos."</string>
     <!-- no translation found for account_setup_basics_instructions (3126077748322815504) -->
     <skip />
     <string name="account_setup_basics_email_hint" msgid="7414269319207261120">"Endereço de e-mail"</string>
@@ -148,10 +129,8 @@
     <string name="account_setup_basics_default_label" msgid="5924790142029806711">"Enviar e-mail a partir desta conta por predefinição."</string>
     <string name="account_setup_basics_manual_setup_action" msgid="8053852205391155912">"Configuração manual"</string>
     <string name="account_setup_username_password_toast" msgid="4441448542557889481">"Escreva um endereço de e-mail e uma palavra-passe válidos."</string>
-    <!-- no translation found for account_duplicate_dlg_title (3176749833792312641) -->
-    <skip />
-    <!-- no translation found for account_duplicate_dlg_message_fmt (1920726613701479851) -->
-    <skip />
+    <string name="account_duplicate_dlg_title" msgid="3176749833792312641">"Duplicar conta"</string>
+    <string name="account_duplicate_dlg_message_fmt" msgid="1920726613701479851">"Este início de sessão já está a ser utilizado para a conta \"<xliff:g id="DUPLICATE">%s</xliff:g>\"."</string>
     <string name="account_setup_check_settings_retr_info_msg" msgid="4121970450267725664">"A obter informações da conta..."</string>
     <string name="account_setup_check_settings_check_incoming_msg" msgid="5356212700221438863">"A verificar definições do servidor de recepção..."</string>
     <string name="account_setup_check_settings_check_outgoing_msg" msgid="4033015234096725343">"A verificar definições do servidor de envio..."</string>
@@ -170,14 +149,10 @@
     <string name="account_setup_incoming_port_label" msgid="8214738923690447796">"Porta"</string>
     <string name="account_setup_incoming_security_label" msgid="2110260791086007424">"Tipo de segurança"</string>
     <string name="account_setup_incoming_security_none_label" msgid="8300169413118264895">"Nenhum"</string>
-    <!-- no translation found for account_setup_incoming_security_ssl_trust_certificates_label (3581382268191377346) -->
-    <skip />
-    <!-- no translation found for account_setup_incoming_security_ssl_label (8886698397743061682) -->
-    <skip />
-    <!-- no translation found for account_setup_incoming_security_tls_trust_certificates_label (1089227022489257055) -->
-    <skip />
-    <!-- no translation found for account_setup_incoming_security_tls_label (8638006172590036487) -->
-    <skip />
+    <string name="account_setup_incoming_security_ssl_trust_certificates_label" msgid="3581382268191377346">"SSL (Aceitar todos os certificados)"</string>
+    <string name="account_setup_incoming_security_ssl_label" msgid="8886698397743061682">"SSL"</string>
+    <string name="account_setup_incoming_security_tls_trust_certificates_label" msgid="1089227022489257055">"TLS (Aceitar todos os certificados)"</string>
+    <string name="account_setup_incoming_security_tls_label" msgid="8638006172590036487">"TLS"</string>
     <string name="account_setup_incoming_delete_policy_label" msgid="9213590134693857912">"Eliminar e-mail 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>
@@ -190,15 +165,15 @@
     <string name="account_setup_outgoing_require_login_label" msgid="6371514297854287948">"Solicitar início de sessão."</string>
     <string name="account_setup_outgoing_username_label" msgid="3309680794731596981">"Nome de utilizador"</string>
     <string name="account_setup_outgoing_password_label" msgid="227844585493317550">"Palavra-passe"</string>
-    <string name="account_setup_exchange_title" msgid="247933841122558059">"Definições do servidor do Exchange"</string>
-    <string name="account_setup_exchange_server_label" msgid="5390359659749339317">"Exchange Server"</string>
-    <!-- no translation found for account_setup_exchange_username_label (6517176180828983060) -->
+    <!-- no translation found for account_setup_exchange_title (2492853474738063453) -->
     <skip />
+    <!-- no translation found for account_setup_exchange_server_label (795137797983360826) -->
+    <skip />
+    <string name="account_setup_exchange_username_label" msgid="6517176180828983060">"Domínio/Nome de utilizador"</string>
     <string name="account_setup_exchange_domain_label" msgid="3584668050727667045">"Domínio"</string>
     <string name="account_setup_exchange_domain_hint" msgid="350372033916025287">"Introduza o domínio aqui"</string>
     <string name="account_setup_exchange_ssl_label" msgid="6704105469083211236">"Utilizar ligação segura (SSL)"</string>
-    <!-- no translation found for account_setup_exchange_trust_certificates_label (6232880757633882678) -->
-    <skip />
+    <string name="account_setup_exchange_trust_certificates_label" msgid="6232880757633882678">"Aceitar todos os certificados SLL"</string>
     <string name="account_setup_options_title" msgid="8995162193118880993">"Opções da conta"</string>
     <string name="account_setup_options_mail_check_frequency_label" msgid="4598023962234986194">"Frequência de verificação de e-mail"</string>
     <string name="account_setup_options_mail_check_frequency_never" msgid="287951859480505416">"Nunca"</string>
@@ -229,13 +204,13 @@
     <string name="account_setup_failed_auth_required" msgid="1676242821459638150">"Os métodos de autenticação não são suportados pelo servidor."</string>
     <string name="account_setup_failed_security" msgid="6142264248671379943">"Não foi possível abrir a ligação ao servidor devido a um erro de segurança."</string>
     <string name="account_setup_failed_ioerror" msgid="7391458717708933095">"Não foi possível abrir a ligação ao servidor."</string>
+    <string name="account_setup_failed_security_policies_required" msgid="3567420384516656976">"Este servidor do Exchange ActiveSync requer funcionalidades de segurança que não são suportadas pelo telefone."</string>
     <string name="account_setup_failed_dlg_edit_details_action" msgid="5355993309841479360">"Editar detalhes"</string>
     <string name="account_settings_title_fmt" msgid="1702058877284382340">"Definições gerais"</string>
     <string name="account_settings_default_label" msgid="3575963379680943640">"Conta predefinida"</string>
     <string name="account_settings_default_summary" msgid="1531901438624688482">"Enviar e-mail a partir desta conta por predefinição"</string>
     <string name="account_settings_notify_label" msgid="1630001017303007974">"Notificações de e-mail"</string>
-    <!-- no translation found for account_settings_exchange_summary (8498451479029626317) -->
-    <skip />
+    <string name="account_settings_exchange_summary" msgid="8498451479029626317">"Frequência da sincronização, notificações, etc."</string>
     <string name="account_settings_notify_summary" msgid="6609224590300639887">"Notificar na barra de estado quando chegar e-mail"</string>
     <string name="account_settings_mail_check_frequency_label" msgid="2067835530563849675">"Frequência de verificação de e-mail"</string>
     <string name="account_settings_incoming_label" msgid="7858928031806297542">"Definições de recepção"</string>
@@ -244,10 +219,8 @@
     <string name="account_settings_description_label" msgid="8894815221204511715">"Nome da conta"</string>
     <string name="account_settings_name_label" msgid="8186406122590008449">"O seu nome"</string>
     <string name="account_settings_notifications" msgid="1042620094281375043">"Definições de notificação"</string>
-    <!-- no translation found for account_settings_sync_contacts_enable (1369272986009573218) -->
-    <skip />
-    <!-- no translation found for account_settings_sync_contacts_summary (8901452720940015928) -->
-    <skip />
+    <string name="account_settings_sync_contacts_enable" msgid="1369272986009573218">"Sincronizar contactos"</string>
+    <string name="account_settings_sync_contacts_summary" msgid="8901452720940015928">"Sincronizar também contactos a partir desta conta"</string>
     <string name="account_settings_vibrate_enable" msgid="8045133290388856478">"Vibrar"</string>
     <string name="account_settings_vibrate_summary" msgid="3690631050585589365">"Vibrar também quando chega e-mail"</string>
     <string name="account_settings_ringtone" msgid="7922187231467500404">"Seleccionar toque"</string>
@@ -258,7 +231,6 @@
     <string name="provider_note_yahoo_uk" msgid="2055976404478603298">"Antes de configurar esta conta de e-mail, visite o Web site do Yahoo! e active o acesso de e-mail POP3 para esta conta."</string>
     <string name="provider_note_live" msgid="3584841823811425060">"Apenas algumas contas \"Plus\" incluem acesso POP, permitindo a ligação deste programa. Se não conseguir iniciar sessão com o seu endereço de e-mail e a palavra-passe correctos, é possível que não tenha uma conta \"Plus\" paga. Inicie o browser para obter acesso a essas contas de correio."</string>
     <string name="provider_note_t_online" msgid="1973701903400232774">"Antes de configurar esta conta de e-mail, visite o Web site T-Online e crie uma palavra-passe para o acesso a e-mail POP3."</string>
-    <!-- no translation found for exchange_name (1190783774800310346) -->
-    <skip />
+    <string name="exchange_name" msgid="1190783774800310346">"Empresa"</string>
     <string name="system_account_create_failed" msgid="4917162302393971752">"O Gestor de Contas não conseguiu criar a Conta; tente novamente."</string>
 </resources>
diff --git a/res/values-pt/strings.xml b/res/values-pt/strings.xml
index e1ac2d5..829629b 100644
--- a/res/values-pt/strings.xml
+++ b/res/values-pt/strings.xml
@@ -15,13 +15,10 @@
 -->
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <!-- no translation found for read_attachment_label (1162255191991555285) -->
-    <skip />
+    <string name="read_attachment_label" msgid="1162255191991555285">"Ler anexos do e-mail"</string>
     <string name="read_attachment_desc" msgid="7594746717616308643">"Permite que este aplicativo leia seus anexos enviados por e-mail."</string>
-    <!-- no translation found for permission_access_provider_label (4274353114641168675) -->
-    <skip />
-    <!-- no translation found for permission_access_provider_desc (1513898266889541617) -->
-    <skip />
+    <string name="permission_access_provider_label" msgid="4274353114641168675">"Acessar dados do provedor de e-mail"</string>
+    <string name="permission_access_provider_desc" msgid="1513898266889541617">"Permite que este aplicativo acesse seu banco de dados do E-mail, incluindo mensagens recebidas e enviadas, nomes de usuário e senhas."</string>
     <string name="app_name" msgid="5815426892327290362">"E-mail"</string>
     <string name="accounts_title" msgid="6622149231904649210">"E-mail"</string>
     <string name="compose_title" msgid="427986915662706899">"Escrever"</string>
@@ -38,19 +35,14 @@
     <string name="discard_action" msgid="6532206074859505968">"Descartar"</string>
     <string name="save_draft_action" msgid="812855865552028622">"Salvar como rascunho"</string>
     <string name="read_unread_action" msgid="4721446664849165077">"Lidos/Não lidos"</string>
-    <!-- no translation found for read_action (4701484794504781686) -->
-    <skip />
-    <!-- no translation found for unread_action (6280399049357552826) -->
-    <skip />
+    <string name="read_action" msgid="4701484794504781686">"Marcar como lida"</string>
+    <string name="unread_action" msgid="6280399049357552826">"Marcar como não lida"</string>
     <string name="favorite_action" msgid="2911296685862420689">"Favorito"</string>
-    <!-- no translation found for set_star_action (4660317166196258160) -->
-    <skip />
-    <!-- no translation found for remove_star_action (6689770999647007163) -->
-    <skip />
+    <string name="set_star_action" msgid="4660317166196258160">"Adicionar estrela"</string>
+    <string name="remove_star_action" msgid="6689770999647007163">"Remover estrela"</string>
     <string name="refresh_action" msgid="5951383001436708175">"Atualizar"</string>
     <string name="add_account_action" msgid="8835736309476033727">"Adicionar conta"</string>
-    <!-- no translation found for deselect_all_action (253663239459688238) -->
-    <skip />
+    <string name="deselect_all_action" msgid="253663239459688238">"Desmarcar todas"</string>
     <string name="compose_action" msgid="4045702519637388045">"Escrever"</string>
     <string name="search_action" msgid="6325101454876682308">"Pesquisar"</string>
     <string name="open_action" msgid="936766723989190816">"Abrir"</string>
@@ -71,8 +63,7 @@
     <string name="status_sending_messages_failed" msgid="7975009558738692407">"Tentar enviar mensagens novamente"</string>
     <string name="status_loading_more_failed" msgid="1629172047185323">"Tentar carregar mais mensagens novamente"</string>
     <string name="notification_new_title" msgid="2200257910380529139">"Novo e-mail"</string>
-    <!-- no translation found for error_loading_message_body (2265140604109272914) -->
-    <skip />
+    <string name="error_loading_message_body" msgid="2265140604109272914">"Erro inesperado ao carregar o texto da mensagem. A mensagem pode ser grande demais para ser exibida."</string>
   <plurals name="notification_new_one_account_fmt">
     <item quantity="one" msgid="3422945912787702191">"<xliff:g id="UNREAD_MESSAGE_COUNT">%d</xliff:g> não lida (<xliff:g id="ACCOUNT">%s</xliff:g>)"</item>
     <item quantity="few" msgid="6543078667692990869">"<xliff:g id="UNREAD_MESSAGE_COUNT">%d</xliff:g> não lidas (<xliff:g id="ACCOUNT">%s</xliff:g>)"</item>
@@ -82,25 +73,17 @@
     <item quantity="few" msgid="1991747245324120305">"em <xliff:g id="NUMBER_ACCOUNTS">%d</xliff:g> contas"</item>
     <item quantity="other" msgid="2723797835410343458">"em <xliff:g id="NUMBER_ACCOUNTS">%d</xliff:g> contas"</item>
   </plurals>
-    <!-- no translation found for mailbox_name_display_inbox (3542327124749861736) -->
-    <skip />
-    <!-- no translation found for mailbox_name_display_outbox (2826214174661417662) -->
-    <skip />
-    <!-- no translation found for mailbox_name_display_drafts (4868718300700514319) -->
-    <skip />
-    <!-- no translation found for mailbox_name_display_trash (9139069064580630647) -->
-    <skip />
-    <!-- no translation found for mailbox_name_display_sent (3426058998191869523) -->
-    <skip />
-    <!-- no translation found for mailbox_name_display_junk (9046762505977999288) -->
-    <skip />
+    <string name="mailbox_name_display_inbox" msgid="3542327124749861736">"Caixa de entrada"</string>
+    <string name="mailbox_name_display_outbox" msgid="2826214174661417662">"Caixa de saída"</string>
+    <string name="mailbox_name_display_drafts" msgid="4868718300700514319">"Rascunhos"</string>
+    <string name="mailbox_name_display_trash" msgid="9139069064580630647">"Lixeira"</string>
+    <string name="mailbox_name_display_sent" msgid="3426058998191869523">"E-mails enviados"</string>
+    <string name="mailbox_name_display_junk" msgid="9046762505977999288">"Lixo"</string>
     <string name="debug_version_fmt" msgid="6160213145745376955">"Versão: <xliff:g id="VERSION">%s</xliff:g>"</string>
     <string name="account_folder_list_separator_accounts" msgid="7568820182396669244">"Contas"</string>
-    <!-- no translation found for account_folder_list_summary_inbox (5790553737870057607) -->
-    <skip />
+    <string name="account_folder_list_summary_inbox" msgid="5790553737870057607">"Caixa de entrada mesclada"</string>
     <string name="account_folder_list_summary_unread" msgid="1200755158196002928">"Não lido"</string>
-    <!-- no translation found for account_folder_list_summary_starred (3134312269246375723) -->
-    <skip />
+    <string name="account_folder_list_summary_starred" msgid="3134312269246375723">"Com estrela"</string>
     <string name="account_folder_list_summary_drafts" msgid="5514845993247300437">"Rascunhos"</string>
     <string name="account_folder_list_summary_outbox" msgid="3059836696049399377">"Caixa de saída"</string>
     <string name="mailbox_list_title" msgid="8299608543467211089">"Caixa de correio"</string>
@@ -119,7 +102,7 @@
     <string name="message_compose_error_invalid_email" msgid="1817633338629885643">"Alguns endereços de e-mail são inválidos."</string>
     <string name="message_compose_attachments_skipped_toast" msgid="5611815773808423460">"Alguns anexos não podem ser encaminhados pois o download deles não foi feito."</string>
     <string name="message_compose_attachment_size" msgid="4401081828287333647">"Arquivo muito grande para ser anexado."</string>
-    <string name="message_compose_display_name" msgid="6415258924917140704">"<xliff:g id="NAME">%1$s</xliff:g> e <xliff:g id="NUMBER">%2$d</xliff:g> outros"</string>
+    <string name="message_compose_display_name" msgid="6415258924917140704">"<xliff:g id="NAME">%1$s</xliff:g> e outras <xliff:g id="NUMBER">%2$d</xliff:g> pessoas"</string>
     <string name="message_view_to_label" msgid="6485191743265527381">"Para:"</string>
     <string name="message_view_cc_label" msgid="6322992216371163122">"Cc:"</string>
     <string name="message_view_attachment_view_action" msgid="5353550848340829134">"Abrir"</string>
@@ -137,10 +120,8 @@
     <string name="add_contact_dlg_message_fmt" msgid="4470846346726847478">"Adicionar \"<xliff:g id="EMAIL">%s</xliff:g>\" aos contatos"</string>
     <string name="message_view_display_attachment_toast" msgid="6096315816776330821">"Este anexo não pode ser exibido."</string>
     <string name="account_setup_basics_title" msgid="3969856368228940980">"Configurar e-mail"</string>
-    <!-- no translation found for accounts_welcome (5901437782383439370) -->
-    <skip />
-    <!-- no translation found for accounts_welcome_exchange (4414121583987233733) -->
-    <skip />
+    <string name="accounts_welcome" msgid="5901437782383439370">"Você pode configurar o E-mail para a maioria das contas em apenas algumas etapas."</string>
+    <string name="accounts_welcome_exchange" msgid="4414121583987233733">"Você pode configurar uma conta do Exchange em apenas algumas etapas."</string>
     <!-- no translation found for account_setup_basics_instructions (3126077748322815504) -->
     <skip />
     <string name="account_setup_basics_email_hint" msgid="7414269319207261120">"Endereço de e-mail"</string>
@@ -148,10 +129,8 @@
     <string name="account_setup_basics_default_label" msgid="5924790142029806711">"Enviar e-mail desta conta por padrão."</string>
     <string name="account_setup_basics_manual_setup_action" msgid="8053852205391155912">"Configuração manual"</string>
     <string name="account_setup_username_password_toast" msgid="4441448542557889481">"Digite um endereço de e-mail e senha válidos."</string>
-    <!-- no translation found for account_duplicate_dlg_title (3176749833792312641) -->
-    <skip />
-    <!-- no translation found for account_duplicate_dlg_message_fmt (1920726613701479851) -->
-    <skip />
+    <string name="account_duplicate_dlg_title" msgid="3176749833792312641">"Conta duplicada"</string>
+    <string name="account_duplicate_dlg_message_fmt" msgid="1920726613701479851">"Este login já está sendo usado para a conta \"<xliff:g id="DUPLICATE">%s</xliff:g>\"."</string>
     <string name="account_setup_check_settings_retr_info_msg" msgid="4121970450267725664">"Recuperando informações sobre a conta"</string>
     <string name="account_setup_check_settings_check_incoming_msg" msgid="5356212700221438863">"Verificando as configurações de entrada do servidor..."</string>
     <string name="account_setup_check_settings_check_outgoing_msg" msgid="4033015234096725343">"Verificando as configurações de saída do servidor..."</string>
@@ -170,14 +149,10 @@
     <string name="account_setup_incoming_port_label" msgid="8214738923690447796">"Porta"</string>
     <string name="account_setup_incoming_security_label" msgid="2110260791086007424">"Tipo de segurança"</string>
     <string name="account_setup_incoming_security_none_label" msgid="8300169413118264895">"Nenhum"</string>
-    <!-- no translation found for account_setup_incoming_security_ssl_trust_certificates_label (3581382268191377346) -->
-    <skip />
-    <!-- no translation found for account_setup_incoming_security_ssl_label (8886698397743061682) -->
-    <skip />
-    <!-- no translation found for account_setup_incoming_security_tls_trust_certificates_label (1089227022489257055) -->
-    <skip />
-    <!-- no translation found for account_setup_incoming_security_tls_label (8638006172590036487) -->
-    <skip />
+    <string name="account_setup_incoming_security_ssl_trust_certificates_label" msgid="3581382268191377346">"SSL (Aceitar todos os certificados)"</string>
+    <string name="account_setup_incoming_security_ssl_label" msgid="8886698397743061682">"SSL"</string>
+    <string name="account_setup_incoming_security_tls_trust_certificates_label" msgid="1089227022489257055">"TLS (Aceitar todos os certificados)"</string>
+    <string name="account_setup_incoming_security_tls_label" msgid="8638006172590036487">"TLS"</string>
     <string name="account_setup_incoming_delete_policy_label" msgid="9213590134693857912">"Excluir e-mail 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 excluir da Caixa de entrada"</string>
@@ -190,15 +165,15 @@
     <string name="account_setup_outgoing_require_login_label" msgid="6371514297854287948">"Requer login."</string>
     <string name="account_setup_outgoing_username_label" msgid="3309680794731596981">"Nome de usuário"</string>
     <string name="account_setup_outgoing_password_label" msgid="227844585493317550">"Senha"</string>
-    <string name="account_setup_exchange_title" msgid="247933841122558059">"Configurações do Exchange Server"</string>
-    <string name="account_setup_exchange_server_label" msgid="5390359659749339317">"Exchange Server"</string>
-    <!-- no translation found for account_setup_exchange_username_label (6517176180828983060) -->
+    <!-- no translation found for account_setup_exchange_title (2492853474738063453) -->
     <skip />
+    <!-- no translation found for account_setup_exchange_server_label (795137797983360826) -->
+    <skip />
+    <string name="account_setup_exchange_username_label" msgid="6517176180828983060">"Domínio\\Nome de usuário"</string>
     <string name="account_setup_exchange_domain_label" msgid="3584668050727667045">"Domínio"</string>
     <string name="account_setup_exchange_domain_hint" msgid="350372033916025287">"Insira o domínio aqui"</string>
     <string name="account_setup_exchange_ssl_label" msgid="6704105469083211236">"Usar conexão segura (SSL)"</string>
-    <!-- no translation found for account_setup_exchange_trust_certificates_label (6232880757633882678) -->
-    <skip />
+    <string name="account_setup_exchange_trust_certificates_label" msgid="6232880757633882678">"Aceitar todos os certificados SSL"</string>
     <string name="account_setup_options_title" msgid="8995162193118880993">"Opções da conta"</string>
     <string name="account_setup_options_mail_check_frequency_label" msgid="4598023962234986194">"Frequência de verificação"</string>
     <string name="account_setup_options_mail_check_frequency_never" msgid="287951859480505416">"Nunca"</string>
@@ -229,13 +204,13 @@
     <string name="account_setup_failed_auth_required" msgid="1676242821459638150">"Os métodos de autenticação não são suportados pelo servidor."</string>
     <string name="account_setup_failed_security" msgid="6142264248671379943">"Não foi possível se conectar ao servidor devido a erro de segurança."</string>
     <string name="account_setup_failed_ioerror" msgid="7391458717708933095">"Não foi possível se conectar ao servidor."</string>
+    <string name="account_setup_failed_security_policies_required" msgid="3567420384516656976">"Este servidor Exchange ActiveSync precisa de recursos de segurança que não são compatíveis com o seu telefone."</string>
     <string name="account_setup_failed_dlg_edit_details_action" msgid="5355993309841479360">"Editar detalhes"</string>
     <string name="account_settings_title_fmt" msgid="1702058877284382340">"Configurações gerais"</string>
     <string name="account_settings_default_label" msgid="3575963379680943640">"Conta padrão"</string>
     <string name="account_settings_default_summary" msgid="1531901438624688482">"Enviar e-mail desta conta por padrão"</string>
     <string name="account_settings_notify_label" msgid="1630001017303007974">"Notificações de e-mail"</string>
-    <!-- no translation found for account_settings_exchange_summary (8498451479029626317) -->
-    <skip />
+    <string name="account_settings_exchange_summary" msgid="8498451479029626317">"Frequência de sincronização, notificações etc."</string>
     <string name="account_settings_notify_summary" msgid="6609224590300639887">"Notificar na barra de status quando chegar um e-mail"</string>
     <string name="account_settings_mail_check_frequency_label" msgid="2067835530563849675">"Frequência de verificação de e-mail"</string>
     <string name="account_settings_incoming_label" msgid="7858928031806297542">"Configurações entrada"</string>
@@ -244,10 +219,8 @@
     <string name="account_settings_description_label" msgid="8894815221204511715">"Nome da conta"</string>
     <string name="account_settings_name_label" msgid="8186406122590008449">"Seu nome"</string>
     <string name="account_settings_notifications" msgid="1042620094281375043">"Configurações de notificação"</string>
-    <!-- no translation found for account_settings_sync_contacts_enable (1369272986009573218) -->
-    <skip />
-    <!-- no translation found for account_settings_sync_contacts_summary (8901452720940015928) -->
-    <skip />
+    <string name="account_settings_sync_contacts_enable" msgid="1369272986009573218">"Sincronizar contatos"</string>
+    <string name="account_settings_sync_contacts_summary" msgid="8901452720940015928">"Também sincronizar contatos desta conta"</string>
     <string name="account_settings_vibrate_enable" msgid="8045133290388856478">"Vibrar"</string>
     <string name="account_settings_vibrate_summary" msgid="3690631050585589365">"Vibrar também quando chegarem os e-mails"</string>
     <string name="account_settings_ringtone" msgid="7922187231467500404">"Selecionar toque"</string>
@@ -258,7 +231,6 @@
     <string name="provider_note_yahoo_uk" msgid="2055976404478603298">"Antes de configurar esta conta de e-mail, visite o site do Yahoo! e habilite o acesso de e-mail POP3 para esta conta."</string>
     <string name="provider_note_live" msgid="3584841823811425060">"Somente algumas contas \"Plus\" incluem o acesso POP permitindo que este programa seja conectado. Se não for possível fazer login com seu endereço de e-mail e senha corretos, você talvez não tenha uma conta \"Plus\" paga. Inicie o navegador da web para acessar estas contas de e-mail."</string>
     <string name="provider_note_t_online" msgid="1973701903400232774">"Antes de configurar essa conta de e-mail, visite o site T-Online e crie uma senha para acessar e-mail POP3."</string>
-    <!-- no translation found for exchange_name (1190783774800310346) -->
-    <skip />
+    <string name="exchange_name" msgid="1190783774800310346">"Corporativa"</string>
     <string name="system_account_create_failed" msgid="4917162302393971752">"O AccountManager não conseguiu criar a Conta. Tente novamente."</string>
 </resources>
diff --git a/res/values-ru/strings.xml b/res/values-ru/strings.xml
index 19a2335..f82616d 100644
--- a/res/values-ru/strings.xml
+++ b/res/values-ru/strings.xml
@@ -15,13 +15,10 @@
 -->
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <!-- no translation found for read_attachment_label (1162255191991555285) -->
-    <skip />
+    <string name="read_attachment_label" msgid="1162255191991555285">"Открывать приложения к письмам"</string>
     <string name="read_attachment_desc" msgid="7594746717616308643">"Разрешить этой программе открывать приложения электронной почты."</string>
-    <!-- no translation found for permission_access_provider_label (4274353114641168675) -->
-    <skip />
-    <!-- no translation found for permission_access_provider_desc (1513898266889541617) -->
-    <skip />
+    <string name="permission_access_provider_label" msgid="4274353114641168675">"Получать доступ к данным провайдера электронной почты"</string>
+    <string name="permission_access_provider_desc" msgid="1513898266889541617">"Разрешает этому приложению доступ к базе данных программы электронной почты, включая полученные и отправленные письма, имена пользователей и пароли."</string>
     <string name="app_name" msgid="5815426892327290362">"Email"</string>
     <string name="accounts_title" msgid="6622149231904649210">"Эл. почта"</string>
     <string name="compose_title" msgid="427986915662706899">"Новое сообщение"</string>
@@ -38,19 +35,14 @@
     <string name="discard_action" msgid="6532206074859505968">"Удалить черновик"</string>
     <string name="save_draft_action" msgid="812855865552028622">"Сохранить черновик"</string>
     <string name="read_unread_action" msgid="4721446664849165077">"Прочитанные/Непрочитанные"</string>
-    <!-- no translation found for read_action (4701484794504781686) -->
-    <skip />
-    <!-- no translation found for unread_action (6280399049357552826) -->
-    <skip />
+    <string name="read_action" msgid="4701484794504781686">"Отметить как прочитанное"</string>
+    <string name="unread_action" msgid="6280399049357552826">"Отметить как непрочитанное"</string>
     <string name="favorite_action" msgid="2911296685862420689">"Избранное"</string>
-    <!-- no translation found for set_star_action (4660317166196258160) -->
-    <skip />
-    <!-- no translation found for remove_star_action (6689770999647007163) -->
-    <skip />
+    <string name="set_star_action" msgid="4660317166196258160">"Пометить"</string>
+    <string name="remove_star_action" msgid="6689770999647007163">"Снять пометку"</string>
     <string name="refresh_action" msgid="5951383001436708175">"Обновить"</string>
     <string name="add_account_action" msgid="8835736309476033727">"Добавить аккаунт"</string>
-    <!-- no translation found for deselect_all_action (253663239459688238) -->
-    <skip />
+    <string name="deselect_all_action" msgid="253663239459688238">"Снять все выделения"</string>
     <string name="compose_action" msgid="4045702519637388045">"Новое сообщение"</string>
     <string name="search_action" msgid="6325101454876682308">"Поиск"</string>
     <string name="open_action" msgid="936766723989190816">"Открыть"</string>
@@ -60,7 +52,7 @@
     <string name="accounts_action" msgid="901105887272231493">"Аккаунты"</string>
     <string name="mark_as_read_action" msgid="5031651846998842419">"Отметить как прочитанные"</string>
     <string name="mark_as_unread_action" msgid="3766298115778767554">"Отметить как непрочитанное"</string>
-    <string name="add_cc_bcc_action" msgid="5569074812077509737">"Добавить копию или скрытую копию"</string>
+    <string name="add_cc_bcc_action" msgid="5569074812077509737">"Добавить копию"</string>
     <string name="add_attachment_action" msgid="2696013743130573897">"Добавить приложение"</string>
     <string name="dump_settings_action" msgid="4478192525236169829">"Настройки дампа"</string>
     <string name="choose_attachment_dialog_title" msgid="81937507117528954">"Выбрать приложение"</string>
@@ -71,8 +63,7 @@
     <string name="status_sending_messages_failed" msgid="7975009558738692407">"Попытаться отправить сообщения повторно"</string>
     <string name="status_loading_more_failed" msgid="1629172047185323">"Попробуйте загрузить остальные сообщения еще раз"</string>
     <string name="notification_new_title" msgid="2200257910380529139">"Новое письмо"</string>
-    <!-- no translation found for error_loading_message_body (2265140604109272914) -->
-    <skip />
+    <string name="error_loading_message_body" msgid="2265140604109272914">"Непредвиденная ошибка при загрузке текста сообщения. Возможно, объем сообщения слишком велик."</string>
   <plurals name="notification_new_one_account_fmt">
     <item quantity="one" msgid="3422945912787702191">"Непрочитанных: <xliff:g id="UNREAD_MESSAGE_COUNT">%d</xliff:g> (<xliff:g id="ACCOUNT">%s</xliff:g>)"</item>
     <item quantity="few" msgid="6543078667692990869">"Непрочитанных: <xliff:g id="UNREAD_MESSAGE_COUNT">%d</xliff:g> (<xliff:g id="ACCOUNT">%s</xliff:g>)"</item>
@@ -82,25 +73,17 @@
     <item quantity="few" msgid="1991747245324120305">"в <xliff:g id="NUMBER_ACCOUNTS">%d</xliff:g> аккаунтах"</item>
     <item quantity="other" msgid="2723797835410343458">"в <xliff:g id="NUMBER_ACCOUNTS">%d</xliff:g> аккаунтах"</item>
   </plurals>
-    <!-- no translation found for mailbox_name_display_inbox (3542327124749861736) -->
-    <skip />
-    <!-- no translation found for mailbox_name_display_outbox (2826214174661417662) -->
-    <skip />
-    <!-- no translation found for mailbox_name_display_drafts (4868718300700514319) -->
-    <skip />
-    <!-- no translation found for mailbox_name_display_trash (9139069064580630647) -->
-    <skip />
-    <!-- no translation found for mailbox_name_display_sent (3426058998191869523) -->
-    <skip />
-    <!-- no translation found for mailbox_name_display_junk (9046762505977999288) -->
-    <skip />
+    <string name="mailbox_name_display_inbox" msgid="3542327124749861736">"Входящие"</string>
+    <string name="mailbox_name_display_outbox" msgid="2826214174661417662">"Исходящие"</string>
+    <string name="mailbox_name_display_drafts" msgid="4868718300700514319">"Черновики"</string>
+    <string name="mailbox_name_display_trash" msgid="9139069064580630647">"Корзина"</string>
+    <string name="mailbox_name_display_sent" msgid="3426058998191869523">"Отправленные"</string>
+    <string name="mailbox_name_display_junk" msgid="9046762505977999288">"Спам"</string>
     <string name="debug_version_fmt" msgid="6160213145745376955">"Версия: <xliff:g id="VERSION">%s</xliff:g>"</string>
     <string name="account_folder_list_separator_accounts" msgid="7568820182396669244">"Аккаунты"</string>
-    <!-- no translation found for account_folder_list_summary_inbox (5790553737870057607) -->
-    <skip />
+    <string name="account_folder_list_summary_inbox" msgid="5790553737870057607">"Все входящие"</string>
     <string name="account_folder_list_summary_unread" msgid="1200755158196002928">"Непрочитанные"</string>
-    <!-- no translation found for account_folder_list_summary_starred (3134312269246375723) -->
-    <skip />
+    <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_title" msgid="8299608543467211089">"Почтовый ящик"</string>
@@ -137,10 +120,8 @@
     <string name="add_contact_dlg_message_fmt" msgid="4470846346726847478">"Добавить <xliff:g id="EMAIL">%s</xliff:g> в контакты"</string>
     <string name="message_view_display_attachment_toast" msgid="6096315816776330821">"Это приложение нельзя просмотреть."</string>
     <string name="account_setup_basics_title" msgid="3969856368228940980">"Настройка электронной почты"</string>
-    <!-- no translation found for accounts_welcome (5901437782383439370) -->
-    <skip />
-    <!-- no translation found for accounts_welcome_exchange (4414121583987233733) -->
-    <skip />
+    <string name="accounts_welcome" msgid="5901437782383439370">"Программу Email можно легко настроить для большинства популярных почтовых служб."</string>
+    <string name="accounts_welcome_exchange" msgid="4414121583987233733">"Аккаунт Exchange легко настроить в несколько шагов."</string>
     <!-- no translation found for account_setup_basics_instructions (3126077748322815504) -->
     <skip />
     <string name="account_setup_basics_email_hint" msgid="7414269319207261120">"Адрес электронной почты"</string>
@@ -148,10 +129,8 @@
     <string name="account_setup_basics_default_label" msgid="5924790142029806711">"По умолчанию отправлять почту с этого аккаунта"</string>
     <string name="account_setup_basics_manual_setup_action" msgid="8053852205391155912">"Настройка вручную"</string>
     <string name="account_setup_username_password_toast" msgid="4441448542557889481">"Введите действительный адрес электронной почты и пароль."</string>
-    <!-- no translation found for account_duplicate_dlg_title (3176749833792312641) -->
-    <skip />
-    <!-- no translation found for account_duplicate_dlg_message_fmt (1920726613701479851) -->
-    <skip />
+    <string name="account_duplicate_dlg_title" msgid="3176749833792312641">"Копия аккаунта"</string>
+    <string name="account_duplicate_dlg_message_fmt" msgid="1920726613701479851">"Это имя пользователя уже используется в аккаунте <xliff:g id="DUPLICATE">%s</xliff:g>."</string>
     <string name="account_setup_check_settings_retr_info_msg" msgid="4121970450267725664">"Получение информации аккаунта..."</string>
     <string name="account_setup_check_settings_check_incoming_msg" msgid="5356212700221438863">"Проверка настроек сервера входящих сообщений..."</string>
     <string name="account_setup_check_settings_check_outgoing_msg" msgid="4033015234096725343">"Проверка настроек сервера исходящих сообщений..."</string>
@@ -170,14 +149,10 @@
     <string name="account_setup_incoming_port_label" msgid="8214738923690447796">"Порт"</string>
     <string name="account_setup_incoming_security_label" msgid="2110260791086007424">"Тип безопасности"</string>
     <string name="account_setup_incoming_security_none_label" msgid="8300169413118264895">"Нет"</string>
-    <!-- no translation found for account_setup_incoming_security_ssl_trust_certificates_label (3581382268191377346) -->
-    <skip />
-    <!-- no translation found for account_setup_incoming_security_ssl_label (8886698397743061682) -->
-    <skip />
-    <!-- no translation found for account_setup_incoming_security_tls_trust_certificates_label (1089227022489257055) -->
-    <skip />
-    <!-- no translation found for account_setup_incoming_security_tls_label (8638006172590036487) -->
-    <skip />
+    <string name="account_setup_incoming_security_ssl_trust_certificates_label" msgid="3581382268191377346">"SSL (принимать все сертификаты)"</string>
+    <string name="account_setup_incoming_security_ssl_label" msgid="8886698397743061682">"SSL"</string>
+    <string name="account_setup_incoming_security_tls_trust_certificates_label" msgid="1089227022489257055">"TLS (принимать все сертификаты)"</string>
+    <string name="account_setup_incoming_security_tls_label" msgid="8638006172590036487">"TLS"</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>
@@ -190,15 +165,15 @@
     <string name="account_setup_outgoing_require_login_label" msgid="6371514297854287948">"Требовать входа в аккаунт."</string>
     <string name="account_setup_outgoing_username_label" msgid="3309680794731596981">"Имя пользователя"</string>
     <string name="account_setup_outgoing_password_label" msgid="227844585493317550">"Пароль"</string>
-    <string name="account_setup_exchange_title" msgid="247933841122558059">"Настройки сервера Exchange"</string>
-    <string name="account_setup_exchange_server_label" msgid="5390359659749339317">"Сервер Exchange"</string>
-    <!-- no translation found for account_setup_exchange_username_label (6517176180828983060) -->
+    <!-- no translation found for account_setup_exchange_title (2492853474738063453) -->
     <skip />
+    <!-- no translation found for account_setup_exchange_server_label (795137797983360826) -->
+    <skip />
+    <string name="account_setup_exchange_username_label" msgid="6517176180828983060">"Домен\\Имя пользователя"</string>
     <string name="account_setup_exchange_domain_label" msgid="3584668050727667045">"Домен"</string>
     <string name="account_setup_exchange_domain_hint" msgid="350372033916025287">"Введите домен"</string>
     <string name="account_setup_exchange_ssl_label" msgid="6704105469083211236">"Использовать защищенное соединение (SSL)"</string>
-    <!-- no translation found for account_setup_exchange_trust_certificates_label (6232880757633882678) -->
-    <skip />
+    <string name="account_setup_exchange_trust_certificates_label" msgid="6232880757633882678">"Принимать все сертификаты SSL"</string>
     <string name="account_setup_options_title" msgid="8995162193118880993">"Параметры аккаунта"</string>
     <string name="account_setup_options_mail_check_frequency_label" msgid="4598023962234986194">"Частота проверки почты"</string>
     <string name="account_setup_options_mail_check_frequency_never" msgid="287951859480505416">"Никогда"</string>
@@ -229,13 +204,13 @@
     <string name="account_setup_failed_auth_required" msgid="1676242821459638150">"Методы аутентификации не поддерживаются сервером."</string>
     <string name="account_setup_failed_security" msgid="6142264248671379943">"Не удается установить соединение с сервером из-за ошибки безопасности."</string>
     <string name="account_setup_failed_ioerror" msgid="7391458717708933095">"Не удается установить соединение с сервером."</string>
+    <string name="account_setup_failed_security_policies_required" msgid="3567420384516656976">"Безопасность этого сервера Exchange ActiveSync обеспечивается с помощью средств, не поддерживаемых вашим телефоном."</string>
     <string name="account_setup_failed_dlg_edit_details_action" msgid="5355993309841479360">"Изменить сведения"</string>
     <string name="account_settings_title_fmt" msgid="1702058877284382340">"Общие настройки"</string>
     <string name="account_settings_default_label" msgid="3575963379680943640">"Аккаунт по умолчанию"</string>
     <string name="account_settings_default_summary" msgid="1531901438624688482">"По умолчанию отправлять почту с этого аккаунта"</string>
     <string name="account_settings_notify_label" msgid="1630001017303007974">"Уведомления о почте"</string>
-    <!-- no translation found for account_settings_exchange_summary (8498451479029626317) -->
-    <skip />
+    <string name="account_settings_exchange_summary" msgid="8498451479029626317">"Частота синхронизации, уведомления и другие настройки"</string>
     <string name="account_settings_notify_summary" msgid="6609224590300639887">"Сообщать о получении почты в строке состояния"</string>
     <string name="account_settings_mail_check_frequency_label" msgid="2067835530563849675">"Частота проверки почты"</string>
     <string name="account_settings_incoming_label" msgid="7858928031806297542">"Настройки входящих сообщений"</string>
@@ -244,12 +219,10 @@
     <string name="account_settings_description_label" msgid="8894815221204511715">"Название аккаунта"</string>
     <string name="account_settings_name_label" msgid="8186406122590008449">"Ваше имя"</string>
     <string name="account_settings_notifications" msgid="1042620094281375043">"Настройки уведомлений"</string>
-    <!-- no translation found for account_settings_sync_contacts_enable (1369272986009573218) -->
-    <skip />
-    <!-- no translation found for account_settings_sync_contacts_summary (8901452720940015928) -->
-    <skip />
-    <string name="account_settings_vibrate_enable" msgid="8045133290388856478">"Вибрация"</string>
-    <string name="account_settings_vibrate_summary" msgid="3690631050585589365">"Вибрация при получении сообщения"</string>
+    <string name="account_settings_sync_contacts_enable" msgid="1369272986009573218">"Синхронизировать контакты"</string>
+    <string name="account_settings_sync_contacts_summary" msgid="8901452720940015928">"Также синхронизировать контакты из этого аккаунта"</string>
+    <string name="account_settings_vibrate_enable" msgid="8045133290388856478">"Вибровызов"</string>
+    <string name="account_settings_vibrate_summary" msgid="3690631050585589365">"Вибросигнал при получении сообщения"</string>
     <string name="account_settings_ringtone" msgid="7922187231467500404">"Выбрать мелодию"</string>
     <string name="account_settings_servers" msgid="4925493817981624242">"Настройки сервера"</string>
     <string name="account_delete_dlg_title" msgid="6806087520856396608">"Удалить аккаунт"</string>
@@ -258,7 +231,6 @@
     <string name="provider_note_yahoo_uk" msgid="2055976404478603298">"Прежде чем настраивать аккаунт, посетите веб-сайт Yahoo! и включите доступ к аккаунту по протоколу POP3."</string>
     <string name="provider_note_live" msgid="3584841823811425060">"Доступ по протоколу POP, позволяющий этой программе подключаться, разрешен только в некоторых аккаунтах Plus. Если вам не удается войти со своим адресом электронной почты и паролем, скорее всего, у вас бесплатный аккаунт (не Plus). Доступ к такому аккаунту возможен через браузер."</string>
     <string name="provider_note_t_online" msgid="1973701903400232774">"Прежде чем настраивать аккаунт электронной почты, посетите веб-сайт оператора связи и установите пароль для доступа к электронной почте по протоколу POP3."</string>
-    <!-- no translation found for exchange_name (1190783774800310346) -->
-    <skip />
+    <string name="exchange_name" msgid="1190783774800310346">"Корпоративный"</string>
     <string name="system_account_create_failed" msgid="4917162302393971752">"Менеджер аккаунта не может создать аккаунт, повторите попытку позже."</string>
 </resources>
diff --git a/res/values-sv/strings.xml b/res/values-sv/strings.xml
index d578b82..346bede 100644
--- a/res/values-sv/strings.xml
+++ b/res/values-sv/strings.xml
@@ -15,13 +15,10 @@
 -->
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <!-- no translation found for read_attachment_label (1162255191991555285) -->
-    <skip />
+    <string name="read_attachment_label" msgid="1162255191991555285">"Läs meddelandets bifogade filer"</string>
     <string name="read_attachment_desc" msgid="7594746717616308643">"Tillåter att programmet läser bifogade filer i meddelanden."</string>
-    <!-- no translation found for permission_access_provider_label (4274353114641168675) -->
-    <skip />
-    <!-- no translation found for permission_access_provider_desc (1513898266889541617) -->
-    <skip />
+    <string name="permission_access_provider_label" msgid="4274353114641168675">"Använd e-postleverantörens data"</string>
+    <string name="permission_access_provider_desc" msgid="1513898266889541617">"Tillåter att programmet får åtkomst till e-postdatabasen, inklusive mottagna meddelanden, skickade meddelanden, användarnamn och lösenord."</string>
     <string name="app_name" msgid="5815426892327290362">"E-post"</string>
     <string name="accounts_title" msgid="6622149231904649210">"E-post"</string>
     <string name="compose_title" msgid="427986915662706899">"Skriv"</string>
@@ -38,19 +35,14 @@
     <string name="discard_action" msgid="6532206074859505968">"Ignorera"</string>
     <string name="save_draft_action" msgid="812855865552028622">"Spara som utkast"</string>
     <string name="read_unread_action" msgid="4721446664849165077">"Lästa/olästa"</string>
-    <!-- no translation found for read_action (4701484794504781686) -->
-    <skip />
-    <!-- no translation found for unread_action (6280399049357552826) -->
-    <skip />
+    <string name="read_action" msgid="4701484794504781686">"Markera som läst"</string>
+    <string name="unread_action" msgid="6280399049357552826">"Markera som oläst"</string>
     <string name="favorite_action" msgid="2911296685862420689">"Favorit"</string>
-    <!-- no translation found for set_star_action (4660317166196258160) -->
-    <skip />
-    <!-- no translation found for remove_star_action (6689770999647007163) -->
-    <skip />
+    <string name="set_star_action" msgid="4660317166196258160">"Lägg till stjärna"</string>
+    <string name="remove_star_action" msgid="6689770999647007163">"Ta bort stjärna"</string>
     <string name="refresh_action" msgid="5951383001436708175">"Uppdatera"</string>
     <string name="add_account_action" msgid="8835736309476033727">"Lägg till konto"</string>
-    <!-- no translation found for deselect_all_action (253663239459688238) -->
-    <skip />
+    <string name="deselect_all_action" msgid="253663239459688238">"Avmarkera alla"</string>
     <string name="compose_action" msgid="4045702519637388045">"Skriv"</string>
     <string name="search_action" msgid="6325101454876682308">"Sök"</string>
     <string name="open_action" msgid="936766723989190816">"Öppna"</string>
@@ -71,8 +63,7 @@
     <string name="status_sending_messages_failed" msgid="7975009558738692407">"Försök skicka meddelanden igen"</string>
     <string name="status_loading_more_failed" msgid="1629172047185323">"Försök läsa in fler meddelanden igen"</string>
     <string name="notification_new_title" msgid="2200257910380529139">"Nytt e-postmeddelande"</string>
-    <!-- no translation found for error_loading_message_body (2265140604109272914) -->
-    <skip />
+    <string name="error_loading_message_body" msgid="2265140604109272914">"Ett oväntat fel uppstod när meddelandetexten skulle läsas in. Meddelandet kanske är för stort för att visas."</string>
   <plurals name="notification_new_one_account_fmt">
     <item quantity="one" msgid="3422945912787702191">"<xliff:g id="UNREAD_MESSAGE_COUNT">%d</xliff:g> oläst (<xliff:g id="ACCOUNT">%s</xliff:g>"</item>
     <item quantity="few" msgid="6543078667692990869">"<xliff:g id="UNREAD_MESSAGE_COUNT">%d</xliff:g> olästa (<xliff:g id="ACCOUNT">%s</xliff:g>)"</item>
@@ -82,25 +73,17 @@
     <item quantity="few" msgid="1991747245324120305">"i <xliff:g id="NUMBER_ACCOUNTS">%d</xliff:g> konton"</item>
     <item quantity="other" msgid="2723797835410343458">"i <xliff:g id="NUMBER_ACCOUNTS">%d</xliff:g> konton"</item>
   </plurals>
-    <!-- no translation found for mailbox_name_display_inbox (3542327124749861736) -->
-    <skip />
-    <!-- no translation found for mailbox_name_display_outbox (2826214174661417662) -->
-    <skip />
-    <!-- no translation found for mailbox_name_display_drafts (4868718300700514319) -->
-    <skip />
-    <!-- no translation found for mailbox_name_display_trash (9139069064580630647) -->
-    <skip />
-    <!-- no translation found for mailbox_name_display_sent (3426058998191869523) -->
-    <skip />
-    <!-- no translation found for mailbox_name_display_junk (9046762505977999288) -->
-    <skip />
+    <string name="mailbox_name_display_inbox" msgid="3542327124749861736">"Inkorgen"</string>
+    <string name="mailbox_name_display_outbox" msgid="2826214174661417662">"Utkorgen"</string>
+    <string name="mailbox_name_display_drafts" msgid="4868718300700514319">"Utkast"</string>
+    <string name="mailbox_name_display_trash" msgid="9139069064580630647">"Papperskorgen"</string>
+    <string name="mailbox_name_display_sent" msgid="3426058998191869523">"Skickat"</string>
+    <string name="mailbox_name_display_junk" msgid="9046762505977999288">"Skräp"</string>
     <string name="debug_version_fmt" msgid="6160213145745376955">"Version: <xliff:g id="VERSION">%s</xliff:g>"</string>
     <string name="account_folder_list_separator_accounts" msgid="7568820182396669244">"Konton"</string>
-    <!-- no translation found for account_folder_list_summary_inbox (5790553737870057607) -->
-    <skip />
+    <string name="account_folder_list_summary_inbox" msgid="5790553737870057607">"Kombinerad Inkorg"</string>
     <string name="account_folder_list_summary_unread" msgid="1200755158196002928">"Olästa"</string>
-    <!-- no translation found for account_folder_list_summary_starred (3134312269246375723) -->
-    <skip />
+    <string name="account_folder_list_summary_starred" msgid="3134312269246375723">"Stjärnmärkta"</string>
     <string name="account_folder_list_summary_drafts" msgid="5514845993247300437">"Utkast"</string>
     <string name="account_folder_list_summary_outbox" msgid="3059836696049399377">"Utkorgen"</string>
     <string name="mailbox_list_title" msgid="8299608543467211089">"E-postkonto"</string>
@@ -137,10 +120,8 @@
     <string name="add_contact_dlg_message_fmt" msgid="4470846346726847478">"Lägg till <xliff:g id="EMAIL">%s</xliff:g> i Kontakter"</string>
     <string name="message_view_display_attachment_toast" msgid="6096315816776330821">"Bilagan kan inte visas."</string>
     <string name="account_setup_basics_title" msgid="3969856368228940980">"Skapa e-postkonto"</string>
-    <!-- no translation found for accounts_welcome (5901437782383439370) -->
-    <skip />
-    <!-- no translation found for accounts_welcome_exchange (4414121583987233733) -->
-    <skip />
+    <string name="accounts_welcome" msgid="5901437782383439370">"Du kan konfigurera e-post för de flesta konton med några få steg."</string>
+    <string name="accounts_welcome_exchange" msgid="4414121583987233733">"Du kan konfigurera ett Exchange-konto med några få steg."</string>
     <!-- no translation found for account_setup_basics_instructions (3126077748322815504) -->
     <skip />
     <string name="account_setup_basics_email_hint" msgid="7414269319207261120">"E-postadress"</string>
@@ -148,10 +129,8 @@
     <string name="account_setup_basics_default_label" msgid="5924790142029806711">"Skicka e-post från det här kontot som standard"</string>
     <string name="account_setup_basics_manual_setup_action" msgid="8053852205391155912">"Manuell inställning"</string>
     <string name="account_setup_username_password_toast" msgid="4441448542557889481">"Ange en giltig e-postadress och lösenord."</string>
-    <!-- no translation found for account_duplicate_dlg_title (3176749833792312641) -->
-    <skip />
-    <!-- no translation found for account_duplicate_dlg_message_fmt (1920726613701479851) -->
-    <skip />
+    <string name="account_duplicate_dlg_title" msgid="3176749833792312641">"Dubblettkonto"</string>
+    <string name="account_duplicate_dlg_message_fmt" msgid="1920726613701479851">"Inloggningsuppgifterna används redan för kontot \"<xliff:g id="DUPLICATE">%s</xliff:g>\"."</string>
     <string name="account_setup_check_settings_retr_info_msg" msgid="4121970450267725664">"Hämtar kontoinformation…"</string>
     <string name="account_setup_check_settings_check_incoming_msg" msgid="5356212700221438863">"Kontrollerar inkommande serverinställningar…"</string>
     <string name="account_setup_check_settings_check_outgoing_msg" msgid="4033015234096725343">"Kontrollerar utgående serverinställningar…"</string>
@@ -170,14 +149,10 @@
     <string name="account_setup_incoming_port_label" msgid="8214738923690447796">"Port"</string>
     <string name="account_setup_incoming_security_label" msgid="2110260791086007424">"Säkerhetstyp"</string>
     <string name="account_setup_incoming_security_none_label" msgid="8300169413118264895">"Inga"</string>
-    <!-- no translation found for account_setup_incoming_security_ssl_trust_certificates_label (3581382268191377346) -->
-    <skip />
-    <!-- no translation found for account_setup_incoming_security_ssl_label (8886698397743061682) -->
-    <skip />
-    <!-- no translation found for account_setup_incoming_security_tls_trust_certificates_label (1089227022489257055) -->
-    <skip />
-    <!-- no translation found for account_setup_incoming_security_tls_label (8638006172590036487) -->
-    <skip />
+    <string name="account_setup_incoming_security_ssl_trust_certificates_label" msgid="3581382268191377346">"SSL (Acceptera alla certifikat)"</string>
+    <string name="account_setup_incoming_security_ssl_label" msgid="8886698397743061682">"SSL"</string>
+    <string name="account_setup_incoming_security_tls_trust_certificates_label" msgid="1089227022489257055">"TLS (Acceptera alla certifikat)"</string>
+    <string name="account_setup_incoming_security_tls_label" msgid="8638006172590036487">"TLS"</string>
     <string name="account_setup_incoming_delete_policy_label" msgid="9213590134693857912">"Ta bort e-post från servern"</string>
     <string name="account_setup_incoming_delete_policy_never_label" msgid="3222897501875871041">"Aldrig"</string>
     <string name="account_setup_incoming_delete_policy_delete_label" msgid="222216840911785631">"Vid borttagning från Inkorgen"</string>
@@ -190,15 +165,15 @@
     <string name="account_setup_outgoing_require_login_label" msgid="6371514297854287948">"Kräv inloggning"</string>
     <string name="account_setup_outgoing_username_label" msgid="3309680794731596981">"Användarnamn"</string>
     <string name="account_setup_outgoing_password_label" msgid="227844585493317550">"Lösenord"</string>
-    <string name="account_setup_exchange_title" msgid="247933841122558059">"Inställningar för Exchange-server"</string>
-    <string name="account_setup_exchange_server_label" msgid="5390359659749339317">"Exchange-server"</string>
-    <!-- no translation found for account_setup_exchange_username_label (6517176180828983060) -->
+    <!-- no translation found for account_setup_exchange_title (2492853474738063453) -->
     <skip />
+    <!-- no translation found for account_setup_exchange_server_label (795137797983360826) -->
+    <skip />
+    <string name="account_setup_exchange_username_label" msgid="6517176180828983060">"Domän\\Användarnamn"</string>
     <string name="account_setup_exchange_domain_label" msgid="3584668050727667045">"Domän"</string>
     <string name="account_setup_exchange_domain_hint" msgid="350372033916025287">"Ange domän här"</string>
     <string name="account_setup_exchange_ssl_label" msgid="6704105469083211236">"Använd säker anslutning (SSL)"</string>
-    <!-- no translation found for account_setup_exchange_trust_certificates_label (6232880757633882678) -->
-    <skip />
+    <string name="account_setup_exchange_trust_certificates_label" msgid="6232880757633882678">"Acceptera alla SSL-certifikat"</string>
     <string name="account_setup_options_title" msgid="8995162193118880993">"Kontoalternativ"</string>
     <string name="account_setup_options_mail_check_frequency_label" msgid="4598023962234986194">"Intervall för e-postkontroll"</string>
     <string name="account_setup_options_mail_check_frequency_never" msgid="287951859480505416">"Aldrig"</string>
@@ -229,25 +204,23 @@
     <string name="account_setup_failed_auth_required" msgid="1676242821459638150">"Servern stöder inte autentiseringsmetoderna."</string>
     <string name="account_setup_failed_security" msgid="6142264248671379943">"Det går inte att ansluta till servern på grund av ett säkerhetsfel."</string>
     <string name="account_setup_failed_ioerror" msgid="7391458717708933095">"Det gick inte att ansluta till servern."</string>
+    <string name="account_setup_failed_security_policies_required" msgid="3567420384516656976">"Den här Exchange ActiveSync-servern kräver säkerhetsfunktioner som din telefon inte stöder."</string>
     <string name="account_setup_failed_dlg_edit_details_action" msgid="5355993309841479360">"Redigera information"</string>
     <string name="account_settings_title_fmt" msgid="1702058877284382340">"Allmänna inställningar"</string>
     <string name="account_settings_default_label" msgid="3575963379680943640">"Standardkonto"</string>
     <string name="account_settings_default_summary" msgid="1531901438624688482">"Skicka e-post från det här kontot som standard"</string>
     <string name="account_settings_notify_label" msgid="1630001017303007974">"E-postavisering"</string>
-    <!-- no translation found for account_settings_exchange_summary (8498451479029626317) -->
-    <skip />
+    <string name="account_settings_exchange_summary" msgid="8498451479029626317">"Synkroniseringsfrekvens, aviseringar osv."</string>
     <string name="account_settings_notify_summary" msgid="6609224590300639887">"Meddelande i statusfältet vid e-postmeddelande"</string>
     <string name="account_settings_mail_check_frequency_label" msgid="2067835530563849675">"Intervall för e-postkontroll"</string>
-    <string name="account_settings_incoming_label" msgid="7858928031806297542">"Inkommande inställn."</string>
+    <string name="account_settings_incoming_label" msgid="7858928031806297542">"Inkommande inställningar"</string>
     <string name="account_settings_outgoing_label" msgid="4464829249980026745">"Utgående inställningar"</string>
     <string name="account_settings_add_account_label" msgid="63971622405360050">"Lägg till ett konto"</string>
     <string name="account_settings_description_label" msgid="8894815221204511715">"Kontonamn"</string>
     <string name="account_settings_name_label" msgid="8186406122590008449">"Ditt namn"</string>
     <string name="account_settings_notifications" msgid="1042620094281375043">"Aviseringsinställningar"</string>
-    <!-- no translation found for account_settings_sync_contacts_enable (1369272986009573218) -->
-    <skip />
-    <!-- no translation found for account_settings_sync_contacts_summary (8901452720940015928) -->
-    <skip />
+    <string name="account_settings_sync_contacts_enable" msgid="1369272986009573218">"Synkronisera kontakter"</string>
+    <string name="account_settings_sync_contacts_summary" msgid="8901452720940015928">"Synkronisera även kontakter från det här kontot"</string>
     <string name="account_settings_vibrate_enable" msgid="8045133290388856478">"Vibrera"</string>
     <string name="account_settings_vibrate_summary" msgid="3690631050585589365">"Vibrerar även vid inkommande e-post"</string>
     <string name="account_settings_ringtone" msgid="7922187231467500404">"Välj ringsignal"</string>
@@ -258,7 +231,6 @@
     <string name="provider_note_yahoo_uk" msgid="2055976404478603298">"Innan du skapar e-postkontot besöker du webbplatsen Yahoo! och aktiverar POP3-åtkomst för kontot."</string>
     <string name="provider_note_live" msgid="3584841823811425060">"POP-åtkomst, som gör så att detta program kan ansluta, ingår bara i vissa pluskonton. Om det inte går att logga in med rätt e-postadress och lösenord kanske du inte har betalat för ett pluskonto. Öppna webbläsaren igen om du vill få åtkomst till dessa e-postkonton."</string>
     <string name="provider_note_t_online" msgid="1973701903400232774">"Innan du skapar e-postkontot besöker du T-Onlines webbplats och skapar ett lösenord för POP3-åtkomst till e-post."</string>
-    <!-- no translation found for exchange_name (1190783774800310346) -->
-    <skip />
+    <string name="exchange_name" msgid="1190783774800310346">"Företag"</string>
     <string name="system_account_create_failed" msgid="4917162302393971752">"Det gick inte att skapa kontot. Försök igen."</string>
 </resources>
diff --git a/res/values-tr/strings.xml b/res/values-tr/strings.xml
index 3d08e5a..ba9ac21 100644
--- a/res/values-tr/strings.xml
+++ b/res/values-tr/strings.xml
@@ -15,13 +15,10 @@
 -->
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <!-- no translation found for read_attachment_label (1162255191991555285) -->
-    <skip />
+    <string name="read_attachment_label" msgid="1162255191991555285">"E-posta eklerini oku"</string>
     <string name="read_attachment_desc" msgid="7594746717616308643">"Bu uygulamaya e-posta eklerinizi okuma izni verir."</string>
-    <!-- no translation found for permission_access_provider_label (4274353114641168675) -->
-    <skip />
-    <!-- no translation found for permission_access_provider_desc (1513898266889541617) -->
-    <skip />
+    <string name="permission_access_provider_label" msgid="4274353114641168675">"E-posta sağlayıcı verilerine eriş"</string>
+    <string name="permission_access_provider_desc" msgid="1513898266889541617">"Alınan iletiler, gönderilen iletiler, kullanıcı adları ve şifreler de dahil olmak üzere E-posta veritabanınıza erişmek için bu uygulamaya izin verir."</string>
     <string name="app_name" msgid="5815426892327290362">"E-posta"</string>
     <string name="accounts_title" msgid="6622149231904649210">"E-posta"</string>
     <string name="compose_title" msgid="427986915662706899">"Oluştur"</string>
@@ -37,20 +34,15 @@
     <string name="done_action" msgid="7497990549515580249">"Bitti"</string>
     <string name="discard_action" msgid="6532206074859505968">"Sil"</string>
     <string name="save_draft_action" msgid="812855865552028622">"Taslak olarak kaydet"</string>
-    <string name="read_unread_action" msgid="4721446664849165077">"Okunanlar/Okunmamış"</string>
-    <!-- no translation found for read_action (4701484794504781686) -->
-    <skip />
-    <!-- no translation found for unread_action (6280399049357552826) -->
-    <skip />
+    <string name="read_unread_action" msgid="4721446664849165077">"Okundu/Okunmadı"</string>
+    <string name="read_action" msgid="4701484794504781686">"Okunanalar olarak işaretle"</string>
+    <string name="unread_action" msgid="6280399049357552826">"Okunmamış olarak işaretle"</string>
     <string name="favorite_action" msgid="2911296685862420689">"Sık Kullanılan"</string>
-    <!-- no translation found for set_star_action (4660317166196258160) -->
-    <skip />
-    <!-- no translation found for remove_star_action (6689770999647007163) -->
-    <skip />
+    <string name="set_star_action" msgid="4660317166196258160">"Yıldız ekle"</string>
+    <string name="remove_star_action" msgid="6689770999647007163">"Yıldızı kaldır"</string>
     <string name="refresh_action" msgid="5951383001436708175">"Yenile"</string>
     <string name="add_account_action" msgid="8835736309476033727">"Hesap ekle"</string>
-    <!-- no translation found for deselect_all_action (253663239459688238) -->
-    <skip />
+    <string name="deselect_all_action" msgid="253663239459688238">"Tüm seçimleri iptal et"</string>
     <string name="compose_action" msgid="4045702519637388045">"Oluştur"</string>
     <string name="search_action" msgid="6325101454876682308">"Ara"</string>
     <string name="open_action" msgid="936766723989190816">"Aç"</string>
@@ -71,8 +63,7 @@
     <string name="status_sending_messages_failed" msgid="7975009558738692407">"İletileri göndermeyi tekrar dene"</string>
     <string name="status_loading_more_failed" msgid="1629172047185323">"Daha fazla ileti yüklemeyi tekrar dene"</string>
     <string name="notification_new_title" msgid="2200257910380529139">"Yeni e-posta"</string>
-    <!-- no translation found for error_loading_message_body (2265140604109272914) -->
-    <skip />
+    <string name="error_loading_message_body" msgid="2265140604109272914">"Kısa mesaj yüklenirken beklenmedik bir hata oluştu. Mesaj, görüntülenemeyecek kadar büyük olabilir."</string>
   <plurals name="notification_new_one_account_fmt">
     <item quantity="one" msgid="3422945912787702191">"<xliff:g id="UNREAD_MESSAGE_COUNT">%d</xliff:g> okunmamış (<xliff:g id="ACCOUNT">%s</xliff:g>)"</item>
     <item quantity="few" msgid="6543078667692990869">"<xliff:g id="UNREAD_MESSAGE_COUNT">%d</xliff:g> okunmamış (<xliff:g id="ACCOUNT">%s</xliff:g>)"</item>
@@ -82,25 +73,17 @@
     <item quantity="few" msgid="1991747245324120305">"<xliff:g id="NUMBER_ACCOUNTS">%d</xliff:g> hesapta"</item>
     <item quantity="other" msgid="2723797835410343458">"<xliff:g id="NUMBER_ACCOUNTS">%d</xliff:g> hesapta"</item>
   </plurals>
-    <!-- no translation found for mailbox_name_display_inbox (3542327124749861736) -->
-    <skip />
-    <!-- no translation found for mailbox_name_display_outbox (2826214174661417662) -->
-    <skip />
-    <!-- no translation found for mailbox_name_display_drafts (4868718300700514319) -->
-    <skip />
-    <!-- no translation found for mailbox_name_display_trash (9139069064580630647) -->
-    <skip />
-    <!-- no translation found for mailbox_name_display_sent (3426058998191869523) -->
-    <skip />
-    <!-- no translation found for mailbox_name_display_junk (9046762505977999288) -->
-    <skip />
+    <string name="mailbox_name_display_inbox" msgid="3542327124749861736">"Gelen Kutusu"</string>
+    <string name="mailbox_name_display_outbox" msgid="2826214174661417662">"Giden Kutusu"</string>
+    <string name="mailbox_name_display_drafts" msgid="4868718300700514319">"Taslaklar"</string>
+    <string name="mailbox_name_display_trash" msgid="9139069064580630647">"Çöp Kutusu"</string>
+    <string name="mailbox_name_display_sent" msgid="3426058998191869523">"Gönderildi"</string>
+    <string name="mailbox_name_display_junk" msgid="9046762505977999288">"Önemsiz"</string>
     <string name="debug_version_fmt" msgid="6160213145745376955">"Sürüm: <xliff:g id="VERSION">%s</xliff:g>"</string>
     <string name="account_folder_list_separator_accounts" msgid="7568820182396669244">"Hesaplar"</string>
-    <!-- no translation found for account_folder_list_summary_inbox (5790553737870057607) -->
-    <skip />
+    <string name="account_folder_list_summary_inbox" msgid="5790553737870057607">"Birleştirilmiş Gelen Kutusu"</string>
     <string name="account_folder_list_summary_unread" msgid="1200755158196002928">"Okunmamış"</string>
-    <!-- no translation found for account_folder_list_summary_starred (3134312269246375723) -->
-    <skip />
+    <string name="account_folder_list_summary_starred" msgid="3134312269246375723">"Yıldızlı"</string>
     <string name="account_folder_list_summary_drafts" msgid="5514845993247300437">"Taslaklar"</string>
     <string name="account_folder_list_summary_outbox" msgid="3059836696049399377">"Giden Kutusu"</string>
     <string name="mailbox_list_title" msgid="8299608543467211089">"Posta kutusu"</string>
@@ -137,10 +120,8 @@
     <string name="add_contact_dlg_message_fmt" msgid="4470846346726847478">"\"<xliff:g id="EMAIL">%s</xliff:g>\" adresini kişilere ekle"</string>
     <string name="message_view_display_attachment_toast" msgid="6096315816776330821">"Bu ek görüntülenemiyor."</string>
     <string name="account_setup_basics_title" msgid="3969856368228940980">"E-posta ayarla"</string>
-    <!-- no translation found for accounts_welcome (5901437782383439370) -->
-    <skip />
-    <!-- no translation found for accounts_welcome_exchange (4414121583987233733) -->
-    <skip />
+    <string name="accounts_welcome" msgid="5901437782383439370">"E-postayı çoğu hesap için yalnızca birkaç adımda yapılandırabilirsiniz."</string>
+    <string name="accounts_welcome_exchange" msgid="4414121583987233733">"Yalnızca birkaç adımda bir Exchange hesabı yapılandırabilirsiniz."</string>
     <!-- no translation found for account_setup_basics_instructions (3126077748322815504) -->
     <skip />
     <string name="account_setup_basics_email_hint" msgid="7414269319207261120">"E-posta adresi"</string>
@@ -148,10 +129,8 @@
     <string name="account_setup_basics_default_label" msgid="5924790142029806711">"E-postayı varsayılan olarak bu hesaptan gönder."</string>
     <string name="account_setup_basics_manual_setup_action" msgid="8053852205391155912">"Manuel kurulum"</string>
     <string name="account_setup_username_password_toast" msgid="4441448542557889481">"Lütfen geçerli bir e-posta adresi ve şifre girin."</string>
-    <!-- no translation found for account_duplicate_dlg_title (3176749833792312641) -->
-    <skip />
-    <!-- no translation found for account_duplicate_dlg_message_fmt (1920726613701479851) -->
-    <skip />
+    <string name="account_duplicate_dlg_title" msgid="3176749833792312641">"Yinelenen Hesap"</string>
+    <string name="account_duplicate_dlg_message_fmt" msgid="1920726613701479851">"Bu giriş, \"<xliff:g id="DUPLICATE">%s</xliff:g>\" hesabı için zaten kullanılıyor."</string>
     <string name="account_setup_check_settings_retr_info_msg" msgid="4121970450267725664">"Hesap bilgileri alınıyor..."</string>
     <string name="account_setup_check_settings_check_incoming_msg" msgid="5356212700221438863">"Gelen sunucu ayarları denetleniyor..."</string>
     <string name="account_setup_check_settings_check_outgoing_msg" msgid="4033015234096725343">"Giden sunucu ayarları denetleniyor..."</string>
@@ -170,14 +149,10 @@
     <string name="account_setup_incoming_port_label" msgid="8214738923690447796">"Bağlantı noktası"</string>
     <string name="account_setup_incoming_security_label" msgid="2110260791086007424">"Güvenlik türü"</string>
     <string name="account_setup_incoming_security_none_label" msgid="8300169413118264895">"Yok"</string>
-    <!-- no translation found for account_setup_incoming_security_ssl_trust_certificates_label (3581382268191377346) -->
-    <skip />
-    <!-- no translation found for account_setup_incoming_security_ssl_label (8886698397743061682) -->
-    <skip />
-    <!-- no translation found for account_setup_incoming_security_tls_trust_certificates_label (1089227022489257055) -->
-    <skip />
-    <!-- no translation found for account_setup_incoming_security_tls_label (8638006172590036487) -->
-    <skip />
+    <string name="account_setup_incoming_security_ssl_trust_certificates_label" msgid="3581382268191377346">"SSL (Tüm sertifikaları kabul et)"</string>
+    <string name="account_setup_incoming_security_ssl_label" msgid="8886698397743061682">"SSL"</string>
+    <string name="account_setup_incoming_security_tls_trust_certificates_label" msgid="1089227022489257055">"TLS (Tüm sertifikaları kabul et)"</string>
+    <string name="account_setup_incoming_security_tls_label" msgid="8638006172590036487">"TLS"</string>
     <string name="account_setup_incoming_delete_policy_label" msgid="9213590134693857912">"E-postayı sunucudan sil"</string>
     <string name="account_setup_incoming_delete_policy_never_label" msgid="3222897501875871041">"Asla"</string>
     <string name="account_setup_incoming_delete_policy_delete_label" msgid="222216840911785631">"Gelen Kutusundan sildiğimde"</string>
@@ -190,15 +165,15 @@
     <string name="account_setup_outgoing_require_login_label" msgid="6371514297854287948">"Oturum açılmasını gerektiriyor."</string>
     <string name="account_setup_outgoing_username_label" msgid="3309680794731596981">"Kullanıcı adı"</string>
     <string name="account_setup_outgoing_password_label" msgid="227844585493317550">"Şifre"</string>
-    <string name="account_setup_exchange_title" msgid="247933841122558059">"Exchange sunucusu ayarları"</string>
-    <string name="account_setup_exchange_server_label" msgid="5390359659749339317">"Exchange Sunucusu"</string>
-    <!-- no translation found for account_setup_exchange_username_label (6517176180828983060) -->
+    <!-- no translation found for account_setup_exchange_title (2492853474738063453) -->
     <skip />
+    <!-- no translation found for account_setup_exchange_server_label (795137797983360826) -->
+    <skip />
+    <string name="account_setup_exchange_username_label" msgid="6517176180828983060">"Alan adı/Kullanıcı adı"</string>
     <string name="account_setup_exchange_domain_label" msgid="3584668050727667045">"Alan"</string>
     <string name="account_setup_exchange_domain_hint" msgid="350372033916025287">"Alan adını buraya girin"</string>
     <string name="account_setup_exchange_ssl_label" msgid="6704105469083211236">"Güvenli bağlantıyı kullan (SSL)"</string>
-    <!-- no translation found for account_setup_exchange_trust_certificates_label (6232880757633882678) -->
-    <skip />
+    <string name="account_setup_exchange_trust_certificates_label" msgid="6232880757633882678">"Tüm SSL sertifikalarını kabul et"</string>
     <string name="account_setup_options_title" msgid="8995162193118880993">"Hesap seçenekleri"</string>
     <string name="account_setup_options_mail_check_frequency_label" msgid="4598023962234986194">"E-posta kontrol etme sıklığı"</string>
     <string name="account_setup_options_mail_check_frequency_never" msgid="287951859480505416">"Asla"</string>
@@ -229,13 +204,13 @@
     <string name="account_setup_failed_auth_required" msgid="1676242821459638150">"Kimlik doğrulama yöntemleriniz sunucu tarafından desteklenmiyor."</string>
     <string name="account_setup_failed_security" msgid="6142264248671379943">"Güvenlik hatası nedeniyle sunucu bağlantısı açılamıyor."</string>
     <string name="account_setup_failed_ioerror" msgid="7391458717708933095">"Sunucu bağlantısı açılamıyor."</string>
+    <string name="account_setup_failed_security_policies_required" msgid="3567420384516656976">"Bu Exchange ActiveSync sunucusu, telefonunuzun desteklemediği güvenlik özelliklerini gerektirmektedir."</string>
     <string name="account_setup_failed_dlg_edit_details_action" msgid="5355993309841479360">"Ayrıntıları düzenle"</string>
     <string name="account_settings_title_fmt" msgid="1702058877284382340">"Genel ayarlar"</string>
     <string name="account_settings_default_label" msgid="3575963379680943640">"Varsayılan hesap"</string>
     <string name="account_settings_default_summary" msgid="1531901438624688482">"E-postaları varsayılan olarak bu hesaptan gönder"</string>
     <string name="account_settings_notify_label" msgid="1630001017303007974">"E-posta bildirimleri"</string>
-    <!-- no translation found for account_settings_exchange_summary (8498451479029626317) -->
-    <skip />
+    <string name="account_settings_exchange_summary" msgid="8498451479029626317">"Frekansı, bildirimleri vs. senkronize et"</string>
     <string name="account_settings_notify_summary" msgid="6609224590300639887">"E-posta geldiğinde durum çubuğunda bildir"</string>
     <string name="account_settings_mail_check_frequency_label" msgid="2067835530563849675">"E-posta kontrol sıklığı"</string>
     <string name="account_settings_incoming_label" msgid="7858928031806297542">"Gelen ayarları"</string>
@@ -244,10 +219,8 @@
     <string name="account_settings_description_label" msgid="8894815221204511715">"Hesap adı"</string>
     <string name="account_settings_name_label" msgid="8186406122590008449">"Adınız"</string>
     <string name="account_settings_notifications" msgid="1042620094281375043">"Bildirim ayarları"</string>
-    <!-- no translation found for account_settings_sync_contacts_enable (1369272986009573218) -->
-    <skip />
-    <!-- no translation found for account_settings_sync_contacts_summary (8901452720940015928) -->
-    <skip />
+    <string name="account_settings_sync_contacts_enable" msgid="1369272986009573218">"Kişileri senkronize et"</string>
+    <string name="account_settings_sync_contacts_summary" msgid="8901452720940015928">"Bu hesaptaki kişileri de senkronize et"</string>
     <string name="account_settings_vibrate_enable" msgid="8045133290388856478">"Titret"</string>
     <string name="account_settings_vibrate_summary" msgid="3690631050585589365">"E-posta geldiğinde aynı zamanda titret"</string>
     <string name="account_settings_ringtone" msgid="7922187231467500404">"Zil sesini seç"</string>
@@ -258,7 +231,6 @@
     <string name="provider_note_yahoo_uk" msgid="2055976404478603298">"Bu e-posta hesabını ayarlamadan önce lütfen Yahoo! web sitesini ziyaret edin ve bu hesap için POP3 e-posta erişimini etkinleştirin."</string>
     <string name="provider_note_live" msgid="3584841823811425060">"Yalnızca bazı \"Plus\" hesapları bu programın bağlanmasına izin veren POP erişimi içerir. Doğru e-posta adresinizle ve şifrenizle oturum açamıyorsanız, ödemeli bir \"Plus\" hesabına sahip olmayabilirsiniz. Lütfen bu posta hesaplarına erişmek için Web tarayıcıyı başlatın."</string>
     <string name="provider_note_t_online" msgid="1973701903400232774">"Bu e-posta hesabını ayarlamadan önce lütfen T-Online Web sitesini ziyaret edin ve POP3 e-posta erişimi için bir şifre oluşturun."</string>
-    <!-- no translation found for exchange_name (1190783774800310346) -->
-    <skip />
+    <string name="exchange_name" msgid="1190783774800310346">"Kurumsal"</string>
     <string name="system_account_create_failed" msgid="4917162302393971752">"AccountManager Hesabı oluşturamadı, lütfen tekrar deneyin."</string>
 </resources>
diff --git a/res/values-zh-rCN/strings.xml b/res/values-zh-rCN/strings.xml
index 8eea232..06fc935 100644
--- a/res/values-zh-rCN/strings.xml
+++ b/res/values-zh-rCN/strings.xml
@@ -15,13 +15,10 @@
 -->
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <!-- no translation found for read_attachment_label (1162255191991555285) -->
-    <skip />
+    <string name="read_attachment_label" msgid="1162255191991555285">"查看电子邮件附件"</string>
     <string name="read_attachment_desc" msgid="7594746717616308643">"允许此应用程序读取您的电子邮件附件。"</string>
-    <!-- no translation found for permission_access_provider_label (4274353114641168675) -->
-    <skip />
-    <!-- no translation found for permission_access_provider_desc (1513898266889541617) -->
-    <skip />
+    <string name="permission_access_provider_label" msgid="4274353114641168675">"访问电子邮件提供者数据"</string>
+    <string name="permission_access_provider_desc" msgid="1513898266889541617">"允许此应用程序访问您的电子邮件数据库，包括已收邮件、已发邮件、用户名和密码。"</string>
     <string name="app_name" msgid="5815426892327290362">"电子邮件"</string>
     <string name="accounts_title" msgid="6622149231904649210">"电子邮件"</string>
     <string name="compose_title" msgid="427986915662706899">"撰写"</string>
@@ -38,19 +35,14 @@
     <string name="discard_action" msgid="6532206074859505968">"舍弃"</string>
     <string name="save_draft_action" msgid="812855865552028622">"另存为草稿"</string>
     <string name="read_unread_action" msgid="4721446664849165077">"已读/未读"</string>
-    <!-- no translation found for read_action (4701484794504781686) -->
-    <skip />
-    <!-- no translation found for unread_action (6280399049357552826) -->
-    <skip />
+    <string name="read_action" msgid="4701484794504781686">"标记为已读"</string>
+    <string name="unread_action" msgid="6280399049357552826">"标记为未读"</string>
     <string name="favorite_action" msgid="2911296685862420689">"收藏"</string>
-    <!-- no translation found for set_star_action (4660317166196258160) -->
-    <skip />
-    <!-- no translation found for remove_star_action (6689770999647007163) -->
-    <skip />
+    <string name="set_star_action" msgid="4660317166196258160">"加注星标"</string>
+    <string name="remove_star_action" msgid="6689770999647007163">"删除星标"</string>
     <string name="refresh_action" msgid="5951383001436708175">"刷新"</string>
     <string name="add_account_action" msgid="8835736309476033727">"添加帐户"</string>
-    <!-- no translation found for deselect_all_action (253663239459688238) -->
-    <skip />
+    <string name="deselect_all_action" msgid="253663239459688238">"取消全选"</string>
     <string name="compose_action" msgid="4045702519637388045">"撰写"</string>
     <string name="search_action" msgid="6325101454876682308">"搜索"</string>
     <string name="open_action" msgid="936766723989190816">"打开"</string>
@@ -71,8 +63,7 @@
     <string name="status_sending_messages_failed" msgid="7975009558738692407">"尝试重新发送邮件"</string>
     <string name="status_loading_more_failed" msgid="1629172047185323">"重新尝试载入更多邮件"</string>
     <string name="notification_new_title" msgid="2200257910380529139">"新电子邮件"</string>
-    <!-- no translation found for error_loading_message_body (2265140604109272914) -->
-    <skip />
+    <string name="error_loading_message_body" msgid="2265140604109272914">"载入消息文本时出现意外错误。可能是讯息太大，无法查看。"</string>
   <plurals name="notification_new_one_account_fmt">
     <item quantity="one" msgid="3422945912787702191">"<xliff:g id="UNREAD_MESSAGE_COUNT">%d</xliff:g> 封未读邮件 (<xliff:g id="ACCOUNT">%s</xliff:g>)"</item>
     <item quantity="few" msgid="6543078667692990869">"<xliff:g id="UNREAD_MESSAGE_COUNT">%d</xliff:g> 封未读邮件 (<xliff:g id="ACCOUNT">%s</xliff:g>)"</item>
@@ -82,25 +73,17 @@
     <item quantity="few" msgid="1991747245324120305">"在 <xliff:g id="NUMBER_ACCOUNTS">%d</xliff:g> 个帐户中"</item>
     <item quantity="other" msgid="2723797835410343458">"在 <xliff:g id="NUMBER_ACCOUNTS">%d</xliff:g> 个帐户中"</item>
   </plurals>
-    <!-- no translation found for mailbox_name_display_inbox (3542327124749861736) -->
-    <skip />
-    <!-- no translation found for mailbox_name_display_outbox (2826214174661417662) -->
-    <skip />
-    <!-- no translation found for mailbox_name_display_drafts (4868718300700514319) -->
-    <skip />
-    <!-- no translation found for mailbox_name_display_trash (9139069064580630647) -->
-    <skip />
-    <!-- no translation found for mailbox_name_display_sent (3426058998191869523) -->
-    <skip />
-    <!-- no translation found for mailbox_name_display_junk (9046762505977999288) -->
-    <skip />
+    <string name="mailbox_name_display_inbox" msgid="3542327124749861736">"收件箱"</string>
+    <string name="mailbox_name_display_outbox" msgid="2826214174661417662">"发件箱"</string>
+    <string name="mailbox_name_display_drafts" msgid="4868718300700514319">"草稿"</string>
+    <string name="mailbox_name_display_trash" msgid="9139069064580630647">"已删除邮件"</string>
+    <string name="mailbox_name_display_sent" msgid="3426058998191869523">"已发送邮件"</string>
+    <string name="mailbox_name_display_junk" msgid="9046762505977999288">"垃圾邮件"</string>
     <string name="debug_version_fmt" msgid="6160213145745376955">"版本：<xliff:g id="VERSION">%s</xliff:g>"</string>
     <string name="account_folder_list_separator_accounts" msgid="7568820182396669244">"帐户"</string>
-    <!-- no translation found for account_folder_list_summary_inbox (5790553737870057607) -->
-    <skip />
+    <string name="account_folder_list_summary_inbox" msgid="5790553737870057607">"合并的收件箱"</string>
     <string name="account_folder_list_summary_unread" msgid="1200755158196002928">"未读邮件"</string>
-    <!-- no translation found for account_folder_list_summary_starred (3134312269246375723) -->
-    <skip />
+    <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_title" msgid="8299608543467211089">"邮箱"</string>
@@ -134,13 +117,11 @@
     <string name="message_discarded_toast" msgid="3891461729325584026">"邮件已舍弃。"</string>
     <string name="message_saved_toast" msgid="8443125659172627665">"邮件已保存为草稿。"</string>
     <string name="add_contact_dlg_title" msgid="7424641029188006580">"添加联系人"</string>
-    <string name="add_contact_dlg_message_fmt" msgid="4470846346726847478">"将“<xliff:g id="EMAIL">%s</xliff:g>”添加到联系人"</string>
+    <string name="add_contact_dlg_message_fmt" msgid="4470846346726847478">"将 <xliff:g id="EMAIL">%s</xliff:g> 添加为联系人"</string>
     <string name="message_view_display_attachment_toast" msgid="6096315816776330821">"该附件无法显示。"</string>
     <string name="account_setup_basics_title" msgid="3969856368228940980">"设置电子邮件"</string>
-    <!-- no translation found for accounts_welcome (5901437782383439370) -->
-    <skip />
-    <!-- no translation found for accounts_welcome_exchange (4414121583987233733) -->
-    <skip />
+    <string name="accounts_welcome" msgid="5901437782383439370">"您只需执行几个步骤，即可为大多数帐户配置电子邮件。"</string>
+    <string name="accounts_welcome_exchange" msgid="4414121583987233733">"您只需执行几个步骤，即可配置 Exchange 帐户。"</string>
     <!-- no translation found for account_setup_basics_instructions (3126077748322815504) -->
     <skip />
     <string name="account_setup_basics_email_hint" msgid="7414269319207261120">"电子邮件地址"</string>
@@ -148,10 +129,8 @@
     <string name="account_setup_basics_default_label" msgid="5924790142029806711">"默认情况下从此帐户发送电子邮件。"</string>
     <string name="account_setup_basics_manual_setup_action" msgid="8053852205391155912">"手动设置"</string>
     <string name="account_setup_username_password_toast" msgid="4441448542557889481">"请输入有效的电子邮件地址和密码。"</string>
-    <!-- no translation found for account_duplicate_dlg_title (3176749833792312641) -->
-    <skip />
-    <!-- no translation found for account_duplicate_dlg_message_fmt (1920726613701479851) -->
-    <skip />
+    <string name="account_duplicate_dlg_title" msgid="3176749833792312641">"帐户重复"</string>
+    <string name="account_duplicate_dlg_message_fmt" msgid="1920726613701479851">"此登录名已由帐户“<xliff:g id="DUPLICATE">%s</xliff:g>”使用。"</string>
     <string name="account_setup_check_settings_retr_info_msg" msgid="4121970450267725664">"正在检索帐户信息..."</string>
     <string name="account_setup_check_settings_check_incoming_msg" msgid="5356212700221438863">"正在检查接收服务器设置..."</string>
     <string name="account_setup_check_settings_check_outgoing_msg" msgid="4033015234096725343">"正在检查外发服务器设置..."</string>
@@ -170,14 +149,10 @@
     <string name="account_setup_incoming_port_label" msgid="8214738923690447796">"端口"</string>
     <string name="account_setup_incoming_security_label" msgid="2110260791086007424">"安全类型"</string>
     <string name="account_setup_incoming_security_none_label" msgid="8300169413118264895">"无"</string>
-    <!-- no translation found for account_setup_incoming_security_ssl_trust_certificates_label (3581382268191377346) -->
-    <skip />
-    <!-- no translation found for account_setup_incoming_security_ssl_label (8886698397743061682) -->
-    <skip />
-    <!-- no translation found for account_setup_incoming_security_tls_trust_certificates_label (1089227022489257055) -->
-    <skip />
-    <!-- no translation found for account_setup_incoming_security_tls_label (8638006172590036487) -->
-    <skip />
+    <string name="account_setup_incoming_security_ssl_trust_certificates_label" msgid="3581382268191377346">"SSL（接受所有证书）"</string>
+    <string name="account_setup_incoming_security_ssl_label" msgid="8886698397743061682">"SSL"</string>
+    <string name="account_setup_incoming_security_tls_trust_certificates_label" msgid="1089227022489257055">"TLS（接受所有证书）"</string>
+    <string name="account_setup_incoming_security_tls_label" msgid="8638006172590036487">"TLS"</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>
@@ -190,15 +165,15 @@
     <string name="account_setup_outgoing_require_login_label" msgid="6371514297854287948">"需要登录。"</string>
     <string name="account_setup_outgoing_username_label" msgid="3309680794731596981">"用户名"</string>
     <string name="account_setup_outgoing_password_label" msgid="227844585493317550">"密码"</string>
-    <string name="account_setup_exchange_title" msgid="247933841122558059">"Exchange 服务器设置"</string>
-    <string name="account_setup_exchange_server_label" msgid="5390359659749339317">"Exchange 服务器"</string>
-    <!-- no translation found for account_setup_exchange_username_label (6517176180828983060) -->
+    <!-- no translation found for account_setup_exchange_title (2492853474738063453) -->
     <skip />
+    <!-- no translation found for account_setup_exchange_server_label (795137797983360826) -->
+    <skip />
+    <string name="account_setup_exchange_username_label" msgid="6517176180828983060">"域名\\用户名"</string>
     <string name="account_setup_exchange_domain_label" msgid="3584668050727667045">"域名"</string>
     <string name="account_setup_exchange_domain_hint" msgid="350372033916025287">"在此输入域名"</string>
     <string name="account_setup_exchange_ssl_label" msgid="6704105469083211236">"采用安全连接 (SSL)"</string>
-    <!-- no translation found for account_setup_exchange_trust_certificates_label (6232880757633882678) -->
-    <skip />
+    <string name="account_setup_exchange_trust_certificates_label" msgid="6232880757633882678">"接受所有 SSL 证书"</string>
     <string name="account_setup_options_title" msgid="8995162193118880993">"帐户选项"</string>
     <string name="account_setup_options_mail_check_frequency_label" msgid="4598023962234986194">"电子邮件检查频率"</string>
     <string name="account_setup_options_mail_check_frequency_never" msgid="287951859480505416">"永不"</string>
@@ -229,13 +204,13 @@
     <string name="account_setup_failed_auth_required" msgid="1676242821459638150">"服务器不支持身份验证方法。"</string>
     <string name="account_setup_failed_security" msgid="6142264248671379943">"由于安全错误，无法打开到服务器的连接。"</string>
     <string name="account_setup_failed_ioerror" msgid="7391458717708933095">"无法与服务器建立连接。"</string>
-    <string name="account_setup_failed_dlg_edit_details_action" msgid="5355993309841479360">"编辑详情"</string>
+    <string name="account_setup_failed_security_policies_required" msgid="3567420384516656976">"此 Exchange ActiveSync 服务器要求使用安全功能，但您的手机不支持这些功能。"</string>
+    <string name="account_setup_failed_dlg_edit_details_action" msgid="5355993309841479360">"修改设置"</string>
     <string name="account_settings_title_fmt" msgid="1702058877284382340">"常规设置"</string>
     <string name="account_settings_default_label" msgid="3575963379680943640">"默认帐户"</string>
     <string name="account_settings_default_summary" msgid="1531901438624688482">"默认情况下用此帐户发送电子邮件"</string>
     <string name="account_settings_notify_label" msgid="1630001017303007974">"电子邮件通知"</string>
-    <!-- no translation found for account_settings_exchange_summary (8498451479029626317) -->
-    <skip />
+    <string name="account_settings_exchange_summary" msgid="8498451479029626317">"同步频率、通知等。"</string>
     <string name="account_settings_notify_summary" msgid="6609224590300639887">"收到电子邮件时在状态栏中显示通知"</string>
     <string name="account_settings_mail_check_frequency_label" msgid="2067835530563849675">"电子邮件检查频率"</string>
     <string name="account_settings_incoming_label" msgid="7858928031806297542">"接收设置"</string>
@@ -244,10 +219,8 @@
     <string name="account_settings_description_label" msgid="8894815221204511715">"帐户名称"</string>
     <string name="account_settings_name_label" msgid="8186406122590008449">"您的姓名"</string>
     <string name="account_settings_notifications" msgid="1042620094281375043">"通知设置"</string>
-    <!-- no translation found for account_settings_sync_contacts_enable (1369272986009573218) -->
-    <skip />
-    <!-- no translation found for account_settings_sync_contacts_summary (8901452720940015928) -->
-    <skip />
+    <string name="account_settings_sync_contacts_enable" msgid="1369272986009573218">"同步联系人"</string>
+    <string name="account_settings_sync_contacts_summary" msgid="8901452720940015928">"也同步此帐户下的联系人"</string>
     <string name="account_settings_vibrate_enable" msgid="8045133290388856478">"振动"</string>
     <string name="account_settings_vibrate_summary" msgid="3690631050585589365">"在收到电子邮件的同时振动"</string>
     <string name="account_settings_ringtone" msgid="7922187231467500404">"选择铃声"</string>
@@ -258,7 +231,6 @@
     <string name="provider_note_yahoo_uk" msgid="2055976404478603298">"在设置此电子邮件帐户之前，请访问 Yahoo! 网站并为此帐户启用 POP3 电子邮件访问。"</string>
     <string name="provider_note_live" msgid="3584841823811425060">"只有某些“Plus”帐户支持 POP 访问而允许此程序进行连接。如果您使用正确的电子邮件地址和密码无法登录，则可能还未开通付费的“Plus”帐户。请启动网络浏览器以获取对这些邮件帐户的访问权限。"</string>
     <string name="provider_note_t_online" msgid="1973701903400232774">"在设置此电子邮件帐户之前，请访问 T-Online 网站，为访问 POP3 电子邮件创建密码。"</string>
-    <!-- no translation found for exchange_name (1190783774800310346) -->
-    <skip />
+    <string name="exchange_name" msgid="1190783774800310346">"公司"</string>
     <string name="system_account_create_failed" msgid="4917162302393971752">"AccountManager 无法创建帐户，请重试。"</string>
 </resources>
diff --git a/res/values-zh-rTW/strings.xml b/res/values-zh-rTW/strings.xml
index d2a72d1..9c85645 100644
--- a/res/values-zh-rTW/strings.xml
+++ b/res/values-zh-rTW/strings.xml
@@ -15,13 +15,10 @@
 -->
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <!-- no translation found for read_attachment_label (1162255191991555285) -->
-    <skip />
+    <string name="read_attachment_label" msgid="1162255191991555285">"讀取電子郵件附件"</string>
     <string name="read_attachment_desc" msgid="7594746717616308643">"允許此應用程式讀取您的電子郵件附件。"</string>
-    <!-- no translation found for permission_access_provider_label (4274353114641168675) -->
-    <skip />
-    <!-- no translation found for permission_access_provider_desc (1513898266889541617) -->
-    <skip />
+    <string name="permission_access_provider_label" msgid="4274353114641168675">"存取電子郵件供應商資料"</string>
+    <string name="permission_access_provider_desc" msgid="1513898266889541617">"允許此應用程式存取您的電子郵件資料庫，包括已接收郵件、已傳送郵件、使用者名稱和密碼。"</string>
     <string name="app_name" msgid="5815426892327290362">"電子郵件"</string>
     <string name="accounts_title" msgid="6622149231904649210">"電子郵件"</string>
     <string name="compose_title" msgid="427986915662706899">"撰寫郵件"</string>
@@ -38,19 +35,14 @@
     <string name="discard_action" msgid="6532206074859505968">"捨棄"</string>
     <string name="save_draft_action" msgid="812855865552028622">"儲存為草稿"</string>
     <string name="read_unread_action" msgid="4721446664849165077">"設為讀取/未讀取"</string>
-    <!-- no translation found for read_action (4701484794504781686) -->
-    <skip />
-    <!-- no translation found for unread_action (6280399049357552826) -->
-    <skip />
+    <string name="read_action" msgid="4701484794504781686">"標示為已讀取"</string>
+    <string name="unread_action" msgid="6280399049357552826">"標示為未讀取"</string>
     <string name="favorite_action" msgid="2911296685862420689">"加入到最愛"</string>
-    <!-- no translation found for set_star_action (4660317166196258160) -->
-    <skip />
-    <!-- no translation found for remove_star_action (6689770999647007163) -->
-    <skip />
+    <string name="set_star_action" msgid="4660317166196258160">"標上星號"</string>
+    <string name="remove_star_action" msgid="6689770999647007163">"移除星號"</string>
     <string name="refresh_action" msgid="5951383001436708175">"重新整理"</string>
     <string name="add_account_action" msgid="8835736309476033727">"新增帳戶"</string>
-    <!-- no translation found for deselect_all_action (253663239459688238) -->
-    <skip />
+    <string name="deselect_all_action" msgid="253663239459688238">"全部取消選取"</string>
     <string name="compose_action" msgid="4045702519637388045">"撰寫郵件"</string>
     <string name="search_action" msgid="6325101454876682308">"搜尋"</string>
     <string name="open_action" msgid="936766723989190816">"開啟"</string>
@@ -71,8 +63,7 @@
     <string name="status_sending_messages_failed" msgid="7975009558738692407">"正在重新傳送訊息"</string>
     <string name="status_loading_more_failed" msgid="1629172047185323">"重新載入更多郵件"</string>
     <string name="notification_new_title" msgid="2200257910380529139">"新郵件"</string>
-    <!-- no translation found for error_loading_message_body (2265140604109272914) -->
-    <skip />
+    <string name="error_loading_message_body" msgid="2265140604109272914">"載入郵件文字時發生未預期的錯誤，郵件可能過大以致於無法檢視。"</string>
   <plurals name="notification_new_one_account_fmt">
     <item quantity="one" msgid="3422945912787702191">"<xliff:g id="UNREAD_MESSAGE_COUNT">%d</xliff:g> 封未讀取郵件 (<xliff:g id="ACCOUNT">%s</xliff:g>)"</item>
     <item quantity="few" msgid="6543078667692990869">"<xliff:g id="UNREAD_MESSAGE_COUNT">%d</xliff:g> 封未讀取郵件 (<xliff:g id="ACCOUNT">%s</xliff:g>)"</item>
@@ -82,25 +73,17 @@
     <item quantity="few" msgid="1991747245324120305">"<xliff:g id="NUMBER_ACCOUNTS">%d</xliff:g> 個帳戶"</item>
     <item quantity="other" msgid="2723797835410343458">"於 <xliff:g id="NUMBER_ACCOUNTS">%d</xliff:g> 個帳戶"</item>
   </plurals>
-    <!-- no translation found for mailbox_name_display_inbox (3542327124749861736) -->
-    <skip />
-    <!-- no translation found for mailbox_name_display_outbox (2826214174661417662) -->
-    <skip />
-    <!-- no translation found for mailbox_name_display_drafts (4868718300700514319) -->
-    <skip />
-    <!-- no translation found for mailbox_name_display_trash (9139069064580630647) -->
-    <skip />
-    <!-- no translation found for mailbox_name_display_sent (3426058998191869523) -->
-    <skip />
-    <!-- no translation found for mailbox_name_display_junk (9046762505977999288) -->
-    <skip />
+    <string name="mailbox_name_display_inbox" msgid="3542327124749861736">"收件匣"</string>
+    <string name="mailbox_name_display_outbox" msgid="2826214174661417662">"寄件匣"</string>
+    <string name="mailbox_name_display_drafts" msgid="4868718300700514319">"草稿"</string>
+    <string name="mailbox_name_display_trash" msgid="9139069064580630647">"垃圾桶"</string>
+    <string name="mailbox_name_display_sent" msgid="3426058998191869523">"寄件備份"</string>
+    <string name="mailbox_name_display_junk" msgid="9046762505977999288">"垃圾郵件"</string>
     <string name="debug_version_fmt" msgid="6160213145745376955">"版本：<xliff:g id="VERSION">%s</xliff:g>"</string>
     <string name="account_folder_list_separator_accounts" msgid="7568820182396669244">"帳戶"</string>
-    <!-- no translation found for account_folder_list_summary_inbox (5790553737870057607) -->
-    <skip />
+    <string name="account_folder_list_summary_inbox" msgid="5790553737870057607">"合併的收件匣"</string>
     <string name="account_folder_list_summary_unread" msgid="1200755158196002928">"未讀取"</string>
-    <!-- no translation found for account_folder_list_summary_starred (3134312269246375723) -->
-    <skip />
+    <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_title" msgid="8299608543467211089">"信箱"</string>
@@ -137,10 +120,8 @@
     <string name="add_contact_dlg_message_fmt" msgid="4470846346726847478">"將「<xliff:g id="EMAIL">%s</xliff:g>」新增為聯絡人"</string>
     <string name="message_view_display_attachment_toast" msgid="6096315816776330821">"無法顯示此附件。"</string>
     <string name="account_setup_basics_title" msgid="3969856368228940980">"設定電子郵件"</string>
-    <!-- no translation found for accounts_welcome (5901437782383439370) -->
-    <skip />
-    <!-- no translation found for accounts_welcome_exchange (4414121583987233733) -->
-    <skip />
+    <string name="accounts_welcome" msgid="5901437782383439370">"只要幾個步驟，就可以為絕大多數的帳戶設定好電子郵件。"</string>
+    <string name="accounts_welcome_exchange" msgid="4414121583987233733">"只要幾個步驟，就可以設定 Exchange 帳戶。"</string>
     <!-- no translation found for account_setup_basics_instructions (3126077748322815504) -->
     <skip />
     <string name="account_setup_basics_email_hint" msgid="7414269319207261120">"電子郵件地址"</string>
@@ -148,10 +129,8 @@
     <string name="account_setup_basics_default_label" msgid="5924790142029806711">"預設使用這個帳戶傳送電子郵件。"</string>
     <string name="account_setup_basics_manual_setup_action" msgid="8053852205391155912">"手動設定"</string>
     <string name="account_setup_username_password_toast" msgid="4441448542557889481">"請輸入有效的電子郵件地址和密碼。"</string>
-    <!-- no translation found for account_duplicate_dlg_title (3176749833792312641) -->
-    <skip />
-    <!-- no translation found for account_duplicate_dlg_message_fmt (1920726613701479851) -->
-    <skip />
+    <string name="account_duplicate_dlg_title" msgid="3176749833792312641">"複製帳戶"</string>
+    <string name="account_duplicate_dlg_message_fmt" msgid="1920726613701479851">"其他帳戶 (<xliff:g id="DUPLICATE">%s</xliff:g>) 已使用相同的登入資訊。"</string>
     <string name="account_setup_check_settings_retr_info_msg" msgid="4121970450267725664">"正在擷取帳戶資訊..."</string>
     <string name="account_setup_check_settings_check_incoming_msg" msgid="5356212700221438863">"正在檢查收信伺服器設定..."</string>
     <string name="account_setup_check_settings_check_outgoing_msg" msgid="4033015234096725343">"正在檢查外寄伺服器設定..."</string>
@@ -170,14 +149,10 @@
     <string name="account_setup_incoming_port_label" msgid="8214738923690447796">"通訊埠"</string>
     <string name="account_setup_incoming_security_label" msgid="2110260791086007424">"安全性類型"</string>
     <string name="account_setup_incoming_security_none_label" msgid="8300169413118264895">"無"</string>
-    <!-- no translation found for account_setup_incoming_security_ssl_trust_certificates_label (3581382268191377346) -->
-    <skip />
-    <!-- no translation found for account_setup_incoming_security_ssl_label (8886698397743061682) -->
-    <skip />
-    <!-- no translation found for account_setup_incoming_security_tls_trust_certificates_label (1089227022489257055) -->
-    <skip />
-    <!-- no translation found for account_setup_incoming_security_tls_label (8638006172590036487) -->
-    <skip />
+    <string name="account_setup_incoming_security_ssl_trust_certificates_label" msgid="3581382268191377346">"SSL (接受所有憑證)"</string>
+    <string name="account_setup_incoming_security_ssl_label" msgid="8886698397743061682">"SSL"</string>
+    <string name="account_setup_incoming_security_tls_trust_certificates_label" msgid="1089227022489257055">"TLS (接受所有憑證)"</string>
+    <string name="account_setup_incoming_security_tls_label" msgid="8638006172590036487">"TLS"</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>
@@ -190,15 +165,15 @@
     <string name="account_setup_outgoing_require_login_label" msgid="6371514297854287948">"必須登入。"</string>
     <string name="account_setup_outgoing_username_label" msgid="3309680794731596981">"使用者名稱"</string>
     <string name="account_setup_outgoing_password_label" msgid="227844585493317550">"密碼"</string>
-    <string name="account_setup_exchange_title" msgid="247933841122558059">"Exchange 伺服器設定"</string>
-    <string name="account_setup_exchange_server_label" msgid="5390359659749339317">"Exchange 伺服器"</string>
-    <!-- no translation found for account_setup_exchange_username_label (6517176180828983060) -->
+    <!-- no translation found for account_setup_exchange_title (2492853474738063453) -->
     <skip />
+    <!-- no translation found for account_setup_exchange_server_label (795137797983360826) -->
+    <skip />
+    <string name="account_setup_exchange_username_label" msgid="6517176180828983060">"網域\\使用者名稱"</string>
     <string name="account_setup_exchange_domain_label" msgid="3584668050727667045">"網域"</string>
     <string name="account_setup_exchange_domain_hint" msgid="350372033916025287">"在此輸入網域"</string>
     <string name="account_setup_exchange_ssl_label" msgid="6704105469083211236">"使用安全連線 (SSL)"</string>
-    <!-- no translation found for account_setup_exchange_trust_certificates_label (6232880757633882678) -->
-    <skip />
+    <string name="account_setup_exchange_trust_certificates_label" msgid="6232880757633882678">"接受所有安全資料傳輸層 (SSL) 憑證"</string>
     <string name="account_setup_options_title" msgid="8995162193118880993">"帳戶選項"</string>
     <string name="account_setup_options_mail_check_frequency_label" msgid="4598023962234986194">"檢查電子郵件的頻率"</string>
     <string name="account_setup_options_mail_check_frequency_never" msgid="287951859480505416">"不要檢查"</string>
@@ -229,13 +204,13 @@
     <string name="account_setup_failed_auth_required" msgid="1676242821459638150">"伺服器不支援這些驗證方法。"</string>
     <string name="account_setup_failed_security" msgid="6142264248671379943">"發生安全性錯誤，無法連線至伺服器。"</string>
     <string name="account_setup_failed_ioerror" msgid="7391458717708933095">"無法連線至伺服器。"</string>
+    <string name="account_setup_failed_security_policies_required" msgid="3567420384516656976">"您的手機不支援這個 Exchange ActiveSync 伺服器所需的安全性功能。"</string>
     <string name="account_setup_failed_dlg_edit_details_action" msgid="5355993309841479360">"請編輯資料"</string>
     <string name="account_settings_title_fmt" msgid="1702058877284382340">"一般設定"</string>
     <string name="account_settings_default_label" msgid="3575963379680943640">"預設帳戶"</string>
     <string name="account_settings_default_summary" msgid="1531901438624688482">"預設使用這個帳戶傳送電子郵件"</string>
     <string name="account_settings_notify_label" msgid="1630001017303007974">"電子郵件通知"</string>
-    <!-- no translation found for account_settings_exchange_summary (8498451479029626317) -->
-    <skip />
+    <string name="account_settings_exchange_summary" msgid="8498451479029626317">"同步處理的頻率和通知等"</string>
     <string name="account_settings_notify_summary" msgid="6609224590300639887">"收到電子郵件時，在狀態列中顯示通知"</string>
     <string name="account_settings_mail_check_frequency_label" msgid="2067835530563849675">"檢查電子郵件的頻率"</string>
     <string name="account_settings_incoming_label" msgid="7858928031806297542">"內收設定"</string>
@@ -244,10 +219,8 @@
     <string name="account_settings_description_label" msgid="8894815221204511715">"帳戶名稱"</string>
     <string name="account_settings_name_label" msgid="8186406122590008449">"您的姓名"</string>
     <string name="account_settings_notifications" msgid="1042620094281375043">"通知設定"</string>
-    <!-- no translation found for account_settings_sync_contacts_enable (1369272986009573218) -->
-    <skip />
-    <!-- no translation found for account_settings_sync_contacts_summary (8901452720940015928) -->
-    <skip />
+    <string name="account_settings_sync_contacts_enable" msgid="1369272986009573218">"同步處理聯絡人"</string>
+    <string name="account_settings_sync_contacts_summary" msgid="8901452720940015928">"也同步處理此帳戶的聯絡人"</string>
     <string name="account_settings_vibrate_enable" msgid="8045133290388856478">"震動"</string>
     <string name="account_settings_vibrate_summary" msgid="3690631050585589365">"收到電子郵件時震動提醒"</string>
     <string name="account_settings_ringtone" msgid="7922187231467500404">"選取鈴聲"</string>
@@ -258,7 +231,6 @@
     <string name="provider_note_yahoo_uk" msgid="2055976404478603298">"在設定此電子郵件帳戶前，請先造訪 Yahoo! 網站，並啟用帳戶的 POP3 電子郵件收發功能。"</string>
     <string name="provider_note_live" msgid="3584841823811425060">"只有部分包含 POP 存取功能的「Plus」帳戶能與這個程式連線。如果您輸入的電子郵件地址和密碼無誤，卻仍無法登入，表示您可能尚未購買「Plus」帳戶。請啟動網頁瀏覽器，以存取這些電子郵件帳戶。"</string>
     <string name="provider_note_t_online" msgid="1973701903400232774">"在設定此電子郵件帳戶前，請先造訪 T-Online 網站，並設定 POP3 電子郵件收發功能的密碼。"</string>
-    <!-- no translation found for exchange_name (1190783774800310346) -->
-    <skip />
+    <string name="exchange_name" msgid="1190783774800310346">"公司"</string>
     <string name="system_account_create_failed" msgid="4917162302393971752">"AccountManager 無法建立帳戶，請再試一次。"</string>
 </resources>