am 4713110b: Merge "Import revised translations" into froyo

Merge commit '4713110b02195dbe5cba41d012a0a432f8460c55' into froyo-plus-aosp

* commit '4713110b02195dbe5cba41d012a0a432f8460c55':
  Import revised translations
diff --git a/res/values-cs/strings.xml b/res/values-cs/strings.xml
index 54698ed..f241fa4 100644
--- a/res/values-cs/strings.xml
+++ b/res/values-cs/strings.xml
@@ -21,8 +21,8 @@
     <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="compose_title" msgid="427986915662706899">"Nová"</string>
-    <string name="debug_title" msgid="5175710493691536719">"Ladění"</string>
+    <string name="compose_title" msgid="427986915662706899">"Napsat"</string>
+    <string name="debug_title" msgid="5175710493691536719">"Ladit"</string>
     <string name="next_action" msgid="3931301986364184415">"Další"</string>
     <string name="okay_action" msgid="8365197396795675617">"OK"</string>
     <string name="cancel_action" msgid="6967435583794021865">"Zrušit"</string>
@@ -30,7 +30,7 @@
     <string name="reply_action" msgid="4262472229221507619">"Odpovědět"</string>
     <string name="reply_all_action" msgid="6192179825726332152">"Odpovědět všem"</string>
     <string name="delete_action" msgid="8421026208288857155">"Smazat"</string>
-    <string name="forward_action" msgid="669174181042344116">"Přeposlat"</string>
+    <string name="forward_action" msgid="669174181042344116">"Předat dál"</string>
     <string name="done_action" msgid="7497990549515580249">"Hotovo"</string>
     <string name="discard_action" msgid="6532206074859505968">"Zrušit"</string>
     <string name="save_draft_action" msgid="812855865552028622">"Uložit jako koncept"</string>
@@ -40,10 +40,10 @@
     <string name="favorite_action" msgid="2911296685862420689">"Oblíbené"</string>
     <string name="set_star_action" msgid="4660317166196258160">"Přidat hvězdičku"</string>
     <string name="remove_star_action" msgid="6689770999647007163">"Odebrat hvězdičku"</string>
-    <string name="refresh_action" msgid="5951383001436708175">"Obnovit"</string>
+    <string name="refresh_action" msgid="5951383001436708175">"Aktualizovat"</string>
     <string name="add_account_action" msgid="8835736309476033727">"Přidat účet"</string>
     <string name="deselect_all_action" msgid="253663239459688238">"Zrušit výběr všech"</string>
-    <string name="compose_action" msgid="4045702519637388045">"Nová"</string>
+    <string name="compose_action" msgid="4045702519637388045">"Napsat"</string>
     <string name="search_action" msgid="6325101454876682308">"Hledat"</string>
     <string name="open_action" msgid="936766723989190816">"Otevřít"</string>
     <string name="account_settings_action" msgid="4494079183315085171">"Nastavení účtu"</string>
@@ -53,7 +53,7 @@
     <string name="mark_as_read_action" msgid="5031651846998842419">"Označit jako přečtené"</string>
     <string name="mark_as_unread_action" msgid="3766298115778767554">"Označit jako nepřečtené"</string>
     <string name="add_cc_bcc_action" msgid="5569074812077509737">"Přidat kopii/skrytou"</string>
-    <string name="add_attachment_action" msgid="2696013743130573897">"Připojit přílohu"</string>
+    <string name="add_attachment_action" msgid="2696013743130573897">"Přidat 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="status_loading_more" msgid="1580386959044617884">"Načítání zpráv..."</string>
@@ -62,9 +62,9 @@
     <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">
-    <item quantity="one" msgid="3422945912787702191">"<xliff:g id="UNREAD_MESSAGE_COUNT">%d</xliff:g> nepřečtená zpráva (<xliff:g id="ACCOUNT">%s</xliff:g>)"</item>
-    <item quantity="few" msgid="6543078667692990869">"Nepřečtené zprávy: <xliff:g id="UNREAD_MESSAGE_COUNT">%d</xliff:g> (<xliff:g id="ACCOUNT">%s</xliff:g>)"</item>
-    <item quantity="other" msgid="6937673814351448076">"Nepřečtené zprávy: <xliff:g id="UNREAD_MESSAGE_COUNT">%d</xliff:g> (<xliff:g id="ACCOUNT">%s</xliff:g>)"</item>
+    <item quantity="one" msgid="3422945912787702191">"Nepřečtené zprávy: <xliff:g id="UNREAD_MESSAGE_COUNT">%d</xliff:g>(<xliff:g id="ACCOUNT">%s</xliff:g>)"</item>
+    <item quantity="few" msgid="6543078667692990869">"Nepřečtené zprávy: <xliff:g id="UNREAD_MESSAGE_COUNT">%d</xliff:g>(<xliff:g id="ACCOUNT">%s</xliff:g>)"</item>
+    <item quantity="other" msgid="6937673814351448076">"Nepřečtené zprávy: <xliff:g id="UNREAD_MESSAGE_COUNT">%d</xliff:g>(<xliff:g id="ACCOUNT">%s</xliff:g>)"</item>
   </plurals>
   <plurals name="notification_new_multi_account_fmt">
     <item quantity="few" msgid="1991747245324120305">"v(e) <xliff:g id="NUMBER_ACCOUNTS">%d</xliff:g> účtech"</item>
@@ -85,7 +85,7 @@
     <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_compose_to_hint" msgid="2891895306418177013">"Komu"</string>
+    <string name="message_compose_to_hint" msgid="2891895306418177013">"Do"</string>
     <string name="message_compose_cc_hint" msgid="8481884461031434144">"Kopie"</string>
     <string name="message_compose_bcc_hint" msgid="9177337492358841680">"Skrytá kopie"</string>
     <string name="message_compose_subject_hint" msgid="6993487234024160782">"Předmět"</string>
@@ -144,7 +144,7 @@
     <string name="account_setup_names_title" msgid="8875040521875381849">"Nastavit e-mail"</string>
     <string name="account_setup_names_instructions" msgid="2880279273965835007">"Váš účet je nastaven, e-mail je na cestě!"</string>
     <string name="account_setup_names_account_name_label" msgid="8033895024273259196">"Pojmenovat tento účet (nepovinné)"</string>
-    <string name="account_setup_names_user_name_label" msgid="8967410178488604770">"Vaše jméno (zobrazované v odchozích zprávách)"</string>
+    <string name="account_setup_names_user_name_label" msgid="8967410178488604770">"Vaše jméno (zobrazované na odchozích zprávách)"</string>
     <string name="account_setup_account_type_title" msgid="6645576356752495504">"Přidat nový e-mailový účet"</string>
     <string name="account_setup_account_type_instructions" msgid="114515540798408760">"O jaký typ účtu se jedná?"</string>
     <string name="account_setup_incoming_title" msgid="6862032674547580337">"Nastavení serveru příchozí pošty"</string>
@@ -154,7 +154,7 @@
     <string name="account_setup_incoming_imap_server_label" msgid="8685076830847734322">"Server IMAP"</string>
     <string name="account_setup_incoming_port_label" msgid="8214738923690447796">"Port"</string>
     <string name="account_setup_incoming_security_label" msgid="2110260791086007424">"Typ zabezpečení"</string>
-    <string name="account_setup_incoming_security_none_label" msgid="8300169413118264895">"Žádné"</string>
+    <string name="account_setup_incoming_security_none_label" msgid="8300169413118264895">"Žádný"</string>
     <string name="account_setup_incoming_security_ssl_trust_certificates_label" msgid="3581382268191377346">"SSL (Přijímat všechny certifikáty)"</string>
     <string name="account_setup_incoming_security_ssl_label" msgid="8886698397743061682">"SSL"</string>
     <string name="account_setup_incoming_security_tls_trust_certificates_label" msgid="1089227022489257055">"TLS (Přijímat všechny certifikáty)"</string>
@@ -186,7 +186,7 @@
     <string name="account_setup_options_mail_check_frequency_30min" msgid="1097088928685931864">"Každých 30 minut"</string>
     <string name="account_setup_options_mail_check_frequency_1hour" msgid="3767715356039692899">"Každou hodinu"</string>
     <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_notify_label" msgid="1247525794828820038">"Upozornit mě na příchod e-mailu"</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>
@@ -203,9 +203,9 @@
     <string name="account_setup_failed_dlg_server_message" msgid="1828270369532779265">"Nelze se připojit k serveru."</string>
     <string name="account_setup_failed_dlg_server_message_fmt" msgid="5956976504788732779">"Nelze se připojit k serveru."\n"(<xliff:g id="ERROR">%s</xliff:g>)"</string>
     <string name="account_setup_failed_tls_required" msgid="307030406688611327">"Služba TLS je požadována, ale není podporována na serveru."</string>
-    <string name="account_setup_failed_auth_required" msgid="1676242821459638150">"Server nepodporuje metody ověření."</string>
+    <string name="account_setup_failed_auth_required" msgid="1676242821459638150">"Metody ověřování nejsou na serveru podporovány."</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_ioerror" msgid="7391458717708933095">"Nelze otevřít připojení k serveru."</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>
@@ -217,9 +217,9 @@
     <string name="account_settings_title_fmt" msgid="1702058877284382340">"Obecná nastavení"</string>
     <string name="account_settings_default_label" msgid="3575963379680943640">"Výchozí účet"</string>
     <string name="account_settings_default_summary" msgid="1531901438624688482">"Ve výchozím nastavení odesílat e-maily z tohoto účtu"</string>
-    <string name="account_settings_notify_label" msgid="1630001017303007974">"Upozornění na e-maily"</string>
+    <string name="account_settings_notify_label" msgid="1630001017303007974">"E-mailová upozornění"</string>
     <string name="account_settings_exchange_summary" msgid="8498451479029626317">"Frekvence synchronizace, oznámení apod."</string>
-    <string name="account_settings_notify_summary" msgid="6609224590300639887">"Zobrazit upozornění na příchozí e-mail na stavovém řádku"</string>
+    <string name="account_settings_notify_summary" msgid="6609224590300639887">"Zobrazit upozornění na příchod e-mailu na stavovém řádku"</string>
     <string name="account_settings_mail_check_frequency_label" msgid="2067835530563849675">"Četnost kontrol e-mailů"</string>
     <string name="account_settings_incoming_label" msgid="7858928031806297542">"Nastavení příchozí pošty"</string>
     <string name="account_settings_outgoing_label" msgid="4464829249980026745">"Nastavení odchozí pošty"</string>
@@ -238,8 +238,8 @@
     <string name="account_settings_vibrate_when_silent" msgid="6417076436551648924">"Pouze v tichém režimu"</string>
     <string name="account_settings_vibrate_when_never" msgid="3759680093309511614">"Nikdy"</string>
     <string name="account_settings_vibrate_when_dlg_title" msgid="308167729046312952">"Vibrace"</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_settings_ringtone" msgid="7922187231467500404">"Vybrat vyzváněcí tón"</string>
+    <string name="account_settings_servers" msgid="4925493817981624242">"Nastavení serveru"</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>
diff --git a/res/values-da/strings.xml b/res/values-da/strings.xml
index 33e3e83..d2e0be7 100644
--- a/res/values-da/strings.xml
+++ b/res/values-da/strings.xml
@@ -17,9 +17,9 @@
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="read_attachment_label" msgid="1162255191991555285">"Læs vedhæftede filer i e-mails"</string>
-    <string name="read_attachment_desc" msgid="7594746717616308643">"Tillader, at dette program læser dine e-mail-vedhæftninger."</string>
-    <string name="permission_access_provider_label" msgid="4274353114641168675">"Få adgang til data om e-mail-udbyder"</string>
-    <string name="permission_access_provider_desc" msgid="1513898266889541617">"Giver dette program adgang til din e-mail-database, herunder modtagne og sendte beskeder, brugernavne og adgangskoder."</string>
+    <string name="read_attachment_desc" msgid="7594746717616308643">"Tillader dette program at læse dine E-mail-vedhæftninger."</string>
+    <string name="permission_access_provider_label" msgid="4274353114641168675">"Få adgang til data til e-mail-udbyder"</string>
+    <string name="permission_access_provider_desc" msgid="1513898266889541617">"Giver dette program adgang til din e-mail-database, herunder modtagne beskeder, sendte beskeder, brugernavne og adgangskoder."</string>
     <string name="app_name" msgid="5815426892327290362">"E-mail"</string>
     <string name="compose_title" msgid="427986915662706899">"Skriv"</string>
     <string name="debug_title" msgid="5175710493691536719">"Fejlretning"</string>
@@ -60,14 +60,14 @@
     <string name="status_sending_messages" msgid="3971880826111264523">"Sender beskeder ..."</string>
     <string name="status_network_error" msgid="6045933332005067021">"Forbindelsesfejl"</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>
+    <string name="error_loading_message_body" msgid="2265140604109272914">"Der opstod en uventet fejl under indlæsning af tekst. Beskeden er muligvis for stor til at blive vist."</string>
   <plurals name="notification_new_one_account_fmt">
     <item quantity="one" msgid="3422945912787702191">"<xliff:g id="UNREAD_MESSAGE_COUNT">%d</xliff:g> ulæste (<xliff:g id="ACCOUNT">%s</xliff:g>)"</item>
     <item quantity="few" msgid="6543078667692990869">"<xliff:g id="UNREAD_MESSAGE_COUNT">%d</xliff:g> ulæste (<xliff:g id="ACCOUNT">%s</xliff:g>)"</item>
     <item quantity="other" msgid="6937673814351448076">"<xliff:g id="UNREAD_MESSAGE_COUNT">%d</xliff:g> ulæste (<xliff:g id="ACCOUNT">%s</xliff:g>)"</item>
   </plurals>
   <plurals name="notification_new_multi_account_fmt">
-    <item quantity="few" msgid="1991747245324120305">"på <xliff:g id="NUMBER_ACCOUNTS">%d</xliff:g> konti"</item>
+    <item quantity="few" msgid="1991747245324120305">"i <xliff:g id="NUMBER_ACCOUNTS">%d</xliff:g> konti"</item>
     <item quantity="other" msgid="2723797835410343458">"i <xliff:g id="NUMBER_ACCOUNTS">%d</xliff:g> konti"</item>
   </plurals>
     <string name="mailbox_name_display_inbox" msgid="3542327124749861736">"Indbakke"</string>
@@ -89,11 +89,11 @@
     <string name="message_compose_cc_hint" msgid="8481884461031434144">"Cc"</string>
     <string name="message_compose_bcc_hint" msgid="9177337492358841680">"Bcc"</string>
     <string name="message_compose_subject_hint" msgid="6993487234024160782">"Emne"</string>
-    <string name="message_compose_body_hint" msgid="7575406246484103697">"Skriv e-mail"</string>
-    <string name="message_compose_fwd_header_fmt" msgid="5181300290654579434">\n\n"-------- Oprindelig besked --------"\n"Emne: <xliff:g id="SUBJECT">%s</xliff:g>"\n"Fra: <xliff:g id="SENDER">%s</xliff:g>"\n"Til: <xliff:g id="TO">%s</xliff:g>"\n"CC: <xliff:g id="CC_0">%s</xliff:g>"\n\n</string>
+    <string name="message_compose_body_hint" msgid="7575406246484103697">"Skriv mail"</string>
+    <string name="message_compose_fwd_header_fmt" msgid="5181300290654579434">\n\n"-------- Oprindelig meddelelse --------"\n"Emne: <xliff:g id="SUBJECT">%s</xliff:g>"\n"Fra: <xliff:g id="SENDER">%s</xliff:g>"\n"Til: <xliff:g id="TO">%s</xliff:g>"\n"CC: <xliff:g id="CC_0">%s</xliff:g>"\n\n</string>
     <string name="message_compose_reply_header_fmt" msgid="8815624773273454573">\n\n"<xliff:g id="SENDER">%s</xliff:g> skrev:"\n\n</string>
     <string name="message_compose_quoted_text_label" msgid="5722467956990009520">"Citeret tekst"</string>
-    <string name="message_compose_error_no_recipients" msgid="4903715888250785486">"Du skal tilføje mindst én modtager."</string>
+    <string name="message_compose_error_no_recipients" msgid="4903715888250785486">"Du skal tilføje mindst en modtager."</string>
     <string name="message_compose_error_invalid_email" msgid="1817633338629885643">"Nogle e-mail-adresser er ugyldige."</string>
     <string name="message_compose_attachments_skipped_toast" msgid="5611815773808423460">"Nogle vedhæftede filer kan ikke videresendes, fordi de ikke er blevet downloadet."</string>
     <string name="message_compose_attachment_size" msgid="4401081828287333647">"Filen er for stor til at vedhæfte."</string>
@@ -102,12 +102,12 @@
     <string name="message_view_cc_label" msgid="6322992216371163122">"Cc:"</string>
     <string name="message_view_attachment_view_action" msgid="5353550848340829134">"Åbn"</string>
     <string name="message_view_attachment_download_action" msgid="7552530274014544406">"Gem"</string>
-    <string name="message_view_status_attachment_saved" msgid="2802843795251453632">"Den vedhæftede fil er gemt på SD-kortet som <xliff:g id="FILENAME">%s</xliff:g>."</string>
+    <string name="message_view_status_attachment_saved" msgid="2802843795251453632">"Vedhæftet fil er gemt til SD-kort som <xliff:g id="FILENAME">%s</xliff:g>."</string>
     <string name="message_view_status_attachment_not_saved" msgid="5039599647697750874">"Den vedhæftede fil kunne ikke gemmes på SD-kortet."</string>
     <string name="message_view_show_pictures_instructions" msgid="1156525837417031085">"Vælg \"Vis billeder\" for at vise indsatte billeder."</string>
     <string name="message_view_show_pictures_action" msgid="5059936981743072545">"Vis billeder"</string>
     <string name="message_view_fetching_attachment_toast" msgid="8812363375155391184">"Henter vedhæftet fil."</string>
-    <string name="message_view_fetching_attachment_progress" msgid="8238550182655758164">"Henter den vedhæftede fil <xliff:g id="FILENAME">%s</xliff:g>"</string>
+    <string name="message_view_fetching_attachment_progress" msgid="8238550182655758164">"Henter vedhæftet fil <xliff:g id="FILENAME">%s</xliff:g>"</string>
     <string name="message_view_invite_view" msgid="6256018854688891069">"Vis i Kalender »"</string>
     <string name="message_view_invite_title" msgid="5024473745902772299">"Kalenderinvitation"</string>
     <string name="message_view_invite_text" msgid="1212799906603873708">"Skal du med?"</string>
@@ -121,10 +121,10 @@
     <item quantity="one" msgid="710742672464447084">"Beskeden er slettet."</item>
     <item quantity="other" msgid="6574961322865652255">"Beskederne er slettet."</item>
   </plurals>
-    <string name="message_discarded_toast" msgid="3891461729325584026">"Beskeden er kasseret."</string>
+    <string name="message_discarded_toast" msgid="3891461729325584026">"Besked kasseret."</string>
     <string name="message_saved_toast" msgid="8443125659172627665">"Beskeden er gemt som kladde."</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_title" msgid="3969856368228940980">"Opsæt 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>
@@ -133,7 +133,7 @@
     <string name="account_setup_basics_email_hint" msgid="7414269319207261120">"E-mail-adresse"</string>
     <string name="account_setup_basics_password_hint" msgid="410210049040536870">"Adgangskode"</string>
     <string name="account_setup_basics_default_label" msgid="5924790142029806711">"Send e-mail fra denne konto som standard."</string>
-    <string name="account_setup_basics_manual_setup_action" msgid="8053852205391155912">"Manuel konfiguration"</string>
+    <string name="account_setup_basics_manual_setup_action" msgid="8053852205391155912">"Manuel opsætning"</string>
     <string name="account_setup_username_password_toast" msgid="4441448542557889481">"Indtast en gyldig e-mail-adresse og adgangskode."</string>
     <string name="account_duplicate_dlg_title" msgid="3176749833792312641">"Dobbeltforekomst af konto"</string>
     <string name="account_duplicate_dlg_message_fmt" msgid="1920726613701479851">"Dette login bruges allerede til kontoen \"<xliff:g id="DUPLICATE">%s</xliff:g>\"."</string>
@@ -141,10 +141,10 @@
     <string name="account_setup_check_settings_check_incoming_msg" msgid="5356212700221438863">"Kontrollerer indstillinger for indgående server ..."</string>
     <string name="account_setup_check_settings_check_outgoing_msg" msgid="4033015234096725343">"Kontrollerer indstillinger for udgående server ..."</string>
     <string name="account_setup_check_settings_canceling_msg" msgid="5077315503721883906">"Annullerer ..."</string>
-    <string name="account_setup_names_title" msgid="8875040521875381849">"Konfiguration af e-mail"</string>
-    <string name="account_setup_names_instructions" msgid="2880279273965835007">"Din konto er konfigureret, og der er e-mail på vej!"</string>
+    <string name="account_setup_names_title" msgid="8875040521875381849">"Opsæt e-mail"</string>
+    <string name="account_setup_names_instructions" msgid="2880279273965835007">"Din konto er opsat, og der er e-mail på vej!"</string>
     <string name="account_setup_names_account_name_label" msgid="8033895024273259196">"Giv kontoen et navn (valgfrit)"</string>
-    <string name="account_setup_names_user_name_label" msgid="8967410178488604770">"Dit navn (vises på udgående beskeder)"</string>
+    <string name="account_setup_names_user_name_label" msgid="8967410178488604770">"Dit navn (vist på udgående beskeder)"</string>
     <string name="account_setup_account_type_title" msgid="6645576356752495504">"Tilføj ny e-mail-konto"</string>
     <string name="account_setup_account_type_instructions" msgid="114515540798408760">"Hvilken slags konto er dette?"</string>
     <string name="account_setup_incoming_title" msgid="6862032674547580337">"Indstillinger for indgående server"</string>
@@ -159,7 +159,7 @@
     <string name="account_setup_incoming_security_ssl_label" msgid="8886698397743061682">"SSL"</string>
     <string name="account_setup_incoming_security_tls_trust_certificates_label" msgid="1089227022489257055">"TLS (Accepter alle certifikater)"</string>
     <string name="account_setup_incoming_security_tls_label" msgid="8638006172590036487">"TLS"</string>
-    <string name="account_setup_incoming_delete_policy_label" msgid="9213590134693857912">"Slet e-mail på server"</string>
+    <string name="account_setup_incoming_delete_policy_label" msgid="9213590134693857912">"Slet e-mail fra server"</string>
     <string name="account_setup_incoming_delete_policy_never_label" msgid="3222897501875871041">"Aldrig"</string>
     <string name="account_setup_incoming_delete_policy_delete_label" msgid="222216840911785631">"Når jeg sletter fra Indbakke"</string>
     <string name="account_setup_incoming_imap_path_prefix_label" msgid="401167247072926810">"Præfiks for IMAP-sti"</string>
@@ -168,7 +168,7 @@
     <string name="account_setup_outgoing_smtp_server_label" msgid="6035137446691195177">"SMTP-server"</string>
     <string name="account_setup_outgoing_port_label" msgid="7573207437835827876">"Port"</string>
     <string name="account_setup_outgoing_security_label" msgid="911398071120720589">"Sikkerhedstype"</string>
-    <string name="account_setup_outgoing_require_login_label" msgid="6371514297854287948">"Kræver login."</string>
+    <string name="account_setup_outgoing_require_login_label" msgid="6371514297854287948">"Kræver login"</string>
     <string name="account_setup_outgoing_username_label" msgid="3309680794731596981">"Brugernavn"</string>
     <string name="account_setup_outgoing_password_label" msgid="227844585493317550">"Adgangskode"</string>
     <string name="account_setup_exchange_title" msgid="2492853474738063453">"Serverindstillinger"</string>
@@ -176,7 +176,7 @@
     <string name="account_setup_exchange_username_label" msgid="6517176180828983060">"Domæne\\brugernavn"</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>
+    <string name="account_setup_options_title" msgid="8995162193118880993">"Kontovalgmuligheder"</string>
     <string name="account_setup_options_mail_check_frequency_label" msgid="4598023962234986194">"Kontrolfrekvens for e-mail"</string>
     <string name="account_setup_options_mail_check_frequency_never" msgid="287951859480505416">"Aldrig"</string>
     <string name="account_setup_options_mail_check_frequency_push" msgid="5934525907736008673">"Automatisk (Push)"</string>
@@ -186,26 +186,26 @@
     <string name="account_setup_options_mail_check_frequency_30min" msgid="1097088928685931864">"Hvert 30. minut"</string>
     <string name="account_setup_options_mail_check_frequency_1hour" msgid="3767715356039692899">"Hver time"</string>
     <string name="account_setup_options_default_label" msgid="8869166381331276697">"Send e-mail fra denne konto som standard."</string>
-    <string name="account_setup_options_notify_label" msgid="1247525794828820038">"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_notify_label" msgid="1247525794828820038">"Underret mig, når der kommer e-mail."</string>
+    <string name="account_setup_options_sync_contacts_label" msgid="7467467090023434271">"Synkroniser kontaktpersoner fra denne konto."</string>
     <string name="account_setup_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_failed_dlg_title" msgid="7827583313117521383">"Opsætningen kunne ikke afsluttes"</string>
     <string name="account_setup_options_mail_window_label" msgid="8764417340954006086">"Mængde, der skal synkroniseres"</string>
     <string name="account_setup_options_mail_window_1day" msgid="3965715241135811407">"En dag"</string>
     <string name="account_setup_options_mail_window_3days" msgid="736181102295878114">"Tre dage"</string>
     <string name="account_setup_options_mail_window_1week" msgid="5639718031108023741">"En uge"</string>
     <string name="account_setup_options_mail_window_2weeks" msgid="4567049268124213035">"To uger"</string>
     <string name="account_setup_options_mail_window_1month" msgid="5846359669750047081">"En måned"</string>
-    <string name="account_setup_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_auth_message" msgid="42827150104879570">"Brugernavn eller adgangskode er forkert."</string>
+    <string name="account_setup_failed_dlg_auth_message_fmt" msgid="8598560266430207606">"Brugernavn eller adgangskode er forkert."\n"(<xliff:g id="ERROR">%s</xliff:g>)"</string>
     <string name="account_setup_failed_dlg_certificate_message" msgid="961843413600482906">"Der kan ikke oprettes en sikker forbindelse til serveren."</string>
     <string name="account_setup_failed_dlg_certificate_message_fmt" msgid="2609150986774736900">"Der kan ikke oprettes en sikker forbindelse til serveren."\n"(<xliff:g id="ERROR">%s</xliff:g>)"</string>
     <string name="account_setup_failed_dlg_server_message" msgid="1828270369532779265">"Der kan ikke oprettes forbindelse til serveren."</string>
     <string name="account_setup_failed_dlg_server_message_fmt" msgid="5956976504788732779">"Der kan ikke oprettes forbindelse til serveren."\n"(<xliff:g id="ERROR">%s</xliff:g>)"</string>
     <string name="account_setup_failed_tls_required" msgid="307030406688611327">"TLS er påkrævet, men understøttes ikke af serveren."</string>
-    <string name="account_setup_failed_auth_required" msgid="1676242821459638150">"Godkendelsesmetoderne understøttes ikke af serveren."</string>
+    <string name="account_setup_failed_auth_required" msgid="1676242821459638150">"Godkendelsesmetoder understøttes ikke af serveren."</string>
     <string name="account_setup_failed_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 oprettes forbindelse til serveren."</string>
+    <string name="account_setup_failed_ioerror" msgid="7391458717708933095">"Der kunne ikke åbnes en forbindelse til serveren."</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>
@@ -217,19 +217,19 @@
     <string name="account_settings_title_fmt" msgid="1702058877284382340">"Generelle indstillinger"</string>
     <string name="account_settings_default_label" msgid="3575963379680943640">"Standardkonto"</string>
     <string name="account_settings_default_summary" msgid="1531901438624688482">"Send e-mail fra denne konto som standard"</string>
-    <string name="account_settings_notify_label" msgid="1630001017303007974">"E-mail-meddelelser"</string>
-    <string name="account_settings_exchange_summary" msgid="8498451479029626317">"Synkroniseringsinterval, meddelelser osv."</string>
-    <string name="account_settings_notify_summary" msgid="6609224590300639887">"Vis i statuslinjen, når der kommer en e-mail"</string>
+    <string name="account_settings_notify_label" msgid="1630001017303007974">"E-mail-beskeder"</string>
+    <string name="account_settings_exchange_summary" msgid="8498451479029626317">"Synkroniseringsinterval, beskeder osv."</string>
+    <string name="account_settings_notify_summary" msgid="6609224590300639887">"Underret i statuslinjen, når der kommer en e-mail"</string>
     <string name="account_settings_mail_check_frequency_label" msgid="2067835530563849675">"Kontrolfrekvens for e-mail"</string>
-    <string name="account_settings_incoming_label" msgid="7858928031806297542">"Indstillinger for indgående"</string>
-    <string name="account_settings_outgoing_label" msgid="4464829249980026745">"Indstillinger for udgående"</string>
+    <string name="account_settings_incoming_label" msgid="7858928031806297542">"Indgående indstillinger"</string>
+    <string name="account_settings_outgoing_label" msgid="4464829249980026745">"Udgående indstillinger"</string>
     <string name="account_settings_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_contacts_enable" msgid="1369272986009573218">"Synkroniser kontaktpersoner"</string>
+    <string name="account_settings_sync_contacts_summary" msgid="8901452720940015928">"Synkroniser også kontaktpersoner 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_when_label" msgid="708477308761702671">"Vibration"</string>
@@ -239,15 +239,15 @@
     <string name="account_settings_vibrate_when_never" msgid="3759680093309511614">"Aldrig"</string>
     <string name="account_settings_vibrate_when_dlg_title" msgid="308167729046312952">"Vibration"</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_settings_servers" msgid="4925493817981624242">"Serverindstillinger"</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="provider_note_yahoo_uk" msgid="2055976404478603298">"Inden du sætter denne e-mail-konto op, skal du gå til Yahoo!-webstedet og aktivere POP3-e-mail-adgang for denne konto."</string>
+    <string name="provider_note_live" msgid="3584841823811425060">"Det er kun nogle \"Plus\"-konti, der indeholder POP-adgang, som tillader dette program at oprette forbindelse. Hvis du ikke er i stand til at logge ind med din rigtige e-mail-adresse og adgangskode, har du muligvis ikke en betalt \"Plus\"-konto. Start webbrowseren igen for at få adgang til disse mail-konti."</string>
+    <string name="provider_note_t_online" msgid="1973701903400232774">"Inden du opsætter denne e-mail-konto, skal du gå til T-Onlines websted og oprette en adgangskode for POP3-e-mail-adgang."</string>
     <string name="exchange_name" msgid="1190783774800310346">"Virksomhed"</string>
     <string name="exchange_name_alternate" msgid="5772529644749041052">"Microsoft Exchange ActiveSync"</string>
     <string name="meeting_accepted" msgid="8796609373330400268">"Accepteret: <xliff:g id="SUBJECT">%s</xliff:g>"</string>
diff --git a/res/values-de/strings.xml b/res/values-de/strings.xml
index a88d8a2..769c2a7 100644
--- a/res/values-de/strings.xml
+++ b/res/values-de/strings.xml
@@ -19,10 +19,10 @@
     <string name="read_attachment_label" msgid="1162255191991555285">"Anhänge lesen"</string>
     <string name="read_attachment_desc" msgid="7594746717616308643">"Erlaubt der Anwendung, Ihre Anhänge zu lesen."</string>
     <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="compose_title" msgid="427986915662706899">"E-Mail schreiben"</string>
-    <string name="debug_title" msgid="5175710493691536719">"Fehlersuche"</string>
+    <string name="permission_access_provider_desc" msgid="1513898266889541617">"Erlaubt dieser Anwendung, auf Ihre E-Mail-Datenbank zuzugreifen, einschließlich erhaltener Nachrichten, gesendeter Nachrichten, Benutzernamen und Passwörtern."</string>
+    <string name="app_name" msgid="5815426892327290362">"E-Mail an"</string>
+    <string name="compose_title" msgid="427986915662706899">"Schreiben"</string>
+    <string name="debug_title" msgid="5175710493691536719">"Fehler suchen"</string>
     <string name="next_action" msgid="3931301986364184415">"Weiter"</string>
     <string name="okay_action" msgid="8365197396795675617">"OK"</string>
     <string name="cancel_action" msgid="6967435583794021865">"Abbrechen"</string>
@@ -30,7 +30,7 @@
     <string name="reply_action" msgid="4262472229221507619">"Antworten"</string>
     <string name="reply_all_action" msgid="6192179825726332152">"Allen antworten"</string>
     <string name="delete_action" msgid="8421026208288857155">"Löschen"</string>
-    <string name="forward_action" msgid="669174181042344116">"Weiterleiten"</string>
+    <string name="forward_action" msgid="669174181042344116">"Vorwärts"</string>
     <string name="done_action" msgid="7497990549515580249">"Fertig"</string>
     <string name="discard_action" msgid="6532206074859505968">"Verwerfen"</string>
     <string name="save_draft_action" msgid="812855865552028622">"Als Entwurf speichern"</string>
@@ -43,9 +43,9 @@
     <string name="refresh_action" msgid="5951383001436708175">"Aktualisieren"</string>
     <string name="add_account_action" msgid="8835736309476033727">"Konto hinzufügen"</string>
     <string name="deselect_all_action" msgid="253663239459688238">"Auswahl für alle aufheben"</string>
-    <string name="compose_action" msgid="4045702519637388045">"E-Mail schreiben"</string>
-    <string name="search_action" msgid="6325101454876682308">"Suchen"</string>
-    <string name="open_action" msgid="936766723989190816">"Öffnen"</string>
+    <string name="compose_action" msgid="4045702519637388045">"Schreiben"</string>
+    <string name="search_action" msgid="6325101454876682308">"Suche"</string>
+    <string name="open_action" msgid="936766723989190816">"Offen"</string>
     <string name="account_settings_action" msgid="4494079183315085171">"Kontoeinstellungen"</string>
     <string name="remove_account_action" msgid="3789169090601376209">"Konto entfernen"</string>
     <string name="folders_action" msgid="7502431531355227666">"Ordner"</string>
@@ -67,8 +67,8 @@
     <item quantity="other" msgid="6937673814351448076">"<xliff:g id="UNREAD_MESSAGE_COUNT">%d</xliff:g> ungelesen (<xliff:g id="ACCOUNT">%s</xliff:g>)"</item>
   </plurals>
   <plurals name="notification_new_multi_account_fmt">
-    <item quantity="few" msgid="1991747245324120305">"in <xliff:g id="NUMBER_ACCOUNTS">%d</xliff:g> E-Mail-Konten"</item>
-    <item quantity="other" msgid="2723797835410343458">"in <xliff:g id="NUMBER_ACCOUNTS">%d</xliff:g> E-Mail-Konten"</item>
+    <item quantity="few" msgid="1991747245324120305">"in <xliff:g id="NUMBER_ACCOUNTS">%d</xliff:g> Google-Konten"</item>
+    <item quantity="other" msgid="2723797835410343458">"in <xliff:g id="NUMBER_ACCOUNTS">%d</xliff:g> Google-Konten"</item>
   </plurals>
     <string name="mailbox_name_display_inbox" msgid="3542327124749861736">"Posteingang"</string>
     <string name="mailbox_name_display_outbox" msgid="2826214174661417662">"Postausgang"</string>
@@ -100,7 +100,7 @@
     <string name="message_compose_display_name" msgid="6415258924917140704">"<xliff:g id="NAME">%1$s</xliff:g> und <xliff:g id="NUMBER">%2$d</xliff:g> weitere"</string>
     <string name="message_view_to_label" msgid="6485191743265527381">"An:"</string>
     <string name="message_view_cc_label" msgid="6322992216371163122">"Cc:"</string>
-    <string name="message_view_attachment_view_action" msgid="5353550848340829134">"Öffnen"</string>
+    <string name="message_view_attachment_view_action" msgid="5353550848340829134">"Offen"</string>
     <string name="message_view_attachment_download_action" msgid="7552530274014544406">"Speichern"</string>
     <string name="message_view_status_attachment_saved" msgid="2802843795251453632">"Anhang auf SD-Speicherkarte unter \"<xliff:g id="FILENAME">%s</xliff:g>\" abgespeichert"</string>
     <string name="message_view_status_attachment_not_saved" msgid="5039599647697750874">"Speichern des Anhangs auf SD-Karte nicht möglich"</string>
@@ -173,7 +173,7 @@
     <string name="account_setup_outgoing_password_label" msgid="227844585493317550">"Passwort"</string>
     <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_username_label" msgid="6517176180828983060">"Domain-/Benutzername"</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>
@@ -197,7 +197,7 @@
     <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_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_auth_message_fmt" msgid="8598560266430207606">"Nutzername/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>
     <string name="account_setup_failed_dlg_certificate_message_fmt" msgid="2609150986774736900">"Keine sichere Verbindung zum Server möglich"\n"(<xliff:g id="ERROR">%s</xliff:g>)"</string>
     <string name="account_setup_failed_dlg_server_message" msgid="1828270369532779265">"Keine Verbindung zu Server möglich"</string>
@@ -228,9 +228,9 @@
     <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 synchr."</string>
+    <string name="account_settings_sync_contacts_enable" msgid="1369272986009573218">"Kontakte synchr"</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_enable" msgid="6855333393468628003">"Kalender synchr"</string>
     <string name="account_settings_sync_calendar_summary" msgid="2456010694443333450">"Kalender dieses Kontos ebenfalls synchronisieren"</string>
     <string name="account_settings_vibrate_when_label" msgid="708477308761702671">"Vibration"</string>
     <string name="account_settings_vibrate_when_summary" msgid="3991584445166247189">"Bei E-Mail-Eingang zusätzlich vibrieren"</string>
diff --git a/res/values-el/strings.xml b/res/values-el/strings.xml
index 72de212..0262f86 100644
--- a/res/values-el/strings.xml
+++ b/res/values-el/strings.xml
@@ -20,8 +20,8 @@
     <string name="read_attachment_desc" msgid="7594746717616308643">"Επιτρέπει σε αυτήν την εφαρμογή την ανάγνωση των επισυνάψεων των μηνυμάτων ηλεκτρονικού ταχυδρομείου."</string>
     <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="compose_title" msgid="427986915662706899">"Σύνθεση"</string>
+    <string name="app_name" msgid="5815426892327290362">"Μήνυμα ηλεκτρονικού ταχυδρομείου"</string>
+    <string name="compose_title" msgid="427986915662706899">"Σύνταξη"</string>
     <string name="debug_title" msgid="5175710493691536719">"Εντοπισμός σφαλμάτων"</string>
     <string name="next_action" msgid="3931301986364184415">"Επόμενο"</string>
     <string name="okay_action" msgid="8365197396795675617">"ΟΚ"</string>
@@ -33,7 +33,7 @@
     <string name="forward_action" msgid="669174181042344116">"Προώθηση"</string>
     <string name="done_action" msgid="7497990549515580249">"Τέλος"</string>
     <string name="discard_action" msgid="6532206074859505968">"Απόρριψη"</string>
-    <string name="save_draft_action" msgid="812855865552028622">"Αποθ.ως πρόχειρο"</string>
+    <string name="save_draft_action" msgid="812855865552028622">"Αποθήκευση ως πρόχειρο"</string>
     <string name="read_unread_action" msgid="4721446664849165077">"Αναγνωσμένες/Μη αναγνωσμένες"</string>
     <string name="read_action" msgid="4701484794504781686">"Επισήμανση ως αναγνωσμένων"</string>
     <string name="unread_action" msgid="6280399049357552826">"Επισήμανση ως μη αναγνωσμένα"</string>
@@ -43,7 +43,7 @@
     <string name="refresh_action" msgid="5951383001436708175">"Ανανέωση"</string>
     <string name="add_account_action" msgid="8835736309476033727">"Προσθήκη λογαριασμού"</string>
     <string name="deselect_all_action" msgid="253663239459688238">"Κατάργηση επιλογής όλων"</string>
-    <string name="compose_action" msgid="4045702519637388045">"Σύνθεση"</string>
+    <string name="compose_action" msgid="4045702519637388045">"Σύνταξη"</string>
     <string name="search_action" msgid="6325101454876682308">"Αναζήτηση"</string>
     <string name="open_action" msgid="936766723989190816">"Άνοιγμα"</string>
     <string name="account_settings_action" msgid="4494079183315085171">"Ρυθμίσεις λογαριασμού"</string>
@@ -96,12 +96,12 @@
     <string name="message_compose_error_no_recipients" msgid="4903715888250785486">"Πρέπει να προσθέσετε τουλάχιστον έναν παραλήπτη."</string>
     <string name="message_compose_error_invalid_email" msgid="1817633338629885643">"Ορισμένες διευθύνσεις ηλεκτρονικού ταχυδρομείου δεν είναι έγκυρες."</string>
     <string name="message_compose_attachments_skipped_toast" msgid="5611815773808423460">"Δεν ήταν δυνατή η προώθηση ορισμένων επισυνάψεων επειδή δεν έχουν ληφθεί."</string>
-    <string name="message_compose_attachment_size" msgid="4401081828287333647">"Το αρχείο είναι πολύ μεγάλο για επισύναψη."</string>
+    <string name="message_compose_attachment_size" msgid="4401081828287333647">"Πολύ μεγάλο αρχείο για επισύναψη."</string>
     <string name="message_compose_display_name" msgid="6415258924917140704">"<xliff:g id="NAME">%1$s</xliff:g> και <xliff:g id="NUMBER">%2$d</xliff:g> ακόμα"</string>
     <string name="message_view_to_label" msgid="6485191743265527381">"Προς:"</string>
-    <string name="message_view_cc_label" msgid="6322992216371163122">"Κοιν.:"</string>
+    <string name="message_view_cc_label" msgid="6322992216371163122">"Κοιν.: "</string>
     <string name="message_view_attachment_view_action" msgid="5353550848340829134">"Άνοιγμα"</string>
-    <string name="message_view_attachment_download_action" msgid="7552530274014544406">"Αποθ/ση"</string>
+    <string name="message_view_attachment_download_action" msgid="7552530274014544406">"Αποθήκευση"</string>
     <string name="message_view_status_attachment_saved" msgid="2802843795251453632">"Η επισύναψη αποθηκεύτηκε στην κάρτα SD ως <xliff:g id="FILENAME">%s</xliff:g>."</string>
     <string name="message_view_status_attachment_not_saved" msgid="5039599647697750874">"Δεν ήταν δυνατή η αποθήκευση της επισύναψης στην κάρτα SD."</string>
     <string name="message_view_show_pictures_instructions" msgid="1156525837417031085">"Επιλέξτε \"Εμφάνιση εικόνων\" για την προβολή των ενσωματωμένων εικόνων."</string>
@@ -132,7 +132,7 @@
     <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>
+    <string name="account_setup_basics_default_label" msgid="5924790142029806711">"Αποστολή μηνυμάτων ηλεκτρονικού ταχυδρομείου από αυτόν τον λογαριασμό από προεπιλογή."</string>
     <string name="account_setup_basics_manual_setup_action" msgid="8053852205391155912">"Μη αυτόματη ρύθμιση"</string>
     <string name="account_setup_username_password_toast" msgid="4441448542557889481">"Πληκτρολογήστε μια έγκυρη διεύθυνση ηλεκτρονικού ταχυδρομείου και έναν έγκυρο κωδικό πρόσβασης."</string>
     <string name="account_duplicate_dlg_title" msgid="3176749833792312641">"Διπλότυπος λογαριασμός"</string>
@@ -154,7 +154,7 @@
     <string name="account_setup_incoming_imap_server_label" msgid="8685076830847734322">"Διακομιστής IMAP"</string>
     <string name="account_setup_incoming_port_label" msgid="8214738923690447796">"Θύρα"</string>
     <string name="account_setup_incoming_security_label" msgid="2110260791086007424">"Τύπος ασφάλειας"</string>
-    <string name="account_setup_incoming_security_none_label" msgid="8300169413118264895">"Κανένα"</string>
+    <string name="account_setup_incoming_security_none_label" msgid="8300169413118264895">"Καμία"</string>
     <string name="account_setup_incoming_security_ssl_trust_certificates_label" msgid="3581382268191377346">"SSL (Αποδοχή όλων των πιστοποιητικών)"</string>
     <string name="account_setup_incoming_security_ssl_label" msgid="8886698397743061682">"SSL"</string>
     <string name="account_setup_incoming_security_tls_trust_certificates_label" msgid="1089227022489257055">"TLS (Αποδοχή όλων των πιστοποιητικών)"</string>
@@ -171,7 +171,7 @@
     <string name="account_setup_outgoing_require_login_label" msgid="6371514297854287948">"Να απαιτείται σύνδεση."</string>
     <string name="account_setup_outgoing_username_label" msgid="3309680794731596981">"Όνομα χρήστη"</string>
     <string name="account_setup_outgoing_password_label" msgid="227844585493317550">"Κωδικός πρόσβασης"</string>
-    <string name="account_setup_exchange_title" msgid="2492853474738063453">"Ρυθμίσεις διακομιστή\n"</string>
+    <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_ssl_label" msgid="6704105469083211236">"Χρήση ασφαλούς σύνδεσης (SSL)"</string>
@@ -185,7 +185,7 @@
     <string name="account_setup_options_mail_check_frequency_15min" msgid="5052776740089741793">"Κάθε 15 λεπτά"</string>
     <string name="account_setup_options_mail_check_frequency_30min" msgid="1097088928685931864">"Κάθε 30 λεπτά"</string>
     <string name="account_setup_options_mail_check_frequency_1hour" msgid="3767715356039692899">"Κάθε ώρα"</string>
-    <string name="account_setup_options_default_label" msgid="8869166381331276697">"Αποστ.μηνυμ.ηλεκτ.ταχυδρ.από αυτόν το λογ/μό από προεπ."</string>
+    <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>
@@ -247,7 +247,7 @@
     <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="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>
     <string name="meeting_accepted" msgid="8796609373330400268">"Έγινε αποδοχή: <xliff:g id="SUBJECT">%s</xliff:g>"</string>
diff --git a/res/values-es-rUS/strings.xml b/res/values-es-rUS/strings.xml
index 8e5cd77..8ca3e63 100644
--- a/res/values-es-rUS/strings.xml
+++ b/res/values-es-rUS/strings.xml
@@ -46,7 +46,7 @@
     <string name="compose_action" msgid="4045702519637388045">"Redactar"</string>
     <string name="search_action" msgid="6325101454876682308">"Buscar"</string>
     <string name="open_action" msgid="936766723989190816">"Abrir"</string>
-    <string name="account_settings_action" msgid="4494079183315085171">"Config. de la cuenta"</string>
+    <string name="account_settings_action" msgid="4494079183315085171">"Configuración de la cuenta"</string>
     <string name="remove_account_action" msgid="3789169090601376209">"Eliminar cuenta"</string>
     <string name="folders_action" msgid="7502431531355227666">"Carpetas"</string>
     <string name="accounts_action" msgid="901105887272231493">"Cuentas"</string>
@@ -128,9 +128,9 @@
     <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>
+    <string name="accounts_welcome_exchange" msgid="4414121583987233733">"Puedes configurar una cuenta de intercambio en sólo algunos pasos."</string>
     <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_email_hint" msgid="7414269319207261120">"Dirección de correo elec."</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>
     <string name="account_setup_basics_manual_setup_action" msgid="8053852205391155912">"Configuración manual"</string>
@@ -162,7 +162,7 @@
     <string name="account_setup_incoming_delete_policy_label" msgid="9213590134693857912">"Suprimir correo electrónico del servidor"</string>
     <string name="account_setup_incoming_delete_policy_never_label" msgid="3222897501875871041">"Nunca"</string>
     <string name="account_setup_incoming_delete_policy_delete_label" msgid="222216840911785631">"Cuándo suprimo desde la bandeja de entrada"</string>
-    <string name="account_setup_incoming_imap_path_prefix_label" msgid="401167247072926810">"Prefijo de ruta IMAP"</string>
+    <string name="account_setup_incoming_imap_path_prefix_label" msgid="401167247072926810">"prefijo de ruta IMAP"</string>
     <string name="account_setup_incoming_imap_path_prefix_hint" msgid="9190845919067906033">"Opcional"</string>
     <string name="account_setup_outgoing_title" msgid="7437215562885986394">"Configuración saliente de servidor"</string>
     <string name="account_setup_outgoing_smtp_server_label" msgid="6035137446691195177">"Servidor SMTP"</string>
@@ -177,7 +177,7 @@
     <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>
-    <string name="account_setup_options_mail_check_frequency_label" msgid="4598023962234986194">"Frec. de verific. de correo electr."</string>
+    <string name="account_setup_options_mail_check_frequency_label" msgid="4598023962234986194">"Frecuencia de verificación de correo electrónico"</string>
     <string name="account_setup_options_mail_check_frequency_never" msgid="287951859480505416">"Nunca"</string>
     <string name="account_setup_options_mail_check_frequency_push" msgid="5934525907736008673">"Automático (Empujar)"</string>
     <string name="account_setup_options_mail_check_frequency_5min" msgid="6388939895878539307">"Cada 5 minutos"</string>
@@ -216,8 +216,8 @@
     <string name="account_setup_failed_dlg_edit_details_action" msgid="5355993309841479360">"Editar detalles"</string>
     <string name="account_settings_title_fmt" msgid="1702058877284382340">"Configuración general"</string>
     <string name="account_settings_default_label" msgid="3575963379680943640">"Cuenta predeterminada"</string>
-    <string name="account_settings_default_summary" msgid="1531901438624688482">"Enviar  correo electr. desde esta cuenta de forma predet."</string>
-    <string name="account_settings_notify_label" msgid="1630001017303007974">"Notific. de correo electr."</string>
+    <string name="account_settings_default_summary" msgid="1531901438624688482">"Enviar mensaje de correo electrónico desde esta cuenta de forma predeterminada"</string>
+    <string name="account_settings_notify_label" msgid="1630001017303007974">"Notificaciones de correo electrónico"</string>
     <string name="account_settings_exchange_summary" msgid="8498451479029626317">"Sincronizar frecuencia, notificaciones, etc."</string>
     <string name="account_settings_notify_summary" msgid="6609224590300639887">"Notificar en la barra de estado cuando llegue un mensaje de correo electrónico"</string>
     <string name="account_settings_mail_check_frequency_label" msgid="2067835530563849675">"Frecuencia de verificación de correo electrónico"</string>
@@ -238,7 +238,7 @@
     <string name="account_settings_vibrate_when_silent" msgid="6417076436551648924">"Sólo cuando esté en silencio"</string>
     <string name="account_settings_vibrate_when_never" msgid="3759680093309511614">"Nunca"</string>
     <string name="account_settings_vibrate_when_dlg_title" msgid="308167729046312952">"Vibrar"</string>
-    <string name="account_settings_ringtone" msgid="7922187231467500404">"Selecc. tono de llam."</string>
+    <string name="account_settings_ringtone" msgid="7922187231467500404">"Seleccionar el tono de timbre"</string>
     <string name="account_settings_servers" msgid="4925493817981624242">"Configuración del servidor"</string>
     <string name="account_delete_dlg_title" msgid="6806087520856396608">"Eliminar cuenta"</string>
     <string name="account_delete_dlg_instructions_fmt" msgid="8236846322040271280">"La cuenta \"<xliff:g id="ACCOUNT">%s</xliff:g>\" se eliminará de correo electrónico."</string>
diff --git a/res/values-es/strings.xml b/res/values-es/strings.xml
index 8a3847c..8b9f4b1 100644
--- a/res/values-es/strings.xml
+++ b/res/values-es/strings.xml
@@ -19,17 +19,17 @@
     <string name="read_attachment_label" msgid="1162255191991555285">"Leer los archivos adjuntos del mensaje"</string>
     <string name="read_attachment_desc" msgid="7594746717616308643">"Permite que esta aplicación lea los archivos adjuntos del correo electrónico."</string>
     <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="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 nombre de usuario y las contraseñas."</string>
+    <string name="app_name" msgid="5815426892327290362">"Enviar 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>
     <string name="okay_action" msgid="8365197396795675617">"Aceptar"</string>
     <string name="cancel_action" msgid="6967435583794021865">"Cancelar"</string>
     <string name="send_action" msgid="1729766205562446418">"Enviar"</string>
-    <string name="reply_action" msgid="4262472229221507619">"Responder"</string>
+    <string name="reply_action" msgid="4262472229221507619">"Resp"</string>
     <string name="reply_all_action" msgid="6192179825726332152">"Responder a todos"</string>
-    <string name="delete_action" msgid="8421026208288857155">"Suprimir"</string>
+    <string name="delete_action" msgid="8421026208288857155">"Eliminar"</string>
     <string name="forward_action" msgid="669174181042344116">"Reenviar"</string>
     <string name="done_action" msgid="7497990549515580249">"Listo"</string>
     <string name="discard_action" msgid="6532206074859505968">"Descartar"</string>
@@ -44,17 +44,17 @@
     <string name="add_account_action" msgid="8835736309476033727">"Añadir cuenta"</string>
     <string name="deselect_all_action" msgid="253663239459688238">"Desmarcar todo"</string>
     <string name="compose_action" msgid="4045702519637388045">"Redactar"</string>
-    <string name="search_action" msgid="6325101454876682308">"Buscar"</string>
+    <string name="search_action" msgid="6325101454876682308">"Búsqueda"</string>
     <string name="open_action" msgid="936766723989190816">"Abrir"</string>
-    <string name="account_settings_action" msgid="4494079183315085171">"Configuración"</string>
+    <string name="account_settings_action" msgid="4494079183315085171">"Ajustes de la cuenta"</string>
     <string name="remove_account_action" msgid="3789169090601376209">"Eliminar cuenta"</string>
     <string name="folders_action" msgid="7502431531355227666">"Carpetas"</string>
     <string name="accounts_action" msgid="901105887272231493">"Cuentas"</string>
     <string name="mark_as_read_action" msgid="5031651846998842419">"Marcar como leída"</string>
     <string name="mark_as_unread_action" msgid="3766298115778767554">"Marcar como no leído"</string>
     <string name="add_cc_bcc_action" msgid="5569074812077509737">"Añadir Cc/CCO"</string>
-    <string name="add_attachment_action" msgid="2696013743130573897">"Añadir archivo adjunto"</string>
-    <string name="dump_settings_action" msgid="4478192525236169829">"Configuración de volcado"</string>
+    <string name="add_attachment_action" msgid="2696013743130573897">"Añadir adjunto"</string>
+    <string name="dump_settings_action" msgid="4478192525236169829">"Ajustes de volcado"</string>
     <string name="choose_attachment_dialog_title" msgid="81937507117528954">"Elegir archivo adjunto"</string>
     <string name="status_loading_more" msgid="1580386959044617884">"Cargando mensajes..."</string>
     <string name="status_sending_messages" msgid="3971880826111264523">"Enviando mensajes..."</string>
@@ -70,22 +70,22 @@
     <item quantity="few" msgid="1991747245324120305">"en <xliff:g id="NUMBER_ACCOUNTS">%d</xliff:g> cuentas"</item>
     <item quantity="other" msgid="2723797835410343458">"en <xliff:g id="NUMBER_ACCOUNTS">%d</xliff:g> cuentas"</item>
   </plurals>
-    <string name="mailbox_name_display_inbox" msgid="3542327124749861736">"Bandeja de entrada"</string>
+    <string name="mailbox_name_display_inbox" msgid="3542327124749861736">"Recibidos"</string>
     <string name="mailbox_name_display_outbox" msgid="2826214174661417662">"Enviados"</string>
     <string name="mailbox_name_display_drafts" msgid="4868718300700514319">"Borradores"</string>
     <string name="mailbox_name_display_trash" msgid="9139069064580630647">"Papelera"</string>
-    <string name="mailbox_name_display_sent" msgid="3426058998191869523">"Enviados"</string>
+    <string name="mailbox_name_display_sent" msgid="3426058998191869523">"Enviado"</string>
     <string name="mailbox_name_display_junk" msgid="9046762505977999288">"Correo basura"</string>
     <string name="debug_version_fmt" msgid="6160213145745376955">"Versión: <xliff:g id="VERSION">%s</xliff:g>"</string>
     <string name="account_folder_list_separator_accounts" msgid="7568820182396669244">"Cuentas"</string>
-    <string name="account_folder_list_summary_inbox" msgid="5790553737870057607">"Bandeja de entrada combinada"</string>
+    <string name="account_folder_list_summary_inbox" msgid="5790553737870057607">"Combinación de recibidos"</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_compose_to_hint" msgid="2891895306418177013">"Para"</string>
+    <string name="message_compose_to_hint" msgid="2891895306418177013">"Al"</string>
     <string name="message_compose_cc_hint" msgid="8481884461031434144">"Cc"</string>
     <string name="message_compose_bcc_hint" msgid="9177337492358841680">"CCO"</string>
     <string name="message_compose_subject_hint" msgid="6993487234024160782">"Asunto"</string>
@@ -99,7 +99,7 @@
     <string name="message_compose_attachment_size" msgid="4401081828287333647">"El archivo es demasiado grande para adjuntarlo."</string>
     <string name="message_compose_display_name" msgid="6415258924917140704">"<xliff:g id="NAME">%1$s</xliff:g> y <xliff:g id="NUMBER">%2$d</xliff:g> más"</string>
     <string name="message_view_to_label" msgid="6485191743265527381">"Para:"</string>
-    <string name="message_view_cc_label" msgid="6322992216371163122">"Cc:"</string>
+    <string name="message_view_cc_label" msgid="6322992216371163122">"Cc: "</string>
     <string name="message_view_attachment_view_action" msgid="5353550848340829134">"Abrir"</string>
     <string name="message_view_attachment_download_action" msgid="7552530274014544406">"Guardar"</string>
     <string name="message_view_status_attachment_saved" msgid="2802843795251453632">"El archivo adjunto se ha guardado en una tarjeta SD como <xliff:g id="FILENAME">%s</xliff:g>."</string>
@@ -147,31 +147,31 @@
     <string name="account_setup_names_user_name_label" msgid="8967410178488604770">"Tu nombre (aparece en los mensajes salientes)"</string>
     <string name="account_setup_account_type_title" msgid="6645576356752495504">"Añadir una cuenta de correo electrónico nueva"</string>
     <string name="account_setup_account_type_instructions" msgid="114515540798408760">"¿Qué tipo de cuenta es ésta?"</string>
-    <string name="account_setup_incoming_title" msgid="6862032674547580337">"Configuración del servidor de entrada"</string>
+    <string name="account_setup_incoming_title" msgid="6862032674547580337">"Ajustes del servidor de entrada"</string>
     <string name="account_setup_incoming_username_label" msgid="5700581386104070302">"Nombre de usuario"</string>
     <string name="account_setup_incoming_password_label" msgid="6365327603172559859">"Contraseña"</string>
     <string name="account_setup_incoming_pop_server_label" msgid="4917504440057879152">"Servidor POP3"</string>
     <string name="account_setup_incoming_imap_server_label" msgid="8685076830847734322">"Servidor IMAP"</string>
     <string name="account_setup_incoming_port_label" msgid="8214738923690447796">"Puerto"</string>
     <string name="account_setup_incoming_security_label" msgid="2110260791086007424">"Tipo de seguridad"</string>
-    <string name="account_setup_incoming_security_none_label" msgid="8300169413118264895">"Ninguna"</string>
+    <string name="account_setup_incoming_security_none_label" msgid="8300169413118264895">"Ninguno"</string>
     <string name="account_setup_incoming_security_ssl_trust_certificates_label" msgid="3581382268191377346">"SSL (aceptar todos los certificados)"</string>
     <string name="account_setup_incoming_security_ssl_label" msgid="8886698397743061682">"SSL"</string>
     <string name="account_setup_incoming_security_tls_trust_certificates_label" msgid="1089227022489257055">"TLS (aceptar todos los certificados)"</string>
     <string name="account_setup_incoming_security_tls_label" msgid="8638006172590036487">"TLS"</string>
-    <string name="account_setup_incoming_delete_policy_label" msgid="9213590134693857912">"Suprimir correo electrónico del servidor"</string>
+    <string name="account_setup_incoming_delete_policy_label" msgid="9213590134693857912">"Eliminar correo electrónico del servidor"</string>
     <string name="account_setup_incoming_delete_policy_never_label" msgid="3222897501875871041">"Nunca"</string>
     <string name="account_setup_incoming_delete_policy_delete_label" msgid="222216840911785631">"Cuando suprimo algún mensaje de \"Bandeja de entrada\""</string>
     <string name="account_setup_incoming_imap_path_prefix_label" msgid="401167247072926810">"Prefijo de ruta IMAP"</string>
     <string name="account_setup_incoming_imap_path_prefix_hint" msgid="9190845919067906033">"Opcional"</string>
-    <string name="account_setup_outgoing_title" msgid="7437215562885986394">"Configuración del servidor de salida"</string>
+    <string name="account_setup_outgoing_title" msgid="7437215562885986394">"Ajustes del servidor de salida"</string>
     <string name="account_setup_outgoing_smtp_server_label" msgid="6035137446691195177">"Servidor SMTP"</string>
     <string name="account_setup_outgoing_port_label" msgid="7573207437835827876">"Puerto"</string>
     <string name="account_setup_outgoing_security_label" msgid="911398071120720589">"Tipo de seguridad"</string>
     <string name="account_setup_outgoing_require_login_label" msgid="6371514297854287948">"Acceso obligatorio"</string>
     <string name="account_setup_outgoing_username_label" msgid="3309680794731596981">"Nombre de usuario"</string>
     <string name="account_setup_outgoing_password_label" msgid="227844585493317550">"Contraseña"</string>
-    <string name="account_setup_exchange_title" msgid="2492853474738063453">"Configuración del servidor"</string>
+    <string name="account_setup_exchange_title" msgid="2492853474738063453">"Ajustes 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_ssl_label" msgid="6704105469083211236">"Utilizar conexión segura (SSL)"</string>
@@ -198,9 +198,9 @@
     <string name="account_setup_options_mail_window_1month" msgid="5846359669750047081">"Un mes"</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>
+    <string name="account_setup_failed_dlg_certificate_message" msgid="961843413600482906">"No se puede establecer una conexión de forma segura con el servidor."</string>
     <string name="account_setup_failed_dlg_certificate_message_fmt" msgid="2609150986774736900">"No se puede establecer una conexión de forma segura con el servidor."\n"(<xliff:g id="ERROR">%s</xliff:g>)"</string>
-    <string name="account_setup_failed_dlg_server_message" msgid="1828270369532779265">"No se puede establecer conexión con el servidor."</string>
+    <string name="account_setup_failed_dlg_server_message" msgid="1828270369532779265">"No se puede establecer una conexión con el servidor."</string>
     <string name="account_setup_failed_dlg_server_message_fmt" msgid="5956976504788732779">"No se puede establecer una conexión con el servidor."\n"(<xliff:g id="ERROR">%s</xliff:g>)"</string>
     <string name="account_setup_failed_tls_required" msgid="307030406688611327">"El protocolo TLS es obligatorio, pero el servidor no lo admite."</string>
     <string name="account_setup_failed_auth_required" msgid="1676242821459638150">"El servidor no admite los métodos de autenticación."</string>
@@ -214,20 +214,20 @@
     <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_title_fmt" msgid="1702058877284382340">"Ajustes generales"</string>
     <string name="account_settings_default_label" msgid="3575963379680943640">"Cuenta predeterminada"</string>
     <string name="account_settings_default_summary" msgid="1531901438624688482">"Enviar correo electrónico desde esta cuenta de forma predeterminada"</string>
     <string name="account_settings_notify_label" msgid="1630001017303007974">"Notificaciones de correo"</string>
     <string name="account_settings_exchange_summary" msgid="8498451479029626317">"Frecuencia de sincronización, notificaciones, etc."</string>
     <string name="account_settings_notify_summary" msgid="6609224590300639887">"Notificar en la barra de estado cuando llegue un mensaje"</string>
-    <string name="account_settings_mail_check_frequency_label" msgid="2067835530563849675">"Frecuencia de comprobación del correo"</string>
+    <string name="account_settings_mail_check_frequency_label" msgid="2067835530563849675">"Frecuencia comprobación"</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_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_notifications" msgid="1042620094281375043">"Ajustes de notificaciones"</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>
@@ -238,8 +238,8 @@
     <string name="account_settings_vibrate_when_silent" msgid="6417076436551648924">"Solo en modo silencio"</string>
     <string name="account_settings_vibrate_when_never" msgid="3759680093309511614">"Nunca"</string>
     <string name="account_settings_vibrate_when_dlg_title" msgid="308167729046312952">"Vibración"</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_settings_ringtone" msgid="7922187231467500404">"Seleccionar tono"</string>
+    <string name="account_settings_servers" msgid="4925493817981624242">"Ajustes 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>
diff --git a/res/values-fr/strings.xml b/res/values-fr/strings.xml
index dbc395e..5d199ac 100644
--- a/res/values-fr/strings.xml
+++ b/res/values-fr/strings.xml
@@ -20,9 +20,9 @@
     <string name="read_attachment_desc" msgid="7594746717616308643">"Permet à cette application de lire les pièces jointes aux e-mails."</string>
     <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="compose_title" msgid="427986915662706899">"Nouveau message"</string>
-    <string name="debug_title" msgid="5175710493691536719">"Déboguer"</string>
+    <string name="app_name" msgid="5815426892327290362">"Envoyer un e-mail"</string>
+    <string name="compose_title" msgid="427986915662706899">"Composer"</string>
+    <string name="debug_title" msgid="5175710493691536719">"Débogage"</string>
     <string name="next_action" msgid="3931301986364184415">"Suivant"</string>
     <string name="okay_action" msgid="8365197396795675617">"OK"</string>
     <string name="cancel_action" msgid="6967435583794021865">"Annuler"</string>
@@ -43,7 +43,7 @@
     <string name="refresh_action" msgid="5951383001436708175">"Actualiser"</string>
     <string name="add_account_action" msgid="8835736309476033727">"Ajouter un compte"</string>
     <string name="deselect_all_action" msgid="253663239459688238">"Tout désélectionner"</string>
-    <string name="compose_action" msgid="4045702519637388045">"Nouveau message"</string>
+    <string name="compose_action" msgid="4045702519637388045">"Composer"</string>
     <string name="search_action" msgid="6325101454876682308">"Rechercher"</string>
     <string name="open_action" msgid="936766723989190816">"Ouvrir"</string>
     <string name="account_settings_action" msgid="4494079183315085171">"Paramètres du compte"</string>
@@ -55,16 +55,16 @@
     <string name="add_cc_bcc_action" msgid="5569074812077509737">"Ajouter Cc/CCi"</string>
     <string name="add_attachment_action" msgid="2696013743130573897">"Ajouter une pièce jointe"</string>
     <string name="dump_settings_action" msgid="4478192525236169829">"Paramètres d\'image mémoire"</string>
-    <string name="choose_attachment_dialog_title" msgid="81937507117528954">"Choisir une pièce jointe"</string>
+    <string name="choose_attachment_dialog_title" msgid="81937507117528954">"Choisir·une·pièce·jointe"</string>
     <string name="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="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">
-    <item quantity="one" msgid="3422945912787702191">"<xliff:g id="UNREAD_MESSAGE_COUNT">%d</xliff:g> non lu (<xliff:g id="ACCOUNT">%s</xliff:g>)"</item>
-    <item quantity="few" msgid="6543078667692990869">"<xliff:g id="UNREAD_MESSAGE_COUNT">%d</xliff:g> non lus (<xliff:g id="ACCOUNT">%s</xliff:g>)"</item>
-    <item quantity="other" msgid="6937673814351448076">"<xliff:g id="UNREAD_MESSAGE_COUNT">%d</xliff:g> non lus (<xliff:g id="ACCOUNT">%s</xliff:g>)"</item>
+    <item quantity="one" msgid="3422945912787702191">"<xliff:g id="UNREAD_MESSAGE_COUNT">%d</xliff:g> non lus (<xliff:g id="ACCOUNT">%s</xliff:g>)"</item>
+    <item quantity="few" msgid="6543078667692990869">"<xliff:g id="UNREAD_MESSAGE_COUNT">%d</xliff:g> non lus (<xliff:g id="ACCOUNT">%s</xliff:g>)"</item>
+    <item quantity="other" msgid="6937673814351448076">"<xliff:g id="UNREAD_MESSAGE_COUNT">%d</xliff:g> non lus (<xliff:g id="ACCOUNT">%s</xliff:g>)"</item>
   </plurals>
   <plurals name="notification_new_multi_account_fmt">
     <item quantity="few" msgid="1991747245324120305">"dans <xliff:g id="NUMBER_ACCOUNTS">%d</xliff:g> comptes"</item>
@@ -85,7 +85,7 @@
     <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_compose_to_hint" msgid="2891895306418177013">"À"</string>
+    <string name="message_compose_to_hint" msgid="2891895306418177013">"Langue cible"</string>
     <string name="message_compose_cc_hint" msgid="8481884461031434144">"Cc"</string>
     <string name="message_compose_bcc_hint" msgid="9177337492358841680">"Cci"</string>
     <string name="message_compose_subject_hint" msgid="6993487234024160782">"Objet"</string>
@@ -98,8 +98,8 @@
     <string name="message_compose_attachments_skipped_toast" msgid="5611815773808423460">"Impossible de transférer certaines pièces jointes : elles n\'ont pas été téléchargées."</string>
     <string name="message_compose_attachment_size" msgid="4401081828287333647">"Impossible de joindre le fichier, car il est trop volumineux."</string>
     <string name="message_compose_display_name" msgid="6415258924917140704">"<xliff:g id="NAME">%1$s</xliff:g> et <xliff:g id="NUMBER">%2$d</xliff:g> autres"</string>
-    <string name="message_view_to_label" msgid="6485191743265527381">"À :"</string>
-    <string name="message_view_cc_label" msgid="6322992216371163122">"Cc :"</string>
+    <string name="message_view_to_label" msgid="6485191743265527381">"Langue cible:"</string>
+    <string name="message_view_cc_label" msgid="6322992216371163122">"Cc : "</string>
     <string name="message_view_attachment_view_action" msgid="5353550848340829134">"Ouvrir"</string>
     <string name="message_view_attachment_download_action" msgid="7552530274014544406">"Enregistrer"</string>
     <string name="message_view_status_attachment_saved" msgid="2802843795251453632">"Pièce jointe enregistrée sur la carte SD sous le nom <xliff:g id="FILENAME">%s</xliff:g>."</string>
@@ -122,12 +122,12 @@
     <item quantity="other" msgid="6574961322865652255">"Messages supprimés"</item>
   </plurals>
     <string name="message_discarded_toast" msgid="3891461729325584026">"Message supprimé."</string>
-    <string name="message_saved_toast" msgid="8443125659172627665">"Message enregistré comme brouillon."</string>
+    <string name="message_saved_toast" msgid="8443125659172627665">"Brouillon enregistré"</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" msgid="5901437782383439370">"Configurez des e-mails pour la plupart des comptes en à peine quelques minutes."</string>
     <string name="accounts_welcome_exchange" msgid="4414121583987233733">"Configurez un compte Exchange en un clin d\'œil."</string>
     <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>
@@ -154,7 +154,7 @@
     <string name="account_setup_incoming_imap_server_label" msgid="8685076830847734322">"Serveur IMAP"</string>
     <string name="account_setup_incoming_port_label" msgid="8214738923690447796">"Port"</string>
     <string name="account_setup_incoming_security_label" msgid="2110260791086007424">"Type de sécurité"</string>
-    <string name="account_setup_incoming_security_none_label" msgid="8300169413118264895">"Aucun protocole"</string>
+    <string name="account_setup_incoming_security_none_label" msgid="8300169413118264895">"Aucun"</string>
     <string name="account_setup_incoming_security_ssl_trust_certificates_label" msgid="3581382268191377346">"SSL (accepter tous les certificats)"</string>
     <string name="account_setup_incoming_security_ssl_label" msgid="8886698397743061682">"SSL"</string>
     <string name="account_setup_incoming_security_tls_trust_certificates_label" msgid="1089227022489257055">"TLS (accepter tous les certificats)"</string>
@@ -238,7 +238,7 @@
     <string name="account_settings_vibrate_when_silent" msgid="6417076436551648924">"Seulement en mode silencieux"</string>
     <string name="account_settings_vibrate_when_never" msgid="3759680093309511614">"Jamais"</string>
     <string name="account_settings_vibrate_when_dlg_title" msgid="308167729046312952">"Vibreur"</string>
-    <string name="account_settings_ringtone" msgid="7922187231467500404">"Sonnerie"</string>
+    <string name="account_settings_ringtone" msgid="7922187231467500404">"Sélectionner la 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>
diff --git a/res/values-it/strings.xml b/res/values-it/strings.xml
index a563a1e..ae049b5 100644
--- a/res/values-it/strings.xml
+++ b/res/values-it/strings.xml
@@ -20,7 +20,7 @@
     <string name="read_attachment_desc" msgid="7594746717616308643">"Consente all\'applicazione di leggere i tuoi allegati email."</string>
     <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="app_name" msgid="5815426892327290362">"Invia 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>
@@ -44,7 +44,7 @@
     <string name="add_account_action" msgid="8835736309476033727">"Aggiungi account"</string>
     <string name="deselect_all_action" msgid="253663239459688238">"Deseleziona tutto"</string>
     <string name="compose_action" msgid="4045702519637388045">"Scrivi"</string>
-    <string name="search_action" msgid="6325101454876682308">"Cerca"</string>
+    <string name="search_action" msgid="6325101454876682308">"Ricerca"</string>
     <string name="open_action" msgid="936766723989190816">"Apri"</string>
     <string name="account_settings_action" msgid="4494079183315085171">"Impostazioni account"</string>
     <string name="remove_account_action" msgid="3789169090601376209">"Rimuovi account"</string>
@@ -85,7 +85,7 @@
     <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_compose_to_hint" msgid="2891895306418177013">"A"</string>
+    <string name="message_compose_to_hint" msgid="2891895306418177013">"In"</string>
     <string name="message_compose_cc_hint" msgid="8481884461031434144">"Cc"</string>
     <string name="message_compose_bcc_hint" msgid="9177337492358841680">"Ccn"</string>
     <string name="message_compose_subject_hint" msgid="6993487234024160782">"Oggetto"</string>
@@ -98,8 +98,8 @@
     <string name="message_compose_attachments_skipped_toast" msgid="5611815773808423460">"Impossibile inviare alcuni allegati poiché non sono stati scaricati."</string>
     <string name="message_compose_attachment_size" msgid="4401081828287333647">"File troppo grande. Impossibile allegarlo."</string>
     <string name="message_compose_display_name" msgid="6415258924917140704">"<xliff:g id="NAME">%1$s</xliff:g> e <xliff:g id="NUMBER">%2$d</xliff:g> altri"</string>
-    <string name="message_view_to_label" msgid="6485191743265527381">"A:"</string>
-    <string name="message_view_cc_label" msgid="6322992216371163122">"Cc:"</string>
+    <string name="message_view_to_label" msgid="6485191743265527381">"In:"</string>
+    <string name="message_view_cc_label" msgid="6322992216371163122">"Cc: "</string>
     <string name="message_view_attachment_view_action" msgid="5353550848340829134">"Apri"</string>
     <string name="message_view_attachment_download_action" msgid="7552530274014544406">"Salva"</string>
     <string name="message_view_status_attachment_saved" msgid="2802843795251453632">"Allegato salvato su scheda SD come <xliff:g id="FILENAME">%s</xliff:g>."</string>
@@ -198,7 +198,7 @@
     <string name="account_setup_options_mail_window_1month" msgid="5846359669750047081">"Un mese"</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>
+    <string name="account_setup_failed_dlg_certificate_message" msgid="961843413600482906">"Impossibile connettersi correttamente al server."</string>
     <string name="account_setup_failed_dlg_certificate_message_fmt" msgid="2609150986774736900">"Impossibile connettersi correttamente al server."\n"(<xliff:g id="ERROR">%s</xliff:g>)"</string>
     <string name="account_setup_failed_dlg_server_message" msgid="1828270369532779265">"Impossibile connettersi al server."</string>
     <string name="account_setup_failed_dlg_server_message_fmt" msgid="5956976504788732779">"Impossibile connettersi al server."\n"(<xliff:g id="ERROR">%s</xliff:g>)"</string>
@@ -227,7 +227,7 @@
     <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_notifications" msgid="1042620094281375043">"Impostazioni notifiche"</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>
diff --git a/res/values-ko/strings.xml b/res/values-ko/strings.xml
index a85b8d9..f0877de 100644
--- a/res/values-ko/strings.xml
+++ b/res/values-ko/strings.xml
@@ -21,7 +21,7 @@
     <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="compose_title" msgid="427986915662706899">"편지쓰기"</string>
+    <string name="compose_title" msgid="427986915662706899">"메시지작성"</string>
     <string name="debug_title" msgid="5175710493691536719">"디버그"</string>
     <string name="next_action" msgid="3931301986364184415">"다음"</string>
     <string name="okay_action" msgid="8365197396795675617">"확인"</string>
@@ -43,7 +43,7 @@
     <string name="refresh_action" msgid="5951383001436708175">"새로고침"</string>
     <string name="add_account_action" msgid="8835736309476033727">"계정 추가"</string>
     <string name="deselect_all_action" msgid="253663239459688238">"모두 선택취소"</string>
-    <string name="compose_action" msgid="4045702519637388045">"편지쓰기"</string>
+    <string name="compose_action" msgid="4045702519637388045">"메시지작성"</string>
     <string name="search_action" msgid="6325101454876682308">"검색"</string>
     <string name="open_action" msgid="936766723989190816">"열기"</string>
     <string name="account_settings_action" msgid="4494079183315085171">"계정 설정"</string>
@@ -56,7 +56,7 @@
     <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="status_loading_more" msgid="1580386959044617884">"메시지 로드 중..."</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="notification_new_title" msgid="2200257910380529139">"새 이메일"</string>
@@ -68,7 +68,7 @@
   </plurals>
   <plurals name="notification_new_multi_account_fmt">
     <item quantity="few" msgid="1991747245324120305">"<xliff:g id="NUMBER_ACCOUNTS">%d</xliff:g>개 계정"</item>
-    <item quantity="other" msgid="2723797835410343458">"(<xliff:g id="NUMBER_ACCOUNTS">%d</xliff:g>개 계정)"</item>
+    <item quantity="other" msgid="2723797835410343458">"<xliff:g id="NUMBER_ACCOUNTS">%d</xliff:g>개 계정"</item>
   </plurals>
     <string name="mailbox_name_display_inbox" msgid="3542327124749861736">"받은편지함"</string>
     <string name="mailbox_name_display_outbox" msgid="2826214174661417662">"보낼편지함"</string>
@@ -85,9 +85,9 @@
     <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_compose_to_hint" msgid="2891895306418177013">"받는사람"</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>
+    <string name="message_compose_bcc_hint" msgid="9177337492358841680">"숨은 참조"</string>
     <string name="message_compose_subject_hint" msgid="6993487234024160782">"제목"</string>
     <string name="message_compose_body_hint" msgid="7575406246484103697">"편지쓰기"</string>
     <string name="message_compose_fwd_header_fmt" msgid="5181300290654579434">\n\n"-------- 원본 메시지 --------"\n"제목: <xliff:g id="SUBJECT">%s</xliff:g>"\n"보낸사람: <xliff:g id="SENDER">%s</xliff:g>"\n"받는사람: <xliff:g id="TO">%s</xliff:g>"\n"참조: <xliff:g id="CC_0">%s</xliff:g>"\n\n</string>
@@ -99,7 +99,7 @@
     <string name="message_compose_attachment_size" msgid="4401081828287333647">"파일이 너무 커서 첨부할 수 없습니다."</string>
     <string name="message_compose_display_name" msgid="6415258924917140704">"<xliff:g id="NAME">%1$s</xliff:g> 외 <xliff:g id="NUMBER">%2$d</xliff:g>명"</string>
     <string name="message_view_to_label" msgid="6485191743265527381">"받는사람:"</string>
-    <string name="message_view_cc_label" msgid="6322992216371163122">"참조:"</string>
+    <string name="message_view_cc_label" msgid="6322992216371163122">"참조: "</string>
     <string name="message_view_attachment_view_action" msgid="5353550848340829134">"열기"</string>
     <string name="message_view_attachment_download_action" msgid="7552530274014544406">"저장"</string>
     <string name="message_view_status_attachment_saved" msgid="2802843795251453632">"첨부파일(<xliff:g id="FILENAME">%s</xliff:g>)이 SD 카드에 저장되었습니다."</string>
@@ -122,31 +122,31 @@
     <item quantity="other" msgid="6574961322865652255">"메시지를 삭제했습니다."</item>
   </plurals>
     <string name="message_discarded_toast" msgid="3891461729325584026">"메시지를 삭제했습니다."</string>
-    <string name="message_saved_toast" msgid="8443125659172627665">"메시지가 임시보관함에 저장되었습니다."</string>
+    <string name="message_saved_toast" msgid="8443125659172627665">"메일이 임시보관함에 저장되었습니다."</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>
-    <string name="accounts_welcome_exchange_alternate" msgid="1324339567986452000">"간단한 몇 가지 절차만 수행하면 Exchange ActiveSync 계정을 구성할 수 있습니다."</string>
+    <string name="accounts_welcome" msgid="5901437782383439370">"간단한 몇 가지 설정만으로 이메일 계정을 등록할 수 있습니다."</string>
+    <string name="accounts_welcome_exchange" msgid="4414121583987233733">"간단한 몇 가지 설정만으로 Exchange 계정을 등록할 수 있습니다."</string>
+    <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>
+    <string name="account_setup_basics_default_label" msgid="5924790142029806711">"이 계정에서 이메일 보냄(기본값)"</string>
     <string name="account_setup_basics_manual_setup_action" msgid="8053852205391155912">"수동 설정"</string>
     <string name="account_setup_username_password_toast" msgid="4441448542557889481">"올바른 이메일 주소와 비밀번호를 입력하세요."</string>
     <string name="account_duplicate_dlg_title" msgid="3176749833792312641">"중복 계정"</string>
     <string name="account_duplicate_dlg_message_fmt" msgid="1920726613701479851">"이 로그인은 이미 \'<xliff:g id="DUPLICATE">%s</xliff:g>\' 계정에서 사용 중입니다."</string>
-    <string name="account_setup_check_settings_retr_info_msg" msgid="4121970450267725664">"계정 정보 검색 중..."</string>
+    <string name="account_setup_check_settings_retr_info_msg" msgid="4121970450267725664">"계정 정보 검색 중... "</string>
     <string name="account_setup_check_settings_check_incoming_msg" msgid="5356212700221438863">"받는 서버 설정 확인 중..."</string>
     <string name="account_setup_check_settings_check_outgoing_msg" msgid="4033015234096725343">"보내는 서버 설정 확인 중..."</string>
     <string name="account_setup_check_settings_canceling_msg" msgid="5077315503721883906">"취소 중..."</string>
     <string name="account_setup_names_title" msgid="8875040521875381849">"이메일 설정"</string>
-    <string name="account_setup_names_instructions" msgid="2880279273965835007">"계정이 설정되었으며 이메일이 작동됩니다."</string>
+    <string name="account_setup_names_instructions" msgid="2880279273965835007">"계정이 성공적으로 등록되어 이메일을 사용할 수 있습니다."</string>
     <string name="account_setup_names_account_name_label" msgid="8033895024273259196">"계정 이름 지정(선택사항)"</string>
     <string name="account_setup_names_user_name_label" msgid="8967410178488604770">"이름(발신 메시지에 표시)"</string>
     <string name="account_setup_account_type_title" msgid="6645576356752495504">"새 이메일 계정 추가"</string>
-    <string name="account_setup_account_type_instructions" msgid="114515540798408760">"계정 유형을 선택하세요."</string>
+    <string name="account_setup_account_type_instructions" msgid="114515540798408760">"계정 유형이 무엇입니까?"</string>
     <string name="account_setup_incoming_title" msgid="6862032674547580337">"수신 서버 설정"</string>
     <string name="account_setup_incoming_username_label" msgid="5700581386104070302">"사용자 이름"</string>
     <string name="account_setup_incoming_password_label" msgid="6365327603172559859">"비밀번호"</string>
@@ -196,7 +196,7 @@
     <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_failed_dlg_auth_message" msgid="42827150104879570">"사용자 이름 및 비밀번호가 잘못되었습니다."</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>
     <string name="account_setup_failed_dlg_certificate_message_fmt" msgid="2609150986774736900">"서버에 안전하게 연결할 수 없습니다."\n"(<xliff:g id="ERROR">%s</xliff:g>)"</string>
@@ -216,7 +216,7 @@
     <string name="account_setup_failed_dlg_edit_details_action" msgid="5355993309841479360">"세부정보 수정"</string>
     <string name="account_settings_title_fmt" msgid="1702058877284382340">"일반 설정"</string>
     <string name="account_settings_default_label" msgid="3575963379680943640">"기본 계정"</string>
-    <string name="account_settings_default_summary" msgid="1531901438624688482">"기본적으로 이 계정에서 이메일 전송"</string>
+    <string name="account_settings_default_summary" msgid="1531901438624688482">"이 계정에서 이메일 보냄(기본값)"</string>
     <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>
@@ -241,7 +241,7 @@
     <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="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>
diff --git a/res/values-nl/strings.xml b/res/values-nl/strings.xml
index 1ca7396..ca53b05 100644
--- a/res/values-nl/strings.xml
+++ b/res/values-nl/strings.xml
@@ -27,12 +27,12 @@
     <string name="okay_action" msgid="8365197396795675617">"OK"</string>
     <string name="cancel_action" msgid="6967435583794021865">"Annuleren"</string>
     <string name="send_action" msgid="1729766205562446418">"Verzenden"</string>
-    <string name="reply_action" msgid="4262472229221507619">"Antwoord"</string>
+    <string name="reply_action" msgid="4262472229221507619">"Reageren"</string>
     <string name="reply_all_action" msgid="6192179825726332152">"Allen antwoord"</string>
     <string name="delete_action" msgid="8421026208288857155">"Verwijderen"</string>
     <string name="forward_action" msgid="669174181042344116">"Doorsturen"</string>
     <string name="done_action" msgid="7497990549515580249">"Gereed"</string>
-    <string name="discard_action" msgid="6532206074859505968">"Verwijderen"</string>
+    <string name="discard_action" msgid="6532206074859505968">"Weggooien"</string>
     <string name="save_draft_action" msgid="812855865552028622">"Opslaan als concept"</string>
     <string name="read_unread_action" msgid="4721446664849165077">"Gelezen/ongelezen"</string>
     <string name="read_action" msgid="4701484794504781686">"Markeren als gelezen"</string>
@@ -45,7 +45,7 @@
     <string name="deselect_all_action" msgid="253663239459688238">"Selectie van alle items ongedaan maken"</string>
     <string name="compose_action" msgid="4045702519637388045">"Opstellen"</string>
     <string name="search_action" msgid="6325101454876682308">"Zoeken"</string>
-    <string name="open_action" msgid="936766723989190816">"Openen"</string>
+    <string name="open_action" msgid="936766723989190816">"Open"</string>
     <string name="account_settings_action" msgid="4494079183315085171">"Accountinstellingen"</string>
     <string name="remove_account_action" msgid="3789169090601376209">"Account verwijderen"</string>
     <string name="folders_action" msgid="7502431531355227666">"Mappen"</string>
@@ -85,7 +85,7 @@
     <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_compose_to_hint" msgid="2891895306418177013">"Aan"</string>
+    <string name="message_compose_to_hint" msgid="2891895306418177013">"Naar"</string>
     <string name="message_compose_cc_hint" msgid="8481884461031434144">"Cc"</string>
     <string name="message_compose_bcc_hint" msgid="9177337492358841680">"Bcc"</string>
     <string name="message_compose_subject_hint" msgid="6993487234024160782">"Onderwerp"</string>
@@ -100,7 +100,7 @@
     <string name="message_compose_display_name" msgid="6415258924917140704">"<xliff:g id="NAME">%1$s</xliff:g> en <xliff:g id="NUMBER">%2$d</xliff:g> anderen"</string>
     <string name="message_view_to_label" msgid="6485191743265527381">"Aan:"</string>
     <string name="message_view_cc_label" msgid="6322992216371163122">"Cc:"</string>
-    <string name="message_view_attachment_view_action" msgid="5353550848340829134">"Openen"</string>
+    <string name="message_view_attachment_view_action" msgid="5353550848340829134">"Open"</string>
     <string name="message_view_attachment_download_action" msgid="7552530274014544406">"Opslaan"</string>
     <string name="message_view_status_attachment_saved" msgid="2802843795251453632">"Bijlage opgeslagen op SD-kaart als <xliff:g id="FILENAME">%s</xliff:g>."</string>
     <string name="message_view_status_attachment_not_saved" msgid="5039599647697750874">"Kan bijlage niet opslaan op SD-kaart."</string>
@@ -127,7 +127,7 @@
     <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 de functie E-mail voor de meeste accounts in enkele stappen configureren."</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>
     <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>
@@ -196,9 +196,9 @@
     <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_failed_dlg_auth_message" msgid="42827150104879570">"Gebruikersnaam of wachtwoord onjuist"</string>
+    <string name="account_setup_failed_dlg_auth_message" msgid="42827150104879570">"Gebruikersnaam of wachtwoord is 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>
+    <string name="account_setup_failed_dlg_certificate_message" msgid="961843413600482906">"Kan geen veilige verbinding met de server tot stand brengen."</string>
     <string name="account_setup_failed_dlg_certificate_message_fmt" msgid="2609150986774736900">"Kan geen veilige verbinding met de server tot stand brengen."\n"(<xliff:g id="ERROR">%s</xliff:g>)"</string>
     <string name="account_setup_failed_dlg_server_message" msgid="1828270369532779265">"Kan geen verbinding maken met de server."</string>
     <string name="account_setup_failed_dlg_server_message_fmt" msgid="5956976504788732779">"Kan geen verbinding maken met de server."\n"(<xliff:g id="ERROR">%s</xliff:g>)"</string>
@@ -241,7 +241,7 @@
     <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="account_delete_dlg_instructions_fmt" msgid="8236846322040271280">"De 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>
diff --git a/res/values-pl/strings.xml b/res/values-pl/strings.xml
index 42770e7..b3f97db 100644
--- a/res/values-pl/strings.xml
+++ b/res/values-pl/strings.xml
@@ -127,7 +127,7 @@
     <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" msgid="5901437782383439370">"Możesz tu skonfigurować większość kont pocztowych, 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>
     <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>
@@ -144,7 +144,7 @@
     <string name="account_setup_names_title" msgid="8875040521875381849">"Konfiguracja konta e-mail"</string>
     <string name="account_setup_names_instructions" msgid="2880279273965835007">"Konto zostało skonfigurowane, a wiadomości e-mail są w drodze!"</string>
     <string name="account_setup_names_account_name_label" msgid="8033895024273259196">"Nazwa konta (opcjonalnie)"</string>
-    <string name="account_setup_names_user_name_label" msgid="8967410178488604770">"Twoje nazwisko (wyświetlane w wiadomościach wychodzących)"</string>
+    <string name="account_setup_names_user_name_label" msgid="8967410178488604770">"Twoja nazwa (wyświetlana w wiadomościach wychodzących)"</string>
     <string name="account_setup_account_type_title" msgid="6645576356752495504">"Dodaj nowe konto e-mail"</string>
     <string name="account_setup_account_type_instructions" msgid="114515540798408760">"Jakiego typu jest to konto?"</string>
     <string name="account_setup_incoming_title" msgid="6862032674547580337">"Ustawienia serwera poczty przychodzącej"</string>
@@ -159,7 +159,7 @@
     <string name="account_setup_incoming_security_ssl_label" msgid="8886698397743061682">"SSL"</string>
     <string name="account_setup_incoming_security_tls_trust_certificates_label" msgid="1089227022489257055">"TLS (akceptuj wszystkie certyfikaty)"</string>
     <string name="account_setup_incoming_security_tls_label" msgid="8638006172590036487">"TLS"</string>
-    <string name="account_setup_incoming_delete_policy_label" msgid="9213590134693857912">"Usuń wiadomości e-mail z serwera"</string>
+    <string name="account_setup_incoming_delete_policy_label" msgid="9213590134693857912">"Usuwaj wiadomości e-mail z serwera"</string>
     <string name="account_setup_incoming_delete_policy_never_label" msgid="3222897501875871041">"Nigdy"</string>
     <string name="account_setup_incoming_delete_policy_delete_label" msgid="222216840911785631">"Po usunięciu z folderu Odebrane"</string>
     <string name="account_setup_incoming_imap_path_prefix_label" msgid="401167247072926810">"Prefiks ścieżki IMAP"</string>
diff --git a/res/values-pt-rPT/strings.xml b/res/values-pt-rPT/strings.xml
index 2e7ecf4..e0566b2 100644
--- a/res/values-pt-rPT/strings.xml
+++ b/res/values-pt-rPT/strings.xml
@@ -30,7 +30,7 @@
     <string name="reply_action" msgid="4262472229221507619">"Responder"</string>
     <string name="reply_all_action" msgid="6192179825726332152">"Responder a todas"</string>
     <string name="delete_action" msgid="8421026208288857155">"Eliminar"</string>
-    <string name="forward_action" msgid="669174181042344116">"Reencaminhar"</string>
+    <string name="forward_action" msgid="669174181042344116">"Encaminhar"</string>
     <string name="done_action" msgid="7497990549515580249">"Concluído"</string>
     <string name="discard_action" msgid="6532206074859505968">"Rejeitar"</string>
     <string name="save_draft_action" msgid="812855865552028622">"Guardar como rascunho"</string>
@@ -60,7 +60,7 @@
     <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="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>
+    <string name="error_loading_message_body" msgid="2265140604109272914">"Erro inesperado durante o carregamento do texto da mensagem. É possível que a mensagem seja demasiado extensa para visualização. "</string>
   <plurals name="notification_new_one_account_fmt">
     <item quantity="one" msgid="3422945912787702191">"<xliff:g id="UNREAD_MESSAGE_COUNT">%d</xliff:g> não lidas (<xliff:g id="ACCOUNT">%s</xliff:g>)"</item>
     <item quantity="few" msgid="6543078667692990869">"<xliff:g id="UNREAD_MESSAGE_COUNT">%d</xliff:g> não lidas (<xliff:g id="ACCOUNT">%s</xliff:g>)"</item>
@@ -89,7 +89,7 @@
     <string name="message_compose_cc_hint" msgid="8481884461031434144">"Cc"</string>
     <string name="message_compose_bcc_hint" msgid="9177337492358841680">"Bcc"</string>
     <string name="message_compose_subject_hint" msgid="6993487234024160782">"Assunto"</string>
-    <string name="message_compose_body_hint" msgid="7575406246484103697">"Redigir mensagem"</string>
+    <string name="message_compose_body_hint" msgid="7575406246484103697">"Redigir correio"</string>
     <string name="message_compose_fwd_header_fmt" msgid="5181300290654579434">\n\n"-------- Mensagem original --------"\n"Assunto: <xliff:g id="SUBJECT">%s</xliff:g>"\n"De: <xliff:g id="SENDER">%s</xliff:g>"\n"Para: <xliff:g id="TO">%s</xliff:g>"\n"CC: <xliff:g id="CC_0">%s</xliff:g>"\n\n</string>
     <string name="message_compose_reply_header_fmt" msgid="8815624773273454573">\n\n"<xliff:g id="SENDER">%s</xliff:g> escreveu:"\n\n</string>
     <string name="message_compose_quoted_text_label" msgid="5722467956990009520">"Texto entre aspas"</string>
@@ -142,7 +142,7 @@
     <string name="account_setup_check_settings_check_outgoing_msg" msgid="4033015234096725343">"A verificar definições do servidor de envio..."</string>
     <string name="account_setup_check_settings_canceling_msg" msgid="5077315503721883906">"A cancelar..."</string>
     <string name="account_setup_names_title" msgid="8875040521875381849">"Configurar e-mail"</string>
-    <string name="account_setup_names_instructions" msgid="2880279273965835007">"A sua conta está configurada e o e-mail está a caminho!"</string>
+    <string name="account_setup_names_instructions" msgid="2880279273965835007">"A sua conta está configurada e o e-mail vai a caminho!"</string>
     <string name="account_setup_names_account_name_label" msgid="8033895024273259196">"Dar um nome a esta conta (opcional)"</string>
     <string name="account_setup_names_user_name_label" msgid="8967410178488604770">"O seu nome (apresentado nas mensagens enviadas)"</string>
     <string name="account_setup_account_type_title" msgid="6645576356752495504">"Adicionar nova conta de e-mail"</string>
@@ -154,7 +154,7 @@
     <string name="account_setup_incoming_imap_server_label" msgid="8685076830847734322">"Servidor IMAP"</string>
     <string name="account_setup_incoming_port_label" msgid="8214738923690447796">"Porta"</string>
     <string name="account_setup_incoming_security_label" msgid="2110260791086007424">"Tipo de segurança"</string>
-    <string name="account_setup_incoming_security_none_label" msgid="8300169413118264895">"Nenhum"</string>
+    <string name="account_setup_incoming_security_none_label" msgid="8300169413118264895">"Nenhuma"</string>
     <string name="account_setup_incoming_security_ssl_trust_certificates_label" msgid="3581382268191377346">"SSL (Aceitar todos os certificados)"</string>
     <string name="account_setup_incoming_security_ssl_label" msgid="8886698397743061682">"SSL"</string>
     <string name="account_setup_incoming_security_tls_trust_certificates_label" msgid="1089227022489257055">"TLS (Aceitar todos os certificados)"</string>
diff --git a/res/values-pt/strings.xml b/res/values-pt/strings.xml
index 6f2cfed..467a316 100644
--- a/res/values-pt/strings.xml
+++ b/res/values-pt/strings.xml
@@ -23,14 +23,14 @@
     <string name="app_name" msgid="5815426892327290362">"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>
+    <string name="next_action" msgid="3931301986364184415">"Próxima"</string>
     <string name="okay_action" msgid="8365197396795675617">"OK"</string>
     <string name="cancel_action" msgid="6967435583794021865">"Cancelar"</string>
     <string name="send_action" msgid="1729766205562446418">"Enviar"</string>
     <string name="reply_action" msgid="4262472229221507619">"Responder"</string>
     <string name="reply_all_action" msgid="6192179825726332152">"Responder a todos"</string>
     <string name="delete_action" msgid="8421026208288857155">"Excluir"</string>
-    <string name="forward_action" msgid="669174181042344116">"Encaminhar"</string>
+    <string name="forward_action" msgid="669174181042344116">"Avançar"</string>
     <string name="done_action" msgid="7497990549515580249">"Concluído"</string>
     <string name="discard_action" msgid="6532206074859505968">"Descartar"</string>
     <string name="save_draft_action" msgid="812855865552028622">"Salvar como rascunho"</string>
@@ -44,7 +44,7 @@
     <string name="add_account_action" msgid="8835736309476033727">"Adicionar conta"</string>
     <string name="deselect_all_action" msgid="253663239459688238">"Desmarcar todas"</string>
     <string name="compose_action" msgid="4045702519637388045">"Escrever"</string>
-    <string name="search_action" msgid="6325101454876682308">"Pesquisar"</string>
+    <string name="search_action" msgid="6325101454876682308">"Pesquisa"</string>
     <string name="open_action" msgid="936766723989190816">"Abrir"</string>
     <string name="account_settings_action" msgid="4494079183315085171">"Configurações da conta"</string>
     <string name="remove_account_action" msgid="3789169090601376209">"Remover conta"</string>
@@ -62,7 +62,7 @@
     <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">
-    <item quantity="one" msgid="3422945912787702191">"<xliff:g id="UNREAD_MESSAGE_COUNT">%d</xliff:g> não lida (<xliff:g id="ACCOUNT">%s</xliff:g>)"</item>
+    <item quantity="one" msgid="3422945912787702191">"<xliff:g id="UNREAD_MESSAGE_COUNT">%d</xliff:g> não lidas (<xliff:g id="ACCOUNT">%s</xliff:g>)"</item>
     <item quantity="few" msgid="6543078667692990869">"<xliff:g id="UNREAD_MESSAGE_COUNT">%d</xliff:g> não lidas (<xliff:g id="ACCOUNT">%s</xliff:g>)"</item>
     <item quantity="other" msgid="6937673814351448076">"<xliff:g id="UNREAD_MESSAGE_COUNT">%d</xliff:g> não lidas (<xliff:g id="ACCOUNT">%s</xliff:g>)"</item>
   </plurals>
@@ -161,18 +161,18 @@
     <string name="account_setup_incoming_security_tls_label" msgid="8638006172590036487">"TLS"</string>
     <string name="account_setup_incoming_delete_policy_label" msgid="9213590134693857912">"Excluir e-mail do servidor"</string>
     <string name="account_setup_incoming_delete_policy_never_label" msgid="3222897501875871041">"Nunca"</string>
-    <string name="account_setup_incoming_delete_policy_delete_label" msgid="222216840911785631">"Quando excluir da Caixa de entrada"</string>
+    <string name="account_setup_incoming_delete_policy_delete_label" msgid="222216840911785631">"Quando eu excluir da Caixa de entrada"</string>
     <string name="account_setup_incoming_imap_path_prefix_label" msgid="401167247072926810">"Prefixo do caminho IMAP"</string>
     <string name="account_setup_incoming_imap_path_prefix_hint" msgid="9190845919067906033">"Opcional"</string>
-    <string name="account_setup_outgoing_title" msgid="7437215562885986394">"Configurações de saída do servidor"</string>
+    <string name="account_setup_outgoing_title" msgid="7437215562885986394">"Configurações de servidor enviadas"</string>
     <string name="account_setup_outgoing_smtp_server_label" msgid="6035137446691195177">"Servidor SMTP"</string>
     <string name="account_setup_outgoing_port_label" msgid="7573207437835827876">"Porta"</string>
     <string name="account_setup_outgoing_security_label" msgid="911398071120720589">"Tipo de segurança"</string>
     <string name="account_setup_outgoing_require_login_label" msgid="6371514297854287948">"Requer login."</string>
     <string name="account_setup_outgoing_username_label" msgid="3309680794731596981">"Nome de usuário"</string>
     <string name="account_setup_outgoing_password_label" msgid="227844585493317550">"Senha"</string>
-    <string name="account_setup_exchange_title" msgid="2492853474738063453">"Configurações do servidor\n"</string>
-    <string name="account_setup_exchange_server_label" msgid="795137797983360826">"Servidor\n"</string>
+    <string name="account_setup_exchange_title" msgid="2492853474738063453">"Configuraçõ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 usuário"</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>
diff --git a/res/values-ru/strings.xml b/res/values-ru/strings.xml
index 8f08546..13d7f22 100644
--- a/res/values-ru/strings.xml
+++ b/res/values-ru/strings.xml
@@ -20,9 +20,9 @@
     <string name="read_attachment_desc" msgid="7594746717616308643">"Разрешить этой программе открывать приложения электронной почты."</string>
     <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="app_name" msgid="5815426892327290362">"Написать письмо"</string>
     <string name="compose_title" msgid="427986915662706899">"Новое сообщение"</string>
-    <string name="debug_title" msgid="5175710493691536719">"Отладка"</string>
+    <string name="debug_title" msgid="5175710493691536719">"Выполнить отладку"</string>
     <string name="next_action" msgid="3931301986364184415">"Далее"</string>
     <string name="okay_action" msgid="8365197396795675617">"ОК"</string>
     <string name="cancel_action" msgid="6967435583794021865">"Отмена"</string>
@@ -32,7 +32,7 @@
     <string name="delete_action" msgid="8421026208288857155">"Удалить"</string>
     <string name="forward_action" msgid="669174181042344116">"Переслать"</string>
     <string name="done_action" msgid="7497990549515580249">"Готово"</string>
-    <string name="discard_action" msgid="6532206074859505968">"Удалить черновик"</string>
+    <string name="discard_action" msgid="6532206074859505968">"Отменить"</string>
     <string name="save_draft_action" msgid="812855865552028622">"Сохранить черновик"</string>
     <string name="read_unread_action" msgid="4721446664849165077">"Прочитанные/Непрочитанные"</string>
     <string name="read_action" msgid="4701484794504781686">"Отметить как прочитанное"</string>
@@ -40,7 +40,7 @@
     <string name="favorite_action" msgid="2911296685862420689">"Избранное"</string>
     <string name="set_star_action" msgid="4660317166196258160">"Пометить"</string>
     <string name="remove_star_action" msgid="6689770999647007163">"Снять пометку"</string>
-    <string name="refresh_action" msgid="5951383001436708175">"Обновить"</string>
+    <string name="refresh_action" msgid="5951383001436708175">"Обновление"</string>
     <string name="add_account_action" msgid="8835736309476033727">"Добавить аккаунт"</string>
     <string name="deselect_all_action" msgid="253663239459688238">"Снять все выделения"</string>
     <string name="compose_action" msgid="4045702519637388045">"Новое сообщение"</string>
@@ -52,7 +52,7 @@
     <string name="accounts_action" msgid="901105887272231493">"Аккаунты"</string>
     <string name="mark_as_read_action" msgid="5031651846998842419">"Отметить как прочитанные"</string>
     <string name="mark_as_unread_action" msgid="3766298115778767554">"Отметить как непрочитанное"</string>
-    <string name="add_cc_bcc_action" msgid="5569074812077509737">"Добавить копию"</string>
+    <string name="add_cc_bcc_action" msgid="5569074812077509737">"Добавить копию или скрытую копию"</string>
     <string name="add_attachment_action" msgid="2696013743130573897">"Добавить приложение"</string>
     <string name="dump_settings_action" msgid="4478192525236169829">"Настройки дампа"</string>
     <string name="choose_attachment_dialog_title" msgid="81937507117528954">"Выбрать приложение"</string>
@@ -85,7 +85,7 @@
     <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_compose_to_hint" msgid="2891895306418177013">"Кому"</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>
     <string name="message_compose_subject_hint" msgid="6993487234024160782">"Тема"</string>
@@ -98,8 +98,8 @@
     <string name="message_compose_attachments_skipped_toast" msgid="5611815773808423460">"Некоторые приложения нельзя переслать, так как они не были загружены."</string>
     <string name="message_compose_attachment_size" msgid="4401081828287333647">"Файл имеет слишком большой размер и не может быть приложен."</string>
     <string name="message_compose_display_name" msgid="6415258924917140704">"<xliff:g id="NAME">%1$s</xliff:g> и еще <xliff:g id="NUMBER">%2$d</xliff:g>"</string>
-    <string name="message_view_to_label" msgid="6485191743265527381">"Кому:"</string>
-    <string name="message_view_cc_label" msgid="6322992216371163122">"Копия:"</string>
+    <string name="message_view_to_label" msgid="6485191743265527381">"На:"</string>
+    <string name="message_view_cc_label" msgid="6322992216371163122">"Копия: "</string>
     <string name="message_view_attachment_view_action" msgid="5353550848340829134">"Открыть"</string>
     <string name="message_view_attachment_download_action" msgid="7552530274014544406">"Сохранить"</string>
     <string name="message_view_status_attachment_saved" msgid="2802843795251453632">"Приложение сохранено на SD-карту под именем <xliff:g id="FILENAME">%s</xliff:g>."</string>
@@ -132,7 +132,7 @@
     <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>
+    <string name="account_setup_basics_default_label" msgid="5924790142029806711">"Сделать аккаунтом электронной почты по умолчанию для отправки сообщений."</string>
     <string name="account_setup_basics_manual_setup_action" msgid="8053852205391155912">"Настройка вручную"</string>
     <string name="account_setup_username_password_toast" msgid="4441448542557889481">"Введите действительный адрес электронной почты и пароль."</string>
     <string name="account_duplicate_dlg_title" msgid="3176749833792312641">"Копия аккаунта"</string>
@@ -143,7 +143,7 @@
     <string name="account_setup_check_settings_canceling_msg" msgid="5077315503721883906">"Отмена..."</string>
     <string name="account_setup_names_title" msgid="8875040521875381849">"Настройка электронной почты"</string>
     <string name="account_setup_names_instructions" msgid="2880279273965835007">"Ваш аккаунт настроен, ждите сообщений!"</string>
-    <string name="account_setup_names_account_name_label" msgid="8033895024273259196">"Присвойте этому аккаунту название (не обязательно)"</string>
+    <string name="account_setup_names_account_name_label" msgid="8033895024273259196">"Присвойте этому аккаунту название (по желанию)"</string>
     <string name="account_setup_names_user_name_label" msgid="8967410178488604770">"Ваше имя (показывается в исходящих сообщениях)"</string>
     <string name="account_setup_account_type_title" msgid="6645576356752495504">"Добавить новый аккаунт электронной почты"</string>
     <string name="account_setup_account_type_instructions" msgid="114515540798408760">"Что это за аккаунт?"</string>
@@ -163,7 +163,7 @@
     <string name="account_setup_incoming_delete_policy_never_label" msgid="3222897501875871041">"Никогда"</string>
     <string name="account_setup_incoming_delete_policy_delete_label" msgid="222216840911785631">"При удалении из входящих"</string>
     <string name="account_setup_incoming_imap_path_prefix_label" msgid="401167247072926810">"Префикс пути IMAP"</string>
-    <string name="account_setup_incoming_imap_path_prefix_hint" msgid="9190845919067906033">"Не обязательно"</string>
+    <string name="account_setup_incoming_imap_path_prefix_hint" msgid="9190845919067906033">"По желанию"</string>
     <string name="account_setup_outgoing_title" msgid="7437215562885986394">"Настройки сервера исходящих сообщений"</string>
     <string name="account_setup_outgoing_smtp_server_label" msgid="6035137446691195177">"Сервер SMTP"</string>
     <string name="account_setup_outgoing_port_label" msgid="7573207437835827876">"Порт"</string>
@@ -171,13 +171,13 @@
     <string name="account_setup_outgoing_require_login_label" msgid="6371514297854287948">"Требовать входа в аккаунт."</string>
     <string name="account_setup_outgoing_username_label" msgid="3309680794731596981">"Имя пользователя"</string>
     <string name="account_setup_outgoing_password_label" msgid="227844585493317550">"Пароль"</string>
-    <string name="account_setup_exchange_title" msgid="2492853474738063453">"Настройки сервера\n"</string>
+    <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_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>
-    <string name="account_setup_options_mail_check_frequency_label" msgid="4598023962234986194">"Частота проверки почты"</string>
+    <string name="account_setup_options_mail_check_frequency_label" msgid="4598023962234986194">"Частота проверки электронной почты"</string>
     <string name="account_setup_options_mail_check_frequency_never" msgid="287951859480505416">"Никогда"</string>
     <string name="account_setup_options_mail_check_frequency_push" msgid="5934525907736008673">"Автоматически (принудительно)"</string>
     <string name="account_setup_options_mail_check_frequency_5min" msgid="6388939895878539307">"Каждые 5 минут"</string>
@@ -185,7 +185,7 @@
     <string name="account_setup_options_mail_check_frequency_15min" msgid="5052776740089741793">"Каждые 15 минут"</string>
     <string name="account_setup_options_mail_check_frequency_30min" msgid="1097088928685931864">"Каждые 30 минут"</string>
     <string name="account_setup_options_mail_check_frequency_1hour" msgid="3767715356039692899">"Каждый час"</string>
-    <string name="account_setup_options_default_label" msgid="8869166381331276697">"По умолчанию отправлять почту с этого аккаунта"</string>
+    <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>
@@ -216,11 +216,11 @@
     <string name="account_setup_failed_dlg_edit_details_action" msgid="5355993309841479360">"Изменить сведения"</string>
     <string name="account_settings_title_fmt" msgid="1702058877284382340">"Общие настройки"</string>
     <string name="account_settings_default_label" msgid="3575963379680943640">"Аккаунт по умолчанию"</string>
-    <string name="account_settings_default_summary" msgid="1531901438624688482">"По умолчанию отправлять почту с этого аккаунта"</string>
-    <string name="account_settings_notify_label" msgid="1630001017303007974">"Уведомления о почте"</string>
+    <string name="account_settings_default_summary" msgid="1531901438624688482">"Сделать аккаунтом электронной почты по умолчанию для отправки сообщений"</string>
+    <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_notify_summary" msgid="6609224590300639887">"При получении сообщения по электронной почте в строке состояния появляется уведомление"</string>
+    <string name="account_settings_mail_check_frequency_label" msgid="2067835530563849675">"Частота проверки электронной почты"</string>
     <string name="account_settings_incoming_label" msgid="7858928031806297542">"Настройки входящих сообщений"</string>
     <string name="account_settings_outgoing_label" msgid="4464829249980026745">"Настройки исходящих сообщений"</string>
     <string name="account_settings_description_label" msgid="8894815221204511715">"Название аккаунта"</string>
@@ -235,10 +235,10 @@
     <string name="account_settings_vibrate_when_label" msgid="708477308761702671">"Вибросигнал"</string>
     <string name="account_settings_vibrate_when_summary" msgid="3991584445166247189">"Вибросигнал при получении сообщения"</string>
     <string name="account_settings_vibrate_when_always" msgid="6739506816960483174">"Всегда"</string>
-    <string name="account_settings_vibrate_when_silent" msgid="6417076436551648924">"Только в тихом режиме"</string>
+    <string name="account_settings_vibrate_when_silent" msgid="6417076436551648924">"Только в режиме без звука"</string>
     <string name="account_settings_vibrate_when_never" msgid="3759680093309511614">"Никогда"</string>
     <string name="account_settings_vibrate_when_dlg_title" msgid="308167729046312952">"Вибросигнал"</string>
-    <string name="account_settings_ringtone" msgid="7922187231467500404">"Выбрать мелодию"</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>
diff --git a/res/values-sv/strings.xml b/res/values-sv/strings.xml
index 671f109..9b10108 100644
--- a/res/values-sv/strings.xml
+++ b/res/values-sv/strings.xml
@@ -30,9 +30,9 @@
     <string name="reply_action" msgid="4262472229221507619">"Svara"</string>
     <string name="reply_all_action" msgid="6192179825726332152">"Svara alla"</string>
     <string name="delete_action" msgid="8421026208288857155">"Ta bort"</string>
-    <string name="forward_action" msgid="669174181042344116">"Vidarebefordra"</string>
-    <string name="done_action" msgid="7497990549515580249">"Färdig"</string>
-    <string name="discard_action" msgid="6532206074859505968">"Ignorera"</string>
+    <string name="forward_action" msgid="669174181042344116">"Framåt"</string>
+    <string name="done_action" msgid="7497990549515580249">"Klar"</string>
+    <string name="discard_action" msgid="6532206074859505968">"Släng"</string>
     <string name="save_draft_action" msgid="812855865552028622">"Spara som utkast"</string>
     <string name="read_unread_action" msgid="4721446664849165077">"Lästa/olästa"</string>
     <string name="read_action" msgid="4701484794504781686">"Markera som läst"</string>
@@ -52,7 +52,7 @@
     <string name="accounts_action" msgid="901105887272231493">"Konton"</string>
     <string name="mark_as_read_action" msgid="5031651846998842419">"Markera som läst"</string>
     <string name="mark_as_unread_action" msgid="3766298115778767554">"Markera som oläst"</string>
-    <string name="add_cc_bcc_action" msgid="5569074812077509737">"Kopia/hemlig kopia"</string>
+    <string name="add_cc_bcc_action" msgid="5569074812077509737">"Lägg till kopia/hemlig kopia"</string>
     <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>
@@ -63,8 +63,8 @@
     <string name="error_loading_message_body" msgid="2265140604109272914">"Ett oväntat fel uppstod när meddelandetexten skulle läsas in. Meddelandet kanske är för stort för att visas."</string>
   <plurals name="notification_new_one_account_fmt">
     <item quantity="one" msgid="3422945912787702191">"<xliff:g id="UNREAD_MESSAGE_COUNT">%d</xliff:g> oläst (<xliff:g id="ACCOUNT">%s</xliff:g>"</item>
-    <item quantity="few" msgid="6543078667692990869">"<xliff:g id="UNREAD_MESSAGE_COUNT">%d</xliff:g> olästa (<xliff:g id="ACCOUNT">%s</xliff:g>)"</item>
-    <item quantity="other" msgid="6937673814351448076">"<xliff:g id="UNREAD_MESSAGE_COUNT">%d</xliff:g> olästa (<xliff:g id="ACCOUNT">%s</xliff:g>)"</item>
+    <item quantity="few" msgid="6543078667692990869">"<xliff:g id="UNREAD_MESSAGE_COUNT">%d</xliff:g> oläst (<xliff:g id="ACCOUNT">%s</xliff:g>"</item>
+    <item quantity="other" msgid="6937673814351448076">"<xliff:g id="UNREAD_MESSAGE_COUNT">%d</xliff:g> oläst (<xliff:g id="ACCOUNT">%s</xliff:g>"</item>
   </plurals>
   <plurals name="notification_new_multi_account_fmt">
     <item quantity="few" msgid="1991747245324120305">"i <xliff:g id="NUMBER_ACCOUNTS">%d</xliff:g> konton"</item>
@@ -122,7 +122,7 @@
     <item quantity="other" msgid="6574961322865652255">"Meddelandena har tagits bort."</item>
   </plurals>
     <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="message_saved_toast" msgid="8443125659172627665">"Meddelande sparat som utkast."</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>
@@ -154,14 +154,14 @@
     <string name="account_setup_incoming_imap_server_label" msgid="8685076830847734322">"IMAP-server"</string>
     <string name="account_setup_incoming_port_label" msgid="8214738923690447796">"Port"</string>
     <string name="account_setup_incoming_security_label" msgid="2110260791086007424">"Säkerhetstyp"</string>
-    <string name="account_setup_incoming_security_none_label" msgid="8300169413118264895">"Inga"</string>
+    <string name="account_setup_incoming_security_none_label" msgid="8300169413118264895">"Ingen"</string>
     <string name="account_setup_incoming_security_ssl_trust_certificates_label" msgid="3581382268191377346">"SSL (Acceptera alla certifikat)"</string>
     <string name="account_setup_incoming_security_ssl_label" msgid="8886698397743061682">"SSL"</string>
     <string name="account_setup_incoming_security_tls_trust_certificates_label" msgid="1089227022489257055">"TLS (Acceptera alla certifikat)"</string>
     <string name="account_setup_incoming_security_tls_label" msgid="8638006172590036487">"TLS"</string>
     <string name="account_setup_incoming_delete_policy_label" msgid="9213590134693857912">"Ta bort e-post från servern"</string>
     <string name="account_setup_incoming_delete_policy_never_label" msgid="3222897501875871041">"Aldrig"</string>
-    <string name="account_setup_incoming_delete_policy_delete_label" msgid="222216840911785631">"Vid borttagning från Inkorgen"</string>
+    <string name="account_setup_incoming_delete_policy_delete_label" msgid="222216840911785631">"När jag tar bort något från min Inkorg"</string>
     <string name="account_setup_incoming_imap_path_prefix_label" msgid="401167247072926810">"IMAP-sökvägsprefix"</string>
     <string name="account_setup_incoming_imap_path_prefix_hint" msgid="9190845919067906033">"Valfritt"</string>
     <string name="account_setup_outgoing_title" msgid="7437215562885986394">"Utgående serverinställningar"</string>
@@ -171,7 +171,7 @@
     <string name="account_setup_outgoing_require_login_label" msgid="6371514297854287948">"Kräv inloggning"</string>
     <string name="account_setup_outgoing_username_label" msgid="3309680794731596981">"Användarnamn"</string>
     <string name="account_setup_outgoing_password_label" msgid="227844585493317550">"Lösenord"</string>
-    <string name="account_setup_exchange_title" msgid="2492853474738063453">"Serverinställningar\n"</string>
+    <string name="account_setup_exchange_title" msgid="2492853474738063453">"Serverinställningar"</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_ssl_label" msgid="6704105469083211236">"Använd säker anslutning (SSL)"</string>
@@ -217,7 +217,7 @@
     <string name="account_settings_title_fmt" msgid="1702058877284382340">"Allmänna inställningar"</string>
     <string name="account_settings_default_label" msgid="3575963379680943640">"Standardkonto"</string>
     <string name="account_settings_default_summary" msgid="1531901438624688482">"Skicka e-post från det här kontot som standard"</string>
-    <string name="account_settings_notify_label" msgid="1630001017303007974">"E-postavisering"</string>
+    <string name="account_settings_notify_label" msgid="1630001017303007974">"E-postaviseringar"</string>
     <string name="account_settings_exchange_summary" msgid="8498451479029626317">"Synkroniseringsfrekvens, aviseringar osv."</string>
     <string name="account_settings_notify_summary" msgid="6609224590300639887">"Meddelande i statusfältet vid e-postmeddelande"</string>
     <string name="account_settings_mail_check_frequency_label" msgid="2067835530563849675">"Intervall för e-postkontroll"</string>
@@ -227,7 +227,7 @@
     <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_notifications" msgid="1042620094281375043">"Meddelandeinstä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>
@@ -246,7 +246,7 @@
     <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_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 tills 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>
diff --git a/res/values-tr/strings.xml b/res/values-tr/strings.xml
index c1b3413..3b58855 100644
--- a/res/values-tr/strings.xml
+++ b/res/values-tr/strings.xml
@@ -30,7 +30,7 @@
     <string name="reply_action" msgid="4262472229221507619">"Yanıtla"</string>
     <string name="reply_all_action" msgid="6192179825726332152">"Tümünü yanıtla"</string>
     <string name="delete_action" msgid="8421026208288857155">"Sil"</string>
-    <string name="forward_action" msgid="669174181042344116">"Yönlendir"</string>
+    <string name="forward_action" msgid="669174181042344116">"İleri"</string>
     <string name="done_action" msgid="7497990549515580249">"Bitti"</string>
     <string name="discard_action" msgid="6532206074859505968">"Sil"</string>
     <string name="save_draft_action" msgid="812855865552028622">"Taslak olarak kaydet"</string>
@@ -50,9 +50,9 @@
     <string name="remove_account_action" msgid="3789169090601376209">"Hesabı kaldır"</string>
     <string name="folders_action" msgid="7502431531355227666">"Klasörler"</string>
     <string name="accounts_action" msgid="901105887272231493">"Hesaplar"</string>
-    <string name="mark_as_read_action" msgid="5031651846998842419">"Okundu diye işaretle"</string>
-    <string name="mark_as_unread_action" msgid="3766298115778767554">"Okunmadı diye işaretle"</string>
-    <string name="add_cc_bcc_action" msgid="5569074812077509737">"Cc/Bcc ekle"</string>
+    <string name="mark_as_read_action" msgid="5031651846998842419">"Okundu olarak işaretle"</string>
+    <string name="mark_as_unread_action" msgid="3766298115778767554">"Okunmadı olarak işaretle"</string>
+    <string name="add_cc_bcc_action" msgid="5569074812077509737">"Cc/Bcc Ekle"</string>
     <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>
@@ -85,7 +85,7 @@
     <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_compose_to_hint" msgid="2891895306418177013">"Hedef:"</string>
+    <string name="message_compose_to_hint" msgid="2891895306418177013">"Şu dile:"</string>
     <string name="message_compose_cc_hint" msgid="8481884461031434144">"Cc"</string>
     <string name="message_compose_bcc_hint" msgid="9177337492358841680">"Bcc"</string>
     <string name="message_compose_subject_hint" msgid="6993487234024160782">"Konu"</string>
@@ -152,7 +152,7 @@
     <string name="account_setup_incoming_password_label" msgid="6365327603172559859">"Şifre"</string>
     <string name="account_setup_incoming_pop_server_label" msgid="4917504440057879152">"POP3 sunucusu"</string>
     <string name="account_setup_incoming_imap_server_label" msgid="8685076830847734322">"IMAP sunucusu"</string>
-    <string name="account_setup_incoming_port_label" msgid="8214738923690447796">"Bağlantı noktası"</string>
+    <string name="account_setup_incoming_port_label" msgid="8214738923690447796">"Bağlantı Noktası"</string>
     <string name="account_setup_incoming_security_label" msgid="2110260791086007424">"Güvenlik türü"</string>
     <string name="account_setup_incoming_security_none_label" msgid="8300169413118264895">"Yok"</string>
     <string name="account_setup_incoming_security_ssl_trust_certificates_label" msgid="3581382268191377346">"SSL (Tüm sertifikaları kabul et)"</string>
@@ -160,13 +160,13 @@
     <string name="account_setup_incoming_security_tls_trust_certificates_label" msgid="1089227022489257055">"TLS (Tüm sertifikaları kabul et)"</string>
     <string name="account_setup_incoming_security_tls_label" msgid="8638006172590036487">"TLS"</string>
     <string name="account_setup_incoming_delete_policy_label" msgid="9213590134693857912">"E-postayı sunucudan sil"</string>
-    <string name="account_setup_incoming_delete_policy_never_label" msgid="3222897501875871041">"Asla"</string>
+    <string name="account_setup_incoming_delete_policy_never_label" msgid="3222897501875871041">"Hiçbir zaman"</string>
     <string name="account_setup_incoming_delete_policy_delete_label" msgid="222216840911785631">"Gelen Kutusundan sildiğimde"</string>
     <string name="account_setup_incoming_imap_path_prefix_label" msgid="401167247072926810">"IMAP yolu öneki"</string>
     <string name="account_setup_incoming_imap_path_prefix_hint" msgid="9190845919067906033">"İsteğe bağlı"</string>
     <string name="account_setup_outgoing_title" msgid="7437215562885986394">"Giden sunucu ayarları"</string>
     <string name="account_setup_outgoing_smtp_server_label" msgid="6035137446691195177">"SMTP sunucusu"</string>
-    <string name="account_setup_outgoing_port_label" msgid="7573207437835827876">"Bağlantı noktası"</string>
+    <string name="account_setup_outgoing_port_label" msgid="7573207437835827876">"Bağlantı Noktası"</string>
     <string name="account_setup_outgoing_security_label" msgid="911398071120720589">"Güvenlik türü"</string>
     <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>
@@ -178,7 +178,7 @@
     <string name="account_setup_exchange_trust_certificates_label" msgid="6232880757633882678">"Tüm SSL sertifikalarını kabul et"</string>
     <string name="account_setup_options_title" msgid="8995162193118880993">"Hesap seçenekleri"</string>
     <string name="account_setup_options_mail_check_frequency_label" msgid="4598023962234986194">"E-posta kontrol etme sıklığı"</string>
-    <string name="account_setup_options_mail_check_frequency_never" msgid="287951859480505416">"Asla"</string>
+    <string name="account_setup_options_mail_check_frequency_never" msgid="287951859480505416">"Hiçbir zaman"</string>
     <string name="account_setup_options_mail_check_frequency_push" msgid="5934525907736008673">"Otomatik (Push)"</string>
     <string name="account_setup_options_mail_check_frequency_5min" msgid="6388939895878539307">"Her 5 dakikada bir"</string>
     <string name="account_setup_options_mail_check_frequency_10min" msgid="5344463157247877480">"Her 10 dakikada bir"</string>
@@ -221,8 +221,8 @@
     <string name="account_settings_exchange_summary" msgid="8498451479029626317">"Frekansı, bildirimleri vs. senkronize et"</string>
     <string name="account_settings_notify_summary" msgid="6609224590300639887">"E-posta geldiğinde durum çubuğunda bildir"</string>
     <string name="account_settings_mail_check_frequency_label" msgid="2067835530563849675">"E-posta kontrol sıklığı"</string>
-    <string name="account_settings_incoming_label" msgid="7858928031806297542">"Gelen ayarları"</string>
-    <string name="account_settings_outgoing_label" msgid="4464829249980026745">"Giden ayarları"</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_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>
@@ -238,7 +238,7 @@
     <string name="account_settings_vibrate_when_silent" msgid="6417076436551648924">"Yalnızca sessizken"</string>
     <string name="account_settings_vibrate_when_never" msgid="3759680093309511614">"Hiçbir zaman"</string>
     <string name="account_settings_vibrate_when_dlg_title" msgid="308167729046312952">"Titreşim"</string>
-    <string name="account_settings_ringtone" msgid="7922187231467500404">"Zil sesini seç"</string>
+    <string name="account_settings_ringtone" msgid="7922187231467500404">"Zil sesini seçin"</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>
diff --git a/res/values-zh-rCN/strings.xml b/res/values-zh-rCN/strings.xml
index 2a35db7..681bb81 100644
--- a/res/values-zh-rCN/strings.xml
+++ b/res/values-zh-rCN/strings.xml
@@ -20,7 +20,7 @@
     <string name="read_attachment_desc" msgid="7594746717616308643">"允许此应用程序读取您的电子邮件附件。"</string>
     <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="app_name" msgid="5815426892327290362">"发送电子邮件"</string>
     <string name="compose_title" msgid="427986915662706899">"撰写"</string>
     <string name="debug_title" msgid="5175710493691536719">"调试"</string>
     <string name="next_action" msgid="3931301986364184415">"下一步"</string>
@@ -32,7 +32,7 @@
     <string name="delete_action" msgid="8421026208288857155">"删除"</string>
     <string name="forward_action" msgid="669174181042344116">"转发"</string>
     <string name="done_action" msgid="7497990549515580249">"完成"</string>
-    <string name="discard_action" msgid="6532206074859505968">"舍弃"</string>
+    <string name="discard_action" msgid="6532206074859505968">"放弃"</string>
     <string name="save_draft_action" msgid="812855865552028622">"另存为草稿"</string>
     <string name="read_unread_action" msgid="4721446664849165077">"已读/未读"</string>
     <string name="read_action" msgid="4701484794504781686">"标记为已读"</string>
@@ -85,7 +85,7 @@
     <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_compose_to_hint" msgid="2891895306418177013">"收件人"</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>
     <string name="message_compose_subject_hint" msgid="6993487234024160782">"主题"</string>
@@ -98,7 +98,7 @@
     <string name="message_compose_attachments_skipped_toast" msgid="5611815773808423460">"某些附件无法转发,因为还未下载。"</string>
     <string name="message_compose_attachment_size" msgid="4401081828287333647">"文件太大,无法附加。"</string>
     <string name="message_compose_display_name" msgid="6415258924917140704">"<xliff:g id="NAME">%1$s</xliff:g>以及其他 <xliff:g id="NUMBER">%2$d</xliff:g> 人"</string>
-    <string name="message_view_to_label" msgid="6485191743265527381">"收件人:"</string>
+    <string name="message_view_to_label" msgid="6485191743265527381">"目标语言:"</string>
     <string name="message_view_cc_label" msgid="6322992216371163122">"抄送:"</string>
     <string name="message_view_attachment_view_action" msgid="5353550848340829134">"打开"</string>
     <string name="message_view_attachment_download_action" msgid="7552530274014544406">"保存"</string>
@@ -122,7 +122,7 @@
     <item quantity="other" msgid="6574961322865652255">"已删除消息。"</item>
   </plurals>
     <string name="message_discarded_toast" msgid="3891461729325584026">"邮件已舍弃。"</string>
-    <string name="message_saved_toast" msgid="8443125659172627665">"邮件已保存为草稿。"</string>
+    <string name="message_saved_toast" msgid="8443125659172627665">"信息已存为草稿。"</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>
@@ -142,8 +142,8 @@
     <string name="account_setup_check_settings_check_outgoing_msg" msgid="4033015234096725343">"正在检查外发服务器设置..."</string>
     <string name="account_setup_check_settings_canceling_msg" msgid="5077315503721883906">"正在取消..."</string>
     <string name="account_setup_names_title" msgid="8875040521875381849">"设置电子邮件"</string>
-    <string name="account_setup_names_instructions" msgid="2880279273965835007">"您已设置帐户,可以使用电子邮件程序了!"</string>
-    <string name="account_setup_names_account_name_label" msgid="8033895024273259196">"指定该帐户的名称(可选)"</string>
+    <string name="account_setup_names_instructions" msgid="2880279273965835007">"您的帐户已设置,可以使用电子邮件了!"</string>
+    <string name="account_setup_names_account_name_label" msgid="8033895024273259196">"为此帐户创建名称(可选)"</string>
     <string name="account_setup_names_user_name_label" msgid="8967410178488604770">"您的姓名(显示在外发邮件上)"</string>
     <string name="account_setup_account_type_title" msgid="6645576356752495504">"添加新电子邮件帐户"</string>
     <string name="account_setup_account_type_instructions" msgid="114515540798408760">"这是什么类型的帐户?"</string>
@@ -160,7 +160,7 @@
     <string name="account_setup_incoming_security_tls_trust_certificates_label" msgid="1089227022489257055">"TLS(接受所有证书)"</string>
     <string name="account_setup_incoming_security_tls_label" msgid="8638006172590036487">"TLS"</string>
     <string name="account_setup_incoming_delete_policy_label" msgid="9213590134693857912">"从服务器中删除电子邮件"</string>
-    <string name="account_setup_incoming_delete_policy_never_label" msgid="3222897501875871041">"永不"</string>
+    <string name="account_setup_incoming_delete_policy_never_label" msgid="3222897501875871041">"一律不"</string>
     <string name="account_setup_incoming_delete_policy_delete_label" msgid="222216840911785631">"当从收件箱中删除时"</string>
     <string name="account_setup_incoming_imap_path_prefix_label" msgid="401167247072926810">"IMAP 路径前缀"</string>
     <string name="account_setup_incoming_imap_path_prefix_hint" msgid="9190845919067906033">"可选"</string>
@@ -178,18 +178,18 @@
     <string name="account_setup_exchange_trust_certificates_label" msgid="6232880757633882678">"接受所有 SSL 证书"</string>
     <string name="account_setup_options_title" msgid="8995162193118880993">"帐户选项"</string>
     <string name="account_setup_options_mail_check_frequency_label" msgid="4598023962234986194">"电子邮件检查频率"</string>
-    <string name="account_setup_options_mail_check_frequency_never" msgid="287951859480505416">"永不"</string>
+    <string name="account_setup_options_mail_check_frequency_never" msgid="287951859480505416">"一律不"</string>
     <string name="account_setup_options_mail_check_frequency_push" msgid="5934525907736008673">"自动(推送)"</string>
-    <string name="account_setup_options_mail_check_frequency_5min" msgid="6388939895878539307">"每 5 分钟"</string>
-    <string name="account_setup_options_mail_check_frequency_10min" msgid="5344463157247877480">"每 10 分钟"</string>
-    <string name="account_setup_options_mail_check_frequency_15min" msgid="5052776740089741793">"每 15 分钟"</string>
-    <string name="account_setup_options_mail_check_frequency_30min" msgid="1097088928685931864">"每 30 分钟"</string>
+    <string name="account_setup_options_mail_check_frequency_5min" msgid="6388939895878539307">"每隔 5 分钟"</string>
+    <string name="account_setup_options_mail_check_frequency_10min" msgid="5344463157247877480">"每隔 10 分钟"</string>
+    <string name="account_setup_options_mail_check_frequency_15min" msgid="5052776740089741793">"每隔 15 分钟"</string>
+    <string name="account_setup_options_mail_check_frequency_30min" msgid="1097088928685931864">"每隔 30 分钟"</string>
     <string name="account_setup_options_mail_check_frequency_1hour" msgid="3767715356039692899">"每小时"</string>
     <string name="account_setup_options_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_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>
     <string name="account_setup_options_mail_window_3days" msgid="736181102295878114">"三天"</string>
@@ -205,7 +205,7 @@
     <string name="account_setup_failed_tls_required" msgid="307030406688611327">"需要 TLS,但服务器不支持 TLS。"</string>
     <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_ioerror" msgid="7391458717708933095">"无法打开到服务器的连接。"</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>
@@ -213,10 +213,10 @@
     <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_setup_failed_dlg_edit_details_action" msgid="5355993309841479360">"编辑详情"</string>
     <string name="account_settings_title_fmt" msgid="1702058877284382340">"常规设置"</string>
     <string name="account_settings_default_label" msgid="3575963379680943640">"默认帐户"</string>
-    <string name="account_settings_default_summary" msgid="1531901438624688482">"默认情况下用此帐户发送电子邮件"</string>
+    <string name="account_settings_default_summary" msgid="1531901438624688482">"默认情况下从此帐户发送电子邮件"</string>
     <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>