diff --git a/res/values-cs/strings.xml b/res/values-cs/strings.xml
index fa105b6..49982eb 100644
--- a/res/values-cs/strings.xml
+++ b/res/values-cs/strings.xml
@@ -20,7 +20,6 @@
     <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>
     <string name="debug_title" msgid="5175710493691536719">"Ladění"</string>
     <string name="next_action" msgid="3931301986364184415">"Další"</string>
@@ -56,12 +55,9 @@
     <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>
-    <string name="accounts_context_menu_title" msgid="1053701760934475027">"Možnosti účtu"</string>
     <string name="status_loading_more" msgid="1580386959044617884">"Načítání zpráv..."</string>
     <string name="status_sending_messages" msgid="3971880826111264523">"Odesílání zpráv..."</string>
     <string name="status_network_error" msgid="6045933332005067021">"Chyba připojení"</string>
-    <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>
     <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">
@@ -82,14 +78,12 @@
     <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>
     <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>
     <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>
     <string name="message_list_load_more_messages_action" msgid="7428302707908825692">"Načíst další zprávy"</string>
     <string name="message_list_send_pending_messages_action" msgid="9100624762133992435">"Odeslat odchozí zprávy"</string>
-    <string name="message_list_title" msgid="6927798150197177235">"<xliff:g id="ACCOUNT">%s</xliff:g>: <xliff:g id="MAILBOX">%s</xliff:g>"</string>
     <string name="message_compose_to_hint" msgid="2891895306418177013">"Komu"</string>
     <string name="message_compose_cc_hint" msgid="8481884461031434144">"Kopie"</string>
     <string name="message_compose_bcc_hint" msgid="9177337492358841680">"Skrytá kopie"</string>
@@ -113,17 +107,35 @@
     <string name="message_view_show_pictures_action" msgid="5059936981743072545">"Zobrazit obrázky"</string>
     <string name="message_view_fetching_attachment_toast" msgid="8812363375155391184">"Načítání přílohy"</string>
     <string name="message_view_fetching_attachment_progress" msgid="8238550182655758164">"Načítání přílohy <xliff:g id="FILENAME">%s</xliff:g>"</string>
-    <string name="message_deleted_toast" msgid="1554845060991758649">"Zpráva byla smazána."</string>
+    <!-- no translation found for message_view_invite_view (6256018854688891069) -->
+    <skip />
+    <!-- no translation found for message_view_invite_title (5024473745902772299) -->
+    <skip />
+    <!-- no translation found for message_view_invite_text (1212799906603873708) -->
+    <skip />
+    <!-- no translation found for message_view_invite_accept (744546668021679819) -->
+    <skip />
+    <!-- no translation found for message_view_invite_maybe (7555189462441562318) -->
+    <skip />
+    <!-- no translation found for message_view_invite_decline (6119797303297149463) -->
+    <skip />
+    <!-- no translation found for message_view_invite_toast_yes (1900593767157209498) -->
+    <skip />
+    <!-- no translation found for message_view_invite_toast_maybe (8324044318669610540) -->
+    <skip />
+    <!-- no translation found for message_view_invite_toast_no (7511491076936887064) -->
+    <skip />
+    <!-- no translation found for message_deleted_toast:one (710742672464447084) -->
+    <!-- no translation found for message_deleted_toast:other (6574961322865652255) -->
     <string name="message_discarded_toast" msgid="3891461729325584026">"Zpráva byla zrušena."</string>
     <string name="message_saved_toast" msgid="8443125659172627665">"Zpráva byla uložena jako koncept."</string>
-    <string name="add_contact_dlg_title" msgid="7424641029188006580">"Přidat kontakt"</string>
-    <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>
+    <string name="account_setup_basics_exchange_title" msgid="1147638872869594157">"Přidat účet Exchange"</string>
+    <string name="account_setup_basics_exchange_title_alternate" msgid="4980422714586153809">"Přidat účet Exchange ActiveSync"</string>
     <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="accounts_welcome_exchange_alternate" msgid="1324339567986452000">"Účet služby Exchange ActiveSync můžete nakonfigurovat v několika snadných krocích."</string>
     <string name="account_setup_basics_email_hint" msgid="7414269319207261120">"E-mailová adresa"</string>
     <string name="account_setup_basics_password_hint" msgid="410210049040536870">"Heslo"</string>
     <string name="account_setup_basics_default_label" msgid="5924790142029806711">"Ve výchozím nastavení odesílat e-maily z tohoto účtu."</string>
@@ -165,13 +177,9 @@
     <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>
-    <!-- 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_title" msgid="2492853474738063453">"Nastavení serveru"</string>
+    <string name="account_setup_exchange_server_label" msgid="795137797983360826">"Server"</string>
     <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>
     <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>
@@ -186,6 +194,7 @@
     <string name="account_setup_options_default_label" msgid="8869166381331276697">"Ve výchozím nastavení odesílat e-maily z tohoto účtu."</string>
     <string name="account_setup_options_notify_label" msgid="1247525794828820038">"Upozornit mě na příchozí e-mail"</string>
     <string name="account_setup_options_sync_contacts_label" msgid="7467467090023434271">"Synchronizovat kontakty z tohoto účtu."</string>
+    <string name="account_setup_options_sync_calendar_label" msgid="3195979658426293931">"Synchronizovat kalendář z tohoto účtu."</string>
     <string name="account_setup_failed_dlg_title" msgid="7827583313117521383">"Nastavení nelze dokončit"</string>
     <string name="account_setup_options_mail_window_label" msgid="8764417340954006086">"Množství k synchronizaci"</string>
     <string name="account_setup_options_mail_window_1day" msgid="3965715241135811407">"Jeden den"</string>
@@ -193,7 +202,6 @@
     <string name="account_setup_options_mail_window_1week" msgid="5639718031108023741">"Jeden týden"</string>
     <string name="account_setup_options_mail_window_2weeks" msgid="4567049268124213035">"Dva týdny"</string>
     <string name="account_setup_options_mail_window_1month" msgid="5846359669750047081">"Jeden měsíc"</string>
-    <string name="account_setup_options_mail_window_all" msgid="5383858972681926166">"Všechna pošta"</string>
     <string name="account_setup_failed_dlg_auth_message" msgid="42827150104879570">"Uživatelské jméno nebo heslo není správné"</string>
     <string name="account_setup_failed_dlg_auth_message_fmt" msgid="8598560266430207606">"Uživatelské jméno nebo heslo není správné."\n"(<xliff:g id="ERROR">%s</xliff:g>)"</string>
     <string name="account_setup_failed_dlg_certificate_message" msgid="961843413600482906">"Nelze se bezpečně připojit k serveru."</string>
@@ -204,7 +212,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_security_required_title" msgid="1850321535870447468">"Vzdálená správa zabezpečení"</string>
+    <string name="account_setup_security_policies_required_fmt" msgid="8146309611870795951">"Server <xliff:g id="SERVER">%s</xliff:g> žádá o povolení, aby mohl vzdáleně ovládat některé funkce zabezpečení vašeho telefonu. Chcete dokončit nastavení tohoto účtu?"</string>
+    <string name="account_setup_failed_security_policies_unsupported" msgid="4093832822988053758">"Tento server vyžaduje funkce zabezpečení, které váš telefon nepodporuje."</string>
+    <string name="security_notification_ticker_fmt" msgid="1108023476125276507">"Účet <xliff:g id="ACCOUNT">%s</xliff:g> požaduje aktualizaci nastavení zabezpečení."</string>
+    <string name="security_notification_content_title" msgid="8096231937552848281">"Aktualizace nastavení zabezpečení"</string>
+    <string name="account_security_title" msgid="4441470647344315196">"Zabezpečení zařízení"</string>
+    <string name="account_security_policy_explanation_fmt" msgid="5153981166755002718">"Server <xliff:g id="SERVER">%s</xliff:g> žádá o povolení, aby mohl vzdáleně ovládat některé funkce zabezpečení vašeho telefonu."</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>
@@ -215,22 +229,40 @@
     <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>
     <string name="account_settings_outgoing_label" msgid="4464829249980026745">"Nastavení odchozí pošty"</string>
-    <string name="account_settings_add_account_label" msgid="63971622405360050">"Přidat další účet"</string>
     <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_signature_label" msgid="4091969938785803201">"Podpis"</string>
+    <string name="account_settings_signature_hint" msgid="7262183168962779403">"Připojit text k odesílaným zprávám"</string>
     <string name="account_settings_notifications" msgid="1042620094281375043">"Nastavení upozornění"</string>
     <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_sync_calendar_enable" msgid="6855333393468628003">"Synchronizovat kalendář"</string>
+    <string name="account_settings_sync_calendar_summary" msgid="2456010694443333450">"Synchronizovat kalendář 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í 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="upgrade_accounts_title" msgid="5444140226380754014">"Upgradovat účty"</string>
+    <string name="upgrade_accounts_error" msgid="7241661832029255715">"Účet nelze upgradovat"</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>
     <string name="exchange_name" msgid="1190783774800310346">"Firemní"</string>
+    <string name="exchange_name_alternate" msgid="5772529644749041052">"Microsoft Exchange ActiveSync"</string>
+    <!-- no translation found for meeting_invitation (352782347335101484) -->
+    <skip />
+    <!-- no translation found for meeting_accepted (8796609373330400268) -->
+    <skip />
+    <!-- no translation found for meeting_declined (6707617183246608552) -->
+    <skip />
+    <!-- no translation found for meeting_tentative (8250995722130443785) -->
+    <skip />
     <string name="system_account_create_failed" msgid="4917162302393971752">"Správci účtů se nepodařilo vytvořit účet. Zkuste to prosím znovu."</string>
+    <string name="device_admin_label" msgid="8680224994637869414">"E-mail"</string>
+    <string name="device_admin_description" msgid="426727923791430306">"Povoluje zásady zabezpečení určené serverem"</string>
+    <!-- no translation found for notification_exchange_calendar_added (6823659622379350159) -->
+    <skip />
 </resources>
diff --git a/res/values-da/strings.xml b/res/values-da/strings.xml
index 94d5d3d..63e5260 100644
--- a/res/values-da/strings.xml
+++ b/res/values-da/strings.xml
@@ -20,7 +20,6 @@
     <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>
     <string name="debug_title" msgid="5175710493691536719">"Fejlretning"</string>
     <string name="next_action" msgid="3931301986364184415">"Næste"</string>
@@ -56,12 +55,9 @@
     <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">"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>
     <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">
@@ -82,14 +78,12 @@
     <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>
     <string name="account_folder_list_summary_inbox" msgid="5790553737870057607">"Kombineret indbakke"</string>
-    <string name="account_folder_list_summary_unread" msgid="1200755158196002928">"Ulæste"</string>
     <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>
     <string name="message_list_load_more_messages_action" msgid="7428302707908825692">"Indlæs flere beskeder"</string>
     <string name="message_list_send_pending_messages_action" msgid="9100624762133992435">"Send udgående beskeder"</string>
-    <string name="message_list_title" msgid="6927798150197177235">"<xliff:g id="ACCOUNT">%s</xliff:g>: <xliff:g id="MAILBOX">%s</xliff:g>"</string>
     <string name="message_compose_to_hint" msgid="2891895306418177013">"Til"</string>
     <string name="message_compose_cc_hint" msgid="8481884461031434144">"Cc"</string>
     <string name="message_compose_bcc_hint" msgid="9177337492358841680">"Bcc"</string>
@@ -113,17 +107,35 @@
     <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 den vedhæftede fil <xliff:g id="FILENAME">%s</xliff:g>"</string>
-    <string name="message_deleted_toast" msgid="1554845060991758649">"Beskeden er slettet."</string>
+    <!-- no translation found for message_view_invite_view (6256018854688891069) -->
+    <skip />
+    <!-- no translation found for message_view_invite_title (5024473745902772299) -->
+    <skip />
+    <!-- no translation found for message_view_invite_text (1212799906603873708) -->
+    <skip />
+    <!-- no translation found for message_view_invite_accept (744546668021679819) -->
+    <skip />
+    <!-- no translation found for message_view_invite_maybe (7555189462441562318) -->
+    <skip />
+    <!-- no translation found for message_view_invite_decline (6119797303297149463) -->
+    <skip />
+    <!-- no translation found for message_view_invite_toast_yes (1900593767157209498) -->
+    <skip />
+    <!-- no translation found for message_view_invite_toast_maybe (8324044318669610540) -->
+    <skip />
+    <!-- no translation found for message_view_invite_toast_no (7511491076936887064) -->
+    <skip />
+    <!-- no translation found for message_deleted_toast:one (710742672464447084) -->
+    <!-- no translation found for message_deleted_toast:other (6574961322865652255) -->
     <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">"Konfiguration af e-mail"</string>
+    <string name="account_setup_basics_exchange_title" msgid="1147638872869594157">"Tilføj en Exchange-konto"</string>
+    <string name="account_setup_basics_exchange_title_alternate" msgid="4980422714586153809">"Tilføj en Exchange ActiveSync-konto"</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="accounts_welcome_exchange_alternate" msgid="1324339567986452000">"Du kan konfigurere en Exchange ActiveSync-konto i nogle få trin."</string>
     <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>
@@ -165,13 +177,9 @@
     <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>
-    <!-- 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_title" msgid="2492853474738063453">"Serverindstillinger"</string>
+    <string name="account_setup_exchange_server_label" msgid="795137797983360826">"Server"</string>
     <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>
     <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>
@@ -186,6 +194,7 @@
     <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">"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_options_sync_calendar_label" msgid="3195979658426293931">"Synkroniser kalender 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>
@@ -193,7 +202,6 @@
     <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 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>
@@ -204,7 +212,13 @@
     <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_security_required_title" msgid="1850321535870447468">"Ekstern sikkerhedsadministration"</string>
+    <string name="account_setup_security_policies_required_fmt" msgid="8146309611870795951">"Serveren <xliff:g id="SERVER">%s</xliff:g> kræver, at du giver den tilladelse til eksternt at kontrollere nogle af telefonens sikkerhedsfunktioner. Vil du afslutte opsætning af denne konto?"</string>
+    <string name="account_setup_failed_security_policies_unsupported" msgid="4093832822988053758">"Denne server kræver sikkerhedsfunktioner, som telefonen ikke understøtter."</string>
+    <string name="security_notification_ticker_fmt" msgid="1108023476125276507">"Kontoen \"<xliff:g id="ACCOUNT">%s</xliff:g>\" kræver opdatering af sikkerhedsindstillingerne."</string>
+    <string name="security_notification_content_title" msgid="8096231937552848281">"Opdater sikkerhedsindstillinger"</string>
+    <string name="account_security_title" msgid="4441470647344315196">"Enhedssikkerhed"</string>
+    <string name="account_security_policy_explanation_fmt" msgid="5153981166755002718">"Serveren <xliff:g id="SERVER">%s</xliff:g> kræver, at du giver den tilladelse til eksternt at kontrollere nogle af telefonens sikkerhedsfunktioner."</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>
@@ -215,22 +229,40 @@
     <string name="account_settings_mail_check_frequency_label" msgid="2067835530563849675">"Kontrolfrekvens for e-mail"</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_signature_label" msgid="4091969938785803201">"Signatur"</string>
+    <string name="account_settings_signature_hint" msgid="7262183168962779403">"Vedhæft tekst til beskeder, du sender"</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_sync_calendar_enable" msgid="6855333393468628003">"Synkroniser kalender"</string>
+    <string name="account_settings_sync_calendar_summary" msgid="2456010694443333450">"Synkroniser også kalender 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">"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="upgrade_accounts_title" msgid="5444140226380754014">"Opgrader konti"</string>
+    <string name="upgrade_accounts_error" msgid="7241661832029255715">"Kontoen kunne ikke opgraderes"</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 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="exchange_name_alternate" msgid="5772529644749041052">"Microsoft Exchange ActiveSync"</string>
+    <!-- no translation found for meeting_invitation (352782347335101484) -->
+    <skip />
+    <!-- no translation found for meeting_accepted (8796609373330400268) -->
+    <skip />
+    <!-- no translation found for meeting_declined (6707617183246608552) -->
+    <skip />
+    <!-- no translation found for meeting_tentative (8250995722130443785) -->
+    <skip />
     <string name="system_account_create_failed" msgid="4917162302393971752">"Kontoadministratoren kunne ikke oprette kontoen. Prøv igen."</string>
+    <string name="device_admin_label" msgid="8680224994637869414">"E-mail"</string>
+    <string name="device_admin_description" msgid="426727923791430306">"Muliggør serverspecifikke sikkerhedspolitikker"</string>
+    <!-- no translation found for notification_exchange_calendar_added (6823659622379350159) -->
+    <skip />
 </resources>
diff --git a/res/values-de/strings.xml b/res/values-de/strings.xml
index 417c5b5..880d059 100644
--- a/res/values-de/strings.xml
+++ b/res/values-de/strings.xml
@@ -20,7 +20,6 @@
     <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>
     <string name="debug_title" msgid="5175710493691536719">"Fehlersuche"</string>
     <string name="next_action" msgid="3931301986364184415">"Weiter"</string>
@@ -56,12 +55,9 @@
     <string name="add_attachment_action" msgid="2696013743130573897">"Anhang hinzufügen"</string>
     <string name="dump_settings_action" msgid="4478192525236169829">"Einstellungen für Speicherauszug"</string>
     <string name="choose_attachment_dialog_title" msgid="81937507117528954">"Anhang auswählen"</string>
-    <string name="accounts_context_menu_title" msgid="1053701760934475027">"Konto-Optionen"</string>
     <string name="status_loading_more" msgid="1580386959044617884">"Nachrichten werden geladen..."</string>
     <string name="status_sending_messages" msgid="3971880826111264523">"Nachrichten werden gesendet…"</string>
     <string name="status_network_error" msgid="6045933332005067021">"Verbindungsfehler"</string>
-    <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>
     <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">
@@ -82,14 +78,12 @@
     <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>
     <string name="account_folder_list_summary_inbox" msgid="5790553737870057607">"Kombinierter Posteingang"</string>
-    <string name="account_folder_list_summary_unread" msgid="1200755158196002928">"Ungelesen"</string>
     <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>
     <string name="message_list_load_more_messages_action" msgid="7428302707908825692">"Weitere Nachrichten laden"</string>
     <string name="message_list_send_pending_messages_action" msgid="9100624762133992435">"Ausgehende Nachrichten senden"</string>
-    <string name="message_list_title" msgid="6927798150197177235">"<xliff:g id="ACCOUNT">%s</xliff:g>: <xliff:g id="MAILBOX">%s</xliff:g>"</string>
     <string name="message_compose_to_hint" msgid="2891895306418177013">"An"</string>
     <string name="message_compose_cc_hint" msgid="8481884461031434144">"Cc"</string>
     <string name="message_compose_bcc_hint" msgid="9177337492358841680">"Bcc"</string>
@@ -113,17 +107,35 @@
     <string name="message_view_show_pictures_action" msgid="5059936981743072545">"Bilder anzeigen"</string>
     <string name="message_view_fetching_attachment_toast" msgid="8812363375155391184">"Anhang wird abgerufen"</string>
     <string name="message_view_fetching_attachment_progress" msgid="8238550182655758164">"Anhang <xliff:g id="FILENAME">%s</xliff:g> wird abgerufen."</string>
-    <string name="message_deleted_toast" msgid="1554845060991758649">"Nachricht gelöscht"</string>
+    <!-- no translation found for message_view_invite_view (6256018854688891069) -->
+    <skip />
+    <!-- no translation found for message_view_invite_title (5024473745902772299) -->
+    <skip />
+    <!-- no translation found for message_view_invite_text (1212799906603873708) -->
+    <skip />
+    <!-- no translation found for message_view_invite_accept (744546668021679819) -->
+    <skip />
+    <!-- no translation found for message_view_invite_maybe (7555189462441562318) -->
+    <skip />
+    <!-- no translation found for message_view_invite_decline (6119797303297149463) -->
+    <skip />
+    <!-- no translation found for message_view_invite_toast_yes (1900593767157209498) -->
+    <skip />
+    <!-- no translation found for message_view_invite_toast_maybe (8324044318669610540) -->
+    <skip />
+    <!-- no translation found for message_view_invite_toast_no (7511491076936887064) -->
+    <skip />
+    <!-- no translation found for message_deleted_toast:one (710742672464447084) -->
+    <!-- no translation found for message_deleted_toast:other (6574961322865652255) -->
     <string name="message_discarded_toast" msgid="3891461729325584026">"Nachricht gelöscht"</string>
     <string name="message_saved_toast" msgid="8443125659172627665">"Nachricht als Entwurf gespeichert"</string>
-    <string name="add_contact_dlg_title" msgid="7424641029188006580">"Kontakt hinzufügen"</string>
-    <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>
+    <string name="account_setup_basics_exchange_title" msgid="1147638872869594157">"Exchange-Konto hinzufügen"</string>
+    <string name="account_setup_basics_exchange_title_alternate" msgid="4980422714586153809">"Exchange ActiveSync-Konto hinzufügen"</string>
     <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="accounts_welcome_exchange_alternate" msgid="1324339567986452000">"Sie können ein Exchange ActiveSync-Konto in nur wenigen Schritten konfigurieren."</string>
     <string name="account_setup_basics_email_hint" msgid="7414269319207261120">"E-Mail-Adresse"</string>
     <string name="account_setup_basics_password_hint" msgid="410210049040536870">"Passwort"</string>
     <string name="account_setup_basics_default_label" msgid="5924790142029806711">"E-Mails standardmäßig von diesem Konto senden"</string>
@@ -165,13 +177,9 @@
     <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>
-    <!-- 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_title" msgid="2492853474738063453">"Servereinstellungen"</string>
+    <string name="account_setup_exchange_server_label" msgid="795137797983360826">"Server"</string>
     <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>
     <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>
@@ -186,6 +194,7 @@
     <string name="account_setup_options_default_label" msgid="8869166381331276697">"E-Mails standardmäßig von diesem Konto senden"</string>
     <string name="account_setup_options_notify_label" msgid="1247525794828820038">"Benachrichtigung bei E-Mail-Eingang"</string>
     <string name="account_setup_options_sync_contacts_label" msgid="7467467090023434271">"Kontakte dieses Kontos synchronisieren"</string>
+    <string name="account_setup_options_sync_calendar_label" msgid="3195979658426293931">"Kalender dieses Kontos synchronisieren"</string>
     <string name="account_setup_failed_dlg_title" msgid="7827583313117521383">"Einrichtung konnte nicht abgeschlossen werden"</string>
     <string name="account_setup_options_mail_window_label" msgid="8764417340954006086">"Umfang der Synchronisation"</string>
     <string name="account_setup_options_mail_window_1day" msgid="3965715241135811407">"Ein Tag"</string>
@@ -193,7 +202,6 @@
     <string name="account_setup_options_mail_window_1week" msgid="5639718031108023741">"Eine Woche"</string>
     <string name="account_setup_options_mail_window_2weeks" msgid="4567049268124213035">"Zwei Wochen"</string>
     <string name="account_setup_options_mail_window_1month" msgid="5846359669750047081">"Ein Monat"</string>
-    <string name="account_setup_options_mail_window_all" msgid="5383858972681926166">"Alle E-Mails"</string>
     <string name="account_setup_failed_dlg_auth_message" msgid="42827150104879570">"Nutzername oder Passwort falsch"</string>
     <string name="account_setup_failed_dlg_auth_message_fmt" msgid="8598560266430207606">"Nutzername oder Password falsch"\n"(<xliff:g id="ERROR">%s</xliff:g>)"</string>
     <string name="account_setup_failed_dlg_certificate_message" msgid="961843413600482906">"Keine sichere Verbindung zu Server möglich"</string>
@@ -204,7 +212,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_security_required_title" msgid="1850321535870447468">"Remote-Sicherheitsverwaltung"</string>
+    <string name="account_setup_security_policies_required_fmt" msgid="8146309611870795951">"Der Server <xliff:g id="SERVER">%s</xliff:g> erfordert die Erlaubnis zur Remote-Steuerung einiger Sicherheitsfunktionen auf Ihrem Telefon. Möchten Sie die Einrichtung dieses Kontos abschließen?"</string>
+    <string name="account_setup_failed_security_policies_unsupported" msgid="4093832822988053758">"Für diesen Server sind Sicherheitsfunktionen erforderlich, die von Ihrem Telefon nicht unterstützt werden."</string>
+    <string name="security_notification_ticker_fmt" msgid="1108023476125276507">"Das Konto \"<xliff:g id="ACCOUNT">%s</xliff:g>\" erfordert eine Aktualisierung der Sicherheitseinstellungen."</string>
+    <string name="security_notification_content_title" msgid="8096231937552848281">"Sicherheitseinstellungen aktualisieren"</string>
+    <string name="account_security_title" msgid="4441470647344315196">"Gerätesicherheit"</string>
+    <string name="account_security_policy_explanation_fmt" msgid="5153981166755002718">"Der Server <xliff:g id="SERVER">%s</xliff:g> erfordert die Erlaubnis zur Remote-Steuerung einiger Sicherheitsfunktionen auf Ihrem Telefon."</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>
@@ -215,22 +229,40 @@
     <string name="account_settings_mail_check_frequency_label" msgid="2067835530563849675">"Abrufhäufigkeit"</string>
     <string name="account_settings_incoming_label" msgid="7858928031806297542">"Eingehende Nachrichten"</string>
     <string name="account_settings_outgoing_label" msgid="4464829249980026745">"Ausgehende Nachrichten"</string>
-    <string name="account_settings_add_account_label" msgid="63971622405360050">"Konto hinzufügen"</string>
     <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_signature_label" msgid="4091969938785803201">"Signatur"</string>
+    <string name="account_settings_signature_hint" msgid="7262183168962779403">"Text an zu sendende Nachrichten anhängen"</string>
     <string name="account_settings_notifications" msgid="1042620094281375043">"Benachrichtigungseinstellungen"</string>
     <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_sync_calendar_enable" msgid="6855333393468628003">"Kalender synchronisieren"</string>
+    <string name="account_settings_sync_calendar_summary" msgid="2456010694443333450">"Kalender 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>
     <string name="account_settings_servers" msgid="4925493817981624242">"Servereinstellungen"</string>
     <string name="account_delete_dlg_title" msgid="6806087520856396608">"Konto entfernen"</string>
     <string name="account_delete_dlg_instructions_fmt" msgid="8236846322040271280">"Das Konto \"<xliff:g id="ACCOUNT">%s</xliff:g>\" wird aus Email entfernt."</string>
+    <string name="upgrade_accounts_title" msgid="5444140226380754014">"Upgrade für Konten"</string>
+    <string name="upgrade_accounts_error" msgid="7241661832029255715">"Konto-Upgrade nicht durchführbar"</string>
     <string name="provider_note_yahoo" msgid="8762024183024261236">"Der Zugang zum Postfach bestimmter E-Mail-Konten von Yahoo! wird nicht unterstützt. Bei Verbindungsproblemen besuchen Sie die Website von Yahoo! für weitere Informationen."</string>
     <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>
     <string name="exchange_name" msgid="1190783774800310346">"Geschäftlich"</string>
+    <string name="exchange_name_alternate" msgid="5772529644749041052">"Microsoft Exchange ActiveSync"</string>
+    <!-- no translation found for meeting_invitation (352782347335101484) -->
+    <skip />
+    <!-- no translation found for meeting_accepted (8796609373330400268) -->
+    <skip />
+    <!-- no translation found for meeting_declined (6707617183246608552) -->
+    <skip />
+    <!-- no translation found for meeting_tentative (8250995722130443785) -->
+    <skip />
     <string name="system_account_create_failed" msgid="4917162302393971752">"Der Account Manager konnte das Konto nicht erstellen. Versuchen Sie es erneut."</string>
+    <string name="device_admin_label" msgid="8680224994637869414">"E-Mail"</string>
+    <string name="device_admin_description" msgid="426727923791430306">"Aktiviert serverspezifische Sicherheitsrichtlinien"</string>
+    <!-- no translation found for notification_exchange_calendar_added (6823659622379350159) -->
+    <skip />
 </resources>
diff --git a/res/values-el/strings.xml b/res/values-el/strings.xml
index 66ccef3..90461c4 100644
--- a/res/values-el/strings.xml
+++ b/res/values-el/strings.xml
@@ -20,7 +20,6 @@
     <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>
     <string name="debug_title" msgid="5175710493691536719">"Εντοπισμός σφαλμάτων"</string>
     <string name="next_action" msgid="3931301986364184415">"Επόμενο"</string>
@@ -56,12 +55,9 @@
     <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>
-    <string name="accounts_context_menu_title" msgid="1053701760934475027">"Επιλογές λογαριασμού"</string>
     <string name="status_loading_more" msgid="1580386959044617884">"Φόρτωση μηνυμάτων..."</string>
     <string name="status_sending_messages" msgid="3971880826111264523">"Αποστολή εικόνων..."</string>
     <string name="status_network_error" msgid="6045933332005067021">"Σφάλμα σύνδεσης"</string>
-    <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>
     <string name="error_loading_message_body" msgid="2265140604109272914">"Μη αναμενόμενο σφάλμα κατά τη φόρτωση κειμένου μηνύματος. Το μήνυμα ενδέχεται να είναι πολύ μεγάλο για προβολή."</string>
   <plurals name="notification_new_one_account_fmt">
@@ -82,14 +78,12 @@
     <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>
     <string name="account_folder_list_summary_inbox" msgid="5790553737870057607">"Συνδυασμένη προβολή εισερχομένων"</string>
-    <string name="account_folder_list_summary_unread" msgid="1200755158196002928">"Μη αναγνωσμένα"</string>
     <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>
     <string name="message_list_load_more_messages_action" msgid="7428302707908825692">"Φόρτωση περισσότερων μηνυμάτων"</string>
     <string name="message_list_send_pending_messages_action" msgid="9100624762133992435">"Αποστολή εξερχόμενων μηνυμάτων"</string>
-    <string name="message_list_title" msgid="6927798150197177235">"<xliff:g id="ACCOUNT">%s</xliff:g>: <xliff:g id="MAILBOX">%s</xliff:g>"</string>
     <string name="message_compose_to_hint" msgid="2891895306418177013">"Προς"</string>
     <string name="message_compose_cc_hint" msgid="8481884461031434144">"Κοιν."</string>
     <string name="message_compose_bcc_hint" msgid="9177337492358841680">"Κρυφή κοιν."</string>
@@ -113,17 +107,35 @@
     <string name="message_view_show_pictures_action" msgid="5059936981743072545">"Εμφάνιση εικόνων"</string>
     <string name="message_view_fetching_attachment_toast" msgid="8812363375155391184">"Ανάκτηση επισύναψης."</string>
     <string name="message_view_fetching_attachment_progress" msgid="8238550182655758164">"Ανάκτηση επισύναψης <xliff:g id="FILENAME">%s</xliff:g>"</string>
-    <string name="message_deleted_toast" msgid="1554845060991758649">"Το μήνυμα διαγράφηκε."</string>
+    <!-- no translation found for message_view_invite_view (6256018854688891069) -->
+    <skip />
+    <!-- no translation found for message_view_invite_title (5024473745902772299) -->
+    <skip />
+    <!-- no translation found for message_view_invite_text (1212799906603873708) -->
+    <skip />
+    <!-- no translation found for message_view_invite_accept (744546668021679819) -->
+    <skip />
+    <!-- no translation found for message_view_invite_maybe (7555189462441562318) -->
+    <skip />
+    <!-- no translation found for message_view_invite_decline (6119797303297149463) -->
+    <skip />
+    <!-- no translation found for message_view_invite_toast_yes (1900593767157209498) -->
+    <skip />
+    <!-- no translation found for message_view_invite_toast_maybe (8324044318669610540) -->
+    <skip />
+    <!-- no translation found for message_view_invite_toast_no (7511491076936887064) -->
+    <skip />
+    <!-- no translation found for message_deleted_toast:one (710742672464447084) -->
+    <!-- no translation found for message_deleted_toast:other (6574961322865652255) -->
     <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="message_view_display_attachment_toast" msgid="6096315816776330821">"Δεν είναι δυνατή η προβολή αυτής της επισύναψης."</string>
     <string name="account_setup_basics_title" msgid="3969856368228940980">"Ρύθμιση ηλεκτρονικού ταχυδρομείου"</string>
+    <string name="account_setup_basics_exchange_title" msgid="1147638872869594157">"Προσθήκη λογαριασμού Exchange"</string>
+    <string name="account_setup_basics_exchange_title_alternate" msgid="4980422714586153809">"Προσθήκη λογαριασμού Exchange ActiveSync"</string>
     <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="accounts_welcome_exchange_alternate" msgid="1324339567986452000">"Μπορείτε να διαμορφώσετε ένα λογαριασμό Exchange ActiveSync σε λίγα μόλις βήματα."</string>
     <string name="account_setup_basics_email_hint" msgid="7414269319207261120">"Διεύθυνση ηλεκτρονικού ταχυδρομείου"</string>
     <string name="account_setup_basics_password_hint" msgid="410210049040536870">"Κωδικός πρόσβασης"</string>
     <string name="account_setup_basics_default_label" msgid="5924790142029806711">"Αποστολή μηνυμάτων ηλεκτρονικού ταχυδρομείου από αυτόν το λογαριασμό από προεπιλογή."</string>
@@ -165,13 +177,9 @@
     <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>
-    <!-- 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_title" msgid="2492853474738063453">"Ρυθμίσεις διακομιστή\n"</string>
+    <string name="account_setup_exchange_server_label" msgid="795137797983360826">"Διακομιστής"</string>
     <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>
     <string name="account_setup_exchange_trust_certificates_label" msgid="6232880757633882678">"Αποδοχή όλων των πιστοποιητικών SSL"</string>
     <string name="account_setup_options_title" msgid="8995162193118880993">"Επιλογές λογαριασμού"</string>
@@ -186,6 +194,7 @@
     <string name="account_setup_options_default_label" msgid="8869166381331276697">"Αποστ.μηνυμ.ηλεκτ.ταχυδρ.από αυτόν το λογ/μό από προεπ."</string>
     <string name="account_setup_options_notify_label" msgid="1247525794828820038">"Να ειδοποιούμαι κατά τη λήψη μηνύματος ηλεκτρονικού ταχυδρομείου."</string>
     <string name="account_setup_options_sync_contacts_label" msgid="7467467090023434271">"Συγχρονισμός επαφών από αυτόν τον λογαριασμό."</string>
+    <string name="account_setup_options_sync_calendar_label" msgid="3195979658426293931">"Συγχρονισμός ημερολογίου από αυτόν τον λογαριασμό."</string>
     <string name="account_setup_failed_dlg_title" msgid="7827583313117521383">"Η ρύθμιση δεν μπόρεσε να ολοκληρωθεί"</string>
     <string name="account_setup_options_mail_window_label" msgid="8764417340954006086">"Όγκος προς συγχρονισμό"</string>
     <string name="account_setup_options_mail_window_1day" msgid="3965715241135811407">"Μία ημέρα"</string>
@@ -193,7 +202,6 @@
     <string name="account_setup_options_mail_window_1week" msgid="5639718031108023741">"Μία εβδομάδα"</string>
     <string name="account_setup_options_mail_window_2weeks" msgid="4567049268124213035">"Δύο εβδομάδες"</string>
     <string name="account_setup_options_mail_window_1month" msgid="5846359669750047081">"Ένας μήνας"</string>
-    <string name="account_setup_options_mail_window_all" msgid="5383858972681926166">"Όλα τα μηνύματα ηλεκτρονικού ταχυδρομείου"</string>
     <string name="account_setup_failed_dlg_auth_message" msgid="42827150104879570">"Λάθος όνομα χρήστη ή κωδικός πρόσβασης."</string>
     <string name="account_setup_failed_dlg_auth_message_fmt" msgid="8598560266430207606">"Λάθος όνομα χρήστη ή κωδικός πρόσβασης."\n"(<xliff:g id="ERROR">%s</xliff:g>)"</string>
     <string name="account_setup_failed_dlg_certificate_message" msgid="961843413600482906">"Δεν είναι δυνατή η ασφαλής σύνδεση με τον διακομιστή."</string>
@@ -204,7 +212,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_security_required_title" msgid="1850321535870447468">"Απομακρυσμένη διαχείριση ασφαλείας"</string>
+    <string name="account_setup_security_policies_required_fmt" msgid="8146309611870795951">"Από το διακομιστή <xliff:g id="SERVER">%s</xliff:g> απαιτείται να του επιτρέπεται ο απομακρυσμένος έλεγχος ορισμένων λειτουργιών ασφαλείας του τηλεφώνου σας. Θέλετε να ολοκληρωθεί η ρύθμιση αυτού του λογαριασμού;"</string>
+    <string name="account_setup_failed_security_policies_unsupported" msgid="4093832822988053758">"Για αυτόν τον διακομιστή απαιτούνται λειτουργίες ασφαλείας που δεν υποστηρίζονται από το τηλέφωνό σας."</string>
+    <string name="security_notification_ticker_fmt" msgid="1108023476125276507">"Από το λογαριασμό \"<xliff:g id="ACCOUNT">%s</xliff:g>\" απαιτείται ενημέρωση ρυθμίσεων ασφαλείας."</string>
+    <string name="security_notification_content_title" msgid="8096231937552848281">"Ενημέρωση ρυθμίσεων ασφαλείας"</string>
+    <string name="account_security_title" msgid="4441470647344315196">"Ασφάλεια συσκευής"</string>
+    <string name="account_security_policy_explanation_fmt" msgid="5153981166755002718">"Από το διακομιστή <xliff:g id="SERVER">%s</xliff:g> απαιτείται να του επιτρέπεται ο απομακρυσμένος έλεγχος ορισμένων λειτουργιών ασφαλείας του τηλεφώνου σας."</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>
@@ -215,22 +229,40 @@
     <string name="account_settings_mail_check_frequency_label" msgid="2067835530563849675">"Συχνότητα ελέγχου μηνυμάτων ηλεκτρονικού ταχυδρομείου"</string>
     <string name="account_settings_incoming_label" msgid="7858928031806297542">"Ρυθμίσεις εισερχομένων"</string>
     <string name="account_settings_outgoing_label" msgid="4464829249980026745">"Ρυθμίσεις εξερχομένων"</string>
-    <string name="account_settings_add_account_label" msgid="63971622405360050">"Προσθήκη άλλου λογαριασμού"</string>
     <string name="account_settings_description_label" msgid="8894815221204511715">"Όνομα λογαριασμού"</string>
     <string name="account_settings_name_label" msgid="8186406122590008449">"Το όνομά σας"</string>
+    <string name="account_settings_signature_label" msgid="4091969938785803201">"Υπογραφή"</string>
+    <string name="account_settings_signature_hint" msgid="7262183168962779403">"Προσάρτηση κειμένου στα μηνύματα που αποστέλλετε"</string>
     <string name="account_settings_notifications" msgid="1042620094281375043">"Ρυθμίσεις ειδοποιήσεων"</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_sync_calendar_enable" msgid="6855333393468628003">"Συγχρονισμός ημερολογίου"</string>
+    <string name="account_settings_sync_calendar_summary" msgid="2456010694443333450">"Επίσης, συγχρονισμός ημερολογίου από αυτόν το λογαριασμό"</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>
     <string name="account_delete_dlg_instructions_fmt" msgid="8236846322040271280">"Ο λογαριασμός \"<xliff:g id="ACCOUNT">%s</xliff:g>\" θα καταργηθεί από το ηλεκτρονικό ταχυδρομείο."</string>
+    <string name="upgrade_accounts_title" msgid="5444140226380754014">"Αναβάθμιση λογαριασμών"</string>
+    <string name="upgrade_accounts_error" msgid="7241661832029255715">"Δεν είναι δυνατή η αναβάθμιση του λογαριασμού"</string>
     <string name="provider_note_yahoo" msgid="8762024183024261236">"Η πρόσβαση στο γραμματοκιβώτιο δεν υποστηρίζεται από ορισμένους τύπους λογαριασμών ηλεκτρονικού ταχυδρομείου Yahoo. Εάν αντιμετωπίζετε προβλήματα σύνδεσης, επισκεφθείτε τη διεύθυνση yahoo.com για περισσότερες πληροφορίες."</string>
     <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>
     <string name="exchange_name" msgid="1190783774800310346">"Εταιρικός"</string>
+    <string name="exchange_name_alternate" msgid="5772529644749041052">"Microsoft Exchange ActiveSync"</string>
+    <!-- no translation found for meeting_invitation (352782347335101484) -->
+    <skip />
+    <!-- no translation found for meeting_accepted (8796609373330400268) -->
+    <skip />
+    <!-- no translation found for meeting_declined (6707617183246608552) -->
+    <skip />
+    <!-- no translation found for meeting_tentative (8250995722130443785) -->
+    <skip />
     <string name="system_account_create_failed" msgid="4917162302393971752">"Δεν ήταν δυνατή η δημιουργία λογαριασμού από τον διαχειριστή λογαριασμών. Δοκιμάστε ξανά."</string>
+    <string name="device_admin_label" msgid="8680224994637869414">"Διεύθυνση ηλεκτρονικού ταχυδρομείου"</string>
+    <string name="device_admin_description" msgid="426727923791430306">"Ενεργοποιεί πολιτικές ασφαλείας καθορισμένες από διακομιστή"</string>
+    <!-- no translation found for notification_exchange_calendar_added (6823659622379350159) -->
+    <skip />
 </resources>
diff --git a/res/values-es-rUS/strings.xml b/res/values-es-rUS/strings.xml
index 63401b6..9465b77 100644
--- a/res/values-es-rUS/strings.xml
+++ b/res/values-es-rUS/strings.xml
@@ -20,7 +20,6 @@
     <string name="permission_access_provider_label" msgid="4274353114641168675">"Acceder a los datos del proveedor de correo electrónico"</string>
     <string name="permission_access_provider_desc" msgid="1513898266889541617">"Permite que esta 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">"Correo electrónico"</string>
-    <string name="accounts_title" msgid="6622149231904649210">"Correo electrónico"</string>
     <string name="compose_title" msgid="427986915662706899">"Redactar"</string>
     <string name="debug_title" msgid="5175710493691536719">"Depurar"</string>
     <string name="next_action" msgid="3931301986364184415">"Siguiente"</string>
@@ -56,12 +55,9 @@
     <string name="add_attachment_action" msgid="2696013743130573897">"Agregar archivo adjunto"</string>
     <string name="dump_settings_action" msgid="4478192525236169829">"Configuración de descarga"</string>
     <string name="choose_attachment_dialog_title" msgid="81937507117528954">"Seleccionar archivo adjunto"</string>
-    <string name="accounts_context_menu_title" msgid="1053701760934475027">"Opciones de cuenta"</string>
     <string name="status_loading_more" msgid="1580386959044617884">"Cargando mensajes..."</string>
     <string name="status_sending_messages" msgid="3971880826111264523">"Enviando mensajes..."</string>
     <string name="status_network_error" msgid="6045933332005067021">"Error de conexión"</string>
-    <string name="status_sending_messages_failed" msgid="7975009558738692407">"Intenta nuevamente enviar los mensajes"</string>
-    <string name="status_loading_more_failed" msgid="1629172047185323">"Intentar nuevamente cargando más mensajes"</string>
     <string name="notification_new_title" msgid="2200257910380529139">"Correo electrónico nuevo"</string>
     <string name="error_loading_message_body" msgid="2265140604109272914">"Se ha producido un error inesperado al cargar el texto del mensaje. El mensaje puede ser demasiado largo para ver."</string>
   <plurals name="notification_new_one_account_fmt">
@@ -82,14 +78,12 @@
     <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>
     <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>
     <string name="account_folder_list_summary_starred" msgid="3134312269246375723">"Marcado con asterisco"</string>
     <string name="account_folder_list_summary_drafts" msgid="5514845993247300437">"Borradores"</string>
     <string name="account_folder_list_summary_outbox" msgid="3059836696049399377">"Bandeja de salida"</string>
     <string name="mailbox_list_title" msgid="8299608543467211089">"Casilla de correo"</string>
     <string name="message_list_load_more_messages_action" msgid="7428302707908825692">"Cargar más mensajes"</string>
     <string name="message_list_send_pending_messages_action" msgid="9100624762133992435">"Enviar mensajes de salida"</string>
-    <string name="message_list_title" msgid="6927798150197177235">"<xliff:g id="ACCOUNT">%s</xliff:g>: <xliff:g id="MAILBOX">%s</xliff:g>"</string>
     <string name="message_compose_to_hint" msgid="2891895306418177013">"Para"</string>
     <string name="message_compose_cc_hint" msgid="8481884461031434144">"CC"</string>
     <string name="message_compose_bcc_hint" msgid="9177337492358841680">"CCO"</string>
@@ -113,17 +107,35 @@
     <string name="message_view_show_pictures_action" msgid="5059936981743072545">"Mostrar imágenes"</string>
     <string name="message_view_fetching_attachment_toast" msgid="8812363375155391184">"Extrayendo archivo adjunto."</string>
     <string name="message_view_fetching_attachment_progress" msgid="8238550182655758164">"Extrayendo archivo adjunto<xliff:g id="FILENAME">%s</xliff:g>"</string>
-    <string name="message_deleted_toast" msgid="1554845060991758649">"Mensaje suprimido."</string>
+    <!-- no translation found for message_view_invite_view (6256018854688891069) -->
+    <skip />
+    <!-- no translation found for message_view_invite_title (5024473745902772299) -->
+    <skip />
+    <!-- no translation found for message_view_invite_text (1212799906603873708) -->
+    <skip />
+    <!-- no translation found for message_view_invite_accept (744546668021679819) -->
+    <skip />
+    <!-- no translation found for message_view_invite_maybe (7555189462441562318) -->
+    <skip />
+    <!-- no translation found for message_view_invite_decline (6119797303297149463) -->
+    <skip />
+    <!-- no translation found for message_view_invite_toast_yes (1900593767157209498) -->
+    <skip />
+    <!-- no translation found for message_view_invite_toast_maybe (8324044318669610540) -->
+    <skip />
+    <!-- no translation found for message_view_invite_toast_no (7511491076936887064) -->
+    <skip />
+    <!-- no translation found for message_deleted_toast:one (710742672464447084) -->
+    <!-- no translation found for message_deleted_toast:other (6574961322865652255) -->
     <string name="message_discarded_toast" msgid="3891461729325584026">"Mensaje descartado."</string>
     <string name="message_saved_toast" msgid="8443125659172627665">"Mensaje guardado como borrador."</string>
-    <string name="add_contact_dlg_title" msgid="7424641029188006580">"Agregar contacto"</string>
-    <string name="add_contact_dlg_message_fmt" msgid="4470846346726847478">"Agregar \"<xliff:g id="EMAIL">%s</xliff:g>\" a los contactos"</string>
     <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="account_setup_basics_exchange_title" msgid="1147638872869594157">"Agregar una cuenta de Exchange"</string>
+    <string name="account_setup_basics_exchange_title_alternate" msgid="4980422714586153809">"Agregar una cuenta de Exchange ActiveSync"</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 Exchange en sólo algunos pasos."</string>
-    <!-- no translation found for account_setup_basics_instructions (3126077748322815504) -->
-    <skip />
+    <string name="accounts_welcome_exchange_alternate" msgid="1324339567986452000">"Puedes configurar una cuenta de Exchange ActiveSync en sólo algunos pasos."</string>
     <string name="account_setup_basics_email_hint" msgid="7414269319207261120">"Dirección de correo electrónico"</string>
     <string name="account_setup_basics_password_hint" msgid="410210049040536870">"Contraseña"</string>
     <string name="account_setup_basics_default_label" msgid="5924790142029806711">"Enviar mensaje de correo electrónico desde esta cuenta de forma predeterminada."</string>
@@ -165,13 +177,9 @@
     <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>
-    <!-- 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_title" msgid="2492853474738063453">"Configuración del servidor"</string>
+    <string name="account_setup_exchange_server_label" msgid="795137797983360826">"Servidor"</string>
     <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>
     <string name="account_setup_exchange_ssl_label" msgid="6704105469083211236">"Utilizar conexión segura (SSL)"</string>
     <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>
@@ -186,6 +194,7 @@
     <string name="account_setup_options_default_label" msgid="8869166381331276697">"Enviar mensaje de correo electrónico desde esta cuenta de forma predeterminada."</string>
     <string name="account_setup_options_notify_label" msgid="1247525794828820038">"Notificarme cuando llegue un mensaje de correo electrónico."</string>
     <string name="account_setup_options_sync_contacts_label" msgid="7467467090023434271">"Sincronizar contactos desde esta cuenta"</string>
+    <string name="account_setup_options_sync_calendar_label" msgid="3195979658426293931">"Sincroniza el calendario desde esta cuenta"</string>
     <string name="account_setup_failed_dlg_title" msgid="7827583313117521383">"No se ha podido finalizar la configuración"</string>
     <string name="account_setup_options_mail_window_label" msgid="8764417340954006086">"Monto para sincronizar"</string>
     <string name="account_setup_options_mail_window_1day" msgid="3965715241135811407">"Un día"</string>
@@ -193,7 +202,6 @@
     <string name="account_setup_options_mail_window_1week" msgid="5639718031108023741">"Una semana"</string>
     <string name="account_setup_options_mail_window_2weeks" msgid="4567049268124213035">"Dos semanas"</string>
     <string name="account_setup_options_mail_window_1month" msgid="5846359669750047081">"Un mes"</string>
-    <string name="account_setup_options_mail_window_all" msgid="5383858972681926166">"Todos los mensajes de correo"</string>
     <string name="account_setup_failed_dlg_auth_message" msgid="42827150104879570">"Nombre de usuario o contraseña incorrecta."</string>
     <string name="account_setup_failed_dlg_auth_message_fmt" msgid="8598560266430207606">"Nombre de usuario o contraseña incorrecta."\n"(<xliff:g id="ERROR">%s</xliff:g>)"</string>
     <string name="account_setup_failed_dlg_certificate_message" msgid="961843413600482906">"No se puede conectar de forma segura al servidor."</string>
@@ -204,7 +212,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 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_security_required_title" msgid="1850321535870447468">"Administración de seguridad remota"</string>
+    <string name="account_setup_security_policies_required_fmt" msgid="8146309611870795951">"El servidor <xliff:g id="SERVER">%s</xliff:g> requiere tu permiso para controlar de forma remota algunas funciones de seguridad en tu teléfono. ¿Deseas finalizar la configuración de esta cuenta?"</string>
+    <string name="account_setup_failed_security_policies_unsupported" msgid="4093832822988053758">"Este servidor requiere funciones de seguridad que no son compatibles con tu teléfono."</string>
+    <string name="security_notification_ticker_fmt" msgid="1108023476125276507">"La cuenta \"<xliff:g id="ACCOUNT">%s</xliff:g>\" requiere que se actualice la configuración de seguridad."</string>
+    <string name="security_notification_content_title" msgid="8096231937552848281">"Actualizar la configuración de seguridad"</string>
+    <string name="account_security_title" msgid="4441470647344315196">"Dispositivo de seguridad"</string>
+    <string name="account_security_policy_explanation_fmt" msgid="5153981166755002718">"El servidor <xliff:g id="SERVER">%s</xliff:g> requiere tu permiso para controlar de forma remota algunas funciones de seguridad en 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>
@@ -215,22 +229,40 @@
     <string name="account_settings_mail_check_frequency_label" msgid="2067835530563849675">"Frecuencia de verificación de correo electrónico"</string>
     <string name="account_settings_incoming_label" msgid="7858928031806297542">"Configuración entrante"</string>
     <string name="account_settings_outgoing_label" msgid="4464829249980026745">"Configuración saliente"</string>
-    <string name="account_settings_add_account_label" msgid="63971622405360050">"Agregar otra cuenta"</string>
     <string name="account_settings_description_label" msgid="8894815221204511715">"Nombre de la cuenta"</string>
     <string name="account_settings_name_label" msgid="8186406122590008449">"Tu nombre"</string>
+    <string name="account_settings_signature_label" msgid="4091969938785803201">"Firma"</string>
+    <string name="account_settings_signature_hint" msgid="7262183168962779403">"Agrega texto a los mensajes que envíes"</string>
     <string name="account_settings_notifications" msgid="1042620094281375043">"Configuración de notificación"</string>
     <string name="account_settings_sync_contacts_enable" msgid="1369272986009573218">"Sincronizar contactos"</string>
     <string name="account_settings_sync_contacts_summary" msgid="8901452720940015928">"También sincronizar contactos desde esta cuenta"</string>
+    <string name="account_settings_sync_calendar_enable" msgid="6855333393468628003">"Sincronizar calendario"</string>
+    <string name="account_settings_sync_calendar_summary" msgid="2456010694443333450">"También sincronizar el calendario 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">"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>
+    <string name="upgrade_accounts_title" msgid="5444140226380754014">"Actualizar cuentas"</string>
+    <string name="upgrade_accounts_error" msgid="7241661832029255715">"No es posible actualizar la cuenta."</string>
     <string name="provider_note_yahoo" msgid="8762024183024261236">"No se admite el acceso al buzón en algunos tipos de cuentas de correo de Yahoo!. Si tienes problemas para conectarte, visita yahoo.com para obtener más información."</string>
     <string name="provider_note_yahoo_uk" msgid="2055976404478603298">"Antes de configurar esta cuenta de correo electrónico, visita el sitio web de Yahoo! y activa el acceso de 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 tu dirección de correo electrónico y contraseña correcta, es posible que no tengas una cuenta \"Plus\" paga. Inicia 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 de correo electrónico POP3."</string>
     <string name="exchange_name" msgid="1190783774800310346">"Corporativo"</string>
+    <string name="exchange_name_alternate" msgid="5772529644749041052">"Microsoft Exchange ActiveSync"</string>
+    <!-- no translation found for meeting_invitation (352782347335101484) -->
+    <skip />
+    <!-- no translation found for meeting_accepted (8796609373330400268) -->
+    <skip />
+    <!-- no translation found for meeting_declined (6707617183246608552) -->
+    <skip />
+    <!-- no translation found for meeting_tentative (8250995722130443785) -->
+    <skip />
     <string name="system_account_create_failed" msgid="4917162302393971752">"El Administrador de cuenta no pudo crear la Cuenta; vuelve a intentarlo."</string>
+    <string name="device_admin_label" msgid="8680224994637869414">"Correo electrónico"</string>
+    <string name="device_admin_description" msgid="426727923791430306">"Habilita las políticas de seguridad específicas según el servidor."</string>
+    <!-- no translation found for notification_exchange_calendar_added (6823659622379350159) -->
+    <skip />
 </resources>
diff --git a/res/values-es/strings.xml b/res/values-es/strings.xml
index 67871a8..7ef03f1 100644
--- a/res/values-es/strings.xml
+++ b/res/values-es/strings.xml
@@ -20,7 +20,6 @@
     <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>
     <string name="debug_title" msgid="5175710493691536719">"Depurar"</string>
     <string name="next_action" msgid="3931301986364184415">"Siguiente"</string>
@@ -56,12 +55,9 @@
     <string name="add_attachment_action" msgid="2696013743130573897">"Añadir archivo adjunto"</string>
     <string name="dump_settings_action" msgid="4478192525236169829">"Configuración de volcado"</string>
     <string name="choose_attachment_dialog_title" msgid="81937507117528954">"Elegir archivo adjunto"</string>
-    <string name="accounts_context_menu_title" msgid="1053701760934475027">"Opciones de cuenta"</string>
     <string name="status_loading_more" msgid="1580386959044617884">"Cargando mensajes..."</string>
     <string name="status_sending_messages" msgid="3971880826111264523">"Enviando mensajes..."</string>
     <string name="status_network_error" msgid="6045933332005067021">"Error de conexión"</string>
-    <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>
     <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">
@@ -82,14 +78,12 @@
     <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>
     <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>
     <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>
     <string name="message_list_load_more_messages_action" msgid="7428302707908825692">"Cargar más mensajes"</string>
     <string name="message_list_send_pending_messages_action" msgid="9100624762133992435">"Enviar mensajes salientes"</string>
-    <string name="message_list_title" msgid="6927798150197177235">"<xliff:g id="ACCOUNT">%s</xliff:g>: <xliff:g id="MAILBOX">%s</xliff:g>"</string>
     <string name="message_compose_to_hint" msgid="2891895306418177013">"Para"</string>
     <string name="message_compose_cc_hint" msgid="8481884461031434144">"Cc"</string>
     <string name="message_compose_bcc_hint" msgid="9177337492358841680">"CCO"</string>
@@ -111,19 +105,37 @@
     <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 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_toast" msgid="8812363375155391184">"Descargando archivo adjunto"</string>
     <string name="message_view_fetching_attachment_progress" msgid="8238550182655758164">"Extrayendo archivo adjunto <xliff:g id="FILENAME">%s</xliff:g>"</string>
-    <string name="message_deleted_toast" msgid="1554845060991758649">"Mensaje suprimido"</string>
+    <!-- no translation found for message_view_invite_view (6256018854688891069) -->
+    <skip />
+    <!-- no translation found for message_view_invite_title (5024473745902772299) -->
+    <skip />
+    <!-- no translation found for message_view_invite_text (1212799906603873708) -->
+    <skip />
+    <!-- no translation found for message_view_invite_accept (744546668021679819) -->
+    <skip />
+    <!-- no translation found for message_view_invite_maybe (7555189462441562318) -->
+    <skip />
+    <!-- no translation found for message_view_invite_decline (6119797303297149463) -->
+    <skip />
+    <!-- no translation found for message_view_invite_toast_yes (1900593767157209498) -->
+    <skip />
+    <!-- no translation found for message_view_invite_toast_maybe (8324044318669610540) -->
+    <skip />
+    <!-- no translation found for message_view_invite_toast_no (7511491076936887064) -->
+    <skip />
+    <!-- no translation found for message_deleted_toast:one (710742672464447084) -->
+    <!-- no translation found for message_deleted_toast:other (6574961322865652255) -->
     <string name="message_discarded_toast" msgid="3891461729325584026">"Mensaje descartado"</string>
     <string name="message_saved_toast" msgid="8443125659172627665">"Mensaje guardado como borrador"</string>
-    <string name="add_contact_dlg_title" msgid="7424641029188006580">"Añadir contacto"</string>
-    <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>
+    <string name="account_setup_basics_exchange_title" msgid="1147638872869594157">"Añadir una cuenta de Exchange"</string>
+    <string name="account_setup_basics_exchange_title_alternate" msgid="4980422714586153809">"Añadir una cuenta de Exchange ActiveSync"</string>
     <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="accounts_welcome_exchange_alternate" msgid="1324339567986452000">"Puedes configurar una cuenta de Exchange ActiveSync en pocos pasos."</string>
     <string name="account_setup_basics_email_hint" msgid="7414269319207261120">"Dirección de correo electrónico"</string>
     <string name="account_setup_basics_password_hint" msgid="410210049040536870">"Contraseña"</string>
     <string name="account_setup_basics_default_label" msgid="5924790142029806711">"Enviar correo electrónico desde esta cuenta de forma predeterminada"</string>
@@ -165,13 +177,9 @@
     <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>
-    <!-- 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_title" msgid="2492853474738063453">"Configuración del servidor"</string>
+    <string name="account_setup_exchange_server_label" msgid="795137797983360826">"Servidor"</string>
     <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>
     <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>
@@ -186,6 +194,7 @@
     <string name="account_setup_options_default_label" msgid="8869166381331276697">"Enviar correo electrónico desde esta cuenta de forma predeterminada"</string>
     <string name="account_setup_options_notify_label" msgid="1247525794828820038">"Avisarme cuando llegue un correo electrónico"</string>
     <string name="account_setup_options_sync_contacts_label" msgid="7467467090023434271">"Sincronizar contactos desde esta cuenta"</string>
+    <string name="account_setup_options_sync_calendar_label" msgid="3195979658426293931">"Sincronizar calendario desde esta cuenta"</string>
     <string name="account_setup_failed_dlg_title" msgid="7827583313117521383">"No se ha podido completar la configuración."</string>
     <string name="account_setup_options_mail_window_label" msgid="8764417340954006086">"Cantidad para sincronizar"</string>
     <string name="account_setup_options_mail_window_1day" msgid="3965715241135811407">"Un día"</string>
@@ -193,7 +202,6 @@
     <string name="account_setup_options_mail_window_1week" msgid="5639718031108023741">"Una semana"</string>
     <string name="account_setup_options_mail_window_2weeks" msgid="4567049268124213035">"Dos semanas"</string>
     <string name="account_setup_options_mail_window_1month" msgid="5846359669750047081">"Un mes"</string>
-    <string name="account_setup_options_mail_window_all" msgid="5383858972681926166">"Todo el correo"</string>
     <string name="account_setup_failed_dlg_auth_message" msgid="42827150104879570">"Nombre de usuario o contraseña incorrecta"</string>
     <string name="account_setup_failed_dlg_auth_message_fmt" msgid="8598560266430207606">"Nombre de usuario o contraseña incorrecta"\n"(<xliff:g id="ERROR">%s</xliff:g>)"</string>
     <string name="account_setup_failed_dlg_certificate_message" msgid="961843413600482906">"No se puede establecer conexión de forma segura con el servidor."</string>
@@ -204,7 +212,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_security_required_title" msgid="1850321535870447468">"Administración de seguridad remota"</string>
+    <string name="account_setup_security_policies_required_fmt" msgid="8146309611870795951">"Es necesario que permitas que el servidor <xliff:g id="SERVER">%s</xliff:g> controle de forma remota algunas funciones de seguridad del teléfono. ¿Deseas terminar de configurar esta cuenta?"</string>
+    <string name="account_setup_failed_security_policies_unsupported" msgid="4093832822988053758">"Este servidor necesita funciones de seguridad que no son compatibles con el teléfono."</string>
+    <string name="security_notification_ticker_fmt" msgid="1108023476125276507">"Es necesario actualizar la configuración de seguridad de la cuenta \"<xliff:g id="ACCOUNT">%s</xliff:g>\"."</string>
+    <string name="security_notification_content_title" msgid="8096231937552848281">"Actualizar configuración de seguridad"</string>
+    <string name="account_security_title" msgid="4441470647344315196">"Seguridad del dispositivo"</string>
+    <string name="account_security_policy_explanation_fmt" msgid="5153981166755002718">"Es necesario que permitas que el servidor <xliff:g id="SERVER">%s</xliff:g> controle de forma remota algunas funciones de seguridad del 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>
@@ -215,22 +229,40 @@
     <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>
     <string name="account_settings_outgoing_label" msgid="4464829249980026745">"Configuración saliente"</string>
-    <string name="account_settings_add_account_label" msgid="63971622405360050">"Añadir otra cuenta"</string>
     <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_signature_label" msgid="4091969938785803201">"Firma"</string>
+    <string name="account_settings_signature_hint" msgid="7262183168962779403">"Añadir texto a los mensajes que envíes"</string>
     <string name="account_settings_notifications" msgid="1042620094281375043">"Configuración de la notificación"</string>
     <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_sync_calendar_enable" msgid="6855333393468628003">"Sincronizar calendario"</string>
+    <string name="account_settings_sync_calendar_summary" msgid="2456010694443333450">"Sincronizar también calendario 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"</string>
     <string name="account_settings_ringtone" msgid="7922187231467500404">"Seleccionar tono de llamada"</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">"Se va a eliminar la cuenta \"<xliff:g id="ACCOUNT">%s</xliff:g>\" de \"Correo electrónico\"."</string>
+    <string name="upgrade_accounts_title" msgid="5444140226380754014">"Actualizar cuentas"</string>
+    <string name="upgrade_accounts_error" msgid="7241661832029255715">"No se ha podido actualizar la cuenta."</string>
     <string name="provider_note_yahoo" msgid="8762024183024261236">"Algunos tipos de cuentas de correo de Yahoo! no permiten acceder al buzón de correo. Si tienes problemas de conexión, visita yahoo.com para obtener información adicional al respecto."</string>
     <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>
     <string name="exchange_name" msgid="1190783774800310346">"Cuenta de trabajo"</string>
+    <string name="exchange_name_alternate" msgid="5772529644749041052">"Microsoft Exchange ActiveSync"</string>
+    <!-- no translation found for meeting_invitation (352782347335101484) -->
+    <skip />
+    <!-- no translation found for meeting_accepted (8796609373330400268) -->
+    <skip />
+    <!-- no translation found for meeting_declined (6707617183246608552) -->
+    <skip />
+    <!-- no translation found for meeting_tentative (8250995722130443785) -->
+    <skip />
     <string name="system_account_create_failed" msgid="4917162302393971752">"El administrador de cuentas no puede crear la cuenta. Inténtalo de nuevo."</string>
+    <string name="device_admin_label" msgid="8680224994637869414">"Correo electrónico"</string>
+    <string name="device_admin_description" msgid="426727923791430306">"Permite las políticas de seguridad especificadas por el servidor."</string>
+    <!-- no translation found for notification_exchange_calendar_added (6823659622379350159) -->
+    <skip />
 </resources>
diff --git a/res/values-fr/strings.xml b/res/values-fr/strings.xml
index 8ad33fd..ba23198 100644
--- a/res/values-fr/strings.xml
+++ b/res/values-fr/strings.xml
@@ -20,7 +20,6 @@
     <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>
     <string name="debug_title" msgid="5175710493691536719">"Déboguer"</string>
     <string name="next_action" msgid="3931301986364184415">"Suivant"</string>
@@ -56,12 +55,9 @@
     <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="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>
     <string name="status_network_error" msgid="6045933332005067021">"Erreur de connexion"</string>
-    <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>
     <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">
@@ -82,14 +78,12 @@
     <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>
     <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>
     <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>
     <string name="message_list_load_more_messages_action" msgid="7428302707908825692">"Charger plus de messages"</string>
     <string name="message_list_send_pending_messages_action" msgid="9100624762133992435">"Envoyer les messages sortants"</string>
-    <string name="message_list_title" msgid="6927798150197177235">"<xliff:g id="ACCOUNT">%s</xliff:g> : <xliff:g id="MAILBOX">%s</xliff:g>"</string>
     <string name="message_compose_to_hint" msgid="2891895306418177013">"À"</string>
     <string name="message_compose_cc_hint" msgid="8481884461031434144">"Cc"</string>
     <string name="message_compose_bcc_hint" msgid="9177337492358841680">"Cci"</string>
@@ -113,17 +107,35 @@
     <string name="message_view_show_pictures_action" msgid="5059936981743072545">"Afficher les images"</string>
     <string name="message_view_fetching_attachment_toast" msgid="8812363375155391184">"Récupération de la pièce jointe."</string>
     <string name="message_view_fetching_attachment_progress" msgid="8238550182655758164">"Récupération de la pièce jointe <xliff:g id="FILENAME">%s</xliff:g>"</string>
-    <string name="message_deleted_toast" msgid="1554845060991758649">"Message supprimé."</string>
+    <!-- no translation found for message_view_invite_view (6256018854688891069) -->
+    <skip />
+    <!-- no translation found for message_view_invite_title (5024473745902772299) -->
+    <skip />
+    <!-- no translation found for message_view_invite_text (1212799906603873708) -->
+    <skip />
+    <!-- no translation found for message_view_invite_accept (744546668021679819) -->
+    <skip />
+    <!-- no translation found for message_view_invite_maybe (7555189462441562318) -->
+    <skip />
+    <!-- no translation found for message_view_invite_decline (6119797303297149463) -->
+    <skip />
+    <!-- no translation found for message_view_invite_toast_yes (1900593767157209498) -->
+    <skip />
+    <!-- no translation found for message_view_invite_toast_maybe (8324044318669610540) -->
+    <skip />
+    <!-- no translation found for message_view_invite_toast_no (7511491076936887064) -->
+    <skip />
+    <!-- no translation found for message_deleted_toast:one (710742672464447084) -->
+    <!-- no translation found for message_deleted_toast:other (6574961322865652255) -->
     <string name="message_discarded_toast" msgid="3891461729325584026">"Message supprimé."</string>
     <string name="message_saved_toast" msgid="8443125659172627665">"Message enregistré comme brouillon."</string>
-    <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">"Configuration de votre messagerie"</string>
+    <string name="account_setup_basics_exchange_title" msgid="1147638872869594157">"Ajouter un compte Exchange"</string>
+    <string name="account_setup_basics_exchange_title_alternate" msgid="4980422714586153809">"Ajouter un compte Exchange ActiveSync"</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="accounts_welcome_exchange_alternate" msgid="1324339567986452000">"Configurez un compte Exchange ActiveSync en un clin d\'œil."</string>
     <string name="account_setup_basics_email_hint" msgid="7414269319207261120">"Adresse e-mail"</string>
     <string name="account_setup_basics_password_hint" msgid="410210049040536870">"Mot de passe"</string>
     <string name="account_setup_basics_default_label" msgid="5924790142029806711">"Par défaut, envoyer les e-mails avec ce compte"</string>
@@ -165,13 +177,9 @@
     <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>
-    <!-- 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_title" msgid="2492853474738063453">"Paramètres du serveur"</string>
+    <string name="account_setup_exchange_server_label" msgid="795137797983360826">"Serveur"</string>
     <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>
     <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>
@@ -186,6 +194,7 @@
     <string name="account_setup_options_default_label" msgid="8869166381331276697">"Par défaut, envoyer les e-mails avec ce compte"</string>
     <string name="account_setup_options_notify_label" msgid="1247525794828820038">"Afficher une notification lors de la réception d\'un e-mail"</string>
     <string name="account_setup_options_sync_contacts_label" msgid="7467467090023434271">"Synchroniser les contacts issus de ce compte"</string>
+    <string name="account_setup_options_sync_calendar_label" msgid="3195979658426293931">"Synchroniser l\'agenda à partir de ce compte"</string>
     <string name="account_setup_failed_dlg_title" msgid="7827583313117521383">"La configuration a échoué."</string>
     <string name="account_setup_options_mail_window_label" msgid="8764417340954006086">"Nombre de messages à synchroniser"</string>
     <string name="account_setup_options_mail_window_1day" msgid="3965715241135811407">"Un jour"</string>
@@ -193,7 +202,6 @@
     <string name="account_setup_options_mail_window_1week" msgid="5639718031108023741">"Une semaine"</string>
     <string name="account_setup_options_mail_window_2weeks" msgid="4567049268124213035">"Deux semaines"</string>
     <string name="account_setup_options_mail_window_1month" msgid="5846359669750047081">"Un mois"</string>
-    <string name="account_setup_options_mail_window_all" msgid="5383858972681926166">"Tous les messages"</string>
     <string name="account_setup_failed_dlg_auth_message" msgid="42827150104879570">"Nom d\'utilisateur ou mot de passe incorrect."</string>
     <string name="account_setup_failed_dlg_auth_message_fmt" msgid="8598560266430207606">"Nom d\'utilisateur ou mot de passe incorrect."\n"(<xliff:g id="ERROR">%s</xliff:g>)"</string>
     <string name="account_setup_failed_dlg_certificate_message" msgid="961843413600482906">"Impossible d\'établir une connexion sécurisée avec le serveur."</string>
@@ -204,7 +212,13 @@
     <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_security_required_title" msgid="1850321535870447468">"Administration de la sécurité à distance"</string>
+    <string name="account_setup_security_policies_required_fmt" msgid="8146309611870795951">"Vous devez autoriser le serveur <xliff:g id="SERVER">%s</xliff:g> à contrôler à distance certaines fonctionnalités de sécurité de votre téléphone. Voulez-vous terminer la configuration de ce compte ?"</string>
+    <string name="account_setup_failed_security_policies_unsupported" msgid="4093832822988053758">"Ce serveur nécessite des fonctionnalités de sécurité que votre téléphone ne prend pas en charge."</string>
+    <string name="security_notification_ticker_fmt" msgid="1108023476125276507">"Le compte \"<xliff:g id="ACCOUNT">%s</xliff:g>\" nécessite une mise à jour de ses paramètres de sécurité."</string>
+    <string name="security_notification_content_title" msgid="8096231937552848281">"Mettre à jour les paramètres de sécurité"</string>
+    <string name="account_security_title" msgid="4441470647344315196">"Sécurité du périphérique"</string>
+    <string name="account_security_policy_explanation_fmt" msgid="5153981166755002718">"Vous devez autoriser le serveur <xliff:g id="SERVER">%s</xliff:g> à contrôler à distance certaines fonctionnalités de sécurité de votre téléphone."</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>
@@ -215,22 +229,40 @@
     <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>
-    <string name="account_settings_add_account_label" msgid="63971622405360050">"Ajouter un autre compte"</string>
     <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_signature_label" msgid="4091969938785803201">"Signature"</string>
+    <string name="account_settings_signature_hint" msgid="7262183168962779403">"Ajouter un texte aux messages envoyés"</string>
     <string name="account_settings_notifications" msgid="1042620094281375043">"Paramètres de notification"</string>
     <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_sync_calendar_enable" msgid="6855333393468628003">"Synchroniser l\'agenda"</string>
+    <string name="account_settings_sync_calendar_summary" msgid="2456010694443333450">"Synchroniser également l\'agenda à partir 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">"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>
+    <string name="upgrade_accounts_title" msgid="5444140226380754014">"Mettre les comptes à niveau"</string>
+    <string name="upgrade_accounts_error" msgid="7241661832029255715">"Impossible de mettre le compte à niveau."</string>
     <string name="provider_note_yahoo" msgid="8762024183024261236">"L\'accès à la boîte aux lettres n\'est pas possible avec certains types de comptes Yahoo!. En cas de problème de connexion, consultez le site yahoo.fr pour obtenir plus d\'informations."</string>
     <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>
     <string name="exchange_name" msgid="1190783774800310346">"Entreprise"</string>
+    <string name="exchange_name_alternate" msgid="5772529644749041052">"Microsoft Exchange ActiveSync"</string>
+    <!-- no translation found for meeting_invitation (352782347335101484) -->
+    <skip />
+    <!-- no translation found for meeting_accepted (8796609373330400268) -->
+    <skip />
+    <!-- no translation found for meeting_declined (6707617183246608552) -->
+    <skip />
+    <!-- no translation found for meeting_tentative (8250995722130443785) -->
+    <skip />
     <string name="system_account_create_failed" msgid="4917162302393971752">"Le gestionnaire de comptes n\'a pas pu créer le compte ; veuillez réessayer."</string>
+    <string name="device_admin_label" msgid="8680224994637869414">"E-mail"</string>
+    <string name="device_admin_description" msgid="426727923791430306">"Active les stratégies de sécurité spécifiées par le serveur."</string>
+    <!-- no translation found for notification_exchange_calendar_added (6823659622379350159) -->
+    <skip />
 </resources>
diff --git a/res/values-it/strings.xml b/res/values-it/strings.xml
index 6ca1aee..92d10ed 100644
--- a/res/values-it/strings.xml
+++ b/res/values-it/strings.xml
@@ -20,7 +20,6 @@
     <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>
     <string name="debug_title" msgid="5175710493691536719">"Debug"</string>
     <string name="next_action" msgid="3931301986364184415">"Avanti"</string>
@@ -56,12 +55,9 @@
     <string name="add_attachment_action" msgid="2696013743130573897">"Aggiungi allegato"</string>
     <string name="dump_settings_action" msgid="4478192525236169829">"Scarica impostazioni"</string>
     <string name="choose_attachment_dialog_title" msgid="81937507117528954">"Scegli allegato"</string>
-    <string name="accounts_context_menu_title" msgid="1053701760934475027">"Opzioni account"</string>
     <string name="status_loading_more" msgid="1580386959044617884">"Caricamento messaggi in corso..."</string>
     <string name="status_sending_messages" msgid="3971880826111264523">"Invio messaggi..."</string>
     <string name="status_network_error" msgid="6045933332005067021">"Errore di connessione"</string>
-    <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>
     <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">
@@ -82,14 +78,12 @@
     <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>
     <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>
     <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>
     <string name="message_list_load_more_messages_action" msgid="7428302707908825692">"Carica ulteriori messaggi"</string>
     <string name="message_list_send_pending_messages_action" msgid="9100624762133992435">"Invia messaggi in uscita"</string>
-    <string name="message_list_title" msgid="6927798150197177235">"<xliff:g id="ACCOUNT">%s</xliff:g>: <xliff:g id="MAILBOX">%s</xliff:g>"</string>
     <string name="message_compose_to_hint" msgid="2891895306418177013">"A"</string>
     <string name="message_compose_cc_hint" msgid="8481884461031434144">"Cc"</string>
     <string name="message_compose_bcc_hint" msgid="9177337492358841680">"Ccn"</string>
@@ -113,17 +107,35 @@
     <string name="message_view_show_pictures_action" msgid="5059936981743072545">"Mostra immagini"</string>
     <string name="message_view_fetching_attachment_toast" msgid="8812363375155391184">"Recupero allegato in corso."</string>
     <string name="message_view_fetching_attachment_progress" msgid="8238550182655758164">"Recupero allegato <xliff:g id="FILENAME">%s</xliff:g>"</string>
-    <string name="message_deleted_toast" msgid="1554845060991758649">"Messaggio eliminato."</string>
+    <!-- no translation found for message_view_invite_view (6256018854688891069) -->
+    <skip />
+    <!-- no translation found for message_view_invite_title (5024473745902772299) -->
+    <skip />
+    <!-- no translation found for message_view_invite_text (1212799906603873708) -->
+    <skip />
+    <!-- no translation found for message_view_invite_accept (744546668021679819) -->
+    <skip />
+    <!-- no translation found for message_view_invite_maybe (7555189462441562318) -->
+    <skip />
+    <!-- no translation found for message_view_invite_decline (6119797303297149463) -->
+    <skip />
+    <!-- no translation found for message_view_invite_toast_yes (1900593767157209498) -->
+    <skip />
+    <!-- no translation found for message_view_invite_toast_maybe (8324044318669610540) -->
+    <skip />
+    <!-- no translation found for message_view_invite_toast_no (7511491076936887064) -->
+    <skip />
+    <!-- no translation found for message_deleted_toast:one (710742672464447084) -->
+    <!-- no translation found for message_deleted_toast:other (6574961322865652255) -->
     <string name="message_discarded_toast" msgid="3891461729325584026">"Messaggio eliminato."</string>
     <string name="message_saved_toast" msgid="8443125659172627665">"Messaggio salvato come bozza."</string>
-    <string name="add_contact_dlg_title" msgid="7424641029188006580">"Aggiungi contatto"</string>
-    <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>
+    <string name="account_setup_basics_exchange_title" msgid="1147638872869594157">"Aggiungi un account Exchange"</string>
+    <string name="account_setup_basics_exchange_title_alternate" msgid="4980422714586153809">"Aggiungi un account Exchange ActiveSync"</string>
     <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="accounts_welcome_exchange_alternate" msgid="1324339567986452000">"Puoi configurare un account Exchange ActiveSync con pochi passaggi."</string>
     <string name="account_setup_basics_email_hint" msgid="7414269319207261120">"Indirizzo email"</string>
     <string name="account_setup_basics_password_hint" msgid="410210049040536870">"Password"</string>
     <string name="account_setup_basics_default_label" msgid="5924790142029806711">"Invia email da questo account per impostazione predefinita."</string>
@@ -165,13 +177,9 @@
     <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>
-    <!-- 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_title" msgid="2492853474738063453">"Impostazioni server"</string>
+    <string name="account_setup_exchange_server_label" msgid="795137797983360826">"Server"</string>
     <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>
     <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>
@@ -186,6 +194,7 @@
     <string name="account_setup_options_default_label" msgid="8869166381331276697">"Invia email da questo account per impostazione predefinita."</string>
     <string name="account_setup_options_notify_label" msgid="1247525794828820038">"Avvisami all\'arrivo di email."</string>
     <string name="account_setup_options_sync_contacts_label" msgid="7467467090023434271">"Sincronizza contatti da questo account."</string>
+    <string name="account_setup_options_sync_calendar_label" msgid="3195979658426293931">"Sincronizza il calendario da questo account."</string>
     <string name="account_setup_failed_dlg_title" msgid="7827583313117521383">"Impossibile completare l\'impostazione"</string>
     <string name="account_setup_options_mail_window_label" msgid="8764417340954006086">"Quantità da sincronizzare"</string>
     <string name="account_setup_options_mail_window_1day" msgid="3965715241135811407">"Un giorno"</string>
@@ -193,7 +202,6 @@
     <string name="account_setup_options_mail_window_1week" msgid="5639718031108023741">"Una settimana"</string>
     <string name="account_setup_options_mail_window_2weeks" msgid="4567049268124213035">"Due settimane"</string>
     <string name="account_setup_options_mail_window_1month" msgid="5846359669750047081">"Un mese"</string>
-    <string name="account_setup_options_mail_window_all" msgid="5383858972681926166">"Tutta la posta"</string>
     <string name="account_setup_failed_dlg_auth_message" msgid="42827150104879570">"Nome utente o password errata."</string>
     <string name="account_setup_failed_dlg_auth_message_fmt" msgid="8598560266430207606">"Nome utente o password errata."\n"(<xliff:g id="ERROR">%s</xliff:g>)"</string>
     <string name="account_setup_failed_dlg_certificate_message" msgid="961843413600482906">"Impossibile connettersi in modo sicuro al server."</string>
@@ -204,7 +212,13 @@
     <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_security_required_title" msgid="1850321535870447468">"Amministrazione protezione da remoto"</string>
+    <string name="account_setup_security_policies_required_fmt" msgid="8146309611870795951">"Il server <xliff:g id="SERVER">%s</xliff:g> richiede che tu consenta il controllo remoto di alcune funzionalità di protezione del tuo telefono. Completare la configurazione dell\'account?"</string>
+    <string name="account_setup_failed_security_policies_unsupported" msgid="4093832822988053758">"Per questo server sono richieste funzionalità di protezione non supportate dal tuo telefono."</string>
+    <string name="security_notification_ticker_fmt" msgid="1108023476125276507">"È richiesto l\'aggiornamento delle impostazioni di protezione per l\'account \"<xliff:g id="ACCOUNT">%s</xliff:g>\"."</string>
+    <string name="security_notification_content_title" msgid="8096231937552848281">"Aggiorna impostazioni di protezione"</string>
+    <string name="account_security_title" msgid="4441470647344315196">"Protezione dispositivo"</string>
+    <string name="account_security_policy_explanation_fmt" msgid="5153981166755002718">"Il server <xliff:g id="SERVER">%s</xliff:g> richiede che tu consenta il controllo remoto di alcune funzionalità di protezione del 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>
@@ -215,22 +229,40 @@
     <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_signature_label" msgid="4091969938785803201">"Firma"</string>
+    <string name="account_settings_signature_hint" msgid="7262183168962779403">"Aggiungi testo ai messaggi inviati"</string>
     <string name="account_settings_notifications" msgid="1042620094281375043">"Impostazioni notifica"</string>
     <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_sync_calendar_enable" msgid="6855333393468628003">"Sincronizza calendario"</string>
+    <string name="account_settings_sync_calendar_summary" msgid="2456010694443333450">"Sincronizza anche il calendario 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>
     <string name="account_settings_servers" msgid="4925493817981624242">"Impostazioni server"</string>
     <string name="account_delete_dlg_title" msgid="6806087520856396608">"Rimuovi account"</string>
     <string name="account_delete_dlg_instructions_fmt" msgid="8236846322040271280">"L\'account \"<xliff:g id="ACCOUNT">%s</xliff:g>\" verrà rimosso da Email."</string>
+    <string name="upgrade_accounts_title" msgid="5444140226380754014">"Esegui l\'upgrade degli account"</string>
+    <string name="upgrade_accounts_error" msgid="7241661832029255715">"Impossibile eseguire l\'upgrade dell\'account"</string>
     <string name="provider_note_yahoo" msgid="8762024183024261236">"Accesso alla casella di posta non supportato per alcuni tipi di account di posta Yahoo!. Se hai problemi di connessione, visita il sito yahoo.com per ulteriori informazioni."</string>
     <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>
     <string name="exchange_name" msgid="1190783774800310346">"Aziendale"</string>
+    <string name="exchange_name_alternate" msgid="5772529644749041052">"Microsoft Exchange ActiveSync"</string>
+    <!-- no translation found for meeting_invitation (352782347335101484) -->
+    <skip />
+    <!-- no translation found for meeting_accepted (8796609373330400268) -->
+    <skip />
+    <!-- no translation found for meeting_declined (6707617183246608552) -->
+    <skip />
+    <!-- no translation found for meeting_tentative (8250995722130443785) -->
+    <skip />
     <string name="system_account_create_failed" msgid="4917162302393971752">"Impossibile creare l\'account con AccountManager. Riprova."</string>
+    <string name="device_admin_label" msgid="8680224994637869414">"Posta"</string>
+    <string name="device_admin_description" msgid="426727923791430306">"Abilita norme di protezione specificate dal server"</string>
+    <!-- no translation found for notification_exchange_calendar_added (6823659622379350159) -->
+    <skip />
 </resources>
diff --git a/res/values-ja/strings.xml b/res/values-ja/strings.xml
index 687a448..acac9cf 100644
--- a/res/values-ja/strings.xml
+++ b/res/values-ja/strings.xml
@@ -20,7 +20,6 @@
     <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>
     <string name="debug_title" msgid="5175710493691536719">"デバッグ"</string>
     <string name="next_action" msgid="3931301986364184415">"次へ"</string>
@@ -56,12 +55,9 @@
     <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>
-    <string name="accounts_context_menu_title" msgid="1053701760934475027">"アカウントのオプション"</string>
     <string name="status_loading_more" msgid="1580386959044617884">"メールを読み込み中..."</string>
     <string name="status_sending_messages" msgid="3971880826111264523">"メッセージを送信中..."</string>
     <string name="status_network_error" msgid="6045933332005067021">"接続エラー"</string>
-    <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>
     <string name="error_loading_message_body" msgid="2265140604109272914">"メッセージテキストの読み込み中に予期しないエラーが発生しました。メッセージが表示できないほど大きい可能性があります。"</string>
   <plurals name="notification_new_one_account_fmt">
@@ -82,14 +78,12 @@
     <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>
     <string name="account_folder_list_summary_inbox" msgid="5790553737870057607">"統合受信トレイ"</string>
-    <string name="account_folder_list_summary_unread" msgid="1200755158196002928">"未読"</string>
     <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>
-    <string name="message_list_load_more_messages_action" msgid="7428302707908825692">"他のメールも表示"</string>
+    <string name="message_list_load_more_messages_action" msgid="7428302707908825692">"さらにメールを読み込む"</string>
     <string name="message_list_send_pending_messages_action" msgid="9100624762133992435">"メッセージを送信します"</string>
-    <string name="message_list_title" msgid="6927798150197177235">"<xliff:g id="ACCOUNT">%s</xliff:g>: <xliff:g id="MAILBOX">%s</xliff:g>"</string>
     <string name="message_compose_to_hint" msgid="2891895306418177013">"To"</string>
     <string name="message_compose_cc_hint" msgid="8481884461031434144">"Cc"</string>
     <string name="message_compose_bcc_hint" msgid="9177337492358841680">"Bcc"</string>
@@ -113,17 +107,35 @@
     <string name="message_view_show_pictures_action" msgid="5059936981743072545">"画像を表示"</string>
     <string name="message_view_fetching_attachment_toast" msgid="8812363375155391184">"添付ファイルを取得中"</string>
     <string name="message_view_fetching_attachment_progress" msgid="8238550182655758164">"添付ファイル<xliff:g id="FILENAME">%s</xliff:g>を取得中"</string>
-    <string name="message_deleted_toast" msgid="1554845060991758649">"メッセージを削除しました。"</string>
+    <!-- no translation found for message_view_invite_view (6256018854688891069) -->
+    <skip />
+    <!-- no translation found for message_view_invite_title (5024473745902772299) -->
+    <skip />
+    <!-- no translation found for message_view_invite_text (1212799906603873708) -->
+    <skip />
+    <!-- no translation found for message_view_invite_accept (744546668021679819) -->
+    <skip />
+    <!-- no translation found for message_view_invite_maybe (7555189462441562318) -->
+    <skip />
+    <!-- no translation found for message_view_invite_decline (6119797303297149463) -->
+    <skip />
+    <!-- no translation found for message_view_invite_toast_yes (1900593767157209498) -->
+    <skip />
+    <!-- no translation found for message_view_invite_toast_maybe (8324044318669610540) -->
+    <skip />
+    <!-- no translation found for message_view_invite_toast_no (7511491076936887064) -->
+    <skip />
+    <!-- no translation found for message_deleted_toast:one (710742672464447084) -->
+    <!-- no translation found for message_deleted_toast:other (6574961322865652255) -->
     <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="message_view_display_attachment_toast" msgid="6096315816776330821">"この添付ファイルは表示できません。"</string>
     <string name="account_setup_basics_title" msgid="3969856368228940980">"メールアカウントの登録"</string>
+    <string name="account_setup_basics_exchange_title" msgid="1147638872869594157">"Exchangeアカウントを追加"</string>
+    <string name="account_setup_basics_exchange_title_alternate" msgid="4980422714586153809">"Exchange ActiveSyncアカウントを追加"</string>
     <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="accounts_welcome_exchange_alternate" msgid="1324339567986452000">"Exchange ActiveSyncアカウントの設定は簡単な操作で完了します。"</string>
     <string name="account_setup_basics_email_hint" msgid="7414269319207261120">"メールアドレス"</string>
     <string name="account_setup_basics_password_hint" msgid="410210049040536870">"パスワード"</string>
     <string name="account_setup_basics_default_label" msgid="5924790142029806711">"いつもこのアカウントでメールを送信"</string>
@@ -165,13 +177,9 @@
     <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>
-    <!-- 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_title" msgid="2492853474738063453">"サーバー設定"</string>
+    <string name="account_setup_exchange_server_label" msgid="795137797983360826">"サーバー"</string>
     <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>
     <string name="account_setup_exchange_trust_certificates_label" msgid="6232880757633882678">"すべてのSSL証明書を承認"</string>
     <string name="account_setup_options_title" msgid="8995162193118880993">"アカウントのオプション"</string>
@@ -186,14 +194,14 @@
     <string name="account_setup_options_default_label" msgid="8869166381331276697">"いつもこのアカウントでメールを送信"</string>
     <string name="account_setup_options_notify_label" msgid="1247525794828820038">"メールの着信を知らせる"</string>
     <string name="account_setup_options_sync_contacts_label" msgid="7467467090023434271">"このアカウントから連絡先を同期します。"</string>
+    <string name="account_setup_options_sync_calendar_label" msgid="3195979658426293931">"このアカウントからカレンダーを同期"</string>
     <string name="account_setup_failed_dlg_title" msgid="7827583313117521383">"セットアップできません"</string>
-    <string name="account_setup_options_mail_window_label" msgid="8764417340954006086">"同期の頻度"</string>
+    <string name="account_setup_options_mail_window_label" msgid="8764417340954006086">"同期する量"</string>
     <string name="account_setup_options_mail_window_1day" msgid="3965715241135811407">"1日"</string>
     <string name="account_setup_options_mail_window_3days" msgid="736181102295878114">"3日間"</string>
     <string name="account_setup_options_mail_window_1week" msgid="5639718031108023741">"1週間"</string>
     <string name="account_setup_options_mail_window_2weeks" msgid="4567049268124213035">"2週間"</string>
     <string name="account_setup_options_mail_window_1month" msgid="5846359669750047081">"1か月"</string>
-    <string name="account_setup_options_mail_window_all" msgid="5383858972681926166">"すべてのメール"</string>
     <string name="account_setup_failed_dlg_auth_message" msgid="42827150104879570">"ユーザー名かパスワードが間違っています。"</string>
     <string name="account_setup_failed_dlg_auth_message_fmt" msgid="8598560266430207606">"ユーザー名かパスワードが間違っています。"\n"(<xliff:g id="ERROR">%s</xliff:g>)"</string>
     <string name="account_setup_failed_dlg_certificate_message" msgid="961843413600482906">"サーバーへの安全な接続を確立できません。"</string>
@@ -204,7 +212,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_security_required_title" msgid="1850321535870447468">"セキュリティのリモート管理"</string>
+    <string name="account_setup_security_policies_required_fmt" msgid="8146309611870795951">"携帯電話のセキュリティ機能の一部に対するリモートコントロールをサーバー<xliff:g id="SERVER">%s</xliff:g>に許可する必要があります。アカウントのセットアップを終了しますか？"</string>
+    <string name="account_setup_failed_security_policies_unsupported" msgid="4093832822988053758">"このサーバーにはお使いの携帯電話でサポートされていないセキュリティ機能が必要です。"</string>
+    <string name="security_notification_ticker_fmt" msgid="1108023476125276507">"アカウント「<xliff:g id="ACCOUNT">%s</xliff:g>」でセキュリティ設定の更新が必要です。"</string>
+    <string name="security_notification_content_title" msgid="8096231937552848281">"セキュリティ設定を更新"</string>
+    <string name="account_security_title" msgid="4441470647344315196">"携帯電話のセキュリティ"</string>
+    <string name="account_security_policy_explanation_fmt" msgid="5153981166755002718">"携帯電話のセキュリティ機能の一部に対するリモートコントロールをサーバー<xliff:g id="SERVER">%s</xliff:g>に許可する必要があります。"</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>
@@ -212,25 +226,43 @@
     <string name="account_settings_notify_label" msgid="1630001017303007974">"メール着信通知"</string>
     <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_mail_check_frequency_label" msgid="2067835530563849675">"新着メール確認の頻度"</string>
     <string name="account_settings_incoming_label" msgid="7858928031806297542">"受信設定"</string>
     <string name="account_settings_outgoing_label" msgid="4464829249980026745">"送信設定"</string>
-    <string name="account_settings_add_account_label" msgid="63971622405360050">"別のアカウントを追加"</string>
     <string name="account_settings_description_label" msgid="8894815221204511715">"アカウント名"</string>
     <string name="account_settings_name_label" msgid="8186406122590008449">"名前"</string>
+    <string name="account_settings_signature_label" msgid="4091969938785803201">"署名"</string>
+    <string name="account_settings_signature_hint" msgid="7262183168962779403">"送信メッセージに署名を付ける"</string>
     <string name="account_settings_notifications" msgid="1042620094281375043">"通知設定"</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_sync_calendar_enable" msgid="6855333393468628003">"カレンダーを同期"</string>
+    <string name="account_settings_sync_calendar_summary" msgid="2456010694443333450">"このアカウントからもカレンダーを同期する"</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>
     <string name="account_settings_servers" msgid="4925493817981624242">"サーバー設定"</string>
     <string name="account_delete_dlg_title" msgid="6806087520856396608">"アカウントを削除"</string>
     <string name="account_delete_dlg_instructions_fmt" msgid="8236846322040271280">"アカウント\"<xliff:g id="ACCOUNT">%s</xliff:g>\"をEメールから削除しますか。"</string>
+    <string name="upgrade_accounts_title" msgid="5444140226380754014">"アカウントをアップグレード"</string>
+    <string name="upgrade_accounts_error" msgid="7241661832029255715">"アカウントをアップグレードできません"</string>
     <string name="provider_note_yahoo" msgid="8762024183024261236">"一部のタイプのYahoo!メールアカウントでは、メールボックスへのアクセスがサポートされていません。接続できない場合はyahoo.comにアクセスして詳細をご確認ください。"</string>
     <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>
     <string name="exchange_name" msgid="1190783774800310346">"コーポレート"</string>
+    <string name="exchange_name_alternate" msgid="5772529644749041052">"Microsoft Exchange ActiveSync"</string>
+    <!-- no translation found for meeting_invitation (352782347335101484) -->
+    <skip />
+    <!-- no translation found for meeting_accepted (8796609373330400268) -->
+    <skip />
+    <!-- no translation found for meeting_declined (6707617183246608552) -->
+    <skip />
+    <!-- no translation found for meeting_tentative (8250995722130443785) -->
+    <skip />
     <string name="system_account_create_failed" msgid="4917162302393971752">"AccountManagerがアカウントを作成できませんでした。もう一度やり直してください。"</string>
+    <string name="device_admin_label" msgid="8680224994637869414">"メール"</string>
+    <string name="device_admin_description" msgid="426727923791430306">"サーバーが指定したセキュリティポリシーを有効にします"</string>
+    <!-- no translation found for notification_exchange_calendar_added (6823659622379350159) -->
+    <skip />
 </resources>
diff --git a/res/values-ko/strings.xml b/res/values-ko/strings.xml
index 22a702b..fa9c3d2 100644
--- a/res/values-ko/strings.xml
+++ b/res/values-ko/strings.xml
@@ -20,7 +20,6 @@
     <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>
     <string name="debug_title" msgid="5175710493691536719">"디버그"</string>
     <string name="next_action" msgid="3931301986364184415">"다음"</string>
@@ -56,12 +55,9 @@
     <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>
-    <string name="accounts_context_menu_title" msgid="1053701760934475027">"계정 옵션"</string>
     <string name="status_loading_more" msgid="1580386959044617884">"메시지 로드 중..."</string>
     <string name="status_sending_messages" msgid="3971880826111264523">"메시지를 보내는 중..."</string>
     <string name="status_network_error" msgid="6045933332005067021">"연결 오류"</string>
-    <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>
     <string name="error_loading_message_body" msgid="2265140604109272914">"문자 메시지를 로드하는 중에 예기치 못한 오류가 발생했습니다. 메시지가 너무 커서 표시할 수 없기 때문일 수 있습니다."</string>
   <plurals name="notification_new_one_account_fmt">
@@ -82,14 +78,12 @@
     <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>
     <string name="account_folder_list_summary_inbox" msgid="5790553737870057607">"모든 받은편지함"</string>
-    <string name="account_folder_list_summary_unread" msgid="1200755158196002928">"읽지않음"</string>
     <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>
     <string name="message_list_load_more_messages_action" msgid="7428302707908825692">"더 많은 메시지 로드"</string>
     <string name="message_list_send_pending_messages_action" msgid="9100624762133992435">"발신 메시지 보내기"</string>
-    <string name="message_list_title" msgid="6927798150197177235">"<xliff:g id="ACCOUNT">%s</xliff:g>: <xliff:g id="MAILBOX">%s</xliff:g>"</string>
     <string name="message_compose_to_hint" msgid="2891895306418177013">"받는사람"</string>
     <string name="message_compose_cc_hint" msgid="8481884461031434144">"참조"</string>
     <string name="message_compose_bcc_hint" msgid="9177337492358841680">"숨은참조"</string>
@@ -113,17 +107,35 @@
     <string name="message_view_show_pictures_action" msgid="5059936981743072545">"사진 표시"</string>
     <string name="message_view_fetching_attachment_toast" msgid="8812363375155391184">"첨부파일을 가져오는 중입니다."</string>
     <string name="message_view_fetching_attachment_progress" msgid="8238550182655758164">"첨부파일(<xliff:g id="FILENAME">%s</xliff:g>)을 가져오는 중"</string>
-    <string name="message_deleted_toast" msgid="1554845060991758649">"메시지를 삭제했습니다."</string>
+    <!-- no translation found for message_view_invite_view (6256018854688891069) -->
+    <skip />
+    <!-- no translation found for message_view_invite_title (5024473745902772299) -->
+    <skip />
+    <!-- no translation found for message_view_invite_text (1212799906603873708) -->
+    <skip />
+    <!-- no translation found for message_view_invite_accept (744546668021679819) -->
+    <skip />
+    <!-- no translation found for message_view_invite_maybe (7555189462441562318) -->
+    <skip />
+    <!-- no translation found for message_view_invite_decline (6119797303297149463) -->
+    <skip />
+    <!-- no translation found for message_view_invite_toast_yes (1900593767157209498) -->
+    <skip />
+    <!-- no translation found for message_view_invite_toast_maybe (8324044318669610540) -->
+    <skip />
+    <!-- no translation found for message_view_invite_toast_no (7511491076936887064) -->
+    <skip />
+    <!-- no translation found for message_deleted_toast:one (710742672464447084) -->
+    <!-- no translation found for message_deleted_toast:other (6574961322865652255) -->
     <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="message_view_display_attachment_toast" msgid="6096315816776330821">"첨부파일을 표시할 수 없습니다."</string>
     <string name="account_setup_basics_title" msgid="3969856368228940980">"이메일 설정"</string>
+    <string name="account_setup_basics_exchange_title" msgid="1147638872869594157">"Exchange 계정 추가"</string>
+    <string name="account_setup_basics_exchange_title_alternate" msgid="4980422714586153809">"Exchange ActiveSync 계정 추가"</string>
     <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="accounts_welcome_exchange_alternate" msgid="1324339567986452000">"간단한 몇 가지 절차만 수행하면 Exchange ActiveSync 계정을 구성할 수 있습니다."</string>
     <string name="account_setup_basics_email_hint" msgid="7414269319207261120">"이메일 주소"</string>
     <string name="account_setup_basics_password_hint" msgid="410210049040536870">"비밀번호"</string>
     <string name="account_setup_basics_default_label" msgid="5924790142029806711">"이 계정에서 이메일을 보냅니다(기본값)."</string>
@@ -165,13 +177,9 @@
     <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>
-    <!-- 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_title" msgid="2492853474738063453">"서버 설정"</string>
+    <string name="account_setup_exchange_server_label" msgid="795137797983360826">"서버"</string>
     <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>
     <string name="account_setup_exchange_trust_certificates_label" msgid="6232880757633882678">"모든 SSL 인증서 수락"</string>
     <string name="account_setup_options_title" msgid="8995162193118880993">"계정 옵션"</string>
@@ -186,6 +194,7 @@
     <string name="account_setup_options_default_label" msgid="8869166381331276697">"이 계정에서 이메일을 보냅니다(기본값)."</string>
     <string name="account_setup_options_notify_label" msgid="1247525794828820038">"이메일이 오면 알림"</string>
     <string name="account_setup_options_sync_contacts_label" msgid="7467467090023434271">"이 계정에서 연락처를 동기화합니다."</string>
+    <string name="account_setup_options_sync_calendar_label" msgid="3195979658426293931">"이 계정에서 캘린더를 동기화합니다."</string>
     <string name="account_setup_failed_dlg_title" msgid="7827583313117521383">"설정을 완료할 수 없음"</string>
     <string name="account_setup_options_mail_window_label" msgid="8764417340954006086">"동기화할 이메일 양"</string>
     <string name="account_setup_options_mail_window_1day" msgid="3965715241135811407">"하루"</string>
@@ -193,7 +202,6 @@
     <string name="account_setup_options_mail_window_1week" msgid="5639718031108023741">"1주"</string>
     <string name="account_setup_options_mail_window_2weeks" msgid="4567049268124213035">"2주"</string>
     <string name="account_setup_options_mail_window_1month" msgid="5846359669750047081">"1달"</string>
-    <string name="account_setup_options_mail_window_all" msgid="5383858972681926166">"전체보관함"</string>
     <string name="account_setup_failed_dlg_auth_message" msgid="42827150104879570">"사용자 이름 및 비밀번호가 잘못되었습니다."</string>
     <string name="account_setup_failed_dlg_auth_message_fmt" msgid="8598560266430207606">"사용자 이름 또는 비밀번호가 잘못되었습니다."\n"(<xliff:g id="ERROR">%s</xliff:g>)"</string>
     <string name="account_setup_failed_dlg_certificate_message" msgid="961843413600482906">"서버에 안전하게 연결할 수 없습니다."</string>
@@ -204,7 +212,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_security_required_title" msgid="1850321535870447468">"원격 보안 관리"</string>
+    <string name="account_setup_security_policies_required_fmt" msgid="8146309611870795951">"<xliff:g id="SERVER">%s</xliff:g> 서버가 휴대전화의 몇 가지 보안 기능을 원격으로 제어할 수 있도록 해야 합니다. 이 계정 설정을 완료하시겠습니까?"</string>
+    <string name="account_setup_failed_security_policies_unsupported" msgid="4093832822988053758">"서버에 필요한 보안 기능 중, 휴대전화에서 지원하지 않는 것이 있습니다."</string>
+    <string name="security_notification_ticker_fmt" msgid="1108023476125276507">"\'<xliff:g id="ACCOUNT">%s</xliff:g>\' 계정을 사용하려면 보안 설정을 업데이트해야 합니다."</string>
+    <string name="security_notification_content_title" msgid="8096231937552848281">"보안 설정 업데이트"</string>
+    <string name="account_security_title" msgid="4441470647344315196">"기기 보안"</string>
+    <string name="account_security_policy_explanation_fmt" msgid="5153981166755002718">"<xliff:g id="SERVER">%s</xliff:g> 서버는 휴대전화의 몇 가지 보안 기능을 원격으로 제어할 수 있어야 합니다."</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>
@@ -215,22 +229,40 @@
     <string name="account_settings_mail_check_frequency_label" msgid="2067835530563849675">"이메일 확인 빈도"</string>
     <string name="account_settings_incoming_label" msgid="7858928031806297542">"수신 설정"</string>
     <string name="account_settings_outgoing_label" msgid="4464829249980026745">"발신 설정"</string>
-    <string name="account_settings_add_account_label" msgid="63971622405360050">"다른 계정 추가"</string>
     <string name="account_settings_description_label" msgid="8894815221204511715">"계정 이름"</string>
     <string name="account_settings_name_label" msgid="8186406122590008449">"이름"</string>
+    <string name="account_settings_signature_label" msgid="4091969938785803201">"서명"</string>
+    <string name="account_settings_signature_hint" msgid="7262183168962779403">"보내는 메일에 텍스트 첨부"</string>
     <string name="account_settings_notifications" msgid="1042620094281375043">"알림 설정"</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_sync_calendar_enable" msgid="6855333393468628003">"캘린더 동기화"</string>
+    <string name="account_settings_sync_calendar_summary" msgid="2456010694443333450">"또한 이 계정에서 캘린더 동기화"</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>
     <string name="account_delete_dlg_instructions_fmt" msgid="8236846322040271280">"계정(<xliff:g id="ACCOUNT">%s</xliff:g>)이 이메일에서 삭제됩니다."</string>
+    <string name="upgrade_accounts_title" msgid="5444140226380754014">"계정 업그레이드"</string>
+    <string name="upgrade_accounts_error" msgid="7241661832029255715">"계정을 업그레이드할 수 없음"</string>
     <string name="provider_note_yahoo" msgid="8762024183024261236">"일부 Yahoo! 메일 계정의 경우 편지함에 액세스할 수 없습니다. 접속에 문제가 있을 경우 자세한 정보는 yahoo.com을 참조하세요."</string>
     <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>
     <string name="exchange_name" msgid="1190783774800310346">"회사"</string>
+    <string name="exchange_name_alternate" msgid="5772529644749041052">"Microsoft Exchange ActiveSync"</string>
+    <!-- no translation found for meeting_invitation (352782347335101484) -->
+    <skip />
+    <!-- no translation found for meeting_accepted (8796609373330400268) -->
+    <skip />
+    <!-- no translation found for meeting_declined (6707617183246608552) -->
+    <skip />
+    <!-- no translation found for meeting_tentative (8250995722130443785) -->
+    <skip />
     <string name="system_account_create_failed" msgid="4917162302393971752">"AccountManager가 계정을 만들 수 없습니다. 다시 시도해 보세요."</string>
+    <string name="device_admin_label" msgid="8680224994637869414">"이메일"</string>
+    <string name="device_admin_description" msgid="426727923791430306">"서버별 보안 정책 사용"</string>
+    <!-- no translation found for notification_exchange_calendar_added (6823659622379350159) -->
+    <skip />
 </resources>
diff --git a/res/values-nb/strings.xml b/res/values-nb/strings.xml
index fff1950..3cd50c3 100644
--- a/res/values-nb/strings.xml
+++ b/res/values-nb/strings.xml
@@ -20,7 +20,6 @@
     <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>
     <string name="debug_title" msgid="5175710493691536719">"Debug"</string>
     <string name="next_action" msgid="3931301986364184415">"Neste"</string>
@@ -56,12 +55,9 @@
     <string name="add_attachment_action" msgid="2696013743130573897">"Legg til vedlegg"</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>
     <string name="status_sending_messages" msgid="3971880826111264523">"Sender meldinger ..."</string>
     <string name="status_network_error" msgid="6045933332005067021">"Feil ved tilkobling"</string>
-    <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>
     <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">
@@ -82,14 +78,12 @@
     <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>
     <string name="account_folder_list_summary_inbox" msgid="5790553737870057607">"Innboks"</string>
-    <string name="account_folder_list_summary_unread" msgid="1200755158196002928">"Ikke lest"</string>
     <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>
     <string name="message_list_load_more_messages_action" msgid="7428302707908825692">"Hent flere meldinger"</string>
     <string name="message_list_send_pending_messages_action" msgid="9100624762133992435">"Send utgående meldinger"</string>
-    <string name="message_list_title" msgid="6927798150197177235">"<xliff:g id="ACCOUNT">%s</xliff:g>: <xliff:g id="MAILBOX">%s</xliff:g>"</string>
     <string name="message_compose_to_hint" msgid="2891895306418177013">"Til"</string>
     <string name="message_compose_cc_hint" msgid="8481884461031434144">"Kopi"</string>
     <string name="message_compose_bcc_hint" msgid="9177337492358841680">"Blindkopi"</string>
@@ -113,17 +107,35 @@
     <string name="message_view_show_pictures_action" msgid="5059936981743072545">"Vis bilder"</string>
     <string name="message_view_fetching_attachment_toast" msgid="8812363375155391184">"Henter vedlegg."</string>
     <string name="message_view_fetching_attachment_progress" msgid="8238550182655758164">"Henter vedlegg <xliff:g id="FILENAME">%s</xliff:g>"</string>
-    <string name="message_deleted_toast" msgid="1554845060991758649">"Meldingen ble slettet."</string>
+    <!-- no translation found for message_view_invite_view (6256018854688891069) -->
+    <skip />
+    <!-- no translation found for message_view_invite_title (5024473745902772299) -->
+    <skip />
+    <!-- no translation found for message_view_invite_text (1212799906603873708) -->
+    <skip />
+    <!-- no translation found for message_view_invite_accept (744546668021679819) -->
+    <skip />
+    <!-- no translation found for message_view_invite_maybe (7555189462441562318) -->
+    <skip />
+    <!-- no translation found for message_view_invite_decline (6119797303297149463) -->
+    <skip />
+    <!-- no translation found for message_view_invite_toast_yes (1900593767157209498) -->
+    <skip />
+    <!-- no translation found for message_view_invite_toast_maybe (8324044318669610540) -->
+    <skip />
+    <!-- no translation found for message_view_invite_toast_no (7511491076936887064) -->
+    <skip />
+    <!-- no translation found for message_deleted_toast:one (710742672464447084) -->
+    <!-- no translation found for message_deleted_toast:other (6574961322865652255) -->
     <string name="message_discarded_toast" msgid="3891461729325584026">"Meldingen ble forkastet."</string>
     <string name="message_saved_toast" msgid="8443125659172627665">"Meldingen ble lagret som utkast."</string>
-    <string name="add_contact_dlg_title" msgid="7424641029188006580">"Legg til kontakt"</string>
-    <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>
+    <string name="account_setup_basics_exchange_title" msgid="1147638872869594157">"Legg til en Exchange-konto"</string>
+    <string name="account_setup_basics_exchange_title_alternate" msgid="4980422714586153809">"Legg til en Exchange ActiveSync-konto"</string>
     <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="accounts_welcome_exchange_alternate" msgid="1324339567986452000">"Du kan konfigurere en Exchange ActiveSync-konto ved kun å følge noen få trinn."</string>
     <string name="account_setup_basics_email_hint" msgid="7414269319207261120">"E-postadresse"</string>
     <string name="account_setup_basics_password_hint" msgid="410210049040536870">"Passord"</string>
     <string name="account_setup_basics_default_label" msgid="5924790142029806711">"Bruk denne kontoen som standard for utgående e-post."</string>
@@ -165,13 +177,9 @@
     <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>
-    <!-- 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_title" msgid="2492853474738063453">"Innstillinger for tjener"</string>
+    <string name="account_setup_exchange_server_label" msgid="795137797983360826">"Tjener"</string>
     <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>
     <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>
@@ -186,6 +194,7 @@
     <string name="account_setup_options_default_label" msgid="8869166381331276697">"Bruk denne kontoen som standard for utgående e-post."</string>
     <string name="account_setup_options_notify_label" msgid="1247525794828820038">"Varsle når det kommer e-post."</string>
     <string name="account_setup_options_sync_contacts_label" msgid="7467467090023434271">"Synkroniser kontakter fra denne kontoen."</string>
+    <string name="account_setup_options_sync_calendar_label" msgid="3195979658426293931">"Synkroniser kalendere fra denne kontoen."</string>
     <string name="account_setup_failed_dlg_title" msgid="7827583313117521383">"Kunne ikke fullføre oppsettet"</string>
     <string name="account_setup_options_mail_window_label" msgid="8764417340954006086">"Mengde som skal synkroniseres"</string>
     <string name="account_setup_options_mail_window_1day" msgid="3965715241135811407">"Én dag"</string>
@@ -193,7 +202,6 @@
     <string name="account_setup_options_mail_window_1week" msgid="5639718031108023741">"Én uke"</string>
     <string name="account_setup_options_mail_window_2weeks" msgid="4567049268124213035">"To uker"</string>
     <string name="account_setup_options_mail_window_1month" msgid="5846359669750047081">"Én måned"</string>
-    <string name="account_setup_options_mail_window_all" msgid="5383858972681926166">"All e-post"</string>
     <string name="account_setup_failed_dlg_auth_message" msgid="42827150104879570">"Feil brukernavn eller passord."</string>
     <string name="account_setup_failed_dlg_auth_message_fmt" msgid="8598560266430207606">"Feil brukernavn eller passord."\n"(<xliff:g id="ERROR">%s</xliff:g>)"</string>
     <string name="account_setup_failed_dlg_certificate_message" msgid="961843413600482906">"Kan ikke åpne en sikker tilkobling til tjeneren."</string>
@@ -204,7 +212,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_security_required_title" msgid="1850321535870447468">"Fjernadministrasjon av sikkerhet"</string>
+    <string name="account_setup_security_policies_required_fmt" msgid="8146309611870795951">"Tjeneren <xliff:g id="SERVER">%s</xliff:g> krever at den kan kontrollere noen av sikkerhetsfunksjonene på telefonen utenfra. Vil du fullføre oppsettet av kontoen?"</string>
+    <string name="account_setup_failed_security_policies_unsupported" msgid="4093832822988053758">"Tjeneren krever sikkerhetsfunksjoner som denne telefonen ikke håndterer."</string>
+    <string name="security_notification_ticker_fmt" msgid="1108023476125276507">"Kontoen «<xliff:g id="ACCOUNT">%s</xliff:g>» krever oppdatering av sikkerhetsinnstillingene."</string>
+    <string name="security_notification_content_title" msgid="8096231937552848281">"Oppdater sikkerhetsinnstilinger"</string>
+    <string name="account_security_title" msgid="4441470647344315196">"Enhetssikkerhet"</string>
+    <string name="account_security_policy_explanation_fmt" msgid="5153981166755002718">"Tjeneren <xliff:g id="SERVER">%s</xliff:g> krever at den kan kontrollere noen av sikkerhetsfunksjonene på telefonen utenfra."</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>
@@ -215,22 +229,40 @@
     <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>
     <string name="account_settings_outgoing_label" msgid="4464829249980026745">"Utgående innstillinger"</string>
-    <string name="account_settings_add_account_label" msgid="63971622405360050">"Legg til en annen konto"</string>
     <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_signature_label" msgid="4091969938785803201">"Underskrift"</string>
+    <string name="account_settings_signature_hint" msgid="7262183168962779403">"Legg til tekst i e-postmeldinger"</string>
     <string name="account_settings_notifications" msgid="1042620094281375043">"Innstillinger for varsling"</string>
     <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_sync_calendar_enable" msgid="6855333393468628003">"Synkroniser kalender"</string>
+    <string name="account_settings_sync_calendar_summary" msgid="2456010694443333450">"Synkroniser også kalendere 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>
     <string name="account_settings_servers" msgid="4925493817981624242">"Innstillinger for tjener"</string>
     <string name="account_delete_dlg_title" msgid="6806087520856396608">"Fjern"</string>
     <string name="account_delete_dlg_instructions_fmt" msgid="8236846322040271280">"Kontoen «<xliff:g id="ACCOUNT">%s</xliff:g>» vil bli fjernet fra e-postapplikasjonen."</string>
+    <string name="upgrade_accounts_title" msgid="5444140226380754014">"Oppgrader kontoer"</string>
+    <string name="upgrade_accounts_error" msgid="7241661832029255715">"Får ikke oppgradert konto"</string>
     <string name="provider_note_yahoo" msgid="8762024183024261236">"E-posttilgang er ikke støttet for enkelte typer Yahoo!-e-postkontoer. Hvis du har problemer med å koble til, besøk yahoo.com for mer informasjon."</string>
     <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>
     <string name="exchange_name" msgid="1190783774800310346">"Exchange"</string>
+    <string name="exchange_name_alternate" msgid="5772529644749041052">"Microsoft Exchange ActiveSync"</string>
+    <!-- no translation found for meeting_invitation (352782347335101484) -->
+    <skip />
+    <!-- no translation found for meeting_accepted (8796609373330400268) -->
+    <skip />
+    <!-- no translation found for meeting_declined (6707617183246608552) -->
+    <skip />
+    <!-- no translation found for meeting_tentative (8250995722130443785) -->
+    <skip />
     <string name="system_account_create_failed" msgid="4917162302393971752">"Kontobehandleren kunne ikke opprette noen konto, prøv på nytt."</string>
+    <string name="device_admin_label" msgid="8680224994637869414">"E-post"</string>
+    <string name="device_admin_description" msgid="426727923791430306">"Aktiverer tjenerspesifikke sikkerhetsinnstillinger"</string>
+    <!-- no translation found for notification_exchange_calendar_added (6823659622379350159) -->
+    <skip />
 </resources>
diff --git a/res/values-nl/strings.xml b/res/values-nl/strings.xml
index 7a8aae6..56272ee 100644
--- a/res/values-nl/strings.xml
+++ b/res/values-nl/strings.xml
@@ -20,7 +20,6 @@
     <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>
     <string name="debug_title" msgid="5175710493691536719">"Foutopsporing"</string>
     <string name="next_action" msgid="3931301986364184415">"Volgende"</string>
@@ -56,12 +55,9 @@
     <string name="add_attachment_action" msgid="2696013743130573897">"Bijlage toevoegen"</string>
     <string name="dump_settings_action" msgid="4478192525236169829">"Dumpinstellingen"</string>
     <string name="choose_attachment_dialog_title" msgid="81937507117528954">"Bijlage kiezen"</string>
-    <string name="accounts_context_menu_title" msgid="1053701760934475027">"Accountopties"</string>
     <string name="status_loading_more" msgid="1580386959044617884">"Berichten laden..."</string>
     <string name="status_sending_messages" msgid="3971880826111264523">"Berichten verzenden…"</string>
     <string name="status_network_error" msgid="6045933332005067021">"Verbindingsfout"</string>
-    <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>
     <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">
@@ -82,14 +78,12 @@
     <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>
     <string name="account_folder_list_summary_inbox" msgid="5790553737870057607">"Gecombineerd Postvak IN"</string>
-    <string name="account_folder_list_summary_unread" msgid="1200755158196002928">"Ongelezen"</string>
     <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>
     <string name="message_list_load_more_messages_action" msgid="7428302707908825692">"Meer berichten laden"</string>
     <string name="message_list_send_pending_messages_action" msgid="9100624762133992435">"Uitgaande berichten verzenden"</string>
-    <string name="message_list_title" msgid="6927798150197177235">"<xliff:g id="ACCOUNT">%s</xliff:g>: <xliff:g id="MAILBOX">%s</xliff:g>"</string>
     <string name="message_compose_to_hint" msgid="2891895306418177013">"Aan"</string>
     <string name="message_compose_cc_hint" msgid="8481884461031434144">"Cc"</string>
     <string name="message_compose_bcc_hint" msgid="9177337492358841680">"Bcc"</string>
@@ -113,17 +107,35 @@
     <string name="message_view_show_pictures_action" msgid="5059936981743072545">"Afbeeldingen weergeven"</string>
     <string name="message_view_fetching_attachment_toast" msgid="8812363375155391184">"Bijlage wordt opgehaald."</string>
     <string name="message_view_fetching_attachment_progress" msgid="8238550182655758164">"Bijlage <xliff:g id="FILENAME">%s</xliff:g> ophalen"</string>
-    <string name="message_deleted_toast" msgid="1554845060991758649">"Bericht verwijderd."</string>
+    <!-- no translation found for message_view_invite_view (6256018854688891069) -->
+    <skip />
+    <!-- no translation found for message_view_invite_title (5024473745902772299) -->
+    <skip />
+    <!-- no translation found for message_view_invite_text (1212799906603873708) -->
+    <skip />
+    <!-- no translation found for message_view_invite_accept (744546668021679819) -->
+    <skip />
+    <!-- no translation found for message_view_invite_maybe (7555189462441562318) -->
+    <skip />
+    <!-- no translation found for message_view_invite_decline (6119797303297149463) -->
+    <skip />
+    <!-- no translation found for message_view_invite_toast_yes (1900593767157209498) -->
+    <skip />
+    <!-- no translation found for message_view_invite_toast_maybe (8324044318669610540) -->
+    <skip />
+    <!-- no translation found for message_view_invite_toast_no (7511491076936887064) -->
+    <skip />
+    <!-- no translation found for message_deleted_toast:one (710742672464447084) -->
+    <!-- no translation found for message_deleted_toast:other (6574961322865652255) -->
     <string name="message_discarded_toast" msgid="3891461729325584026">"Bericht wordt verwijderd"</string>
     <string name="message_saved_toast" msgid="8443125659172627665">"Bericht opgeslagen als concept."</string>
-    <string name="add_contact_dlg_title" msgid="7424641029188006580">"Contact toevoegen"</string>
-    <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>
+    <string name="account_setup_basics_exchange_title" msgid="1147638872869594157">"Een Exchange-account toevoegen"</string>
+    <string name="account_setup_basics_exchange_title_alternate" msgid="4980422714586153809">"Een Exchange ActiveSync-account toevoegen"</string>
     <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="accounts_welcome_exchange_alternate" msgid="1324339567986452000">"U kunt een Exchange ActiveSync-account in enkele stappen configureren."</string>
     <string name="account_setup_basics_email_hint" msgid="7414269319207261120">"E-mailadres"</string>
     <string name="account_setup_basics_password_hint" msgid="410210049040536870">"Wachtwoord"</string>
     <string name="account_setup_basics_default_label" msgid="5924790142029806711">"E-mail standaard vanaf dit account verzenden"</string>
@@ -165,13 +177,9 @@
     <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>
-    <!-- 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_title" msgid="2492853474738063453">"Serverinstellingen"</string>
+    <string name="account_setup_exchange_server_label" msgid="795137797983360826">"Server"</string>
     <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>
     <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>
@@ -186,6 +194,7 @@
     <string name="account_setup_options_default_label" msgid="8869166381331276697">"E-mail standaard vanaf dit account verzenden"</string>
     <string name="account_setup_options_notify_label" msgid="1247525794828820038">"Stuur me een melding wanneer er e-mail binnenkomt."</string>
     <string name="account_setup_options_sync_contacts_label" msgid="7467467090023434271">"Contacten van dit account synchroniseren."</string>
+    <string name="account_setup_options_sync_calendar_label" msgid="3195979658426293931">"Agenda van dit account synchroniseren."</string>
     <string name="account_setup_failed_dlg_title" msgid="7827583313117521383">"Instellen is niet voltooid"</string>
     <string name="account_setup_options_mail_window_label" msgid="8764417340954006086">"Hoeveelheid om te synchroniseren"</string>
     <string name="account_setup_options_mail_window_1day" msgid="3965715241135811407">"Eén dag"</string>
@@ -193,7 +202,6 @@
     <string name="account_setup_options_mail_window_1week" msgid="5639718031108023741">"Eén week"</string>
     <string name="account_setup_options_mail_window_2weeks" msgid="4567049268124213035">"Twee weken"</string>
     <string name="account_setup_options_mail_window_1month" msgid="5846359669750047081">"Eén maand"</string>
-    <string name="account_setup_options_mail_window_all" msgid="5383858972681926166">"Alle e-mail"</string>
     <string name="account_setup_failed_dlg_auth_message" msgid="42827150104879570">"Gebruikersnaam of wachtwoord onjuist"</string>
     <string name="account_setup_failed_dlg_auth_message_fmt" msgid="8598560266430207606">"Gebruikersnaam of wachtwoord is onjuist."\n"(<xliff:g id="ERROR">%s</xliff:g>)"</string>
     <string name="account_setup_failed_dlg_certificate_message" msgid="961843413600482906">"Kan geen veilige verbinding met de server maken."</string>
@@ -204,7 +212,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_security_required_title" msgid="1850321535870447468">"Extern beveiligingsbeheer"</string>
+    <string name="account_setup_security_policies_required_fmt" msgid="8146309611870795951">"De server <xliff:g id="SERVER">%s</xliff:g> vereist dat u de server toestemming geeft bepaalde beveiligingsfuncties van uw telefoon extern te bedienen. Wilt u het instellen van dit account voltooien?"</string>
+    <string name="account_setup_failed_security_policies_unsupported" msgid="4093832822988053758">"Voor deze server zijn beveiligingsfuncties nodig die uw telefoon niet ondersteunt."</string>
+    <string name="security_notification_ticker_fmt" msgid="1108023476125276507">"Account \'<xliff:g id="ACCOUNT">%s</xliff:g>\' vereist een update van de beveiligingsinstellingen."</string>
+    <string name="security_notification_content_title" msgid="8096231937552848281">"Beveiligingsinstellingen bijwerken"</string>
+    <string name="account_security_title" msgid="4441470647344315196">"Apparaatbeveiliging"</string>
+    <string name="account_security_policy_explanation_fmt" msgid="5153981166755002718">"De server <xliff:g id="SERVER">%s</xliff:g> vereist dat u de server toestemming geeft bepaalde beveiligingsfuncties van uw telefoon extern te bedienen."</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>
@@ -215,22 +229,40 @@
     <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>
     <string name="account_settings_outgoing_label" msgid="4464829249980026745">"Instellingen uitgaande e-mail"</string>
-    <string name="account_settings_add_account_label" msgid="63971622405360050">"Nieuw account toevoegen"</string>
     <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_signature_label" msgid="4091969938785803201">"Handtekening"</string>
+    <string name="account_settings_signature_hint" msgid="7262183168962779403">"Tekst toevoegen aan berichten die u verzendt"</string>
     <string name="account_settings_notifications" msgid="1042620094281375043">"Instellingen voor meldingen"</string>
     <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_sync_calendar_enable" msgid="6855333393468628003">"Agenda synchroniseren"</string>
+    <string name="account_settings_sync_calendar_summary" msgid="2456010694443333450">"Agenda 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>
     <string name="account_settings_servers" msgid="4925493817981624242">"Serverinstellingen"</string>
     <string name="account_delete_dlg_title" msgid="6806087520856396608">"Account verwijderen"</string>
     <string name="account_delete_dlg_instructions_fmt" msgid="8236846322040271280">"Het account <xliff:g id="ACCOUNT">%s</xliff:g> wordt verwijderd van E-mail"</string>
+    <string name="upgrade_accounts_title" msgid="5444140226380754014">"Accounts upgraden"</string>
+    <string name="upgrade_accounts_error" msgid="7241661832029255715">"Kan account niet upgraden"</string>
     <string name="provider_note_yahoo" msgid="8762024183024261236">"Toegang tot postvakken wordt niet ondersteund door sommige typen Yahoo!-mailaccounts. Als er problemen ontstaan bij het verbinden, gaat u naar yahoo.com voor meer informatie."</string>
     <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>
     <string name="exchange_name" msgid="1190783774800310346">"Zakelijk"</string>
+    <string name="exchange_name_alternate" msgid="5772529644749041052">"Microsoft Exchange ActiveSync"</string>
+    <!-- no translation found for meeting_invitation (352782347335101484) -->
+    <skip />
+    <!-- no translation found for meeting_accepted (8796609373330400268) -->
+    <skip />
+    <!-- no translation found for meeting_declined (6707617183246608552) -->
+    <skip />
+    <!-- no translation found for meeting_tentative (8250995722130443785) -->
+    <skip />
     <string name="system_account_create_failed" msgid="4917162302393971752">"De AccountManager kan het account niet maken, probeer het opnieuw."</string>
+    <string name="device_admin_label" msgid="8680224994637869414">"E-mail"</string>
+    <string name="device_admin_description" msgid="426727923791430306">"Door de server aangegeven beveiligingsbeleid inschakelen"</string>
+    <!-- no translation found for notification_exchange_calendar_added (6823659622379350159) -->
+    <skip />
 </resources>
diff --git a/res/values-pl/strings.xml b/res/values-pl/strings.xml
index 9944728..02a48e4 100644
--- a/res/values-pl/strings.xml
+++ b/res/values-pl/strings.xml
@@ -20,7 +20,6 @@
     <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>
     <string name="debug_title" msgid="5175710493691536719">"Debuguj"</string>
     <string name="next_action" msgid="3931301986364184415">"Dalej"</string>
@@ -56,12 +55,9 @@
     <string name="add_attachment_action" msgid="2696013743130573897">"Dodaj załącznik"</string>
     <string name="dump_settings_action" msgid="4478192525236169829">"Zrzut ustawień"</string>
     <string name="choose_attachment_dialog_title" msgid="81937507117528954">"Wybierz załącznik"</string>
-    <string name="accounts_context_menu_title" msgid="1053701760934475027">"Opcje konta"</string>
     <string name="status_loading_more" msgid="1580386959044617884">"Ładowanie wiadomości…"</string>
     <string name="status_sending_messages" msgid="3971880826111264523">"Wysyłanie wiadomości…"</string>
     <string name="status_network_error" msgid="6045933332005067021">"Błąd połączenia"</string>
-    <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>
     <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">
@@ -82,14 +78,12 @@
     <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>
     <string name="account_folder_list_summary_inbox" msgid="5790553737870057607">"Wszystkie skrzynki odbiorcze"</string>
-    <string name="account_folder_list_summary_unread" msgid="1200755158196002928">"Nieprzeczytane"</string>
     <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>
     <string name="message_list_load_more_messages_action" msgid="7428302707908825692">"Załaduj więcej wiadomości"</string>
     <string name="message_list_send_pending_messages_action" msgid="9100624762133992435">"Wyślij wiadomości wychodzące"</string>
-    <string name="message_list_title" msgid="6927798150197177235">"<xliff:g id="ACCOUNT">%s</xliff:g>: <xliff:g id="MAILBOX">%s</xliff:g>"</string>
     <string name="message_compose_to_hint" msgid="2891895306418177013">"Do"</string>
     <string name="message_compose_cc_hint" msgid="8481884461031434144">"DW"</string>
     <string name="message_compose_bcc_hint" msgid="9177337492358841680">"UDW"</string>
@@ -113,17 +107,35 @@
     <string name="message_view_show_pictures_action" msgid="5059936981743072545">"Pokaż obrazy"</string>
     <string name="message_view_fetching_attachment_toast" msgid="8812363375155391184">"Pobieranie załącznika."</string>
     <string name="message_view_fetching_attachment_progress" msgid="8238550182655758164">"Pobieranie załącznika <xliff:g id="FILENAME">%s</xliff:g>"</string>
-    <string name="message_deleted_toast" msgid="1554845060991758649">"Wiadomość została usunięta."</string>
+    <!-- no translation found for message_view_invite_view (6256018854688891069) -->
+    <skip />
+    <!-- no translation found for message_view_invite_title (5024473745902772299) -->
+    <skip />
+    <!-- no translation found for message_view_invite_text (1212799906603873708) -->
+    <skip />
+    <!-- no translation found for message_view_invite_accept (744546668021679819) -->
+    <skip />
+    <!-- no translation found for message_view_invite_maybe (7555189462441562318) -->
+    <skip />
+    <!-- no translation found for message_view_invite_decline (6119797303297149463) -->
+    <skip />
+    <!-- no translation found for message_view_invite_toast_yes (1900593767157209498) -->
+    <skip />
+    <!-- no translation found for message_view_invite_toast_maybe (8324044318669610540) -->
+    <skip />
+    <!-- no translation found for message_view_invite_toast_no (7511491076936887064) -->
+    <skip />
+    <!-- no translation found for message_deleted_toast:one (710742672464447084) -->
+    <!-- no translation found for message_deleted_toast:other (6574961322865652255) -->
     <string name="message_discarded_toast" msgid="3891461729325584026">"Wiadomość została odrzucona."</string>
     <string name="message_saved_toast" msgid="8443125659172627665">"Wiadomość została zapisana jako wersja robocza."</string>
-    <string name="add_contact_dlg_title" msgid="7424641029188006580">"Dodaj kontakt"</string>
-    <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>
+    <string name="account_setup_basics_exchange_title" msgid="1147638872869594157">"Dodaj konto Exchange"</string>
+    <string name="account_setup_basics_exchange_title_alternate" msgid="4980422714586153809">"Dodaj konto Exchange ActiveSync"</string>
     <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="accounts_welcome_exchange_alternate" msgid="1324339567986452000">"Możesz skonfigurować konto Exchange ActiveSync, wykonując zaledwie kilka czynności."</string>
     <string name="account_setup_basics_email_hint" msgid="7414269319207261120">"Adres e-mail"</string>
     <string name="account_setup_basics_password_hint" msgid="410210049040536870">"Hasło"</string>
     <string name="account_setup_basics_default_label" msgid="5924790142029806711">"Domyślnie wysyłaj wiadomości e-mail z tego konta"</string>
@@ -165,13 +177,9 @@
     <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>
-    <!-- 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_title" msgid="2492853474738063453">"Ustawienia serwera"</string>
+    <string name="account_setup_exchange_server_label" msgid="795137797983360826">"Serwer"</string>
     <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>
     <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>
@@ -186,6 +194,7 @@
     <string name="account_setup_options_default_label" msgid="8869166381331276697">"Domyślnie wysyłaj wiadomości e-mail z tego konta"</string>
     <string name="account_setup_options_notify_label" msgid="1247525794828820038">"Powiadom mnie o odebranej poczcie e-mail."</string>
     <string name="account_setup_options_sync_contacts_label" msgid="7467467090023434271">"Synchronizuj kontakty na tym koncie"</string>
+    <string name="account_setup_options_sync_calendar_label" msgid="3195979658426293931">"Synchronizuj kalendarz na tym koncie"</string>
     <string name="account_setup_failed_dlg_title" msgid="7827583313117521383">"Nie można zakończyć konfiguracji"</string>
     <string name="account_setup_options_mail_window_label" msgid="8764417340954006086">"Ilość do zsynchronizowania"</string>
     <string name="account_setup_options_mail_window_1day" msgid="3965715241135811407">"Jeden dzień"</string>
@@ -193,7 +202,6 @@
     <string name="account_setup_options_mail_window_1week" msgid="5639718031108023741">"Jeden tydzień"</string>
     <string name="account_setup_options_mail_window_2weeks" msgid="4567049268124213035">"Dwa tygodnie"</string>
     <string name="account_setup_options_mail_window_1month" msgid="5846359669750047081">"Jeden miesiąc"</string>
-    <string name="account_setup_options_mail_window_all" msgid="5383858972681926166">"Cała poczta"</string>
     <string name="account_setup_failed_dlg_auth_message" msgid="42827150104879570">"Nieprawidłowa nazwa użytkownika lub hasło."</string>
     <string name="account_setup_failed_dlg_auth_message_fmt" msgid="8598560266430207606">"Nieprawidłowa nazwa użytkownika lub hasło."\n"(<xliff:g id="ERROR">%s</xliff:g>)"</string>
     <string name="account_setup_failed_dlg_certificate_message" msgid="961843413600482906">"Nie można nawiązać bezpiecznego połączenia z serwerem."</string>
@@ -204,7 +212,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_security_required_title" msgid="1850321535870447468">"Zdalne administrowanie zabezpieczeniami"</string>
+    <string name="account_setup_security_policies_required_fmt" msgid="8146309611870795951">"Serwer <xliff:g id="SERVER">%s</xliff:g> wymaga udzielenia zezwolenia na zdalną kontrolę niektórych funkcji zabezpieczeń telefonu. Chcesz zakończyć konfigurowanie tego konta?"</string>
+    <string name="account_setup_failed_security_policies_unsupported" msgid="4093832822988053758">"Ten serwer wymaga funkcji zabezpieczeń, których Twój telefon nie obsługuje."</string>
+    <string name="security_notification_ticker_fmt" msgid="1108023476125276507">"Konto „<xliff:g id="ACCOUNT">%s</xliff:g>” wymaga aktualizacji ustawień zabezpieczeń."</string>
+    <string name="security_notification_content_title" msgid="8096231937552848281">"Aktualizuj ustawienia zabezpieczeń"</string>
+    <string name="account_security_title" msgid="4441470647344315196">"Zabezpieczenia urządzenia"</string>
+    <string name="account_security_policy_explanation_fmt" msgid="5153981166755002718">"Serwer <xliff:g id="SERVER">%s</xliff:g> wymaga udzielenia zezwolenia na zdalną kontrolę niektórych funkcji zabezpieczeń telefonu."</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>
@@ -215,22 +229,40 @@
     <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>
     <string name="account_settings_outgoing_label" msgid="4464829249980026745">"Poczta wychodząca"</string>
-    <string name="account_settings_add_account_label" msgid="63971622405360050">"Dodaj kolejne konto"</string>
     <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_signature_label" msgid="4091969938785803201">"Podpis"</string>
+    <string name="account_settings_signature_hint" msgid="7262183168962779403">"Dołącz tekst do wysyłanych wiadomości"</string>
     <string name="account_settings_notifications" msgid="1042620094281375043">"Ustawienia powiadomień"</string>
     <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_sync_calendar_enable" msgid="6855333393468628003">"Synchronizuj kalendarz"</string>
+    <string name="account_settings_sync_calendar_summary" msgid="2456010694443333450">"Synchronizuj również kalendarz na tym koncie"</string>
     <string name="account_settings_vibrate_enable" msgid="8045133290388856478">"Wibracje"</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>
     <string name="account_delete_dlg_instructions_fmt" msgid="8236846322040271280">"Konto <xliff:g id="ACCOUNT">%s</xliff:g> zostanie usunięte z usługi poczty e-mail."</string>
+    <string name="upgrade_accounts_title" msgid="5444140226380754014">"Uaktualnij konta"</string>
+    <string name="upgrade_accounts_error" msgid="7241661832029255715">"Nie można uaktualnić konta"</string>
     <string name="provider_note_yahoo" msgid="8762024183024261236">"Dostęp do skrzynki pocztowej nie jest obsługiwany w przypadku kilku typów kont pocztowych w usłudze Yahoo! Jeśli podczas nawiązywania połączenia występują problemy, odwiedź witrynę yahoo.com w celu uzyskania dodatkowych informacji."</string>
     <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>
     <string name="exchange_name" msgid="1190783774800310346">"Firma"</string>
+    <string name="exchange_name_alternate" msgid="5772529644749041052">"Microsoft Exchange ActiveSync"</string>
+    <!-- no translation found for meeting_invitation (352782347335101484) -->
+    <skip />
+    <!-- no translation found for meeting_accepted (8796609373330400268) -->
+    <skip />
+    <!-- no translation found for meeting_declined (6707617183246608552) -->
+    <skip />
+    <!-- no translation found for meeting_tentative (8250995722130443785) -->
+    <skip />
     <string name="system_account_create_failed" msgid="4917162302393971752">"Usługa AccountManager nie może utworzyć konta. Spróbuj ponownie."</string>
+    <string name="device_admin_label" msgid="8680224994637869414">"E-mail"</string>
+    <string name="device_admin_description" msgid="426727923791430306">"Włącza zasady zabezpieczeń określone na serwerze"</string>
+    <!-- no translation found for notification_exchange_calendar_added (6823659622379350159) -->
+    <skip />
 </resources>
diff --git a/res/values-pt-rPT/strings.xml b/res/values-pt-rPT/strings.xml
index dfb9aad..0a964ae 100644
--- a/res/values-pt-rPT/strings.xml
+++ b/res/values-pt-rPT/strings.xml
@@ -20,7 +20,6 @@
     <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>
     <string name="debug_title" msgid="5175710493691536719">"Depuração"</string>
     <string name="next_action" msgid="3931301986364184415">"Seguinte"</string>
@@ -56,12 +55,9 @@
     <string name="add_attachment_action" msgid="2696013743130573897">"Adicionar anexo"</string>
     <string name="dump_settings_action" msgid="4478192525236169829">"Definições de imagem de erro"</string>
     <string name="choose_attachment_dialog_title" msgid="81937507117528954">"Seleccionar anexo"</string>
-    <string name="accounts_context_menu_title" msgid="1053701760934475027">"Opções da conta"</string>
     <string name="status_loading_more" msgid="1580386959044617884">"A carregar mensagens..."</string>
     <string name="status_sending_messages" msgid="3971880826111264523">"A enviar mensagens..."</string>
     <string name="status_network_error" msgid="6045933332005067021">"Erro de ligação"</string>
-    <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>
     <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">
@@ -82,14 +78,12 @@
     <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>
     <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>
     <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>
     <string name="message_list_load_more_messages_action" msgid="7428302707908825692">"Carregar mais mensagens"</string>
     <string name="message_list_send_pending_messages_action" msgid="9100624762133992435">"Enviar mensagens a enviar"</string>
-    <string name="message_list_title" msgid="6927798150197177235">"<xliff:g id="ACCOUNT">%s</xliff:g>: <xliff:g id="MAILBOX">%s</xliff:g>"</string>
     <string name="message_compose_to_hint" msgid="2891895306418177013">"Para"</string>
     <string name="message_compose_cc_hint" msgid="8481884461031434144">"Cc"</string>
     <string name="message_compose_bcc_hint" msgid="9177337492358841680">"Bcc"</string>
@@ -113,17 +107,35 @@
     <string name="message_view_show_pictures_action" msgid="5059936981743072545">"Mostrar imagens"</string>
     <string name="message_view_fetching_attachment_toast" msgid="8812363375155391184">"A obter anexo."</string>
     <string name="message_view_fetching_attachment_progress" msgid="8238550182655758164">"A obter anexo<xliff:g id="FILENAME">%s</xliff:g>"</string>
-    <string name="message_deleted_toast" msgid="1554845060991758649">"Mensagem eliminada."</string>
+    <!-- no translation found for message_view_invite_view (6256018854688891069) -->
+    <skip />
+    <!-- no translation found for message_view_invite_title (5024473745902772299) -->
+    <skip />
+    <!-- no translation found for message_view_invite_text (1212799906603873708) -->
+    <skip />
+    <!-- no translation found for message_view_invite_accept (744546668021679819) -->
+    <skip />
+    <!-- no translation found for message_view_invite_maybe (7555189462441562318) -->
+    <skip />
+    <!-- no translation found for message_view_invite_decline (6119797303297149463) -->
+    <skip />
+    <!-- no translation found for message_view_invite_toast_yes (1900593767157209498) -->
+    <skip />
+    <!-- no translation found for message_view_invite_toast_maybe (8324044318669610540) -->
+    <skip />
+    <!-- no translation found for message_view_invite_toast_no (7511491076936887064) -->
+    <skip />
+    <!-- no translation found for message_deleted_toast:one (710742672464447084) -->
+    <!-- no translation found for message_deleted_toast:other (6574961322865652255) -->
     <string name="message_discarded_toast" msgid="3891461729325584026">"Mensagem rejeitada."</string>
     <string name="message_saved_toast" msgid="8443125659172627665">"Mensagem guardada como rascunho."</string>
-    <string name="add_contact_dlg_title" msgid="7424641029188006580">"Adicionar contacto"</string>
-    <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>
+    <string name="account_setup_basics_exchange_title" msgid="1147638872869594157">"Adicionar uma conta do Exchange"</string>
+    <string name="account_setup_basics_exchange_title_alternate" msgid="4980422714586153809">"Adicionar uma conta do Exchange ActiveSync"</string>
     <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="accounts_welcome_exchange_alternate" msgid="1324339567986452000">"Pode configurar uma conta do Exchange ActiveSync em apenas alguns passos."</string>
     <string name="account_setup_basics_email_hint" msgid="7414269319207261120">"Endereço de e-mail"</string>
     <string name="account_setup_basics_password_hint" msgid="410210049040536870">"Palavra-passe"</string>
     <string name="account_setup_basics_default_label" msgid="5924790142029806711">"Enviar e-mail a partir desta conta por predefinição."</string>
@@ -165,13 +177,9 @@
     <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>
-    <!-- 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_title" msgid="2492853474738063453">"Definições do servidor"</string>
+    <string name="account_setup_exchange_server_label" msgid="795137797983360826">"Servidor"</string>
     <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>
     <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>
@@ -186,6 +194,7 @@
     <string name="account_setup_options_default_label" msgid="8869166381331276697">"Enviar e-mail a partir desta conta por predefinição."</string>
     <string name="account_setup_options_notify_label" msgid="1247525794828820038">"Notificar-me quando chega e-mail."</string>
     <string name="account_setup_options_sync_contacts_label" msgid="7467467090023434271">"Sincronizar contactos a partir desta conta."</string>
+    <string name="account_setup_options_sync_calendar_label" msgid="3195979658426293931">"Sincronizar o calendário a partir desta conta."</string>
     <string name="account_setup_failed_dlg_title" msgid="7827583313117521383">"Não foi possível concluir a configuração"</string>
     <string name="account_setup_options_mail_window_label" msgid="8764417340954006086">"Quantidade a sincronizar"</string>
     <string name="account_setup_options_mail_window_1day" msgid="3965715241135811407">"Um dia"</string>
@@ -193,7 +202,6 @@
     <string name="account_setup_options_mail_window_1week" msgid="5639718031108023741">"Uma semana"</string>
     <string name="account_setup_options_mail_window_2weeks" msgid="4567049268124213035">"Duas semanas"</string>
     <string name="account_setup_options_mail_window_1month" msgid="5846359669750047081">"Um mês"</string>
-    <string name="account_setup_options_mail_window_all" msgid="5383858972681926166">"Todo o correio"</string>
     <string name="account_setup_failed_dlg_auth_message" msgid="42827150104879570">"Nome de utilizador ou palavra passe incorrectos."</string>
     <string name="account_setup_failed_dlg_auth_message_fmt" msgid="8598560266430207606">"Nome de utilizador ou palavra-passe incorrectos."\n"(<xliff:g id="ERROR">%s</xliff:g>)"</string>
     <string name="account_setup_failed_dlg_certificate_message" msgid="961843413600482906">"Não é possível ligar ao servidor em segurança."</string>
@@ -204,7 +212,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_security_required_title" msgid="1850321535870447468">"Administração de segurança remota"</string>
+    <string name="account_setup_security_policies_required_fmt" msgid="8146309611870795951">"O servidor <xliff:g id="SERVER">%s</xliff:g> requer permissão para controlar remotamente algumas das funcionalidades de segurança do telefone. Pretende concluir a configuração desta conta?"</string>
+    <string name="account_setup_failed_security_policies_unsupported" msgid="4093832822988053758">"Este servidor do requer funcionalidades de segurança que não são suportadas pelo telefone."</string>
+    <string name="security_notification_ticker_fmt" msgid="1108023476125276507">"A conta \"<xliff:g id="ACCOUNT">%s</xliff:g>\" requer a actualização das definições de segurança."</string>
+    <string name="security_notification_content_title" msgid="8096231937552848281">"Actualizar definições de segurança"</string>
+    <string name="account_security_title" msgid="4441470647344315196">"Segurança do dispositivo"</string>
+    <string name="account_security_policy_explanation_fmt" msgid="5153981166755002718">"O servidor <xliff:g id="SERVER">%s</xliff:g> requer permissão para controlar remotamente algumas das funcionalidades de segurança do 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>
@@ -215,22 +229,40 @@
     <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>
     <string name="account_settings_outgoing_label" msgid="4464829249980026745">"Definições de envio"</string>
-    <string name="account_settings_add_account_label" msgid="63971622405360050">"Adicionar outra conta"</string>
     <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_signature_label" msgid="4091969938785803201">"Assinatura"</string>
+    <string name="account_settings_signature_hint" msgid="7262183168962779403">"Acrescente texto às mensagens que enviar"</string>
     <string name="account_settings_notifications" msgid="1042620094281375043">"Definições de notificação"</string>
     <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_sync_calendar_enable" msgid="6855333393468628003">"Sincronizar calendário"</string>
+    <string name="account_settings_sync_calendar_summary" msgid="2456010694443333450">"Sincronizar também calendário 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>
     <string name="account_settings_servers" msgid="4925493817981624242">"Definições do servidor"</string>
     <string name="account_delete_dlg_title" msgid="6806087520856396608">"Remover conta"</string>
     <string name="account_delete_dlg_instructions_fmt" msgid="8236846322040271280">"A conta \"<xliff:g id="ACCOUNT">%s</xliff:g>\" será removida do E-mail."</string>
+    <string name="upgrade_accounts_title" msgid="5444140226380754014">"Actualizar contas"</string>
+    <string name="upgrade_accounts_error" msgid="7241661832029255715">"Não é possível actualizar a conta"</string>
     <string name="provider_note_yahoo" msgid="8762024183024261236">"O acesso à caixa de correio não é suportado para alguns tipos de contas de correio do Yahoo!. Se estiver com dificuldades em efectuar a ligação, visite yahoo.com para obter mais informações."</string>
     <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>
     <string name="exchange_name" msgid="1190783774800310346">"Empresa"</string>
+    <string name="exchange_name_alternate" msgid="5772529644749041052">"Microsoft Exchange ActiveSync"</string>
+    <!-- no translation found for meeting_invitation (352782347335101484) -->
+    <skip />
+    <!-- no translation found for meeting_accepted (8796609373330400268) -->
+    <skip />
+    <!-- no translation found for meeting_declined (6707617183246608552) -->
+    <skip />
+    <!-- no translation found for meeting_tentative (8250995722130443785) -->
+    <skip />
     <string name="system_account_create_failed" msgid="4917162302393971752">"O Gestor de Contas não conseguiu criar a Conta; tente novamente."</string>
+    <string name="device_admin_label" msgid="8680224994637869414">"E-mail"</string>
+    <string name="device_admin_description" msgid="426727923791430306">"Activa as políticas de segurança especificadas pelo servidor"</string>
+    <!-- no translation found for notification_exchange_calendar_added (6823659622379350159) -->
+    <skip />
 </resources>
diff --git a/res/values-pt/strings.xml b/res/values-pt/strings.xml
index 829629b..746d3c2 100644
--- a/res/values-pt/strings.xml
+++ b/res/values-pt/strings.xml
@@ -20,7 +20,6 @@
     <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>
     <string name="debug_title" msgid="5175710493691536719">"Depurar"</string>
     <string name="next_action" msgid="3931301986364184415">"Avançar"</string>
@@ -56,12 +55,9 @@
     <string name="add_attachment_action" msgid="2696013743130573897">"Adicionar anexo"</string>
     <string name="dump_settings_action" msgid="4478192525236169829">"Despejar configurações"</string>
     <string name="choose_attachment_dialog_title" msgid="81937507117528954">"Escolher anexo"</string>
-    <string name="accounts_context_menu_title" msgid="1053701760934475027">"Opções da conta"</string>
     <string name="status_loading_more" msgid="1580386959044617884">"Carregando mensagens..."</string>
     <string name="status_sending_messages" msgid="3971880826111264523">"Enviando mensagens..."</string>
     <string name="status_network_error" msgid="6045933332005067021">"Erro de conexão"</string>
-    <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>
     <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">
@@ -82,14 +78,12 @@
     <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>
     <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>
     <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>
     <string name="message_list_load_more_messages_action" msgid="7428302707908825692">"Carregar mais mensagens"</string>
     <string name="message_list_send_pending_messages_action" msgid="9100624762133992435">"Enviar mensagens de saída"</string>
-    <string name="message_list_title" msgid="6927798150197177235">"<xliff:g id="ACCOUNT">%s</xliff:g>: <xliff:g id="MAILBOX">%s</xliff:g>"</string>
     <string name="message_compose_to_hint" msgid="2891895306418177013">"Para"</string>
     <string name="message_compose_cc_hint" msgid="8481884461031434144">"Cc"</string>
     <string name="message_compose_bcc_hint" msgid="9177337492358841680">"Cco"</string>
@@ -113,17 +107,35 @@
     <string name="message_view_show_pictures_action" msgid="5059936981743072545">"Mostrar imagens"</string>
     <string name="message_view_fetching_attachment_toast" msgid="8812363375155391184">"Buscando anexo."</string>
     <string name="message_view_fetching_attachment_progress" msgid="8238550182655758164">"Buscando anexo <xliff:g id="FILENAME">%s</xliff:g>"</string>
-    <string name="message_deleted_toast" msgid="1554845060991758649">"Mensagem excluída."</string>
+    <!-- no translation found for message_view_invite_view (6256018854688891069) -->
+    <skip />
+    <!-- no translation found for message_view_invite_title (5024473745902772299) -->
+    <skip />
+    <!-- no translation found for message_view_invite_text (1212799906603873708) -->
+    <skip />
+    <!-- no translation found for message_view_invite_accept (744546668021679819) -->
+    <skip />
+    <!-- no translation found for message_view_invite_maybe (7555189462441562318) -->
+    <skip />
+    <!-- no translation found for message_view_invite_decline (6119797303297149463) -->
+    <skip />
+    <!-- no translation found for message_view_invite_toast_yes (1900593767157209498) -->
+    <skip />
+    <!-- no translation found for message_view_invite_toast_maybe (8324044318669610540) -->
+    <skip />
+    <!-- no translation found for message_view_invite_toast_no (7511491076936887064) -->
+    <skip />
+    <!-- no translation found for message_deleted_toast:one (710742672464447084) -->
+    <!-- no translation found for message_deleted_toast:other (6574961322865652255) -->
     <string name="message_discarded_toast" msgid="3891461729325584026">"Mensagem descartada."</string>
     <string name="message_saved_toast" msgid="8443125659172627665">"Mensagem salva como rascunho."</string>
-    <string name="add_contact_dlg_title" msgid="7424641029188006580">"Adicionar contato"</string>
-    <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>
+    <string name="account_setup_basics_exchange_title" msgid="1147638872869594157">"Adicionar uma conta do Exchange"</string>
+    <string name="account_setup_basics_exchange_title_alternate" msgid="4980422714586153809">"Adicionar uma conta do Exchange ActiveSync"</string>
     <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="accounts_welcome_exchange_alternate" msgid="1324339567986452000">"Você pode configurar uma conta do Exchange ActiveSync em apenas algumas etapas."</string>
     <string name="account_setup_basics_email_hint" msgid="7414269319207261120">"Endereço de e-mail"</string>
     <string name="account_setup_basics_password_hint" msgid="410210049040536870">"Senha"</string>
     <string name="account_setup_basics_default_label" msgid="5924790142029806711">"Enviar e-mail desta conta por padrão."</string>
@@ -165,13 +177,9 @@
     <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>
-    <!-- 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_title" msgid="2492853474738063453">"Configurações do servidor\n"</string>
+    <string name="account_setup_exchange_server_label" msgid="795137797983360826">"Servidor\n"</string>
     <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>
     <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>
@@ -186,6 +194,7 @@
     <string name="account_setup_options_default_label" msgid="8869166381331276697">"Enviar e-mail desta conta por padrão."</string>
     <string name="account_setup_options_notify_label" msgid="1247525794828820038">"Receber notificação quando chegar um e-mail"</string>
     <string name="account_setup_options_sync_contacts_label" msgid="7467467090023434271">"Sincronizar contatos desta conta."</string>
+    <string name="account_setup_options_sync_calendar_label" msgid="3195979658426293931">"Sincronizar agenda desta conta."</string>
     <string name="account_setup_failed_dlg_title" msgid="7827583313117521383">"A configuração não pode ser finalizada"</string>
     <string name="account_setup_options_mail_window_label" msgid="8764417340954006086">"Valor a ser sincronizado"</string>
     <string name="account_setup_options_mail_window_1day" msgid="3965715241135811407">"Um dia"</string>
@@ -193,7 +202,6 @@
     <string name="account_setup_options_mail_window_1week" msgid="5639718031108023741">"Uma semana"</string>
     <string name="account_setup_options_mail_window_2weeks" msgid="4567049268124213035">"Duas semanas"</string>
     <string name="account_setup_options_mail_window_1month" msgid="5846359669750047081">"Um mês"</string>
-    <string name="account_setup_options_mail_window_all" msgid="5383858972681926166">"Todos os e-mails"</string>
     <string name="account_setup_failed_dlg_auth_message" msgid="42827150104879570">"Nome de usuário ou senha incorretos."</string>
     <string name="account_setup_failed_dlg_auth_message_fmt" msgid="8598560266430207606">"Nome de usuário ou senha incorretos. "\n"(<xliff:g id="ERROR">%s</xliff:g>)"</string>
     <string name="account_setup_failed_dlg_certificate_message" msgid="961843413600482906">"Não é possível se conectar ao servidor com segurança."</string>
@@ -204,7 +212,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_security_required_title" msgid="1850321535870447468">"Administração de segurança remota"</string>
+    <string name="account_setup_security_policies_required_fmt" msgid="8146309611870795951">"O servidor <xliff:g id="SERVER">%s</xliff:g> requer a permissão de controle remoto de alguns recursos de segurança do seu telefone. Deseja concluir a configuração desta conta?"</string>
+    <string name="account_setup_failed_security_policies_unsupported" msgid="4093832822988053758">"Este servidor precisa de recursos de segurança que não são compatíveis com o seu telefone."</string>
+    <string name="security_notification_ticker_fmt" msgid="1108023476125276507">"A conta \"<xliff:g id="ACCOUNT">%s</xliff:g>\" requer a atualização das configurações de segurança."</string>
+    <string name="security_notification_content_title" msgid="8096231937552848281">"Atualizar as configurações de segurança"</string>
+    <string name="account_security_title" msgid="4441470647344315196">"Segurança do aparelho"</string>
+    <string name="account_security_policy_explanation_fmt" msgid="5153981166755002718">"O servidor <xliff:g id="SERVER">%s</xliff:g> requer a permissão de controle remoto de alguns recursos de segurança do 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>
@@ -215,22 +229,40 @@
     <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>
     <string name="account_settings_outgoing_label" msgid="4464829249980026745">"Configurações saída"</string>
-    <string name="account_settings_add_account_label" msgid="63971622405360050">"Adicionar outra conta"</string>
     <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_signature_label" msgid="4091969938785803201">"Assinatura"</string>
+    <string name="account_settings_signature_hint" msgid="7262183168962779403">"Acrescentar texto às mensagens que você envia"</string>
     <string name="account_settings_notifications" msgid="1042620094281375043">"Configurações de notificação"</string>
     <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_sync_calendar_enable" msgid="6855333393468628003">"Sincronizar agenda"</string>
+    <string name="account_settings_sync_calendar_summary" msgid="2456010694443333450">"Também sincronizar a agenda 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>
     <string name="account_settings_servers" msgid="4925493817981624242">"Configurações do servidor"</string>
     <string name="account_delete_dlg_title" msgid="6806087520856396608">"Remover conta"</string>
     <string name="account_delete_dlg_instructions_fmt" msgid="8236846322040271280">"A conta \"<xliff:g id="ACCOUNT">%s</xliff:g>\" será removida deste e-mail."</string>
+    <string name="upgrade_accounts_title" msgid="5444140226380754014">"Atualizar contas"</string>
+    <string name="upgrade_accounts_error" msgid="7241661832029255715">"Não é possível atualizar a conta."</string>
     <string name="provider_note_yahoo" msgid="8762024183024261236">"Alguns tipos de contas de e-mail do Yahoo! não suportam o acesso à caixa de e-mail. Se você tiver problemas ao conectar, visite yahoo.com para obter mais informações."</string>
     <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>
     <string name="exchange_name" msgid="1190783774800310346">"Corporativa"</string>
+    <string name="exchange_name_alternate" msgid="5772529644749041052">"Microsoft Exchange ActiveSync"</string>
+    <!-- no translation found for meeting_invitation (352782347335101484) -->
+    <skip />
+    <!-- no translation found for meeting_accepted (8796609373330400268) -->
+    <skip />
+    <!-- no translation found for meeting_declined (6707617183246608552) -->
+    <skip />
+    <!-- no translation found for meeting_tentative (8250995722130443785) -->
+    <skip />
     <string name="system_account_create_failed" msgid="4917162302393971752">"O AccountManager não conseguiu criar a Conta. Tente novamente."</string>
+    <string name="device_admin_label" msgid="8680224994637869414">"E-mail"</string>
+    <string name="device_admin_description" msgid="426727923791430306">"Ativa as políticas de segurança especificadas pelo servidor"</string>
+    <!-- no translation found for notification_exchange_calendar_added (6823659622379350159) -->
+    <skip />
 </resources>
diff --git a/res/values-ru/strings.xml b/res/values-ru/strings.xml
index f82616d..3ecf00d 100644
--- a/res/values-ru/strings.xml
+++ b/res/values-ru/strings.xml
@@ -20,7 +20,6 @@
     <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>
     <string name="debug_title" msgid="5175710493691536719">"Отладка"</string>
     <string name="next_action" msgid="3931301986364184415">"Далее"</string>
@@ -56,12 +55,9 @@
     <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>
-    <string name="accounts_context_menu_title" msgid="1053701760934475027">"Параметры аккаунта"</string>
     <string name="status_loading_more" msgid="1580386959044617884">"Загрузка сообщений..."</string>
     <string name="status_sending_messages" msgid="3971880826111264523">"Отправка сообщений..."</string>
     <string name="status_network_error" msgid="6045933332005067021">"Ошибка соединения"</string>
-    <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>
     <string name="error_loading_message_body" msgid="2265140604109272914">"Непредвиденная ошибка при загрузке текста сообщения. Возможно, объем сообщения слишком велик."</string>
   <plurals name="notification_new_one_account_fmt">
@@ -82,14 +78,12 @@
     <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>
     <string name="account_folder_list_summary_inbox" msgid="5790553737870057607">"Все входящие"</string>
-    <string name="account_folder_list_summary_unread" msgid="1200755158196002928">"Непрочитанные"</string>
     <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>
     <string name="message_list_load_more_messages_action" msgid="7428302707908825692">"Загрузить еще сообщения"</string>
     <string name="message_list_send_pending_messages_action" msgid="9100624762133992435">"Отправить исходящие сообщения"</string>
-    <string name="message_list_title" msgid="6927798150197177235">"<xliff:g id="ACCOUNT">%s</xliff:g>: <xliff:g id="MAILBOX">%s</xliff:g>"</string>
     <string name="message_compose_to_hint" msgid="2891895306418177013">"Кому"</string>
     <string name="message_compose_cc_hint" msgid="8481884461031434144">"Копия"</string>
     <string name="message_compose_bcc_hint" msgid="9177337492358841680">"Скрытая копия"</string>
@@ -113,17 +107,35 @@
     <string name="message_view_show_pictures_action" msgid="5059936981743072545">"Показать картинки"</string>
     <string name="message_view_fetching_attachment_toast" msgid="8812363375155391184">"Получение приложения."</string>
     <string name="message_view_fetching_attachment_progress" msgid="8238550182655758164">"Получение приложения <xliff:g id="FILENAME">%s</xliff:g>"</string>
-    <string name="message_deleted_toast" msgid="1554845060991758649">"Сообщение удалено."</string>
+    <!-- no translation found for message_view_invite_view (6256018854688891069) -->
+    <skip />
+    <!-- no translation found for message_view_invite_title (5024473745902772299) -->
+    <skip />
+    <!-- no translation found for message_view_invite_text (1212799906603873708) -->
+    <skip />
+    <!-- no translation found for message_view_invite_accept (744546668021679819) -->
+    <skip />
+    <!-- no translation found for message_view_invite_maybe (7555189462441562318) -->
+    <skip />
+    <!-- no translation found for message_view_invite_decline (6119797303297149463) -->
+    <skip />
+    <!-- no translation found for message_view_invite_toast_yes (1900593767157209498) -->
+    <skip />
+    <!-- no translation found for message_view_invite_toast_maybe (8324044318669610540) -->
+    <skip />
+    <!-- no translation found for message_view_invite_toast_no (7511491076936887064) -->
+    <skip />
+    <!-- no translation found for message_deleted_toast:one (710742672464447084) -->
+    <!-- no translation found for message_deleted_toast:other (6574961322865652255) -->
     <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="message_view_display_attachment_toast" msgid="6096315816776330821">"Это приложение нельзя просмотреть."</string>
     <string name="account_setup_basics_title" msgid="3969856368228940980">"Настройка электронной почты"</string>
+    <string name="account_setup_basics_exchange_title" msgid="1147638872869594157">"Добавить аккаунт Exchange"</string>
+    <string name="account_setup_basics_exchange_title_alternate" msgid="4980422714586153809">"Добавить аккаунт Exchange ActiveSync"</string>
     <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="accounts_welcome_exchange_alternate" msgid="1324339567986452000">"Настроить аккаунт Exchange ActiveSync очень просто."</string>
     <string name="account_setup_basics_email_hint" msgid="7414269319207261120">"Адрес электронной почты"</string>
     <string name="account_setup_basics_password_hint" msgid="410210049040536870">"Пароль"</string>
     <string name="account_setup_basics_default_label" msgid="5924790142029806711">"По умолчанию отправлять почту с этого аккаунта"</string>
@@ -165,13 +177,9 @@
     <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>
-    <!-- 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_title" msgid="2492853474738063453">"Настройки сервера\n"</string>
+    <string name="account_setup_exchange_server_label" msgid="795137797983360826">"Сервер"</string>
     <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>
     <string name="account_setup_exchange_trust_certificates_label" msgid="6232880757633882678">"Принимать все сертификаты SSL"</string>
     <string name="account_setup_options_title" msgid="8995162193118880993">"Параметры аккаунта"</string>
@@ -186,6 +194,7 @@
     <string name="account_setup_options_default_label" msgid="8869166381331276697">"По умолчанию отправлять почту с этого аккаунта"</string>
     <string name="account_setup_options_notify_label" msgid="1247525794828820038">"Уведомлять при получении сообщения по электронной почте."</string>
     <string name="account_setup_options_sync_contacts_label" msgid="7467467090023434271">"Синхронизировать контакты из этого аккаунта."</string>
+    <string name="account_setup_options_sync_calendar_label" msgid="3195979658426293931">"Синхронизировать календарь из этого аккаунта."</string>
     <string name="account_setup_failed_dlg_title" msgid="7827583313117521383">"Не удается завершить настройку"</string>
     <string name="account_setup_options_mail_window_label" msgid="8764417340954006086">"Количество сообщений для синхронизации"</string>
     <string name="account_setup_options_mail_window_1day" msgid="3965715241135811407">"Один день"</string>
@@ -193,7 +202,6 @@
     <string name="account_setup_options_mail_window_1week" msgid="5639718031108023741">"Одна неделя"</string>
     <string name="account_setup_options_mail_window_2weeks" msgid="4567049268124213035">"Две недели"</string>
     <string name="account_setup_options_mail_window_1month" msgid="5846359669750047081">"Один месяц"</string>
-    <string name="account_setup_options_mail_window_all" msgid="5383858972681926166">"Вся почта"</string>
     <string name="account_setup_failed_dlg_auth_message" msgid="42827150104879570">"Неверное имя пользователя или пароль."</string>
     <string name="account_setup_failed_dlg_auth_message_fmt" msgid="8598560266430207606">"Неверное имя пользователя или пароль."\n"<xliff:g id="ERROR">%s</xliff:g>"</string>
     <string name="account_setup_failed_dlg_certificate_message" msgid="961843413600482906">"Не удается установить защищенное подключение к серверу."</string>
@@ -204,7 +212,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_security_required_title" msgid="1850321535870447468">"Удаленное управление безопасностью"</string>
+    <string name="account_setup_security_policies_required_fmt" msgid="8146309611870795951">"Серверу <xliff:g id="SERVER">%s</xliff:g> требуется разрешение на удаленное управление некоторыми функциями безопасности телефона. Завершить настройку этого аккаунта?"</string>
+    <string name="account_setup_failed_security_policies_unsupported" msgid="4093832822988053758">"Безопасность этого сервера обеспечивается с помощью средств, не поддерживаемых вашим телефоном."</string>
+    <string name="security_notification_ticker_fmt" msgid="1108023476125276507">"Аккаунт \"<xliff:g id="ACCOUNT">%s</xliff:g>\" требует обновления настроек безопасности."</string>
+    <string name="security_notification_content_title" msgid="8096231937552848281">"Обновление настроек безопасности"</string>
+    <string name="account_security_title" msgid="4441470647344315196">"Безопасность устройства"</string>
+    <string name="account_security_policy_explanation_fmt" msgid="5153981166755002718">"Серверу <xliff:g id="SERVER">%s</xliff:g> требуется разрешение на удаленное управление некоторыми функциями безопасности телефона."</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>
@@ -215,22 +229,40 @@
     <string name="account_settings_mail_check_frequency_label" msgid="2067835530563849675">"Частота проверки почты"</string>
     <string name="account_settings_incoming_label" msgid="7858928031806297542">"Настройки входящих сообщений"</string>
     <string name="account_settings_outgoing_label" msgid="4464829249980026745">"Настройки исходящих сообщений"</string>
-    <string name="account_settings_add_account_label" msgid="63971622405360050">"Добавить другой аккаунт"</string>
     <string name="account_settings_description_label" msgid="8894815221204511715">"Название аккаунта"</string>
     <string name="account_settings_name_label" msgid="8186406122590008449">"Ваше имя"</string>
+    <string name="account_settings_signature_label" msgid="4091969938785803201">"Подпись"</string>
+    <string name="account_settings_signature_hint" msgid="7262183168962779403">"Добавлять текст к отправляемым сообщениям"</string>
     <string name="account_settings_notifications" msgid="1042620094281375043">"Настройки уведомлений"</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_sync_calendar_enable" msgid="6855333393468628003">"Синхронизировать календарь"</string>
+    <string name="account_settings_sync_calendar_summary" msgid="2456010694443333450">"Также синхронизировать календарь из этого аккаунта"</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>
     <string name="account_delete_dlg_instructions_fmt" msgid="8236846322040271280">"Аккаунт \"<xliff:g id="ACCOUNT">%s</xliff:g>\" будет удален из Email."</string>
+    <string name="upgrade_accounts_title" msgid="5444140226380754014">"Обновить аккаунты"</string>
+    <string name="upgrade_accounts_error" msgid="7241661832029255715">"Не удается обновить аккаунт"</string>
     <string name="provider_note_yahoo" msgid="8762024183024261236">"Не все типы аккаунтов Yahoo! поддерживают доступ к почте. При возникновении проблем с подключением см. дополнительную информацию на yahoo.com."</string>
     <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>
     <string name="exchange_name" msgid="1190783774800310346">"Корпоративный"</string>
+    <string name="exchange_name_alternate" msgid="5772529644749041052">"Microsoft Exchange ActiveSync"</string>
+    <!-- no translation found for meeting_invitation (352782347335101484) -->
+    <skip />
+    <!-- no translation found for meeting_accepted (8796609373330400268) -->
+    <skip />
+    <!-- no translation found for meeting_declined (6707617183246608552) -->
+    <skip />
+    <!-- no translation found for meeting_tentative (8250995722130443785) -->
+    <skip />
     <string name="system_account_create_failed" msgid="4917162302393971752">"Менеджер аккаунта не может создать аккаунт, повторите попытку позже."</string>
+    <string name="device_admin_label" msgid="8680224994637869414">"Электронная почта"</string>
+    <string name="device_admin_description" msgid="426727923791430306">"Включение серверных политик безопасности"</string>
+    <!-- no translation found for notification_exchange_calendar_added (6823659622379350159) -->
+    <skip />
 </resources>
diff --git a/res/values-sv/strings.xml b/res/values-sv/strings.xml
index 346bede..56e2531 100644
--- a/res/values-sv/strings.xml
+++ b/res/values-sv/strings.xml
@@ -20,7 +20,6 @@
     <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>
     <string name="debug_title" msgid="5175710493691536719">"Felsökning"</string>
     <string name="next_action" msgid="3931301986364184415">"Nästa"</string>
@@ -56,12 +55,9 @@
     <string name="add_attachment_action" msgid="2696013743130573897">"Lägg till bilaga"</string>
     <string name="dump_settings_action" msgid="4478192525236169829">"Inställningar för dumpar"</string>
     <string name="choose_attachment_dialog_title" msgid="81937507117528954">"Välj bilaga"</string>
-    <string name="accounts_context_menu_title" msgid="1053701760934475027">"Kontoalternativ"</string>
     <string name="status_loading_more" msgid="1580386959044617884">"Läser in meddelanden…"</string>
     <string name="status_sending_messages" msgid="3971880826111264523">"Skickar meddelanden..."</string>
     <string name="status_network_error" msgid="6045933332005067021">"Anslutningsfel"</string>
-    <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>
     <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">
@@ -82,14 +78,12 @@
     <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>
     <string name="account_folder_list_summary_inbox" msgid="5790553737870057607">"Kombinerad Inkorg"</string>
-    <string name="account_folder_list_summary_unread" msgid="1200755158196002928">"Olästa"</string>
     <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>
     <string name="message_list_load_more_messages_action" msgid="7428302707908825692">"Hämta fler meddelanden"</string>
     <string name="message_list_send_pending_messages_action" msgid="9100624762133992435">"Skicka utgående meddelanden"</string>
-    <string name="message_list_title" msgid="6927798150197177235">"<xliff:g id="ACCOUNT">%s</xliff:g>: <xliff:g id="MAILBOX">%s</xliff:g>"</string>
     <string name="message_compose_to_hint" msgid="2891895306418177013">"Till"</string>
     <string name="message_compose_cc_hint" msgid="8481884461031434144">"Kopia"</string>
     <string name="message_compose_bcc_hint" msgid="9177337492358841680">"Hemlig kopia"</string>
@@ -113,17 +107,35 @@
     <string name="message_view_show_pictures_action" msgid="5059936981743072545">"Visa bilder"</string>
     <string name="message_view_fetching_attachment_toast" msgid="8812363375155391184">"Hämtar bilaga."</string>
     <string name="message_view_fetching_attachment_progress" msgid="8238550182655758164">"Hämtar bilaga <xliff:g id="FILENAME">%s</xliff:g>"</string>
-    <string name="message_deleted_toast" msgid="1554845060991758649">"Meddelandet tas bort."</string>
+    <!-- no translation found for message_view_invite_view (6256018854688891069) -->
+    <skip />
+    <!-- no translation found for message_view_invite_title (5024473745902772299) -->
+    <skip />
+    <!-- no translation found for message_view_invite_text (1212799906603873708) -->
+    <skip />
+    <!-- no translation found for message_view_invite_accept (744546668021679819) -->
+    <skip />
+    <!-- no translation found for message_view_invite_maybe (7555189462441562318) -->
+    <skip />
+    <!-- no translation found for message_view_invite_decline (6119797303297149463) -->
+    <skip />
+    <!-- no translation found for message_view_invite_toast_yes (1900593767157209498) -->
+    <skip />
+    <!-- no translation found for message_view_invite_toast_maybe (8324044318669610540) -->
+    <skip />
+    <!-- no translation found for message_view_invite_toast_no (7511491076936887064) -->
+    <skip />
+    <!-- no translation found for message_deleted_toast:one (710742672464447084) -->
+    <!-- no translation found for message_deleted_toast:other (6574961322865652255) -->
     <string name="message_discarded_toast" msgid="3891461729325584026">"Meddelandet slängs."</string>
     <string name="message_saved_toast" msgid="8443125659172627665">"Meddelandet sparas som utkast."</string>
-    <string name="add_contact_dlg_title" msgid="7424641029188006580">"Lägg till kontakt"</string>
-    <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>
+    <string name="account_setup_basics_exchange_title" msgid="1147638872869594157">"Lägg till ett Exchange-konto"</string>
+    <string name="account_setup_basics_exchange_title_alternate" msgid="4980422714586153809">"Lägg till ett Exchange ActiveSync-konto"</string>
     <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="accounts_welcome_exchange_alternate" msgid="1324339567986452000">"Du kan konfigurera ett Exchange ActiveSync-konto med några få steg."</string>
     <string name="account_setup_basics_email_hint" msgid="7414269319207261120">"E-postadress"</string>
     <string name="account_setup_basics_password_hint" msgid="410210049040536870">"Lösenord"</string>
     <string name="account_setup_basics_default_label" msgid="5924790142029806711">"Skicka e-post från det här kontot som standard"</string>
@@ -165,13 +177,9 @@
     <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>
-    <!-- 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_title" msgid="2492853474738063453">"Serverinställningar\n"</string>
+    <string name="account_setup_exchange_server_label" msgid="795137797983360826">"Server"</string>
     <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>
     <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>
@@ -186,6 +194,7 @@
     <string name="account_setup_options_default_label" msgid="8869166381331276697">"Skicka e-post från det här kontot som standard"</string>
     <string name="account_setup_options_notify_label" msgid="1247525794828820038">"Meddela mig när jag får e-post"</string>
     <string name="account_setup_options_sync_contacts_label" msgid="7467467090023434271">"Synkronisera kontakter från det här kontot."</string>
+    <string name="account_setup_options_sync_calendar_label" msgid="3195979658426293931">"Synkronisera kalendrar från det här kontot."</string>
     <string name="account_setup_failed_dlg_title" msgid="7827583313117521383">"Det gick inte att slutföra installationen"</string>
     <string name="account_setup_options_mail_window_label" msgid="8764417340954006086">"Antal att synkronisera"</string>
     <string name="account_setup_options_mail_window_1day" msgid="3965715241135811407">"En dag"</string>
@@ -193,7 +202,6 @@
     <string name="account_setup_options_mail_window_1week" msgid="5639718031108023741">"En vecka"</string>
     <string name="account_setup_options_mail_window_2weeks" msgid="4567049268124213035">"Två veckor"</string>
     <string name="account_setup_options_mail_window_1month" msgid="5846359669750047081">"En månad"</string>
-    <string name="account_setup_options_mail_window_all" msgid="5383858972681926166">"All e-post"</string>
     <string name="account_setup_failed_dlg_auth_message" msgid="42827150104879570">"Fel användarnamn eller lösenord."</string>
     <string name="account_setup_failed_dlg_auth_message_fmt" msgid="8598560266430207606">"Fel användarnamn eller lösenord."\n"(<xliff:g id="ERROR">%s</xliff:g>)"</string>
     <string name="account_setup_failed_dlg_certificate_message" msgid="961843413600482906">"Det går inte att upprätta en säker anslutning till servern."</string>
@@ -204,7 +212,13 @@
     <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_security_required_title" msgid="1850321535870447468">"Fjärradministrera säkerhet"</string>
+    <string name="account_setup_security_policies_required_fmt" msgid="8146309611870795951">"Servern <xliff:g id="SERVER">%s</xliff:g> måste kunna fjärrkontrollera vissa säkerhetsfunktioner i telefonen. Vill du slutföra registreringen av kontot?"</string>
+    <string name="account_setup_failed_security_policies_unsupported" msgid="4093832822988053758">"Den här servern kräver säkerhetsfunktioner som din telefon inte stöder."</string>
+    <string name="security_notification_ticker_fmt" msgid="1108023476125276507">"Kontot \"<xliff:g id="ACCOUNT">%s</xliff:g>\" kräver att säkerhetsinställningarna uppdateras."</string>
+    <string name="security_notification_content_title" msgid="8096231937552848281">"Uppdatera säkerhetsinställningar"</string>
+    <string name="account_security_title" msgid="4441470647344315196">"Säkerhet för enhet"</string>
+    <string name="account_security_policy_explanation_fmt" msgid="5153981166755002718">"Servern <xliff:g id="SERVER">%s</xliff:g> måste kunna fjärrkontrollera vissa säkerhetsfunktioner i telefonen."</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>
@@ -215,22 +229,40 @@
     <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ä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_signature_label" msgid="4091969938785803201">"Signatur"</string>
+    <string name="account_settings_signature_hint" msgid="7262183168962779403">"Lägg till text i meddelanden som du skickar"</string>
     <string name="account_settings_notifications" msgid="1042620094281375043">"Aviseringsinställningar"</string>
     <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_sync_calendar_enable" msgid="6855333393468628003">"Synkronisera kalender"</string>
+    <string name="account_settings_sync_calendar_summary" msgid="2456010694443333450">"Synkronisera även kalendrar 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>
     <string name="account_settings_servers" msgid="4925493817981624242">"Serverinställningar"</string>
     <string name="account_delete_dlg_title" msgid="6806087520856396608">"Ta bort konto"</string>
     <string name="account_delete_dlg_instructions_fmt" msgid="8236846322040271280">"Kontot <xliff:g id="ACCOUNT">%s</xliff:g> tas bort från E-post."</string>
+    <string name="upgrade_accounts_title" msgid="5444140226380754014">"Uppgradera konton"</string>
+    <string name="upgrade_accounts_error" msgid="7241661832029255715">"Det går inte att uppgradera kontot"</string>
     <string name="provider_note_yahoo" msgid="8762024183024261236">"Vi stöder inte åtkomst till postlådan för visa typer av Yahoo!-konton. Om du har problem att ansluta besöker du yahoo.com. Där hittar du mer information."</string>
     <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>
     <string name="exchange_name" msgid="1190783774800310346">"Företag"</string>
+    <string name="exchange_name_alternate" msgid="5772529644749041052">"Microsoft Exchange ActiveSync"</string>
+    <!-- no translation found for meeting_invitation (352782347335101484) -->
+    <skip />
+    <!-- no translation found for meeting_accepted (8796609373330400268) -->
+    <skip />
+    <!-- no translation found for meeting_declined (6707617183246608552) -->
+    <skip />
+    <!-- no translation found for meeting_tentative (8250995722130443785) -->
+    <skip />
     <string name="system_account_create_failed" msgid="4917162302393971752">"Det gick inte att skapa kontot. Försök igen."</string>
+    <string name="device_admin_label" msgid="8680224994637869414">"E-post"</string>
+    <string name="device_admin_description" msgid="426727923791430306">"Aktiverar serverangivna säkerhetsprinciper"</string>
+    <!-- no translation found for notification_exchange_calendar_added (6823659622379350159) -->
+    <skip />
 </resources>
diff --git a/res/values-tr/strings.xml b/res/values-tr/strings.xml
index ba9ac21..0b08349 100644
--- a/res/values-tr/strings.xml
+++ b/res/values-tr/strings.xml
@@ -20,7 +20,6 @@
     <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>
     <string name="debug_title" msgid="5175710493691536719">"Hata Ayıklama"</string>
     <string name="next_action" msgid="3931301986364184415">"İleri"</string>
@@ -56,12 +55,9 @@
     <string name="add_attachment_action" msgid="2696013743130573897">"Ek ekle"</string>
     <string name="dump_settings_action" msgid="4478192525236169829">"Döküm ayarları"</string>
     <string name="choose_attachment_dialog_title" msgid="81937507117528954">"Eki seç"</string>
-    <string name="accounts_context_menu_title" msgid="1053701760934475027">"Hesap seçenekleri"</string>
     <string name="status_loading_more" msgid="1580386959044617884">"İletiler yükleniyor..."</string>
     <string name="status_sending_messages" msgid="3971880826111264523">"İletiler gönderiliyor..."</string>
     <string name="status_network_error" msgid="6045933332005067021">"Bağlantı hatası"</string>
-    <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>
     <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">
@@ -82,14 +78,12 @@
     <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>
     <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>
     <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>
     <string name="message_list_load_more_messages_action" msgid="7428302707908825692">"Daha fazla ileti yükle"</string>
     <string name="message_list_send_pending_messages_action" msgid="9100624762133992435">"Giden iletileri gönder"</string>
-    <string name="message_list_title" msgid="6927798150197177235">"<xliff:g id="ACCOUNT">%s</xliff:g>: <xliff:g id="MAILBOX">%s</xliff:g>"</string>
     <string name="message_compose_to_hint" msgid="2891895306418177013">"Hedef:"</string>
     <string name="message_compose_cc_hint" msgid="8481884461031434144">"Cc"</string>
     <string name="message_compose_bcc_hint" msgid="9177337492358841680">"Bcc"</string>
@@ -113,17 +107,35 @@
     <string name="message_view_show_pictures_action" msgid="5059936981743072545">"Resimleri göster"</string>
     <string name="message_view_fetching_attachment_toast" msgid="8812363375155391184">"Ek alınıyor."</string>
     <string name="message_view_fetching_attachment_progress" msgid="8238550182655758164">"Ek getiriliyor: <xliff:g id="FILENAME">%s</xliff:g>"</string>
-    <string name="message_deleted_toast" msgid="1554845060991758649">"İleti silindi."</string>
+    <!-- no translation found for message_view_invite_view (6256018854688891069) -->
+    <skip />
+    <!-- no translation found for message_view_invite_title (5024473745902772299) -->
+    <skip />
+    <!-- no translation found for message_view_invite_text (1212799906603873708) -->
+    <skip />
+    <!-- no translation found for message_view_invite_accept (744546668021679819) -->
+    <skip />
+    <!-- no translation found for message_view_invite_maybe (7555189462441562318) -->
+    <skip />
+    <!-- no translation found for message_view_invite_decline (6119797303297149463) -->
+    <skip />
+    <!-- no translation found for message_view_invite_toast_yes (1900593767157209498) -->
+    <skip />
+    <!-- no translation found for message_view_invite_toast_maybe (8324044318669610540) -->
+    <skip />
+    <!-- no translation found for message_view_invite_toast_no (7511491076936887064) -->
+    <skip />
+    <!-- no translation found for message_deleted_toast:one (710742672464447084) -->
+    <!-- no translation found for message_deleted_toast:other (6574961322865652255) -->
     <string name="message_discarded_toast" msgid="3891461729325584026">"İleti silindi."</string>
     <string name="message_saved_toast" msgid="8443125659172627665">"İleti taslak olarak kaydedildi."</string>
-    <string name="add_contact_dlg_title" msgid="7424641029188006580">"Kişi Ekle"</string>
-    <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>
+    <string name="account_setup_basics_exchange_title" msgid="1147638872869594157">"Bir Exchange hesabı ekleyin"</string>
+    <string name="account_setup_basics_exchange_title_alternate" msgid="4980422714586153809">"Bir Exchange ActiveSync hesabı ekleyin"</string>
     <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="accounts_welcome_exchange_alternate" msgid="1324339567986452000">"Exchange ActiveSync hesabını yalnızca birkaç adımda yapılandırabilirsiniz."</string>
     <string name="account_setup_basics_email_hint" msgid="7414269319207261120">"E-posta adresi"</string>
     <string name="account_setup_basics_password_hint" msgid="410210049040536870">"Şifre"</string>
     <string name="account_setup_basics_default_label" msgid="5924790142029806711">"E-postayı varsayılan olarak bu hesaptan gönder."</string>
@@ -165,13 +177,9 @@
     <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>
-    <!-- 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_title" msgid="2492853474738063453">"Sunucu ayarları"</string>
+    <string name="account_setup_exchange_server_label" msgid="795137797983360826">"Sunucu"</string>
     <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>
     <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>
@@ -186,6 +194,7 @@
     <string name="account_setup_options_default_label" msgid="8869166381331276697">"E-postayı varsayılan olarak bu hesaptan gönder."</string>
     <string name="account_setup_options_notify_label" msgid="1247525794828820038">"E-posta geldiğinde bana bildir."</string>
     <string name="account_setup_options_sync_contacts_label" msgid="7467467090023434271">"Bu hesaptaki kişileri senkronize et."</string>
+    <string name="account_setup_options_sync_calendar_label" msgid="3195979658426293931">"Bu hesaptaki takvimi senkronize et"</string>
     <string name="account_setup_failed_dlg_title" msgid="7827583313117521383">"Kurulum tamamlanamadı"</string>
     <string name="account_setup_options_mail_window_label" msgid="8764417340954006086">"Senkronize edilecek miktar"</string>
     <string name="account_setup_options_mail_window_1day" msgid="3965715241135811407">"Bir gün"</string>
@@ -193,7 +202,6 @@
     <string name="account_setup_options_mail_window_1week" msgid="5639718031108023741">"Bir hafta"</string>
     <string name="account_setup_options_mail_window_2weeks" msgid="4567049268124213035">"İki hafta"</string>
     <string name="account_setup_options_mail_window_1month" msgid="5846359669750047081">"Bir ay"</string>
-    <string name="account_setup_options_mail_window_all" msgid="5383858972681926166">"Tüm postalar"</string>
     <string name="account_setup_failed_dlg_auth_message" msgid="42827150104879570">"Kullanıcı adı veya şifre hatalı."</string>
     <string name="account_setup_failed_dlg_auth_message_fmt" msgid="8598560266430207606">"Kullanıcı adı veya şifre hatalı."\n"(<xliff:g id="ERROR">%s</xliff:g>)"</string>
     <string name="account_setup_failed_dlg_certificate_message" msgid="961843413600482906">"Sunucuya güvenli biçimde bağlanılamıyor."</string>
@@ -204,7 +212,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_security_required_title" msgid="1850321535870447468">"Uzaktan güvenlik yönetimi"</string>
+    <string name="account_setup_security_policies_required_fmt" msgid="8146309611870795951">"<xliff:g id="SERVER">%s</xliff:g> sunucusu, telefonunuzun bazı özelliklerini uzaktan kontrol etmesi için izin vermenizi gerektiriyor. Bu hesabı ayarlamayı tamamlamak istiyor musunuz?"</string>
+    <string name="account_setup_failed_security_policies_unsupported" msgid="4093832822988053758">"Bu sunucu, telefonunuzun desteklemediği güvenlik özellikleri gerektiriyor."</string>
+    <string name="security_notification_ticker_fmt" msgid="1108023476125276507">"\"<xliff:g id="ACCOUNT">%s</xliff:g>\" hesabı, güvenlik ayarları güncellemesi gerektiriyor."</string>
+    <string name="security_notification_content_title" msgid="8096231937552848281">"Güvenlik Ayarlarını Güncelle"</string>
+    <string name="account_security_title" msgid="4441470647344315196">"Cihaz Güvenliği"</string>
+    <string name="account_security_policy_explanation_fmt" msgid="5153981166755002718">"<xliff:g id="SERVER">%s</xliff:g> sunucusu, telefonunuzdaki bazı güvenlik özelliklerini uzaktan denetlemesi için izin vermenizi gerektiriyor."</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>
@@ -215,22 +229,40 @@
     <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>
     <string name="account_settings_outgoing_label" msgid="4464829249980026745">"Giden ayarları"</string>
-    <string name="account_settings_add_account_label" msgid="63971622405360050">"Başka hesap ekle"</string>
     <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_signature_label" msgid="4091969938785803201">"İmza"</string>
+    <string name="account_settings_signature_hint" msgid="7262183168962779403">"Gönderdiğiniz iletilere metin ekleyin"</string>
     <string name="account_settings_notifications" msgid="1042620094281375043">"Bildirim ayarları"</string>
     <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_sync_calendar_enable" msgid="6855333393468628003">"Takvimi senkronize et"</string>
+    <string name="account_settings_sync_calendar_summary" msgid="2456010694443333450">"Bu hesaptaki takvimi 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>
     <string name="account_settings_servers" msgid="4925493817981624242">"Sunucu ayarları"</string>
     <string name="account_delete_dlg_title" msgid="6806087520856396608">"Hesabı kaldır"</string>
     <string name="account_delete_dlg_instructions_fmt" msgid="8236846322040271280">"\"<xliff:g id="ACCOUNT">%s</xliff:g>\" hesabı E-postadan kaldırılacak."</string>
+    <string name="upgrade_accounts_title" msgid="5444140226380754014">"Hesapların yeni sürümüne geç"</string>
+    <string name="upgrade_accounts_error" msgid="7241661832029255715">"Hesabın yeni sürümüne geçilemiyor"</string>
     <string name="provider_note_yahoo" msgid="8762024183024261236">"Posta kutusu erişimi bazı Yahoo! posta hesabı türlerinde desteklenmemektedir. Bağlanma sorunu yaşıyorsanız daha fazla bilgi için yahoo.com sitesini ziyaret edin."</string>
     <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>
     <string name="exchange_name" msgid="1190783774800310346">"Kurumsal"</string>
+    <string name="exchange_name_alternate" msgid="5772529644749041052">"Microsoft Exchange ActiveSync"</string>
+    <!-- no translation found for meeting_invitation (352782347335101484) -->
+    <skip />
+    <!-- no translation found for meeting_accepted (8796609373330400268) -->
+    <skip />
+    <!-- no translation found for meeting_declined (6707617183246608552) -->
+    <skip />
+    <!-- no translation found for meeting_tentative (8250995722130443785) -->
+    <skip />
     <string name="system_account_create_failed" msgid="4917162302393971752">"AccountManager Hesabı oluşturamadı, lütfen tekrar deneyin."</string>
+    <string name="device_admin_label" msgid="8680224994637869414">"E-posta"</string>
+    <string name="device_admin_description" msgid="426727923791430306">"Sunucu tarafından belirlenen güvenlik politikalarını etkinleştirir"</string>
+    <!-- no translation found for notification_exchange_calendar_added (6823659622379350159) -->
+    <skip />
 </resources>
diff --git a/res/values-zh-rCN/strings.xml b/res/values-zh-rCN/strings.xml
index 06fc935..fb2a7a7 100644
--- a/res/values-zh-rCN/strings.xml
+++ b/res/values-zh-rCN/strings.xml
@@ -20,7 +20,6 @@
     <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>
     <string name="debug_title" msgid="5175710493691536719">"调试"</string>
     <string name="next_action" msgid="3931301986364184415">"下一步"</string>
@@ -56,12 +55,9 @@
     <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>
-    <string name="accounts_context_menu_title" msgid="1053701760934475027">"帐户选项"</string>
     <string name="status_loading_more" msgid="1580386959044617884">"正在载入邮件..."</string>
     <string name="status_sending_messages" msgid="3971880826111264523">"正在发送邮件..."</string>
     <string name="status_network_error" msgid="6045933332005067021">"连接错误"</string>
-    <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>
     <string name="error_loading_message_body" msgid="2265140604109272914">"载入消息文本时出现意外错误。可能是讯息太大，无法查看。"</string>
   <plurals name="notification_new_one_account_fmt">
@@ -82,14 +78,12 @@
     <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>
     <string name="account_folder_list_summary_inbox" msgid="5790553737870057607">"合并的收件箱"</string>
-    <string name="account_folder_list_summary_unread" msgid="1200755158196002928">"未读邮件"</string>
     <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>
     <string name="message_list_load_more_messages_action" msgid="7428302707908825692">"载入更多邮件"</string>
     <string name="message_list_send_pending_messages_action" msgid="9100624762133992435">"外发邮件"</string>
-    <string name="message_list_title" msgid="6927798150197177235">"<xliff:g id="ACCOUNT">%s</xliff:g>：<xliff:g id="MAILBOX">%s</xliff:g>"</string>
     <string name="message_compose_to_hint" msgid="2891895306418177013">"收件人"</string>
     <string name="message_compose_cc_hint" msgid="8481884461031434144">"抄送"</string>
     <string name="message_compose_bcc_hint" msgid="9177337492358841680">"密送"</string>
@@ -113,17 +107,35 @@
     <string name="message_view_show_pictures_action" msgid="5059936981743072545">"显示图片"</string>
     <string name="message_view_fetching_attachment_toast" msgid="8812363375155391184">"正在提取附件。"</string>
     <string name="message_view_fetching_attachment_progress" msgid="8238550182655758164">"正在获取附件<xliff:g id="FILENAME">%s</xliff:g>"</string>
-    <string name="message_deleted_toast" msgid="1554845060991758649">"邮件已删除。"</string>
+    <!-- no translation found for message_view_invite_view (6256018854688891069) -->
+    <skip />
+    <!-- no translation found for message_view_invite_title (5024473745902772299) -->
+    <skip />
+    <!-- no translation found for message_view_invite_text (1212799906603873708) -->
+    <skip />
+    <!-- no translation found for message_view_invite_accept (744546668021679819) -->
+    <skip />
+    <!-- no translation found for message_view_invite_maybe (7555189462441562318) -->
+    <skip />
+    <!-- no translation found for message_view_invite_decline (6119797303297149463) -->
+    <skip />
+    <!-- no translation found for message_view_invite_toast_yes (1900593767157209498) -->
+    <skip />
+    <!-- no translation found for message_view_invite_toast_maybe (8324044318669610540) -->
+    <skip />
+    <!-- no translation found for message_view_invite_toast_no (7511491076936887064) -->
+    <skip />
+    <!-- no translation found for message_deleted_toast:one (710742672464447084) -->
+    <!-- no translation found for message_deleted_toast:other (6574961322865652255) -->
     <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="message_view_display_attachment_toast" msgid="6096315816776330821">"该附件无法显示。"</string>
     <string name="account_setup_basics_title" msgid="3969856368228940980">"设置电子邮件"</string>
+    <string name="account_setup_basics_exchange_title" msgid="1147638872869594157">"添加 Exchange 帐户"</string>
+    <string name="account_setup_basics_exchange_title_alternate" msgid="4980422714586153809">"添加 Exchange ActiveSync 帐户"</string>
     <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="accounts_welcome_exchange_alternate" msgid="1324339567986452000">"您只需执行几个步骤，即可配置 Exchange ActiveSync 帐户。"</string>
     <string name="account_setup_basics_email_hint" msgid="7414269319207261120">"电子邮件地址"</string>
     <string name="account_setup_basics_password_hint" msgid="410210049040536870">"密码"</string>
     <string name="account_setup_basics_default_label" msgid="5924790142029806711">"默认情况下从此帐户发送电子邮件。"</string>
@@ -165,13 +177,9 @@
     <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>
-    <!-- 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_title" msgid="2492853474738063453">"服务器设置"</string>
+    <string name="account_setup_exchange_server_label" msgid="795137797983360826">"服务器"</string>
     <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>
     <string name="account_setup_exchange_trust_certificates_label" msgid="6232880757633882678">"接受所有 SSL 证书"</string>
     <string name="account_setup_options_title" msgid="8995162193118880993">"帐户选项"</string>
@@ -186,6 +194,7 @@
     <string name="account_setup_options_default_label" msgid="8869166381331276697">"默认情况下从此帐户发送电子邮件。"</string>
     <string name="account_setup_options_notify_label" msgid="1247525794828820038">"收到电子邮件时通知我。"</string>
     <string name="account_setup_options_sync_contacts_label" msgid="7467467090023434271">"同步此帐户下的联系人。"</string>
+    <string name="account_setup_options_sync_calendar_label" msgid="3195979658426293931">"同步此帐户下的日历。"</string>
     <string name="account_setup_failed_dlg_title" msgid="7827583313117521383">"无法完成设置"</string>
     <string name="account_setup_options_mail_window_label" msgid="8764417340954006086">"要同步的数量"</string>
     <string name="account_setup_options_mail_window_1day" msgid="3965715241135811407">"一天"</string>
@@ -193,7 +202,6 @@
     <string name="account_setup_options_mail_window_1week" msgid="5639718031108023741">"一周"</string>
     <string name="account_setup_options_mail_window_2weeks" msgid="4567049268124213035">"两周"</string>
     <string name="account_setup_options_mail_window_1month" msgid="5846359669750047081">"一个月"</string>
-    <string name="account_setup_options_mail_window_all" msgid="5383858972681926166">"所有邮件"</string>
     <string name="account_setup_failed_dlg_auth_message" msgid="42827150104879570">"用户名或密码不正确。"</string>
     <string name="account_setup_failed_dlg_auth_message_fmt" msgid="8598560266430207606">"用户名或密码不正确。"\n"(<xliff:g id="ERROR">%s</xliff:g>)"</string>
     <string name="account_setup_failed_dlg_certificate_message" msgid="961843413600482906">"无法安全地连接到服务器。"</string>
@@ -204,7 +212,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_security_required_title" msgid="1850321535870447468">"远程安全管理"</string>
+    <string name="account_setup_security_policies_required_fmt" msgid="8146309611870795951">"<xliff:g id="SERVER">%s</xliff:g> 服务器要求您允许其远程控制手机中的某些安全功能。您希望完成此帐户的设置吗？"</string>
+    <string name="account_setup_failed_security_policies_unsupported" msgid="4093832822988053758">"您的手机不支持此服务器要求使用的安全功能。"</string>
+    <string name="security_notification_ticker_fmt" msgid="1108023476125276507">"帐户“<xliff:g id="ACCOUNT">%s</xliff:g>”要求更新安全设置。"</string>
+    <string name="security_notification_content_title" msgid="8096231937552848281">"更新安全设置"</string>
+    <string name="account_security_title" msgid="4441470647344315196">"设备安全性"</string>
+    <string name="account_security_policy_explanation_fmt" msgid="5153981166755002718">"<xliff:g id="SERVER">%s</xliff:g> 服务器要求您允许其远程控制手机中的某些安全功能。"</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>
@@ -215,22 +229,40 @@
     <string name="account_settings_mail_check_frequency_label" msgid="2067835530563849675">"电子邮件检查频率"</string>
     <string name="account_settings_incoming_label" msgid="7858928031806297542">"接收设置"</string>
     <string name="account_settings_outgoing_label" msgid="4464829249980026745">"外发设置"</string>
-    <string name="account_settings_add_account_label" msgid="63971622405360050">"添加其他帐户"</string>
     <string name="account_settings_description_label" msgid="8894815221204511715">"帐户名称"</string>
     <string name="account_settings_name_label" msgid="8186406122590008449">"您的姓名"</string>
+    <string name="account_settings_signature_label" msgid="4091969938785803201">"签名"</string>
+    <string name="account_settings_signature_hint" msgid="7262183168962779403">"在您发送的邮件中附加文本"</string>
     <string name="account_settings_notifications" msgid="1042620094281375043">"通知设置"</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_sync_calendar_enable" msgid="6855333393468628003">"同步日历"</string>
+    <string name="account_settings_sync_calendar_summary" msgid="2456010694443333450">"也同步此帐户下的日历"</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>
     <string name="account_delete_dlg_instructions_fmt" msgid="8236846322040271280">"将会从电子邮件中删除“<xliff:g id="ACCOUNT">%s</xliff:g>”帐户。"</string>
+    <string name="upgrade_accounts_title" msgid="5444140226380754014">"升级帐户"</string>
+    <string name="upgrade_accounts_error" msgid="7241661832029255715">"无法升级帐户"</string>
     <string name="provider_note_yahoo" msgid="8762024183024261236">"对于某些类型的 Yahoo! 邮件帐户，不支持邮箱访问。如果您遇到连接问题，请访问 yahoo.com 了解详细信息。"</string>
     <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>
     <string name="exchange_name" msgid="1190783774800310346">"公司"</string>
+    <string name="exchange_name_alternate" msgid="5772529644749041052">"Microsoft Exchange ActiveSync"</string>
+    <!-- no translation found for meeting_invitation (352782347335101484) -->
+    <skip />
+    <!-- no translation found for meeting_accepted (8796609373330400268) -->
+    <skip />
+    <!-- no translation found for meeting_declined (6707617183246608552) -->
+    <skip />
+    <!-- no translation found for meeting_tentative (8250995722130443785) -->
+    <skip />
     <string name="system_account_create_failed" msgid="4917162302393971752">"AccountManager 无法创建帐户，请重试。"</string>
+    <string name="device_admin_label" msgid="8680224994637869414">"电子邮件"</string>
+    <string name="device_admin_description" msgid="426727923791430306">"启用指定服务器的安全政策"</string>
+    <!-- no translation found for notification_exchange_calendar_added (6823659622379350159) -->
+    <skip />
 </resources>
diff --git a/res/values-zh-rTW/strings.xml b/res/values-zh-rTW/strings.xml
index 9c85645..3f0770a 100644
--- a/res/values-zh-rTW/strings.xml
+++ b/res/values-zh-rTW/strings.xml
@@ -20,7 +20,6 @@
     <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>
     <string name="debug_title" msgid="5175710493691536719">"偵錯"</string>
     <string name="next_action" msgid="3931301986364184415">"下一步"</string>
@@ -56,12 +55,9 @@
     <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>
-    <string name="accounts_context_menu_title" msgid="1053701760934475027">"帳戶選項"</string>
     <string name="status_loading_more" msgid="1580386959044617884">"正在載入郵件..."</string>
     <string name="status_sending_messages" msgid="3971880826111264523">"正在傳送訊息..."</string>
     <string name="status_network_error" msgid="6045933332005067021">"連線錯誤"</string>
-    <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>
     <string name="error_loading_message_body" msgid="2265140604109272914">"載入郵件文字時發生未預期的錯誤，郵件可能過大以致於無法檢視。"</string>
   <plurals name="notification_new_one_account_fmt">
@@ -82,14 +78,12 @@
     <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>
     <string name="account_folder_list_summary_inbox" msgid="5790553737870057607">"合併的收件匣"</string>
-    <string name="account_folder_list_summary_unread" msgid="1200755158196002928">"未讀取"</string>
     <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>
     <string name="message_list_load_more_messages_action" msgid="7428302707908825692">"載入更多郵件"</string>
     <string name="message_list_send_pending_messages_action" msgid="9100624762133992435">"傳送寄出訊息"</string>
-    <string name="message_list_title" msgid="6927798150197177235">"<xliff:g id="ACCOUNT">%s</xliff:g>：<xliff:g id="MAILBOX">%s</xliff:g>"</string>
     <string name="message_compose_to_hint" msgid="2891895306418177013">"收件者"</string>
     <string name="message_compose_cc_hint" msgid="8481884461031434144">"副本"</string>
     <string name="message_compose_bcc_hint" msgid="9177337492358841680">"密件副本"</string>
@@ -113,16 +107,37 @@
     <string name="message_view_show_pictures_action" msgid="5059936981743072545">"顯示圖片"</string>
     <string name="message_view_fetching_attachment_toast" msgid="8812363375155391184">"正在取得附件。"</string>
     <string name="message_view_fetching_attachment_progress" msgid="8238550182655758164">"正在擷取附件 <xliff:g id="FILENAME">%s</xliff:g>"</string>
-    <string name="message_deleted_toast" msgid="1554845060991758649">"已刪除郵件。"</string>
+    <!-- no translation found for message_view_invite_view (6256018854688891069) -->
+    <skip />
+    <!-- no translation found for message_view_invite_title (5024473745902772299) -->
+    <skip />
+    <!-- no translation found for message_view_invite_text (1212799906603873708) -->
+    <skip />
+    <!-- no translation found for message_view_invite_accept (744546668021679819) -->
+    <skip />
+    <!-- no translation found for message_view_invite_maybe (7555189462441562318) -->
+    <skip />
+    <!-- no translation found for message_view_invite_decline (6119797303297149463) -->
+    <skip />
+    <!-- no translation found for message_view_invite_toast_yes (1900593767157209498) -->
+    <skip />
+    <!-- no translation found for message_view_invite_toast_maybe (8324044318669610540) -->
+    <skip />
+    <!-- no translation found for message_view_invite_toast_no (7511491076936887064) -->
+    <skip />
+    <!-- no translation found for message_deleted_toast:one (710742672464447084) -->
+    <!-- no translation found for message_deleted_toast:other (6574961322865652255) -->
     <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="message_view_display_attachment_toast" msgid="6096315816776330821">"無法顯示此附件。"</string>
     <string name="account_setup_basics_title" msgid="3969856368228940980">"設定電子郵件"</string>
+    <!-- no translation found for account_setup_basics_exchange_title (1147638872869594157) -->
+    <skip />
+    <!-- no translation found for account_setup_basics_exchange_title_alternate (4980422714586153809) -->
+    <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) -->
+    <!-- no translation found for accounts_welcome_exchange_alternate (1324339567986452000) -->
     <skip />
     <string name="account_setup_basics_email_hint" msgid="7414269319207261120">"電子郵件地址"</string>
     <string name="account_setup_basics_password_hint" msgid="410210049040536870">"密碼"</string>
@@ -165,13 +180,9 @@
     <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>
-    <!-- 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_title" msgid="2492853474738063453">"伺服器設定"</string>
+    <string name="account_setup_exchange_server_label" msgid="795137797983360826">"伺服器"</string>
     <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>
     <string name="account_setup_exchange_trust_certificates_label" msgid="6232880757633882678">"接受所有安全資料傳輸層 (SSL) 憑證"</string>
     <string name="account_setup_options_title" msgid="8995162193118880993">"帳戶選項"</string>
@@ -186,6 +197,8 @@
     <string name="account_setup_options_default_label" msgid="8869166381331276697">"設為傳送電子郵件的預設帳戶。"</string>
     <string name="account_setup_options_notify_label" msgid="1247525794828820038">"收到電子郵件時通知我。"</string>
     <string name="account_setup_options_sync_contacts_label" msgid="7467467090023434271">"同步處理此帳戶的聯絡人。"</string>
+    <!-- no translation found for account_setup_options_sync_calendar_label (3195979658426293931) -->
+    <skip />
     <string name="account_setup_failed_dlg_title" msgid="7827583313117521383">"無法完成設定"</string>
     <string name="account_setup_options_mail_window_label" msgid="8764417340954006086">"同步數量"</string>
     <string name="account_setup_options_mail_window_1day" msgid="3965715241135811407">"1 天"</string>
@@ -193,7 +206,6 @@
     <string name="account_setup_options_mail_window_1week" msgid="5639718031108023741">"1 週"</string>
     <string name="account_setup_options_mail_window_2weeks" msgid="4567049268124213035">"2 週"</string>
     <string name="account_setup_options_mail_window_1month" msgid="5846359669750047081">"1 個月"</string>
-    <string name="account_setup_options_mail_window_all" msgid="5383858972681926166">"所有郵件"</string>
     <string name="account_setup_failed_dlg_auth_message" msgid="42827150104879570">"使用者名稱或密碼不正確。"</string>
     <string name="account_setup_failed_dlg_auth_message_fmt" msgid="8598560266430207606">"使用者名稱或密碼不正確。"\n"(<xliff:g id="ERROR">%s</xliff:g>)"</string>
     <string name="account_setup_failed_dlg_certificate_message" msgid="961843413600482906">"無法安全地連線至伺服器。"</string>
@@ -204,7 +216,20 @@
     <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>
+    <!-- no translation found for account_setup_security_required_title (1850321535870447468) -->
+    <skip />
+    <!-- no translation found for account_setup_security_policies_required_fmt (8146309611870795951) -->
+    <skip />
+    <!-- no translation found for account_setup_failed_security_policies_unsupported (4093832822988053758) -->
+    <skip />
+    <!-- no translation found for security_notification_ticker_fmt (1108023476125276507) -->
+    <skip />
+    <!-- no translation found for security_notification_content_title (8096231937552848281) -->
+    <skip />
+    <!-- no translation found for account_security_title (4441470647344315196) -->
+    <skip />
+    <!-- no translation found for account_security_policy_explanation_fmt (5153981166755002718) -->
+    <skip />
     <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>
@@ -215,22 +240,49 @@
     <string name="account_settings_mail_check_frequency_label" msgid="2067835530563849675">"檢查電子郵件的頻率"</string>
     <string name="account_settings_incoming_label" msgid="7858928031806297542">"內收設定"</string>
     <string name="account_settings_outgoing_label" msgid="4464829249980026745">"外寄設定"</string>
-    <string name="account_settings_add_account_label" msgid="63971622405360050">"新增其他帳戶"</string>
     <string name="account_settings_description_label" msgid="8894815221204511715">"帳戶名稱"</string>
     <string name="account_settings_name_label" msgid="8186406122590008449">"您的姓名"</string>
+    <!-- no translation found for account_settings_signature_label (4091969938785803201) -->
+    <skip />
+    <!-- no translation found for account_settings_signature_hint (7262183168962779403) -->
+    <skip />
     <string name="account_settings_notifications" msgid="1042620094281375043">"通知設定"</string>
     <string name="account_settings_sync_contacts_enable" msgid="1369272986009573218">"同步處理聯絡人"</string>
     <string name="account_settings_sync_contacts_summary" msgid="8901452720940015928">"也同步處理此帳戶的聯絡人"</string>
+    <!-- no translation found for account_settings_sync_calendar_enable (6855333393468628003) -->
+    <skip />
+    <!-- no translation found for account_settings_sync_calendar_summary (2456010694443333450) -->
+    <skip />
     <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>
     <string name="account_delete_dlg_instructions_fmt" msgid="8236846322040271280">"系統將從 [電子郵件] 中移除帳戶「<xliff:g id="ACCOUNT">%s</xliff:g>」。"</string>
+    <!-- no translation found for upgrade_accounts_title (5444140226380754014) -->
+    <skip />
+    <!-- no translation found for upgrade_accounts_error (7241661832029255715) -->
+    <skip />
     <string name="provider_note_yahoo" msgid="8762024183024261236">"系統不支援某些類型的 Yahoo! 郵件帳戶信箱。如果您無法順利連線，請前往 yahoo.com 以瞭解詳情。"</string>
     <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>
     <string name="exchange_name" msgid="1190783774800310346">"公司"</string>
+    <!-- no translation found for exchange_name_alternate (5772529644749041052) -->
+    <skip />
+    <!-- no translation found for meeting_invitation (352782347335101484) -->
+    <skip />
+    <!-- no translation found for meeting_accepted (8796609373330400268) -->
+    <skip />
+    <!-- no translation found for meeting_declined (6707617183246608552) -->
+    <skip />
+    <!-- no translation found for meeting_tentative (8250995722130443785) -->
+    <skip />
     <string name="system_account_create_failed" msgid="4917162302393971752">"AccountManager 無法建立帳戶，請再試一次。"</string>
+    <!-- no translation found for device_admin_label (8680224994637869414) -->
+    <skip />
+    <!-- no translation found for device_admin_description (426727923791430306) -->
+    <skip />
+    <!-- no translation found for notification_exchange_calendar_added (6823659622379350159) -->
+    <skip />
 </resources>