From 19019ae6942121ed33203b2e355730af08f7c31e Mon Sep 17 00:00:00 2001
From: Baligh Uddin <baligh@google.com>
Date: Sun, 6 Jul 2014 10:56:15 -0700
Subject: [PATCH] Import translations. DO NOT MERGE

Change-Id: I97a1fb94befee6929e63648440a67518c4bc82bb
Auto-generated-cl: translation import
---
 res/values-am/strings.xml     | 46 ++++++++++++------------
 res/values-ca/strings.xml     | 12 +++----
 res/values-cs/strings.xml     |  4 +--
 res/values-da/strings.xml     | 46 ++++++++++++------------
 res/values-de/strings.xml     |  6 ++--
 res/values-es-rUS/strings.xml |  2 +-
 res/values-es/strings.xml     |  8 ++---
 res/values-fi/strings.xml     |  8 ++---
 res/values-fr-rCA/strings.xml | 16 ++++-----
 res/values-fr/strings.xml     |  2 +-
 res/values-hi/strings.xml     |  6 ++--
 res/values-hu/strings.xml     |  2 +-
 res/values-ja/strings.xml     |  2 +-
 res/values-km-rKH/strings.xml | 28 +++++++--------
 res/values-ko/strings.xml     |  2 +-
 res/values-lt/strings.xml     |  2 +-
 res/values-nb/strings.xml     |  4 +--
 res/values-nl/strings.xml     |  4 +--
 res/values-pl/strings.xml     | 18 +++++-----
 res/values-pt-rPT/strings.xml | 38 ++++++++++----------
 res/values-ro/strings.xml     | 20 +++++------
 res/values-ru/strings.xml     | 14 ++++----
 res/values-sk/strings.xml     | 66 +++++++++++++++++------------------
 res/values-sl/strings.xml     |  6 ++--
 res/values-sr/strings.xml     | 16 ++++-----
 res/values-sv/strings.xml     |  2 +-
 res/values-sw/strings.xml     | 22 ++++++------
 res/values-th/strings.xml     | 12 +++----
 res/values-tr/strings.xml     |  4 +--
 res/values-zh-rCN/strings.xml | 54 ++++++++++++++--------------
 res/values-zh-rHK/strings.xml | 14 ++++----
 res/values-zh-rTW/strings.xml |  2 +-
 res/values-zu/strings.xml     | 14 ++++----
 33 files changed, 251 insertions(+), 251 deletions(-)

diff --git a/res/values-am/strings.xml b/res/values-am/strings.xml
index 84ac82a89..569c628b0 100644
--- a/res/values-am/strings.xml
+++ b/res/values-am/strings.xml
@@ -51,7 +51,7 @@
     <string name="account_folder_list_summary_starred" msgid="3134312269246375723">"ኮከብ የተደረገባቸው"</string>
     <string name="account_folder_list_summary_drafts" msgid="5514845993247300437">"ረቂቆች"</string>
     <string name="account_folder_list_summary_outbox" msgid="3059836696049399377">"የወጪ መልዕክት ሳጥን"</string>
-    <string name="mailbox_list_account_selector_combined_view" msgid="1556327299894225044">"የተቀላቀለዕይታ"</string>
+    <string name="mailbox_list_account_selector_combined_view" msgid="1556327299894225044">"የተቀላቀለ ዕይታ"</string>
     <string name="message_compose_fwd_header_fmt" msgid="5181300290654579434">\n\n"----------- ዋና መልዕክት---------\nጉዳዩ፡<xliff:g id="SUBJECT">%1$s</xliff:g>\n ከ፡<xliff:g id="SENDER">%2$s</xliff:g>\nለ፡<xliff:g id="TO">%3$s</xliff:g>\n<xliff:g id="CC_0">%4$s</xliff:g>\n  ካርቦን ቅጂ፡\n"</string>
     <string name="message_compose_insert_quick_response_list_title" msgid="5314107302508728189">"ፈጣን ምላሽ አስገባ"</string>
     <string name="message_compose_insert_quick_response_menu_title" msgid="5817075097532919955">"ፈጣን ምላሽ አስገባ"</string>
@@ -93,9 +93,9 @@
     <string name="account_setup_check_settings_check_outgoing_msg" msgid="4566131393776891419">"የsmtp ቅንብሮችን በማረጋገጥ ላይ…"</string>
     <string name="account_setup_creating_account_msg" msgid="6235569720466839946">"መለያን በመፍጠር ላይ…"</string>
     <string name="account_setup_names_title" msgid="8483517350241119291">"መለያ አዘጋጅ"</string>
-    <string name="account_setup_names_headline" msgid="914858472109729140">"መለያህ ተዋቅሯል፣ ኢሜይልህም መንገድ ላይ ነው!"</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_names_headline" msgid="914858472109729140">"መለያዎ እየተዋቀረ ነው፣ኢሜይልዎ በዝግጅት ላይ ነው!"</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_names_user_name_empty_error" msgid="6791427018325367364">"ይህ መስክ ባዶ መሆን አይችልም።"</string>
     <string name="account_setup_account_type_title" msgid="7156551693961182124">"መለያ አዘጋጅ"</string>
     <string name="account_setup_account_type_headline" msgid="3574102329184831086">"መለያ አይነት"</string>
@@ -112,9 +112,9 @@
     <string name="account_setup_incoming_security_ssl_label" msgid="2798501138420163861">"SSL/TLS"</string>
     <string name="account_setup_incoming_security_tls_trust_certificates_label" msgid="6149084428423662620">"STARTTLS (ሁሉንም ምስክሮች ተቀበል)"</string>
     <string name="account_setup_incoming_security_tls_label" msgid="6573498431821879660">"STARTTLS"</string>
-    <string name="account_setup_incoming_delete_policy_label" msgid="9213590134693857912">"ኢሜልል ከአገልጋይ ሰርዝ"</string>
+    <string name="account_setup_incoming_delete_policy_label" msgid="9213590134693857912">"ኢሜይል ከአገልጋይ ሰርዝ"</string>
     <string name="account_setup_incoming_delete_policy_never_label" msgid="3222897501875871041">"በፍፁም"</string>
-    <string name="account_setup_incoming_delete_policy_delete_label" msgid="222216840911785631">"ከገቢ መልዕክት ውስጥ ስሰርዘው"</string>
+    <string name="account_setup_incoming_delete_policy_delete_label" msgid="222216840911785631">"መቼ ነው ከገቢ መልዕክት ውስጥ የሚሰረዘው"</string>
     <string name="account_setup_incoming_imap_path_prefix_label" msgid="401167247072926810">"የIMAP ቅድመ ቅጥያዱካ"</string>
     <string name="account_setup_incoming_imap_path_prefix_hint" msgid="9190845919067906033">"አማራጭ"</string>
     <string name="account_setup_outgoing_title" msgid="7208495965665711539">"መለያ አዘጋጅ"</string>
@@ -142,15 +142,15 @@
     <string name="account_setup_options_mail_check_frequency_30min" msgid="1097088928685931864">"በየ30 ደቂቃዎቹ"</string>
     <string name="account_setup_options_mail_check_frequency_1hour" msgid="3767715356039692899">"በየሰዓቱ"</string>
     <string name="account_setup_options_notify_label" msgid="7046146571560728829">"ኢሜይል ሲደርስ አሳውቀኝ"</string>
-    <string name="account_setup_options_sync_contacts_label" msgid="276492345599531778">"ከዚህ መለያ ዕውቂያዎች አመሳስል"</string>
-    <string name="account_setup_options_sync_calendar_label" msgid="3222151135467189411">"ከዚህ መለያ የቀን አቆጣጠር አመሳስል"</string>
-    <string name="account_setup_options_sync_email_label" msgid="8585177128405004068">"ከዚህ መለያ ኢሜይል አመሳስል"</string>
+    <string name="account_setup_options_sync_contacts_label" msgid="276492345599531778">"ከዚህ መለያ ዕውቂያዎች አስምር"</string>
+    <string name="account_setup_options_sync_calendar_label" msgid="3222151135467189411">"ከዚህ መለያ የቀን አቆጣጠር አስምር"</string>
+    <string name="account_setup_options_sync_email_label" msgid="8585177128405004068">"ከዚህ መለያ ኢሜይል አስምር"</string>
     <string name="account_setup_options_background_attachments_label" msgid="5247749298276451846">"ወደ Wi-Fi ስትገናኝ አባሪዎችን በራስ ሰር አውርድ"</string>
     <string name="account_setup_failed_dlg_title" msgid="9083263347962940552">"ማጠናቀቅ አልተቻለም"</string>
     <string name="account_setup_options_mail_window_label" msgid="7582247646138987328">"ቀኖች አስምር"</string>
     <string name="account_setup_options_mail_window_auto" msgid="4188895354366183790">"ራስ ሰር"</string>
     <string name="account_setup_options_mail_window_1day" msgid="7727436096227637646">"ያለፈው ቀን"</string>
-    <string name="account_setup_options_mail_window_3days" msgid="1841106793912850270">"ያለፉት ሶስት ቀናት"</string>
+    <string name="account_setup_options_mail_window_3days" msgid="1841106793912850270">"ያለፉት ሶስት ቀኖች"</string>
     <string name="account_setup_options_mail_window_1week" msgid="5804121771990249346">"ያለፈው ሳምንት"</string>
     <string name="account_setup_options_mail_window_2weeks" msgid="3583478100026382495">"ያለፉት ሁለት ሳምንታት"</string>
     <string name="account_setup_options_mail_window_1month" msgid="4289585173153789717">"ያለፈው ወር"</string>
@@ -174,7 +174,7 @@
     <string name="account_setup_failed_protocol_unsupported" msgid="4607759927226943569">"የተሳሳተ የአገልጋይ አድራሻ አስገብተሃል ወይም አገልጋዩ ኢሜይሉ የማይደግፈው የፕሮቶኮል ሥሪት ይጠይቃል።"</string>
     <string name="account_setup_failed_access_denied" msgid="6835358740050287051">"ከዚህ አገልጋይ ጋር ለአስምር ፈቃድ የለህም። እባክህ ለተጨማሪ መረጃ የአገልጋዮን አስተዳዳሪ አግኝ።"</string>
     <string name="account_setup_security_required_title" msgid="1850321535870447468">"የሩቅ አስተዳደር ደህንነት"</string>
-    <string name="account_setup_security_policies_required_fmt" msgid="5410714107656671761">"<xliff:g id="SERVER">%s</xliff:g>አገልጋይየAndroid  መሣሪያዎ አንዳንድ ገፅታዎች በርቀት ለመቆጣጠር እንዲፈቅዱ ይጠይቃል። ይህን  መለያ ጨርሰው ለማቀናበር ይፈልጋሉ?"</string>
+    <string name="account_setup_security_policies_required_fmt" msgid="5410714107656671761">"<xliff:g id="SERVER">%s</xliff:g> አገልጋይ የAndroid መሣሪያዎ አንዳንድ ገፅታዎች በርቀት ለመቆጣጠር እንዲፈቅዱ ይጠይቃል። ይህን መለያ ጨርሰው ለማቀናበር ይፈልጋሉ?"</string>
     <string name="account_setup_failed_security_policies_unsupported" msgid="3210264746877120355">"ይህ አገልጋይ የአንተ Android መሣሪያ የማይደግፈው የደህንነት ገፅታዎችን ይጠይቃል፣<xliff:g id="ERROR">%s</xliff:g> ጨምሮ።"</string>
     <string name="account_setup_username_uneditable_error" msgid="1618869759801584109">"የመለያውን ተጠቃሚ ስም መለወጥ አትችልም። መለያውን በተለየ ተጠቃሚ ስም ለማከል መለያ አክል ንካ።"</string>
     <string name="disable_admin_warning" msgid="6196985268695592382">"ማስጠንቀቂያ፣ መሣሪያህን ለማስተዳደር የኢሜይል ትግበራዎችን ኃላፊነት ማቦዘን የሚጠይቁትን ሁሉ የኢሜይል መለያዎች ከኢሜይል፣ ዕውቂያዎች፣ ቀን መቁጠሪያ ክስተቶች፣ እና ሌላ ውሂብ ጋር አብሮ ይሰርዛል።"</string>
@@ -184,10 +184,10 @@
     <string name="security_needed_ticker_fmt" msgid="2120499087897133665">"መለያ \"<xliff:g id="ACCOUNT">%s</xliff:g>\" የደህንነት ቅንብሮችን ማዘመን ይጠይቃል።"</string>
     <string name="security_changed_ticker_fmt" msgid="2609435447352755285">"መለያ<xliff:g id="ACCOUNT">%s</xliff:g> የደህንነት ቅንብሮቹን ለውጧል፤ምንም የተጠቃሚ እርምጃ አይጠበቅም፡፡"</string>
     <string name="security_notification_content_update_title" msgid="2429762903228690154">"የደህንነት አዘምን ይጠበቃል"</string>
-    <string name="security_notification_content_change_title" msgid="443490921895642130">"የደህንነት ቋሚ መመሪያዎች ተለውጠዎል"</string>
+    <string name="security_notification_content_change_title" msgid="443490921895642130">"የደህንነት ቋሚ መመሪያዎች ተለውጠዋል"</string>
     <string name="security_notification_content_unsupported_title" msgid="7315219208043169233">"የደህንነት ቋሚ መመሪያዎች ሊሟሉ አይችሉም"</string>
     <string name="account_security_title" msgid="3511543138560418587">"የመሣሪያ ደህንነት"</string>
-    <string name="account_security_policy_explanation_fmt" msgid="6932627044314460766">"<xliff:g id="SERVER">%s</xliff:g> አገልጋይየAndroid  መሣሪያዎ አንዳንድገፅታዎች በርቀት ለመቆጣጠር እንዲፈቅዱ ይጠይቃል። ይህን መለያ ጨርሰው ለማቀናበር ይፈልጋሉ?"</string>
+    <string name="account_security_policy_explanation_fmt" msgid="6932627044314460766">"<xliff:g id="SERVER">%s</xliff:g> አገልጋይ የAndroid መሣሪያዎ አንዳንድ ገፅታዎች በርቀት ለመቆጣጠር እንዲፈቅዱ ይጠይቃል። ይህን መለያ ጨርሰው ለማቀናበር ይፈልጋሉ?"</string>
     <string name="account_setup_failed_dlg_edit_details_action" msgid="5355993309841479360">"ዝርዝሮችን አርትዕ"</string>
     <string name="password_expire_warning_ticker_fmt" msgid="2459977229180023773">"<xliff:g id="ACCOUNT">%s</xliff:g> የማያ መቆለፊያ ፒን ወይም ይለፍ ቃል መለወጥን ይጠይቃል።"</string>
     <string name="password_expire_warning_content_title" msgid="7174669014074849304">"የማያ ቆልፍ ይለፍ ቃል ጊዜው እያለፈነው"</string>
@@ -204,9 +204,9 @@
     <string name="account_settings_background_attachments_label" msgid="2980317599840958688">"አባሪዎችን አውርድ"</string>
     <string name="account_settings_background_attachments_summary" msgid="5954218549226189376">"ራስሰር-አውርድ አባሪዎች ወደ በቅርብ ጊዜ በWi-Fi የተላኩ መልዕክቶች"</string>
     <string name="account_settings_notify_label" msgid="1630001017303007974">"የኢሜይል ማሳወቂያ"</string>
-    <string name="account_settings_summary" msgid="8403582255413830007">"ድግግሞሽ፣ ማሳወቂያዎች፣ ወዘተ አስምር።"</string>
+    <string name="account_settings_summary" msgid="8403582255413830007">"የአስምር ድግግሞሽ፣ ማሳወቂያዎች፣ ወዘተ"</string>
     <string name="account_settings_notify_summary" msgid="8134339460923068254">"ኢሜይል ሲመጣ ማሳወቂያ አሳይ"</string>
-    <string name="account_settings_mail_check_frequency_label" msgid="4322235101687302250">"የአመሳስል ድግግሞሽ"</string>
+    <string name="account_settings_mail_check_frequency_label" msgid="4322235101687302250">"የአስምር ድግግሞሽ"</string>
     <string name="account_settings_incoming_label" msgid="7858928031806297542">"የገቢ ቅንብሮች"</string>
     <string name="account_settings_incoming_summary" msgid="2923044634831881068">"የተጠቃሚ ስም፣ ይለፍቃል፣ እና ሌላ የገቢ አገልጋይ ቅንብሮች"</string>
     <string name="account_settings_outgoing_label" msgid="4464829249980026745">"የወጪ  ቅንብሮች"</string>
@@ -220,7 +220,7 @@
     <string name="account_settings_description_label" msgid="8894815221204511715">"የመለያ ስም"</string>
     <string name="account_settings_name_label" msgid="8186406122590008449">"ስምዎ"</string>
     <string name="account_settings_edit_quick_responses_label" msgid="3106019627675996480">"ፈጣን ምላሾች"</string>
-    <string name="account_settings_edit_quick_responses_summary" msgid="8056686122888722591">"ኢሜይል ስትጽፍ በተደጋጋሚ የምታስገባውን ፅሁፍ አርትዕ አድርግ"</string>
+    <string name="account_settings_edit_quick_responses_summary" msgid="8056686122888722591">"ኢሜይል ሲያቀናብሩ በተደጋጋሚ የሚያስገቡትን ፅሁፍ አርትዕ ያድርጉ"</string>
     <string name="account_settings_notifications" msgid="1042620094281375043">"የማሳወቂያ ቅንብሮች"</string>
     <string name="account_settings_data_usage" msgid="6669107430575866736">"የውሂብ አጠቃቀም"</string>
     <string name="account_settings_policies" msgid="6292833636418641840">"የደህንነት ቋሚ መመሪያዎች"</string>
@@ -236,8 +236,8 @@
     <string name="account_settings_sync_contacts_enable" msgid="1369272986009573218">"ዕውቂያዎች አስምር"</string>
     <string name="account_settings_sync_contacts_summary" msgid="816919452270997919">"ለእዚህ መለያ እውቂያዎች አስምር"</string>
     <string name="account_settings_sync_calendar_enable" msgid="6855333393468628003">"የቀን አቆጣጠር አስምር"</string>
-    <string name="account_settings_sync_calendar_summary" msgid="7606340353079301703">"ለእዚህ መለያ የቀን መቁጠሪያ ክስተት አመሳስል"</string>
-    <string name="account_settings_sync_email_enable" msgid="3754115565685222477">"ኢሜይል አመሳስል"</string>
+    <string name="account_settings_sync_calendar_summary" msgid="7606340353079301703">"ለእዚህ መለያ የቀን መቁጠሪያ ክስተት አስምር"</string>
+    <string name="account_settings_sync_email_enable" msgid="3754115565685222477">"ኢሜይል አስምር"</string>
     <string name="account_settings_sync_email_summary" msgid="262964076412310990">"ለእዚህ መለያ ኢሜይል አስምር"</string>
     <string name="account_settings_vibrate_when_label" msgid="708477308761702671">"ንዘር"</string>
     <string name="account_settings_ringtone" msgid="8229878374785575207">"የደወል ቅላጼ ምረጥ"</string>
@@ -246,7 +246,7 @@
     <string name="mailbox_settings_activity_title_with_mailbox" msgid="6485481250424219240">"የ(<xliff:g id="MAILBOXX_NAME">%s</xliff:g>) አስምር አማራጮች"</string>
     <string name="mailbox_settings_sync_enabled_label" msgid="1180866791599296994">"ይህንን ዓቃፊ ያመሳስሉ"</string>
     <string name="mailbox_settings_sync_enabled_summary" msgid="345878979425044320">"በሚገናኝበት ጊዜ መልዕክቶች ይወርዳሉ"</string>
-    <string name="mailbox_settings_mailbox_sync_window_label" msgid="851180833264474141">"ለማመሳሰል የደብዳቤ ቀናት"</string>
+    <string name="mailbox_settings_mailbox_sync_window_label" msgid="851180833264474141">"ለአስምር የደብዳቤ ቀኖች"</string>
     <string name="prefDialogTitle_conversationListIcon" msgid="4601797400885989153">"የላኪ ምስል"</string>
     <string name="provider_note_live" msgid="2995297671709325333">"ጥቂት \"Plus\" መለያዎች ይህን ፕሮግራም ለማገናኘት ብቻ የPOP ድረስ ያካትታሉ። ከትክክለኛ ኢሜይል አድራሻህ እና የይለፍ ቃልህን ማስገባት ካልቻልክ የተከፈለበት የ\"Plus\" መለያ ሊኖርህ አይችልም። እባክህ ወደ እነዚህ የመልዕክት መለያዎች መዳረሻ ለማግኘት የድረ አሳሹን አስነሳ።"</string>
     <string name="provider_note_t_online" msgid="1630642061431427894">"ይህን ኢሜይል ከመፍጠርህ በፊት፣ የT-Online ድረ ጣቢያን ጎብኝ እና ለPOP3 ኢሜይል ለመድረስ ይለፍ ቃል ፍጠር።"</string>
@@ -257,9 +257,9 @@
     <string name="device_admin_description" msgid="426727923791430306">"በአገልጋይ-የተገለፁ የደህንነት ፖሊሲዎች አንቃ"</string>
     <string name="settings_activity_title" msgid="5185915603716333904">"ቅንብሮች"</string>
     <string name="header_label_general_preferences" msgid="8243724566056800991">"ጠቅላላ ቅንብሮች"</string>
-    <string name="general_preference_confirm_delete_label" msgid="1863245465244241907">"ከመሰረዝህ በፊት አረጋግጥ"</string>
+    <string name="general_preference_confirm_delete_label" msgid="1863245465244241907">"ከመሰረዝዎ በፊት ያረጋግጡ"</string>
     <string name="general_preference_confirm_delete_summary" msgid="6710240861010766643">"መልዕክቶች"</string>
-    <string name="general_preference_confirm_send_label" msgid="4548277349553989930">"ከመላክህ በፊት አረጋግጥ"</string>
+    <string name="general_preference_confirm_send_label" msgid="4548277349553989930">"ከመላክዎ በፊት ያረጋግጡ"</string>
     <string name="general_preference_confirm_send_summary" msgid="2695471027185506093">"መልዕክቶች"</string>
     <string name="general_preference_text_zoom_label" msgid="4021955890499565713">"የመልዕክት ፅሁፍ መጠን"</string>
   <string-array name="general_preference_text_zoom_summary_array">
@@ -285,9 +285,9 @@
     <string name="policy_calendar_age" msgid="627405158087482302">"የሚመሳሰሉ የቀን መቁጠሪያ ክስተቶችን ቁጥር ወሰን አድርግ"</string>
     <string name="policy_email_age" msgid="7144148367145424963">"የሚመሳሰሉ ኢሜይሎችን ቁጥር ወሰን አድርግ"</string>
     <string name="quick_1" msgid="3426057697353380951">"እናመሰግናለን!"</string>
-    <string name="quick_2" msgid="4188036352885736617">"ለኔ ጥሩ ይመስላል!"</string>
+    <string name="quick_2" msgid="4188036352885736617">"ለእኔ ጥሩ ይመስላል!"</string>
     <string name="quick_3" msgid="8061819976353395585">"በኋላ ይሄንን አነበዋለሁ እና ወደ እርስዎ እመለሳለሁ።"</string>
-    <string name="quick_4" msgid="3988974084396883051">"ስብሰባ እናዘጋጅ እስቲ ይሄንን ለመወያየት፡፡"</string>
+    <string name="quick_4" msgid="3988974084396883051">"ይሄንን ለመወያየት ስብሰባ እናዋቅር።"</string>
     <string name="require_manual_sync_message" msgid="7777357288642785955">"ውጫዊ አገልግሎት በማድረግ ጊዜ የዳራ ማመሳሰል ለእዚህ መለያ ቦዝኗል፡፡"</string>
     <string name="confirm_response" msgid="9151965975158906286">"ምላሽ በመላክ ላይ..."</string>
     <string name="no_conversations" msgid="5559527390337162819">"መልዕክቶች የሉም።"</string>
diff --git a/res/values-ca/strings.xml b/res/values-ca/strings.xml
index 88eb2f405..3de48e152 100644
--- a/res/values-ca/strings.xml
+++ b/res/values-ca/strings.xml
@@ -51,7 +51,7 @@
     <string name="account_folder_list_summary_starred" msgid="3134312269246375723">"Destacats"</string>
     <string name="account_folder_list_summary_drafts" msgid="5514845993247300437">"Esborranys"</string>
     <string name="account_folder_list_summary_outbox" msgid="3059836696049399377">"Bústia de sortida"</string>
-    <string name="mailbox_list_account_selector_combined_view" msgid="1556327299894225044">"Vista combinada"</string>
+    <string name="mailbox_list_account_selector_combined_view" msgid="1556327299894225044">"Visualització combinada"</string>
     <string name="message_compose_fwd_header_fmt" msgid="5181300290654579434">\n\n"-------- Missatge original --------\nAssumpte: <xliff:g id="SUBJECT">%1$s</xliff:g>\nDe: <xliff:g id="SENDER">%2$s</xliff:g>\nPer a: <xliff:g id="TO">%3$s</xliff:g>\nCc: <xliff:g id="CC_0">%4$s</xliff:g>\n\n"</string>
     <string name="message_compose_insert_quick_response_list_title" msgid="5314107302508728189">"Inserció d\'una resposta ràpida"</string>
     <string name="message_compose_insert_quick_response_menu_title" msgid="5817075097532919955">"Insereix resposta ràpida"</string>
@@ -145,7 +145,7 @@
     <string name="account_setup_options_sync_contacts_label" msgid="276492345599531778">"Sincronitza els contactes d\'aquest compte"</string>
     <string name="account_setup_options_sync_calendar_label" msgid="3222151135467189411">"Sincronitza el calendari d\'aquest compte"</string>
     <string name="account_setup_options_sync_email_label" msgid="8585177128405004068">"Sincronitza el correu d\'aquest compte"</string>
-    <string name="account_setup_options_background_attachments_label" msgid="5247749298276451846">"Baixa automàticament els fitxers adjunts en connectar-te a Wi-Fi"</string>
+    <string name="account_setup_options_background_attachments_label" msgid="5247749298276451846">"Baixa els fitxers adjunts automàticament en connectar a una xarxa Wi-Fi"</string>
     <string name="account_setup_failed_dlg_title" msgid="9083263347962940552">"No s\'ha pogut acabar"</string>
     <string name="account_setup_options_mail_window_label" msgid="7582247646138987328">"Dies per sincronitzar"</string>
     <string name="account_setup_options_mail_window_auto" msgid="4188895354366183790">"Automàtic"</string>
@@ -170,7 +170,7 @@
     <string name="account_setup_failed_tls_required" msgid="307030406688611327">"TLS necessari, però no compatible amb el servidor."</string>
     <string name="account_setup_failed_auth_required" msgid="6799839150250217566">"Els mètodes d\'autenticació no són compatibles amb el servidor."</string>
     <string name="account_setup_failed_security" msgid="925820957665764964">"No s\'ha pogut obrir la connexió al servidor a causa d\'un error de seguretat."</string>
-    <string name="account_setup_failed_ioerror" msgid="7802604687451830378">"No s\'ha pogut obrir la connexió amb el servidor."</string>
+    <string name="account_setup_failed_ioerror" msgid="7802604687451830378">"No s\'ha pogut establir la connexió amb el servidor."</string>
     <string name="account_setup_failed_protocol_unsupported" msgid="4607759927226943569">"Has introduït una adreça de servidor incorrecta o el servidor requereix una versió de protocol que el correu electrònic no admet."</string>
     <string name="account_setup_failed_access_denied" msgid="6835358740050287051">"No tens permís per sincronitzar amb aquest servidor. Contacta amb l\'administrador del servidor per obtenir més informació."</string>
     <string name="account_setup_security_required_title" msgid="1850321535870447468">"Administració de seguretat remota"</string>
@@ -234,11 +234,11 @@
     <string name="edit_quick_response_dialog" msgid="6479106007607928450">"Resposta ràpida"</string>
     <string name="save_action" msgid="1988862706623227093">"Desa"</string>
     <string name="account_settings_sync_contacts_enable" msgid="1369272986009573218">"Sincronitza els contactes"</string>
-    <string name="account_settings_sync_contacts_summary" msgid="816919452270997919">"Sincronitza contactes del compte"</string>
+    <string name="account_settings_sync_contacts_summary" msgid="816919452270997919">"Sincronitza els contactes del compte"</string>
     <string name="account_settings_sync_calendar_enable" msgid="6855333393468628003">"Sincronitza el calendari"</string>
-    <string name="account_settings_sync_calendar_summary" msgid="7606340353079301703">"Sincronitza esdeveniments del calendari per al compte"</string>
+    <string name="account_settings_sync_calendar_summary" msgid="7606340353079301703">"Sincronitza els esdeveniments del calendari del compte"</string>
     <string name="account_settings_sync_email_enable" msgid="3754115565685222477">"Sincronitza el correu electrònic"</string>
-    <string name="account_settings_sync_email_summary" msgid="262964076412310990">"Sincronitza correu del compte"</string>
+    <string name="account_settings_sync_email_summary" msgid="262964076412310990">"Sincronitza el correu del compte"</string>
     <string name="account_settings_vibrate_when_label" msgid="708477308761702671">"Vibra"</string>
     <string name="account_settings_ringtone" msgid="8229878374785575207">"Tria un so"</string>
     <string name="account_settings_servers" msgid="4925493817981624242">"Configuració del servidor"</string>
diff --git a/res/values-cs/strings.xml b/res/values-cs/strings.xml
index 0a2e150c1..e9de6de7f 100644
--- a/res/values-cs/strings.xml
+++ b/res/values-cs/strings.xml
@@ -93,7 +93,7 @@
     <string name="account_setup_check_settings_check_outgoing_msg" msgid="4566131393776891419">"Ověřování nastavení serveru SMTP…"</string>
     <string name="account_setup_creating_account_msg" msgid="6235569720466839946">"Vytváření účtu..."</string>
     <string name="account_setup_names_title" msgid="8483517350241119291">"Nastavení účtu"</string>
-    <string name="account_setup_names_headline" msgid="914858472109729140">"Váš účet je nastaven, e-mail je na cestě!"</string>
+    <string name="account_setup_names_headline" msgid="914858472109729140">"Váš účet je nastaven a e-mail je na cestě!"</string>
     <string name="account_setup_names_account_name_label" msgid="8033895024273259196">"Pojmenovat tento účet (nepovinné)"</string>
     <string name="account_setup_names_user_name_label" msgid="8967410178488604770">"Vaše jméno (zobr. na odchozích zprávách)"</string>
     <string name="account_setup_names_user_name_empty_error" msgid="6791427018325367364">"Toto pole nesmí být prázdné."</string>
@@ -155,7 +155,7 @@
     <string name="account_setup_options_mail_window_2weeks" msgid="3583478100026382495">"Poslední dva týdny"</string>
     <string name="account_setup_options_mail_window_1month" msgid="4289585173153789717">"Poslední měsíc"</string>
     <string name="account_setup_options_mail_window_all" msgid="5372861827683632364">"Vše"</string>
-    <string name="account_setup_options_mail_window_default" msgid="2540360826995543134">"Použít výchozí nast. účtu"</string>
+    <string name="account_setup_options_mail_window_default" msgid="2540360826995543134">"Použít výchozí nastavení účtu"</string>
     <string name="account_setup_failed_dlg_auth_message" msgid="426627755590431364">"Uživatelské jméno nebo heslo jsou nesprávné."</string>
     <string name="account_setup_failed_dlg_auth_message_fmt" msgid="2081384892947238930">"Přihlášení se nezdařilo.\n(<xliff:g id="ERROR">%s</xliff:g>)"</string>
     <string name="account_setup_autodiscover_dlg_authfail_title" msgid="7365992662150541370">"Problém s nastavením účtu"</string>
diff --git a/res/values-da/strings.xml b/res/values-da/strings.xml
index ee782aac0..496683651 100644
--- a/res/values-da/strings.xml
+++ b/res/values-da/strings.xml
@@ -19,18 +19,18 @@
     <string name="permission_read_attachment_label" msgid="9208086010625033590">"Læs vedhæftede filer i e-mails"</string>
     <string name="permission_read_attachment_desc" msgid="3394721085306308972">"Tillader, at appen kan læse vedhæftede filer i dine e-mails."</string>
     <string name="permission_access_provider_label" msgid="378256653525377586">"Få adgang til data om e-mailudbyder"</string>
-    <string name="permission_access_provider_desc" msgid="6296566558584670348">"Tillader, at denne app kan få adgang til din e-maildatabase, f.eks. modtagne beskeder, sendte beskeder, brugernavne og adgangskoder."</string>
+    <string name="permission_access_provider_desc" msgid="6296566558584670348">"Tillader, at denne app kan få adgang til din e-maildatabase, f.eks. modtagne meddelelser, sendte meddelelser, brugernavne og adgangskoder."</string>
     <string name="app_name" msgid="5815426892327290362">"E-mail"</string>
     <string name="debug_title" msgid="5175710493691536719">"Fejlretning"</string>
     <string name="next_action" msgid="3931301986364184415">"Næste"</string>
     <string name="okay_action" msgid="8365197396795675617">"OK"</string>
     <string name="cancel_action" msgid="6967435583794021865">"Annuller"</string>
     <string name="previous_action" msgid="5181616311579820981">"Forrige"</string>
-    <string name="done_action" msgid="7497990549515580249">"Færdig"</string>
+    <string name="done_action" msgid="7497990549515580249">"Udfør"</string>
     <string name="create_action" msgid="3062715563215392251">"Opret nyt"</string>
     <string name="quick_responses_empty_view" msgid="3960050972306132367">"Ingen hurtige svar."</string>
     <string name="account_settings_action" msgid="4494079183315085171">"Indstillinger for konto"</string>
-    <string name="menu_folder_options" msgid="2871906096248843471">"Muligheder for synkronisering"</string>
+    <string name="menu_folder_options" msgid="2871906096248843471">"Indstillinger for synkronisering"</string>
     <string name="status_network_error" msgid="2611654064403817391">"Forbindelsesproblem."</string>
   <plurals name="move_messages">
     <item quantity="one" msgid="320885379869442589">"Flyt meddelelse"</item>
@@ -38,7 +38,7 @@
   </plurals>
     <string name="cannot_move_protocol_not_supported_toast" msgid="6558083148128616292">"Flytning understøttes ikke for POP3-konti."</string>
     <string name="cannot_move_multiple_accounts_toast" msgid="7922594026384944163">"Kan ikke flyttes, fordi det valgte indeholder flere konti."</string>
-    <string name="cannot_move_special_mailboxes_toast" msgid="7093107954841896970">"Beskeder i Kladder, Udbakke og Sendte kan ikke flyttes."</string>
+    <string name="cannot_move_special_mailboxes_toast" msgid="7093107954841896970">"Meddelelser i Kladder, Udbakke og Sendte kan ikke flyttes."</string>
     <string name="mailbox_name_display_inbox" msgid="3542327124749861736">"Indbakke"</string>
     <string name="mailbox_name_display_outbox" msgid="2826214174661417662">"Udbakke"</string>
     <string name="mailbox_name_display_drafts" msgid="4868718300700514319">"Kladder"</string>
@@ -55,9 +55,9 @@
     <string name="message_compose_fwd_header_fmt" msgid="5181300290654579434">\n\n"-------- Oprindelig meddelelse --------\nEmne: <xliff:g id="SUBJECT">%1$s</xliff:g>\nFra: <xliff:g id="SENDER">%2$s</xliff:g>\nTil: <xliff:g id="TO">%3$s</xliff:g>\nCC: <xliff:g id="CC_0">%4$s</xliff:g>\n\n"</string>
     <string name="message_compose_insert_quick_response_list_title" msgid="5314107302508728189">"Indsæt hurtigt svar"</string>
     <string name="message_compose_insert_quick_response_menu_title" msgid="5817075097532919955">"Indsæt hurtigt svar"</string>
-    <string name="message_view_attachment_background_load" msgid="7906875687519445185">"En eller flere vedhæftede filer i din videresendte besked downloades før afsendelse."</string>
+    <string name="message_view_attachment_background_load" msgid="7906875687519445185">"En eller flere vedhæftede filer i din videresendte meddelelse downloades før afsendelse."</string>
     <string name="attachment_not_found" msgid="7155322700141145123">"Den vedhæftede fil kunne ikke downloades."</string>
-    <string name="message_decode_error" msgid="5016042255170947834">"Der opstod en fejl under afkodning af beskeden."</string>
+    <string name="message_decode_error" msgid="5016042255170947834">"Der opstod en fejl under afkodning af meddelelsen."</string>
     <string name="forward_download_failed_ticker" msgid="6176608320359303255">"En eller flere vedhæftede filer kunne ikke videresendes."</string>
     <string name="forward_download_failed_title" msgid="6139701848515572511">"Vedhæftet fil er ikke sendt"</string>
     <string name="login_failed_ticker" msgid="2169365211566829350">"<xliff:g id="ACCOUNT_NAME">%s</xliff:g> kunne ikke logge ind."</string>
@@ -78,12 +78,12 @@
     <item quantity="one" msgid="6261986598249539093">"<xliff:g id="SIZE_IN_GIGABYTES">%d</xliff:g> Gb"</item>
     <item quantity="other" msgid="1041353825053598633">"<xliff:g id="SIZE_IN_GIGABYTES">%d</xliff:g> Gb"</item>
   </plurals>
-    <string name="account_setup_basics_title" msgid="3578333196594678422">"Kontoindstillinger"</string>
+    <string name="account_setup_basics_title" msgid="3578333196594678422">"Konfiguration af konto"</string>
     <string name="account_setup_basics_headline" msgid="6726590205905464015">"E-mailkonto"</string>
-    <string name="accounts_welcome" msgid="8337750045270269649">"Du kan nemt og hurtigt oprette din konto."</string>
+    <string name="accounts_welcome" msgid="8337750045270269649">"Du kan nemt og hurtigt konfigurere din konto."</string>
     <string name="account_setup_basics_email_label" msgid="3454164053624112047">"E-mailadresse"</string>
     <string name="account_setup_basics_password_label" msgid="9133549799291519298">"Adgangskode"</string>
-    <string name="account_setup_basics_manual_setup_action" msgid="8053852205391155912">"Manuel opsætning"</string>
+    <string name="account_setup_basics_manual_setup_action" msgid="8053852205391155912">"Manuel konfiguration"</string>
     <string name="account_setup_username_password_toast" msgid="3968270274727947460">"Indtast en gyldig e-mailadresse og adgangskode."</string>
     <string name="account_duplicate_dlg_title" msgid="8089732986912704425">"Dobbeltforekomst af konto"</string>
     <string name="account_duplicate_dlg_message_fmt" msgid="6447629283679935840">"Du bruger allerede dette brugernavn til kontoen \"<xliff:g id="DUPLICATE">%s</xliff:g>\"."</string>
@@ -92,15 +92,15 @@
     <string name="account_setup_check_settings_check_incoming_msg" msgid="2869198335297585862">"Godkender serverindstillinger..."</string>
     <string name="account_setup_check_settings_check_outgoing_msg" msgid="4566131393776891419">"Godkender SMTP-indstillinger..."</string>
     <string name="account_setup_creating_account_msg" msgid="6235569720466839946">"Kontoen oprettes…"</string>
-    <string name="account_setup_names_title" msgid="8483517350241119291">"Kontoindstillinger"</string>
+    <string name="account_setup_names_title" msgid="8483517350241119291">"Konfiguration af konto"</string>
     <string name="account_setup_names_headline" msgid="914858472109729140">"Din konto er konfigureret, og der er e-mail på vej."</string>
     <string name="account_setup_names_account_name_label" msgid="8033895024273259196">"Giv kontoen et navn (valgfrit)"</string>
-    <string name="account_setup_names_user_name_label" msgid="8967410178488604770">"Dit navn (vist på udgående beskeder)"</string>
+    <string name="account_setup_names_user_name_label" msgid="8967410178488604770">"Dit navn (vises på udgående meddelelser)"</string>
     <string name="account_setup_names_user_name_empty_error" msgid="6791427018325367364">"Dette felt må ikke være tomt."</string>
-    <string name="account_setup_account_type_title" msgid="7156551693961182124">"Kontoindstillinger"</string>
+    <string name="account_setup_account_type_title" msgid="7156551693961182124">"Konfiguration af konto"</string>
     <string name="account_setup_account_type_headline" msgid="3574102329184831086">"Kontotype"</string>
     <string name="account_setup_account_type_instructions" msgid="114515540798408760">"Hvilken slags konto er dette?"</string>
-    <string name="account_setup_incoming_title" msgid="6796626791039136005">"Kontoindstillinger"</string>
+    <string name="account_setup_incoming_title" msgid="6796626791039136005">"Konfiguration af konto"</string>
     <string name="account_setup_incoming_headline" msgid="6183711037633407184">"Indstillinger for indgående server"</string>
     <string name="account_setup_incoming_username_label" msgid="5700581386104070302">"Brugernavn"</string>
     <string name="account_setup_incoming_password_label" msgid="6365327603172559859">"Adgangskode"</string>
@@ -108,7 +108,7 @@
     <string name="account_setup_incoming_port_label" msgid="8214738923690447796">"Port"</string>
     <string name="account_setup_incoming_security_label" msgid="2110260791086007424">"Sikkerhedstype"</string>
     <string name="account_setup_incoming_security_none_label" msgid="8300169413118264895">"Ingen"</string>
-    <string name="account_setup_incoming_security_ssl_trust_certificates_label" msgid="6151855090123117538">"SSL/TLS (Accepter alle certifikater)"</string>
+    <string name="account_setup_incoming_security_ssl_trust_certificates_label" msgid="6151855090123117538">"SSL/TLS (accepter alle certifikater)"</string>
     <string name="account_setup_incoming_security_ssl_label" msgid="2798501138420163861">"SSL/TLS"</string>
     <string name="account_setup_incoming_security_tls_trust_certificates_label" msgid="6149084428423662620">"STARTTLS (accepter alle certifikater)"</string>
     <string name="account_setup_incoming_security_tls_label" msgid="6573498431821879660">"STARTTLS"</string>
@@ -117,7 +117,7 @@
     <string name="account_setup_incoming_delete_policy_delete_label" msgid="222216840911785631">"Når jeg sletter fra Indbakke"</string>
     <string name="account_setup_incoming_imap_path_prefix_label" msgid="401167247072926810">"Præfiks for IMAP-sti"</string>
     <string name="account_setup_incoming_imap_path_prefix_hint" msgid="9190845919067906033">"Valgfrit"</string>
-    <string name="account_setup_outgoing_title" msgid="7208495965665711539">"Kontoindstillinger"</string>
+    <string name="account_setup_outgoing_title" msgid="7208495965665711539">"Konfiguration af konto"</string>
     <string name="account_setup_outgoing_headline" msgid="2025001060935366394">"Indstillinger for udgående server"</string>
     <string name="account_setup_outgoing_smtp_server_label" msgid="6035137446691195177">"SMTP-server"</string>
     <string name="account_setup_outgoing_port_label" msgid="7573207437835827876">"Port"</string>
@@ -132,7 +132,7 @@
     <string name="account_setup_exchange_no_certificate" msgid="1119542961954780872">"Intet"</string>
     <string name="account_setup_exchange_device_id_label" msgid="1646827333223157658">"Id for mobilenhed"</string>
     <string name="account_setup_options_title" msgid="9016600767888846051">"Indstillinger for konto"</string>
-    <string name="account_setup_options_headline" msgid="4181274232835368085">"Kontovalgmuligheder"</string>
+    <string name="account_setup_options_headline" msgid="4181274232835368085">"Valgmuligheder for konto"</string>
     <string name="account_setup_options_mail_check_frequency_label" msgid="4824859792882810053">"Kontrolfrekvens for indbakke"</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>
@@ -174,7 +174,7 @@
     <string name="account_setup_failed_protocol_unsupported" msgid="4607759927226943569">"Du har indtastet en forkert serveradresse, eller serveren kræver en protokolversion, som E-mail ikke understøtter."</string>
     <string name="account_setup_failed_access_denied" msgid="6835358740050287051">"Du har ikke tilladelse til at synkronisere med denne server. Kontakt din servers administrator for at få flere oplysninger."</string>
     <string name="account_setup_security_required_title" msgid="1850321535870447468">"Ekstern sikkerhedsadministration"</string>
-    <string name="account_setup_security_policies_required_fmt" msgid="5410714107656671761">"Serveren <xliff:g id="SERVER">%s</xliff:g> kræver, at du giver den tilladelse til eksternt at kontrollere nogle af Android-enhedens sikkerhedsfunktioner. Vil du afslutte opsætning af denne konto?"</string>
+    <string name="account_setup_security_policies_required_fmt" msgid="5410714107656671761">"Serveren <xliff:g id="SERVER">%s</xliff:g> kræver, at du giver den tilladelse til eksternt at kontrollere nogle af Android-enhedens sikkerhedsfunktioner. Vil du afslutte konfigurationen af denne konto?"</string>
     <string name="account_setup_failed_security_policies_unsupported" msgid="3210264746877120355">"Denne server kræver sikkerhedsfunktioner, som din Android-enhed ikke understøtter, f.eks.: <xliff:g id="ERROR">%s</xliff:g>"</string>
     <string name="account_setup_username_uneditable_error" msgid="1618869759801584109">"Du kan ikke ændre brugernavnet på en konto. Hvis du vil tilføje en konto med et andet brugernavn, skal du trykke på Tilføj konto."</string>
     <string name="disable_admin_warning" msgid="6196985268695592382">"ADVARSEL! Hvis du deaktiverer appen E-mails tilladelse til at administrere din enhed, slettes alle konti i E-mail, der kræver dette, sammen med alle e-mails, kontaktpersoner, kalenderbegivenheder og andre data på disse konti."</string>
@@ -188,7 +188,7 @@
     <string name="security_notification_content_unsupported_title" msgid="7315219208043169233">"Politikker kan ikke opfyldes"</string>
     <string name="account_security_title" msgid="3511543138560418587">"Enhedssikkerhed"</string>
     <string name="account_security_policy_explanation_fmt" msgid="6932627044314460766">"Serveren <xliff:g id="SERVER">%s</xliff:g> kræver, at du giver den tilladelse til eksternt at kontrollere nogle af Android-enhedens sikkerhedsfunktioner."</string>
-    <string name="account_setup_failed_dlg_edit_details_action" msgid="5355993309841479360">"Rediger detaljer"</string>
+    <string name="account_setup_failed_dlg_edit_details_action" msgid="5355993309841479360">"Rediger oplysninger"</string>
     <string name="password_expire_warning_ticker_fmt" msgid="2459977229180023773">"\"<xliff:g id="ACCOUNT">%s</xliff:g>\" kræver, at du ændrer skærmlåsens pinkode eller adgangskode."</string>
     <string name="password_expire_warning_content_title" msgid="7174669014074849304">"Skærmlåskoden er ved at udløbe"</string>
     <string name="password_expired_ticker" msgid="4230570412974108968">"Pinkoden eller adgangskoden til skærmlåsen er udløbet."</string>
@@ -202,8 +202,8 @@
     <string name="account_settings_login_dialog_content_fmt" msgid="8849649646111167377">"Brugernavn eller adgangskode for <xliff:g id="ACCOUNT">%s</xliff:g> er forkert. Vil du opdatere dem nu?"</string>
     <string name="account_settings_login_dialog_reason_fmt" msgid="4266359321648406752">"Dit login på <xliff:g id="ACCOUNT">%s</xliff:g> mislykkedes. Serveren sagde: <xliff:g id="REASON">%s</xliff:g> Vil du opdatere dit brugernavn og/eller din adgangskode?"</string>
     <string name="account_settings_background_attachments_label" msgid="2980317599840958688">"Download vedhæftede filer"</string>
-    <string name="account_settings_background_attachments_summary" msgid="5954218549226189376">"Download autom. vedhæftede filer i de seneste beskeder via Wi-Fi"</string>
-    <string name="account_settings_notify_label" msgid="1630001017303007974">"E-mail-beskeder"</string>
+    <string name="account_settings_background_attachments_summary" msgid="5954218549226189376">"Download autom. vedhæftede filer i nye meddelelser via Wi-Fi"</string>
+    <string name="account_settings_notify_label" msgid="1630001017303007974">"Underretninger om e-mails"</string>
     <string name="account_settings_summary" msgid="8403582255413830007">"Synkroniseringsinterval, meddelelser osv."</string>
     <string name="account_settings_notify_summary" msgid="8134339460923068254">"Send en underretning ved nye e-mails"</string>
     <string name="account_settings_mail_check_frequency_label" msgid="4322235101687302250">"Synkroniseringshyppighed"</string>
@@ -221,7 +221,7 @@
     <string name="account_settings_name_label" msgid="8186406122590008449">"Dit navn"</string>
     <string name="account_settings_edit_quick_responses_label" msgid="3106019627675996480">"Hurtige svar"</string>
     <string name="account_settings_edit_quick_responses_summary" msgid="8056686122888722591">"Rediger tekst, som du ofte indsætter, når du skriver e-mails"</string>
-    <string name="account_settings_notifications" msgid="1042620094281375043">"Underretningsindstillinger"</string>
+    <string name="account_settings_notifications" msgid="1042620094281375043">"Indstillinger for underretninger"</string>
     <string name="account_settings_data_usage" msgid="6669107430575866736">"Dataforbrug"</string>
     <string name="account_settings_policies" msgid="6292833636418641840">"Sikkerhedspolitikker"</string>
     <string name="system_folders_title" msgid="2934406494244347991">"Systemmapper"</string>
@@ -261,7 +261,7 @@
     <string name="general_preference_confirm_delete_summary" msgid="6710240861010766643">"Meddelelser"</string>
     <string name="general_preference_confirm_send_label" msgid="4548277349553989930">"Bekræft før afsendelse"</string>
     <string name="general_preference_confirm_send_summary" msgid="2695471027185506093">"Meddelelser"</string>
-    <string name="general_preference_text_zoom_label" msgid="4021955890499565713">"Tekststørrelse i besked"</string>
+    <string name="general_preference_text_zoom_label" msgid="4021955890499565713">"Tekststørrelse i meddelelse"</string>
   <string-array name="general_preference_text_zoom_summary_array">
     <item msgid="4693576184223089069">"Lillebitte tekst"</item>
     <item msgid="4415205108584620118">"Lille tekst"</item>
@@ -269,7 +269,7 @@
     <item msgid="6227813549949219991">"Stor tekst"</item>
     <item msgid="1197917420815786571">"Stor tekst"</item>
   </string-array>
-    <string name="general_preference_text_zoom_dialog_title" msgid="7446841758331151643">"Tekststørrelse i besked"</string>
+    <string name="general_preference_text_zoom_dialog_title" msgid="7446841758331151643">"Tekststørrelse i meddelelse"</string>
     <string name="general_preference_text_zoom_tiny" msgid="2948174583663330937">"Lillebitte"</string>
     <string name="general_preference_text_zoom_small" msgid="6618520238223144876">"Lille"</string>
     <string name="general_preference_text_zoom_normal" msgid="1765540147950855479">"Normal"</string>
diff --git a/res/values-de/strings.xml b/res/values-de/strings.xml
index 9b79fc9f8..acd7e945c 100644
--- a/res/values-de/strings.xml
+++ b/res/values-de/strings.xml
@@ -27,7 +27,7 @@
     <string name="cancel_action" msgid="6967435583794021865">"Abbrechen"</string>
     <string name="previous_action" msgid="5181616311579820981">"Zurück"</string>
     <string name="done_action" msgid="7497990549515580249">"Fertig"</string>
-    <string name="create_action" msgid="3062715563215392251">"Neue erstellen"</string>
+    <string name="create_action" msgid="3062715563215392251">"Neue hinzufügen"</string>
     <string name="quick_responses_empty_view" msgid="3960050972306132367">"Keine Kurzantworten"</string>
     <string name="account_settings_action" msgid="4494079183315085171">"Kontoeinstellungen"</string>
     <string name="menu_folder_options" msgid="2871906096248843471">"Synchronisierungsoptionen"</string>
@@ -99,9 +99,9 @@
     <string name="account_setup_names_user_name_empty_error" msgid="6791427018325367364">"Dieses Feld darf nicht leer sein."</string>
     <string name="account_setup_account_type_title" msgid="7156551693961182124">"Kontoeinrichtung"</string>
     <string name="account_setup_account_type_headline" msgid="3574102329184831086">"Kontotyp"</string>
-    <string name="account_setup_account_type_instructions" msgid="114515540798408760">"Um welchen Kontotyp handelt es sich hierbei?"</string>
+    <string name="account_setup_account_type_instructions" msgid="114515540798408760">"Um welchen Kontotyp handelt es sich?"</string>
     <string name="account_setup_incoming_title" msgid="6796626791039136005">"Kontoeinrichtung"</string>
-    <string name="account_setup_incoming_headline" msgid="6183711037633407184">"Einstellungen des Eingangsserver"</string>
+    <string name="account_setup_incoming_headline" msgid="6183711037633407184">"Einstellungen des Eingangsservers"</string>
     <string name="account_setup_incoming_username_label" msgid="5700581386104070302">"Nutzername"</string>
     <string name="account_setup_incoming_password_label" msgid="6365327603172559859">"Passwort"</string>
     <string name="account_setup_incoming_server_label" msgid="1480342966630002638">"Server"</string>
diff --git a/res/values-es-rUS/strings.xml b/res/values-es-rUS/strings.xml
index b57670551..8ee0c0b1d 100644
--- a/res/values-es-rUS/strings.xml
+++ b/res/values-es-rUS/strings.xml
@@ -155,7 +155,7 @@
     <string name="account_setup_options_mail_window_2weeks" msgid="3583478100026382495">"Últimas dos semanas"</string>
     <string name="account_setup_options_mail_window_1month" msgid="4289585173153789717">"Último mes"</string>
     <string name="account_setup_options_mail_window_all" msgid="5372861827683632364">"Todos"</string>
-    <string name="account_setup_options_mail_window_default" msgid="2540360826995543134">"Usar cta. predeterminada"</string>
+    <string name="account_setup_options_mail_window_default" msgid="2540360826995543134">"Usar cuenta predeterminada"</string>
     <string name="account_setup_failed_dlg_auth_message" msgid="426627755590431364">"El nombre de usuario o la contraseña son incorrectos."</string>
     <string name="account_setup_failed_dlg_auth_message_fmt" msgid="2081384892947238930">"Se produjo un error al acceder.\n(<xliff:g id="ERROR">%s</xliff:g>)"</string>
     <string name="account_setup_autodiscover_dlg_authfail_title" msgid="7365992662150541370">"Error al configurar la cuenta"</string>
diff --git a/res/values-es/strings.xml b/res/values-es/strings.xml
index ea1ed2d04..a0469ebad 100644
--- a/res/values-es/strings.xml
+++ b/res/values-es/strings.xml
@@ -141,7 +141,7 @@
     <string name="account_setup_options_mail_check_frequency_15min" msgid="5052776740089741793">"Cada 15 minutos"</string>
     <string name="account_setup_options_mail_check_frequency_30min" msgid="1097088928685931864">"Cada 30 minutos"</string>
     <string name="account_setup_options_mail_check_frequency_1hour" msgid="3767715356039692899">"Cada hora"</string>
-    <string name="account_setup_options_notify_label" msgid="7046146571560728829">"Notificarme cuando llegue un correo"</string>
+    <string name="account_setup_options_notify_label" msgid="7046146571560728829">"Notificar cuando llegue un correo"</string>
     <string name="account_setup_options_sync_contacts_label" msgid="276492345599531778">"Sincronizar contactos de esta cuenta"</string>
     <string name="account_setup_options_sync_calendar_label" msgid="3222151135467189411">"Sincronizar calendario de esta cuenta"</string>
     <string name="account_setup_options_sync_email_label" msgid="8585177128405004068">"Sincronizar correo de esta cuenta"</string>
@@ -151,7 +151,7 @@
     <string name="account_setup_options_mail_window_auto" msgid="4188895354366183790">"Automática"</string>
     <string name="account_setup_options_mail_window_1day" msgid="7727436096227637646">"Último día"</string>
     <string name="account_setup_options_mail_window_3days" msgid="1841106793912850270">"Los últimos tres días"</string>
-    <string name="account_setup_options_mail_window_1week" msgid="5804121771990249346">"La última pasada"</string>
+    <string name="account_setup_options_mail_window_1week" msgid="5804121771990249346">"La última semana"</string>
     <string name="account_setup_options_mail_window_2weeks" msgid="3583478100026382495">"Las últimas dos semanas"</string>
     <string name="account_setup_options_mail_window_1month" msgid="4289585173153789717">"El mes pasado"</string>
     <string name="account_setup_options_mail_window_all" msgid="5372861827683632364">"Todo"</string>
@@ -185,7 +185,7 @@
     <string name="security_changed_ticker_fmt" msgid="2609435447352755285">"Se ha modificado la configuración de seguridad de la cuenta \"<xliff:g id="ACCOUNT">%s</xliff:g>\" (no es necesaria la intervención del usuario)."</string>
     <string name="security_notification_content_update_title" msgid="2429762903228690154">"Actualización seguridad necesaria"</string>
     <string name="security_notification_content_change_title" msgid="443490921895642130">"Políticas de seguridad modificadas"</string>
-    <string name="security_notification_content_unsupported_title" msgid="7315219208043169233">"Error al cumplir políticas seguridad"</string>
+    <string name="security_notification_content_unsupported_title" msgid="7315219208043169233">"No se pueden cumplir las políticas de seguridad"</string>
     <string name="account_security_title" msgid="3511543138560418587">"Seguridad del dispositivo"</string>
     <string name="account_security_policy_explanation_fmt" msgid="6932627044314460766">"Es necesario que permitas que el servidor <xliff:g id="SERVER">%s</xliff:g> controle de forma remota algunas funciones de seguridad de tu dispositivo Android."</string>
     <string name="account_setup_failed_dlg_edit_details_action" msgid="5355993309841479360">"Aceptar"</string>
@@ -231,7 +231,7 @@
     <string name="system_folders_sent_title" msgid="4265722817877075367">"Carpeta de elementos enviados"</string>
     <string name="system_folders_sent_summary" msgid="5529250353569545181">"Seleccionar tu carpeta de elementos enviados del servidor"</string>
     <string name="system_folders_sent_dlg" msgid="7071006714702094762">"Seleccionar tu carpeta de elementos enviados del servidor"</string>
-    <string name="edit_quick_response_dialog" msgid="6479106007607928450">"Respuestas rápidas"</string>
+    <string name="edit_quick_response_dialog" msgid="6479106007607928450">"Respuesta rápida"</string>
     <string name="save_action" msgid="1988862706623227093">"Guardar"</string>
     <string name="account_settings_sync_contacts_enable" msgid="1369272986009573218">"Sincronizar contactos"</string>
     <string name="account_settings_sync_contacts_summary" msgid="816919452270997919">"Sincronizar contactos de esta cuenta"</string>
diff --git a/res/values-fi/strings.xml b/res/values-fi/strings.xml
index 16934dd44..f89f25ace 100644
--- a/res/values-fi/strings.xml
+++ b/res/values-fi/strings.xml
@@ -145,7 +145,7 @@
     <string name="account_setup_options_sync_contacts_label" msgid="276492345599531778">"Synkronoi tämän tilin yhteystiedot"</string>
     <string name="account_setup_options_sync_calendar_label" msgid="3222151135467189411">"Synkronoi tämän tilin kalenteri"</string>
     <string name="account_setup_options_sync_email_label" msgid="8585177128405004068">"Synkronoi tämän tilin sähköpostit"</string>
-    <string name="account_setup_options_background_attachments_label" msgid="5247749298276451846">"Lataa liitteet automaattisesti wifi-yhteyden ollessa käytössä."</string>
+    <string name="account_setup_options_background_attachments_label" msgid="5247749298276451846">"Lataa liitteet automaattisesti WiFI-."</string>
     <string name="account_setup_failed_dlg_title" msgid="9083263347962940552">"Ei onnistunut"</string>
     <string name="account_setup_options_mail_window_label" msgid="7582247646138987328">"Synkronoitavien päivien määrä"</string>
     <string name="account_setup_options_mail_window_auto" msgid="4188895354366183790">"Automaattinen"</string>
@@ -202,15 +202,15 @@
     <string name="account_settings_login_dialog_content_fmt" msgid="8849649646111167377">"Tilin <xliff:g id="ACCOUNT">%s</xliff:g> käyttäjänimi tai salasana on virheellinen. Haluatko päivittää ne nyt?"</string>
     <string name="account_settings_login_dialog_reason_fmt" msgid="4266359321648406752">"Kirjautuminen tiliin <xliff:g id="ACCOUNT">%s</xliff:g> epäonnistui. Palvelimen ilmoittama syy: <xliff:g id="REASON">%s</xliff:g> Haluatko päivittää käyttäjänimesi ja/tai salasanasi?"</string>
     <string name="account_settings_background_attachments_label" msgid="2980317599840958688">"Lataa liitetiedostoja"</string>
-    <string name="account_settings_background_attachments_summary" msgid="5954218549226189376">"Lataa viimeaikaisten viestien liitteet wifi-yhteyden kautta."</string>
+    <string name="account_settings_background_attachments_summary" msgid="5954218549226189376">"Lataa viimeaikaisten viestien liitteet WiFi-yhteyden kautta."</string>
     <string name="account_settings_notify_label" msgid="1630001017303007974">"Sähköposti-ilmoitukset"</string>
     <string name="account_settings_summary" msgid="8403582255413830007">"Synkronoinnin tiheys, ilmoitukset jne."</string>
     <string name="account_settings_notify_summary" msgid="8134339460923068254">"Lähetä ilmoitus, kun sähköpostiviesti saapuu"</string>
     <string name="account_settings_mail_check_frequency_label" msgid="4322235101687302250">"Synkronoinnin tiheys"</string>
     <string name="account_settings_incoming_label" msgid="7858928031806297542">"Saapuvan postin asetukset"</string>
-    <string name="account_settings_incoming_summary" msgid="2923044634831881068">"Käyttäjänimi, salasana ja muut tulevat palvelimen asetukset"</string>
+    <string name="account_settings_incoming_summary" msgid="2923044634831881068">"Käyttäjänimi, salasana ja muut saapuvan postin palvelimen asetukset"</string>
     <string name="account_settings_outgoing_label" msgid="4464829249980026745">"Lähtevän postin asetukset"</string>
-    <string name="account_settings_outgoing_summary" msgid="3572093624332724311">"Käyttäjänimi, salasana ja muut lähtevät palvelimen asetukset"</string>
+    <string name="account_settings_outgoing_summary" msgid="3572093624332724311">"Käyttäjänimi, salasana ja muut lähtevän postin palvelimen asetukset"</string>
     <string name="account_settings_enforced_label" msgid="7429582254433588882">"Käytännöt otettu käyttöön"</string>
     <string name="account_settings_enforced_summary" msgid="8140860420440447771">"Ei mitään"</string>
     <string name="account_settings_unsupported_label" msgid="1954091071454235577">"Käytäntöjä ei tueta"</string>
diff --git a/res/values-fr-rCA/strings.xml b/res/values-fr-rCA/strings.xml
index db632b851..7fa906c5d 100644
--- a/res/values-fr-rCA/strings.xml
+++ b/res/values-fr-rCA/strings.xml
@@ -45,7 +45,7 @@
     <string name="mailbox_name_display_trash" msgid="9139069064580630647">"Corbeille"</string>
     <string name="mailbox_name_display_sent" msgid="3426058998191869523">"Messages envoyés"</string>
     <string name="mailbox_name_display_junk" msgid="9046762505977999288">"Pourriel"</string>
-    <string name="mailbox_name_display_starred" msgid="7788694947644186069">"Messages suivis"</string>
+    <string name="mailbox_name_display_starred" msgid="7788694947644186069">"Messages favoris"</string>
     <string name="mailbox_name_display_unread" msgid="1015674989793998695">"Non lu"</string>
     <string name="account_folder_list_summary_inbox" msgid="7518263761297423255">"Boîte de réception"</string>
     <string name="account_folder_list_summary_starred" msgid="3134312269246375723">"Marqué d\'une étoile"</string>
@@ -99,7 +99,7 @@
     <string name="account_setup_names_user_name_empty_error" msgid="6791427018325367364">"Ce champ est obligatoire."</string>
     <string name="account_setup_account_type_title" msgid="7156551693961182124">"Configuration du compte"</string>
     <string name="account_setup_account_type_headline" msgid="3574102329184831086">"Type de compte"</string>
-    <string name="account_setup_account_type_instructions" msgid="114515540798408760">"De quel type de compte s\'agit-il ?"</string>
+    <string name="account_setup_account_type_instructions" msgid="114515540798408760">"De quel type de compte s\'agit-il?"</string>
     <string name="account_setup_incoming_title" msgid="6796626791039136005">"Configuration du compte"</string>
     <string name="account_setup_incoming_headline" msgid="6183711037633407184">"Paramètres du serveur entrant"</string>
     <string name="account_setup_incoming_username_label" msgid="5700581386104070302">"Nom d\'utilisateur"</string>
@@ -189,18 +189,18 @@
     <string name="account_security_title" msgid="3511543138560418587">"Sécurité de l\'appareil"</string>
     <string name="account_security_policy_explanation_fmt" msgid="6932627044314460766">"Vous devez autoriser le serveur <xliff:g id="SERVER">%s</xliff:g> à contrôler à distance certaines fonctionnalités de sécurité de votre mobile Android."</string>
     <string name="account_setup_failed_dlg_edit_details_action" msgid="5355993309841479360">"Modifier les détails"</string>
-    <string name="password_expire_warning_ticker_fmt" msgid="2459977229180023773">"\"<xliff:g id="ACCOUNT">%s</xliff:g>\" exige que le code PIN ou mot de passe d\'écran de verrouillage soit modifié."</string>
+    <string name="password_expire_warning_ticker_fmt" msgid="2459977229180023773">"« <xliff:g id="ACCOUNT">%s</xliff:g> » exige que le NIP ou mot de passe d\'écran de verrouillage soit modifié."</string>
     <string name="password_expire_warning_content_title" msgid="7174669014074849304">"Expiration mot de passe de verrouillage"</string>
-    <string name="password_expired_ticker" msgid="4230570412974108968">"Le code PIN ou le mot de passe de verrouillage de votre écran a expiré."</string>
+    <string name="password_expired_ticker" msgid="4230570412974108968">"Le NIP ou le mot de passe de verrouillage de votre écran a expiré."</string>
     <string name="password_expired_content_title" msgid="4349518706602252979">"Mot de passe verrou. expiré"</string>
     <string name="password_expire_warning_dialog_title" msgid="1687074175399798189">"Expiration mot de passe de verrouillage"</string>
-    <string name="password_expire_warning_dialog_content_fmt" msgid="4293446611405084436">"Vous allez bientôt devoir modifier le code PIN ou le mot de passe de verrouillage de l\'écran, faute de quoi les données de <xliff:g id="ACCOUNT">%s</xliff:g> vont être effacées. Voulez-vous le modifier maintenant?"</string>
+    <string name="password_expire_warning_dialog_content_fmt" msgid="4293446611405084436">"Vous allez bientôt devoir modifier le NIP ou le mot de passe de verrouillage de l\'écran, faute de quoi les données de <xliff:g id="ACCOUNT">%s</xliff:g> vont être effacées. Voulez-vous le modifier maintenant?"</string>
     <string name="password_expired_dialog_title" msgid="2186547998125938084">"Mot de passe verrou. expiré"</string>
-    <string name="password_expired_dialog_content_fmt" msgid="6538210092073931079">"Les données de <xliff:g id="ACCOUNT">%s</xliff:g> sont en cours d\'effacement de votre appareil. Vous pouvez les restaurer en modifiant le code PIN ou le mot de passe de verrouillage de l\'écran. Voulez-vous le modifier maintenant?"</string>
+    <string name="password_expired_dialog_content_fmt" msgid="6538210092073931079">"Les données de <xliff:g id="ACCOUNT">%s</xliff:g> sont en cours d\'effacement de votre appareil. Vous pouvez les restaurer en modifiant le NIP ou le mot de passe de verrouillage de l\'écran. Voulez-vous le modifier maintenant?"</string>
     <string name="account_settings_exit_server_settings" msgid="8006323251094711431">"Annuler les modifications non enregistrées ?"</string>
     <string name="account_settings_login_dialog_title" msgid="4024422579146302775">"Impossible de se connecter"</string>
     <string name="account_settings_login_dialog_content_fmt" msgid="8849649646111167377">"Le nom d\'utilisateur ou le mot de passe de <xliff:g id="ACCOUNT">%s</xliff:g> est incorrect. Voulez-vous les mettre à jour maintenant ?"</string>
-    <string name="account_settings_login_dialog_reason_fmt" msgid="4266359321648406752">"Échec de la connexion au compte <xliff:g id="ACCOUNT">%s</xliff:g>. Motif donné par le serveur : <xliff:g id="REASON">%s</xliff:g>. Voulez-vous mettre à jour votre nom d\'utilisateur et/ou votre mot de passe ?"</string>
+    <string name="account_settings_login_dialog_reason_fmt" msgid="4266359321648406752">"Échec de la connexion au compte <xliff:g id="ACCOUNT">%s</xliff:g>. Motif donné par le serveur : <xliff:g id="REASON">%s</xliff:g>. Voulez-vous mettre à jour votre nom d\'utilisateur et/ou votre mot de passe?"</string>
     <string name="account_settings_background_attachments_label" msgid="2980317599840958688">"Télécharger les pièces jointes"</string>
     <string name="account_settings_background_attachments_summary" msgid="5954218549226189376">"Télécharger automatiquement les pièces jointes aux messages récents via Wi-Fi"</string>
     <string name="account_settings_notify_label" msgid="1630001017303007974">"Notifications par courriel"</string>
@@ -248,7 +248,7 @@
     <string name="mailbox_settings_sync_enabled_summary" msgid="345878979425044320">"Tous les messages sont téléchargés lorsque vous vous connectez"</string>
     <string name="mailbox_settings_mailbox_sync_window_label" msgid="851180833264474141">"Nombre de jours à synchroniser"</string>
     <string name="prefDialogTitle_conversationListIcon" msgid="4601797400885989153">"Image de l\'expéditeur"</string>
-    <string name="provider_note_live" msgid="2995297671709325333">"Seuls certains comptes \"Plus\" disposent d\'un accès POP permettant à ce programme de se connecter. Si vous ne parvenez pas à vous connecter avec l\'adresse de courriel et le mot de passe corrects, vous ne possédez peut-être pas de compte payant \"Plus\". Pour accéder à ces comptes de messagerie, lancez le navigateur Web."</string>
+    <string name="provider_note_live" msgid="2995297671709325333">"Seuls certains comptes « Plus » disposent d\'un accès POP permettant à ce programme de se connecter. Si vous ne parvenez pas à vous connecter avec l\'adresse de courriel et le mot de passe corrects, vous ne possédez peut-être pas de compte payant « Plus ». Pour accéder à ces comptes de messagerie, lancez le navigateur Web."</string>
     <string name="provider_note_t_online" msgid="1630642061431427894">"Avant de configurer ce compte de messagerie, consultez le site Web de T-Online et créez un mot de passe d\'accès à la messagerie POP3."</string>
     <string name="exchange_name" msgid="1190783774800310346">"Entreprise"</string>
     <string name="exchange_name_alternate" msgid="5772529644749041052">"Microsoft Exchange ActiveSync"</string>
diff --git a/res/values-fr/strings.xml b/res/values-fr/strings.xml
index 3c83bb495..e66405888 100644
--- a/res/values-fr/strings.xml
+++ b/res/values-fr/strings.xml
@@ -133,7 +133,7 @@
     <string name="account_setup_exchange_device_id_label" msgid="1646827333223157658">"Numéro d\'appareil mobile :"</string>
     <string name="account_setup_options_title" msgid="9016600767888846051">"Paramètres du compte"</string>
     <string name="account_setup_options_headline" msgid="4181274232835368085">"Options de compte"</string>
-    <string name="account_setup_options_mail_check_frequency_label" msgid="4824859792882810053">"Fréquence de consultation de la boîte de réception"</string>
+    <string name="account_setup_options_mail_check_frequency_label" msgid="4824859792882810053">"Fréquence d\'actualisation de la boîte de réception"</string>
     <string name="account_setup_options_mail_check_frequency_never" msgid="287951859480505416">"Jamais"</string>
     <string name="account_setup_options_mail_check_frequency_push" msgid="5934525907736008673">"Automatique (Push)"</string>
     <string name="account_setup_options_mail_check_frequency_5min" msgid="6388939895878539307">"Toutes les 5 minutes"</string>
diff --git a/res/values-hi/strings.xml b/res/values-hi/strings.xml
index bd5b9a6aa..d23fac0b9 100644
--- a/res/values-hi/strings.xml
+++ b/res/values-hi/strings.xml
@@ -17,7 +17,7 @@
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="permission_read_attachment_label" msgid="9208086010625033590">"ईमेल अनुलग्‍नक पढ़ें"</string>
-    <string name="permission_read_attachment_desc" msgid="3394721085306308972">"ऐप्स  को आपके ईमेल अनुलग्नक पढ़ने देता है."</string>
+    <string name="permission_read_attachment_desc" msgid="3394721085306308972">"ऐप्स  को आपके ईमेल अटैचमेंट पढ़ने देता है."</string>
     <string name="permission_access_provider_label" msgid="378256653525377586">"ईमेल प्रदाता के डेटा तक पहुंचें"</string>
     <string name="permission_access_provider_desc" msgid="6296566558584670348">"इस ऐप्स को प्राप्‍त संदेशों, भेजे गए संदेशों, उपयोगकर्ता नाम और पासवर्ड सहित आपके ईमेल डेटाबेस में पहुंच देता है."</string>
     <string name="app_name" msgid="5815426892327290362">"ईमेल"</string>
@@ -145,7 +145,7 @@
     <string name="account_setup_options_sync_contacts_label" msgid="276492345599531778">"संपर्कों को इस खाते से समन्ववित करें"</string>
     <string name="account_setup_options_sync_calendar_label" msgid="3222151135467189411">"इस खाते से कैलेंडर समन्‍वयित करें"</string>
     <string name="account_setup_options_sync_email_label" msgid="8585177128405004068">"इस खाते से ईमेल समन्वयित करें"</string>
-    <string name="account_setup_options_background_attachments_label" msgid="5247749298276451846">"Wi-Fi से कनेक्‍ट होने पर अनुलग्‍नकों को स्‍वचालित रूप से डाउनलोड करें"</string>
+    <string name="account_setup_options_background_attachments_label" msgid="5247749298276451846">"Wi-Fi से कनेक्‍ट होने पर अटैचमेंट को स्‍वचालित रूप से डाउनलोड करें"</string>
     <string name="account_setup_failed_dlg_title" msgid="9083263347962940552">"पूरा नहीं हो सका"</string>
     <string name="account_setup_options_mail_window_label" msgid="7582247646138987328">"समन्वयन के लिए दिन:"</string>
     <string name="account_setup_options_mail_window_auto" msgid="4188895354366183790">"स्वचालित"</string>
@@ -202,7 +202,7 @@
     <string name="account_settings_login_dialog_content_fmt" msgid="8849649646111167377">"<xliff:g id="ACCOUNT">%s</xliff:g> का उपयोगकर्ता नाम या पासवर्ड गलत है. क्या आप उन्हें अभी अपडेट करना चाहते हैं?"</string>
     <string name="account_settings_login_dialog_reason_fmt" msgid="4266359321648406752">"<xliff:g id="ACCOUNT">%s</xliff:g> पर आपका प्रवेश विफल हो गया; सर्वर ने बताया: <xliff:g id="REASON">%s</xliff:g> क्या आप अपना उपयोगकर्ता नाम और/या पासवर्ड अपडेट करना चाहते हैं?"</string>
     <string name="account_settings_background_attachments_label" msgid="2980317599840958688">"अनुलग्नकों को डाउनलोड करें"</string>
-    <string name="account_settings_background_attachments_summary" msgid="5954218549226189376">"WiFi के माध्यम से हाल के संदेशों के अनुलग्नक स्वत: डाउनलोड करें"</string>
+    <string name="account_settings_background_attachments_summary" msgid="5954218549226189376">"WiFi के माध्यम से हाल के संदेशों के अटैचमेंट स्वत: डाउनलोड करें"</string>
     <string name="account_settings_notify_label" msgid="1630001017303007974">"ईमेल सूचनाएं"</string>
     <string name="account_settings_summary" msgid="8403582255413830007">"आवृत्ति, सूचनाएं आदि समन्वयन करें."</string>
     <string name="account_settings_notify_summary" msgid="8134339460923068254">"ईमेल आने पर सूचना भेजें"</string>
diff --git a/res/values-hu/strings.xml b/res/values-hu/strings.xml
index bc4ba01a6..3dbdf7c44 100644
--- a/res/values-hu/strings.xml
+++ b/res/values-hu/strings.xml
@@ -237,7 +237,7 @@
     <string name="account_settings_sync_contacts_summary" msgid="816919452270997919">"A fiók névjegyeinek szinkronizálása"</string>
     <string name="account_settings_sync_calendar_enable" msgid="6855333393468628003">"Naptár szinkronizálása"</string>
     <string name="account_settings_sync_calendar_summary" msgid="7606340353079301703">"A fiók naptárának szinkronizálása"</string>
-    <string name="account_settings_sync_email_enable" msgid="3754115565685222477">"E-mail szinkroniz."</string>
+    <string name="account_settings_sync_email_enable" msgid="3754115565685222477">"E-mail szinkronizálása"</string>
     <string name="account_settings_sync_email_summary" msgid="262964076412310990">"A fiók e-mailjeinek szinkronizálása"</string>
     <string name="account_settings_vibrate_when_label" msgid="708477308761702671">"Rezgés"</string>
     <string name="account_settings_ringtone" msgid="8229878374785575207">"Válasszon csengőhangot"</string>
diff --git a/res/values-ja/strings.xml b/res/values-ja/strings.xml
index 4e8e37449..853f54e60 100644
--- a/res/values-ja/strings.xml
+++ b/res/values-ja/strings.xml
@@ -99,7 +99,7 @@
     <string name="account_setup_names_user_name_empty_error" msgid="6791427018325367364">"このフィールドは必須です。"</string>
     <string name="account_setup_account_type_title" msgid="7156551693961182124">"アカウント設定"</string>
     <string name="account_setup_account_type_headline" msgid="3574102329184831086">"アカウントの種類"</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="6796626791039136005">"アカウント設定"</string>
     <string name="account_setup_incoming_headline" msgid="6183711037633407184">"受信サーバーの設定"</string>
     <string name="account_setup_incoming_username_label" msgid="5700581386104070302">"ユーザー名"</string>
diff --git a/res/values-km-rKH/strings.xml b/res/values-km-rKH/strings.xml
index 20c892606..85baaed9f 100644
--- a/res/values-km-rKH/strings.xml
+++ b/res/values-km-rKH/strings.xml
@@ -22,9 +22,9 @@
     <string name="permission_access_provider_desc" msgid="6296566558584670348">"អនុញ្ញាត​​ឲ្យ​​កម្មវិធី​ដើម្បី​ចូល​ដំណើរការ​មូលដ្ឋាន​ទិន្នន័យ​អ៊ីមែល​របស់​អ្នក,​ រួម​ទាំង​សារ​ដែល​បាន​ទទួល, ​សារ​ដែល​បាន​ផ្ញើ, ​ឈ្មោះ​អ្នក​ប្រើ ​និង​ពាក្យ​សម្ងាត់​។"</string>
     <string name="app_name" msgid="5815426892327290362">"អ៊ីមែល"</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>
+    <string name="next_action" msgid="3931301986364184415">"បន្ទាប់​"</string>
+    <string name="okay_action" msgid="8365197396795675617">"យល់​ព្រម​"</string>
+    <string name="cancel_action" msgid="6967435583794021865">"បោះ​បង់​"</string>
     <string name="previous_action" msgid="5181616311579820981">"មុន"</string>
     <string name="done_action" msgid="7497990549515580249">"ធ្វើ​រួច"</string>
     <string name="create_action" msgid="3062715563215392251">"បង្កើត​ថ្មី"</string>
@@ -43,7 +43,7 @@
     <string name="mailbox_name_display_outbox" msgid="2826214174661417662">"ប្រអប់​ចេញ"</string>
     <string name="mailbox_name_display_drafts" msgid="4868718300700514319">"សេចក្ដី​ព្រាង"</string>
     <string name="mailbox_name_display_trash" msgid="9139069064580630647">"ធុង​សំរាម"</string>
-    <string name="mailbox_name_display_sent" msgid="3426058998191869523">"បាន​ផ្ញើ"</string>
+    <string name="mailbox_name_display_sent" msgid="3426058998191869523">"បាន​ផ្ញើ​"</string>
     <string name="mailbox_name_display_junk" msgid="9046762505977999288">"ឥត​បាន​ការ"</string>
     <string name="mailbox_name_display_starred" msgid="7788694947644186069">"បាន​ដាក់​ផ្កាយ"</string>
     <string name="mailbox_name_display_unread" msgid="1015674989793998695">"មិន​ទាន់​អាន"</string>
@@ -81,8 +81,8 @@
     <string name="account_setup_basics_title" msgid="3578333196594678422">"រៀបចំ​គណនី"</string>
     <string name="account_setup_basics_headline" msgid="6726590205905464015">"គណនី​អ៊ីមែល"</string>
     <string name="accounts_welcome" msgid="8337750045270269649">"អ្នក​អាច​កំណត់​រចនា​សម្ព័ន្ធ​​​​អ៊ីមែល​សម្រាប់​គណនី​​ភាគច្រើន​​​​​ដោយ​ពីរ ឬ​បី​ជំហានទៀត​ប៉ុណ្ណោះ។"</string>
-    <string name="account_setup_basics_email_label" msgid="3454164053624112047">"អាសយដ្ឋាន​អ៊ីមែល"</string>
-    <string name="account_setup_basics_password_label" msgid="9133549799291519298">"ពាក្យសម្ងាត់"</string>
+    <string name="account_setup_basics_email_label" msgid="3454164053624112047">"អាសយដ្ឋាន​អ៊ីមែល​"</string>
+    <string name="account_setup_basics_password_label" msgid="9133549799291519298">"ពាក្យសម្ងាត់​"</string>
     <string name="account_setup_basics_manual_setup_action" msgid="8053852205391155912">"រៀបចំ​ដោយ​ដៃ"</string>
     <string name="account_setup_username_password_toast" msgid="3968270274727947460">"​បញ្ចូល​​ពាក្យ​សម្ងាត់ ​និង​​អាសយដ្ឋាន​អ៊ីមែល​​ដែល​ត្រឹមត្រូវ​។"</string>
     <string name="account_duplicate_dlg_title" msgid="8089732986912704425">"ស្ទួន​គណនី"</string>
@@ -102,8 +102,8 @@
     <string name="account_setup_account_type_instructions" msgid="114515540798408760">"តើ​​គណនី​នេះ​ជា​ប្រភេទ​អ្វី?"</string>
     <string name="account_setup_incoming_title" msgid="6796626791039136005">"រៀបចំ​គណនី"</string>
     <string name="account_setup_incoming_headline" msgid="6183711037633407184">"ការ​កំណត់​ម៉ាស៊ីន​មេ​​ចូល"</string>
-    <string name="account_setup_incoming_username_label" msgid="5700581386104070302">"ឈ្មោះ​អ្នក​ប្រើ"</string>
-    <string name="account_setup_incoming_password_label" msgid="6365327603172559859">"ពាក្យសម្ងាត់"</string>
+    <string name="account_setup_incoming_username_label" msgid="5700581386104070302">"ឈ្មោះ​អ្នក​ប្រើ​"</string>
+    <string name="account_setup_incoming_password_label" msgid="6365327603172559859">"ពាក្យសម្ងាត់​"</string>
     <string name="account_setup_incoming_server_label" msgid="1480342966630002638">"ម៉ាស៊ីន​មេ"</string>
     <string name="account_setup_incoming_port_label" msgid="8214738923690447796">"ច្រក"</string>
     <string name="account_setup_incoming_security_label" msgid="2110260791086007424">"ប្រភេទ​សុវត្ថិភាព"</string>
@@ -123,8 +123,8 @@
     <string name="account_setup_outgoing_port_label" msgid="7573207437835827876">"ច្រក"</string>
     <string name="account_setup_outgoing_security_label" msgid="911398071120720589">"ប្រភេទ​​សុវត្ថិភាព"</string>
     <string name="account_setup_outgoing_require_login_label" msgid="7779484127897397562">"ទាមទារ​ឲ្យ​​ចូល"</string>
-    <string name="account_setup_outgoing_username_label" msgid="3309680794731596981">"ឈ្មោះ​អ្នក​ប្រើ"</string>
-    <string name="account_setup_outgoing_password_label" msgid="227844585493317550">"ពាក្យសម្ងាត់"</string>
+    <string name="account_setup_outgoing_username_label" msgid="3309680794731596981">"ឈ្មោះ​អ្នក​ប្រើ​"</string>
+    <string name="account_setup_outgoing_password_label" msgid="227844585493317550">"ពាក្យសម្ងាត់​"</string>
     <string name="account_setup_exchange_certificate_title" msgid="8473793588405277962">"វិញ្ញាបនបត្រ​ម៉ាស៊ីន​ភ្ញៀវ"</string>
     <string name="account_setup_exchange_select_certificate" msgid="1536103662037268683">"ជ្រើស"</string>
     <string name="account_setup_exchange_use_certificate" msgid="8690682770083161349">"ប្រើ​វិញ្ញាបនបត្រ​ម៉ាស៊ីន​ភ្ញៀវ"</string>
@@ -150,7 +150,7 @@
     <string name="account_setup_options_mail_window_label" msgid="7582247646138987328">"ថ្ងៃ​​ត្រូវ​ធ្វើ​សម​កាល​កម្ម"</string>
     <string name="account_setup_options_mail_window_auto" msgid="4188895354366183790">"ស្វ័យប្រវត្តិ"</string>
     <string name="account_setup_options_mail_window_1day" msgid="7727436096227637646">"ថ្ងៃ​ចុង​ក្រោយ"</string>
-    <string name="account_setup_options_mail_window_3days" msgid="1841106793912850270">"បី​ថ្ងៃ​ចុង​ក្រោយ"</string>
+    <string name="account_setup_options_mail_window_3days" msgid="1841106793912850270">"បី​ថ្ងៃ​ចុង​ក្រោយ​"</string>
     <string name="account_setup_options_mail_window_1week" msgid="5804121771990249346">"សប្ដាហ៍​​ចុង​ក្រោយ"</string>
     <string name="account_setup_options_mail_window_2weeks" msgid="3583478100026382495">"ពីរ​​សប្ដាហ៍​​ចុង​ក្រោយ"</string>
     <string name="account_setup_options_mail_window_1month" msgid="4289585173153789717">"ខែ​មុន"</string>
@@ -210,7 +210,7 @@
     <string name="account_settings_incoming_label" msgid="7858928031806297542">"ការ​កំណត់​ចូល"</string>
     <string name="account_settings_incoming_summary" msgid="2923044634831881068">"ឈ្មោះ​អ្នក​ប្រើ​, ពាក្យ​សម្ងាត់ ​និង​ការ​កំណត់​ម៉ាស៊ីន​មេ​ចូល​​ផ្សេង​ទៀត"</string>
     <string name="account_settings_outgoing_label" msgid="4464829249980026745">"​កំណត់​ការ​ចេញ"</string>
-    <string name="account_settings_outgoing_summary" msgid="3572093624332724311">"ឈ្មោះ​អ្នក​ប្រើ​, ពាក្យ​សម្ងាត់ ​និង​ការ​កំណត់​ម៉ាស៊ីន​មេ​​ផ្សេង​ទៀត"</string>
+    <string name="account_settings_outgoing_summary" msgid="3572093624332724311">"ឈ្មោះ​អ្នក​ប្រើ​, ពាក្យ​សម្ងាត់ ​និង​ការ​កំណត់​ម៉ាស៊ីន​មេ​​ផ្សេង​ទៀត​"</string>
     <string name="account_settings_enforced_label" msgid="7429582254433588882">"បាន​អនុវត្ត​គោល​ន​យោ​បាយ"</string>
     <string name="account_settings_enforced_summary" msgid="8140860420440447771">"គ្មាន"</string>
     <string name="account_settings_unsupported_label" msgid="1954091071454235577">"គោល​ន​យោ​បាយ​ដែល​មិន​បាន​គាំទ្រ"</string>
@@ -254,7 +254,7 @@
     <string name="exchange_name_alternate" msgid="5772529644749041052">"Microsoft Exchange ActiveSync"</string>
     <string name="system_account_create_failed" msgid="3673792980526246177">"មិន​អាច​បង្កើត​គណនី​។ សូម​ព្យាយាម​ម្ដងទៀត។"</string>
     <string name="device_admin_label" msgid="8680224994637869414">"អ៊ីមែល"</string>
-    <string name="device_admin_description" msgid="426727923791430306">"បើក​​គោល​ន​យោ​បាយ​សុវត្ថិភាព​ម៉ាស៊ីន​មេ​​ដែល​បាន​បញ្ជាក់"</string>
+    <string name="device_admin_description" msgid="426727923791430306">"បើក​​គោល​ន​យោ​បាយ​សុវត្ថិភាព​ម៉ាស៊ីន​មេ​​ដែល​បាន​បញ្ជាក់​"</string>
     <string name="settings_activity_title" msgid="5185915603716333904">"ការ​កំណត់"</string>
     <string name="header_label_general_preferences" msgid="8243724566056800991">"ការ​កំណត់​ទូទៅ"</string>
     <string name="general_preference_confirm_delete_label" msgid="1863245465244241907">"បញ្ជាក់​មុន​ពេល​លុប"</string>
@@ -281,7 +281,7 @@
     <string name="policy_require_password" msgid="7177274900480984702">"ទាមទារ​ការ​ពាក្យ​សម្ងាត់​ឧបករណ៍"</string>
     <string name="policy_password_history" msgid="5743544498302303181">"ដាក់កម្រិត​​ប្រើ​​ពាក្យ​សម្ងាត់​ថ្មី​ឡើងវិញ"</string>
     <string name="policy_password_expiration" msgid="1248123255253649199">"ទាមទារ​​​ពាក្យ​សម្ងាត់​ដើម្បី​កំណត់​ពេល​ផុត​កំណត់"</string>
-    <string name="policy_screen_timeout" msgid="414869965358468080">"ទាមទារ​ឲ្យ​​​មាន​ឧបករណ៍​​​ទំនេរ​ ដើម្បី​ចាក់សោ​អេក្រង់"</string>
+    <string name="policy_screen_timeout" msgid="414869965358468080">"ទាមទារ​ឲ្យ​​​មាន​ឧបករណ៍​​​ទំនេរ​ ដើម្បី​ចាក់សោ​អេក្រង់​"</string>
     <string name="policy_calendar_age" msgid="627405158087482302">"កំណត់​​លេខ​ព្រឹត្តិការណ៍​ប្រតិទិន​ដែល​បាន​ធ្វើ​សម​កាល​កម្ម"</string>
     <string name="policy_email_age" msgid="7144148367145424963">"កំណត់​ចំនួន​​អ៊ីមែល​ដែល​​​បាន​ធ្វើ​សម​កាល​កម្ម"</string>
     <string name="quick_1" msgid="3426057697353380951">"​អរគុណ​!"</string>
diff --git a/res/values-ko/strings.xml b/res/values-ko/strings.xml
index 2baeac5b6..53c04716c 100644
--- a/res/values-ko/strings.xml
+++ b/res/values-ko/strings.xml
@@ -234,7 +234,7 @@
     <string name="edit_quick_response_dialog" msgid="6479106007607928450">"빠른 응답"</string>
     <string name="save_action" msgid="1988862706623227093">"저장"</string>
     <string name="account_settings_sync_contacts_enable" msgid="1369272986009573218">"연락처 동기화"</string>
-    <string name="account_settings_sync_contacts_summary" msgid="816919452270997919">"이 계정의 주소록을 동기화합니다."</string>
+    <string name="account_settings_sync_contacts_summary" msgid="816919452270997919">"이 계정의 연락처를 동기화합니다."</string>
     <string name="account_settings_sync_calendar_enable" msgid="6855333393468628003">"캘린더 동기화"</string>
     <string name="account_settings_sync_calendar_summary" msgid="7606340353079301703">"이 계정의 캘린더 일정을 동기화합니다."</string>
     <string name="account_settings_sync_email_enable" msgid="3754115565685222477">"이메일 동기화"</string>
diff --git a/res/values-lt/strings.xml b/res/values-lt/strings.xml
index 6fd9ecff3..266540495 100644
--- a/res/values-lt/strings.xml
+++ b/res/values-lt/strings.xml
@@ -285,7 +285,7 @@
     <string name="policy_calendar_age" msgid="627405158087482302">"Riboti sinchron. kalendoriaus įvykių skaičių"</string>
     <string name="policy_email_age" msgid="7144148367145424963">"Riboti sinchronizuojamų el. laiškų skaičių"</string>
     <string name="quick_1" msgid="3426057697353380951">"Ačiū!"</string>
-    <string name="quick_2" msgid="4188036352885736617">"Skamba gerai!"</string>
+    <string name="quick_2" msgid="4188036352885736617">"Gerai"</string>
     <string name="quick_3" msgid="8061819976353395585">"Perskaitysiu vėliau ir jums atsakysiu."</string>
     <string name="quick_4" msgid="3988974084396883051">"Aptarkime tai susitikę."</string>
     <string name="require_manual_sync_message" msgid="7777357288642785955">"Foninis šios paskyros sinchronizavimas neleidžiamas perduodant duomenis tarptinkliniu ryšiu."</string>
diff --git a/res/values-nb/strings.xml b/res/values-nb/strings.xml
index c626b0784..de6513adc 100644
--- a/res/values-nb/strings.xml
+++ b/res/values-nb/strings.xml
@@ -93,7 +93,7 @@
     <string name="account_setup_check_settings_check_outgoing_msg" msgid="4566131393776891419">"Bekrefter smtp-innstillingene ..."</string>
     <string name="account_setup_creating_account_msg" msgid="6235569720466839946">"Oppretter kontoen ..."</string>
     <string name="account_setup_names_title" msgid="8483517350241119291">"Konfigurering av konto"</string>
-    <string name="account_setup_names_headline" msgid="914858472109729140">"Kontoen din er konfigurert, og e-post er på vei."</string>
+    <string name="account_setup_names_headline" msgid="914858472109729140">"Kontoen din er konfigurert, og innkommende e-poster er på vei."</string>
     <string name="account_setup_names_account_name_label" msgid="8033895024273259196">"Gi denne kontoen et navn (valgfritt)"</string>
     <string name="account_setup_names_user_name_label" msgid="8967410178488604770">"Navnet ditt (vises i utgående meldinger)"</string>
     <string name="account_setup_names_user_name_empty_error" msgid="6791427018325367364">"Dette feltet må fylles ut."</string>
@@ -247,7 +247,7 @@
     <string name="mailbox_settings_sync_enabled_label" msgid="1180866791599296994">"Synkroniser denne mappen"</string>
     <string name="mailbox_settings_sync_enabled_summary" msgid="345878979425044320">"Alle e-postene lastes ned når du er tilkoblet"</string>
     <string name="mailbox_settings_mailbox_sync_window_label" msgid="851180833264474141">"Antall dager med e-post å synkronisere"</string>
-    <string name="prefDialogTitle_conversationListIcon" msgid="4601797400885989153">"Avsenderbilder"</string>
+    <string name="prefDialogTitle_conversationListIcon" msgid="4601797400885989153">"Bilde av avsender"</string>
     <string name="provider_note_live" msgid="2995297671709325333">"Bare noen «Pluss»-kontoer tilbyr POP-tilgangen denne appen trenger for å koble til. Hvis du ikke klarer å logge på med riktig e-postadresse og passord, kan det være du ikke har en betalt «Pluss»-konto. Start nettleseren for å få tilgang til slike e-postkontoer."</string>
     <string name="provider_note_t_online" msgid="1630642061431427894">"Før du konfigurerer denne e-postkontoen, må du gå til nettstedet for T-Online og opprette et passord for e-posttilgang via POP3."</string>
     <string name="exchange_name" msgid="1190783774800310346">"Exchange"</string>
diff --git a/res/values-nl/strings.xml b/res/values-nl/strings.xml
index 73db47635..8ade0ec14 100644
--- a/res/values-nl/strings.xml
+++ b/res/values-nl/strings.xml
@@ -157,7 +157,7 @@
     <string name="account_setup_options_mail_window_all" msgid="5372861827683632364">"Alles"</string>
     <string name="account_setup_options_mail_window_default" msgid="2540360826995543134">"Accountstandaard gebruiken"</string>
     <string name="account_setup_failed_dlg_auth_message" msgid="426627755590431364">"Gebruikersnaam of wachtwoord is onjuist."</string>
-    <string name="account_setup_failed_dlg_auth_message_fmt" msgid="2081384892947238930">"Aanmelden mislukt.\n(<xliff:g id="ERROR">%s</xliff:g>)"</string>
+    <string name="account_setup_failed_dlg_auth_message_fmt" msgid="2081384892947238930">"Inloggen mislukt.\n(<xliff:g id="ERROR">%s</xliff:g>)"</string>
     <string name="account_setup_autodiscover_dlg_authfail_title" msgid="7365992662150541370">"Probleem met instellen van account"</string>
     <string name="account_setup_autodiscover_dlg_authfail_message" msgid="8354874879956702097">"Controleer of de gebruikersnaam, het wachtwoord en de accountinstellingen correct zijn."</string>
     <string name="account_setup_failed_dlg_certificate_message" msgid="3836152264696108805">"Kan geen veilige verbinding met de server tot stand brengen."</string>
@@ -200,7 +200,7 @@
     <string name="account_settings_exit_server_settings" msgid="8006323251094711431">"Niet-opgeslagen wijzigingen annuleren?"</string>
     <string name="account_settings_login_dialog_title" msgid="4024422579146302775">"Kan niet inloggen"</string>
     <string name="account_settings_login_dialog_content_fmt" msgid="8849649646111167377">"De gebruikersnaam of het wachtwoord voor <xliff:g id="ACCOUNT">%s</xliff:g> is onjuist. Wilt u deze nu bijwerken?"</string>
-    <string name="account_settings_login_dialog_reason_fmt" msgid="4266359321648406752">"Uw aanmelding bij <xliff:g id="ACCOUNT">%s</xliff:g> is mislukt. De server retourneerde het volgende bericht: <xliff:g id="REASON">%s</xliff:g> Wilt u uw gebruikersnaam en/of wachtwoord bijwerken?"</string>
+    <string name="account_settings_login_dialog_reason_fmt" msgid="4266359321648406752">"Inloggen bij <xliff:g id="ACCOUNT">%s</xliff:g> is mislukt. De server retourneerde het volgende bericht: <xliff:g id="REASON">%s</xliff:g> Wilt u uw gebruikersnaam en/of wachtwoord bijwerken?"</string>
     <string name="account_settings_background_attachments_label" msgid="2980317599840958688">"Bijlagen downloaden"</string>
     <string name="account_settings_background_attachments_summary" msgid="5954218549226189376">"Bijlagen van recente berichten automatisch downloaden via wifi"</string>
     <string name="account_settings_notify_label" msgid="1630001017303007974">"Meldingen via e-mail"</string>
diff --git a/res/values-pl/strings.xml b/res/values-pl/strings.xml
index 5e27c48e9..d7d51c726 100644
--- a/res/values-pl/strings.xml
+++ b/res/values-pl/strings.xml
@@ -83,7 +83,7 @@
     <string name="accounts_welcome" msgid="8337750045270269649">"Skonfiguruj swoje konto w kilku prostych krokach."</string>
     <string name="account_setup_basics_email_label" msgid="3454164053624112047">"Adres e-mail"</string>
     <string name="account_setup_basics_password_label" msgid="9133549799291519298">"Hasło"</string>
-    <string name="account_setup_basics_manual_setup_action" msgid="8053852205391155912">"Konfig. ręczna"</string>
+    <string name="account_setup_basics_manual_setup_action" msgid="8053852205391155912">"Konfiguracja ręczna"</string>
     <string name="account_setup_username_password_toast" msgid="3968270274727947460">"Wpisz prawidłowy adres e-mail i hasło."</string>
     <string name="account_duplicate_dlg_title" msgid="8089732986912704425">"Zduplikowane konto"</string>
     <string name="account_duplicate_dlg_message_fmt" msgid="6447629283679935840">"Używasz już tej nazwy użytkownika na koncie „<xliff:g id="DUPLICATE">%s</xliff:g>”."</string>
@@ -147,7 +147,7 @@
     <string name="account_setup_options_sync_email_label" msgid="8585177128405004068">"Synchronizuj e-maile z tego konta"</string>
     <string name="account_setup_options_background_attachments_label" msgid="5247749298276451846">"Automatycznie pobieraj załączniki, gdy połączono z siecią Wi-Fi"</string>
     <string name="account_setup_failed_dlg_title" msgid="9083263347962940552">"Nie można zakończyć"</string>
-    <string name="account_setup_options_mail_window_label" msgid="7582247646138987328">"Dni do synchronizacji"</string>
+    <string name="account_setup_options_mail_window_label" msgid="7582247646138987328">"Okres do synchronizacji"</string>
     <string name="account_setup_options_mail_window_auto" msgid="4188895354366183790">"Automatycznie"</string>
     <string name="account_setup_options_mail_window_1day" msgid="7727436096227637646">"Ostatni dzień"</string>
     <string name="account_setup_options_mail_window_3days" msgid="1841106793912850270">"Ostatnie trzy dni"</string>
@@ -202,10 +202,10 @@
     <string name="account_settings_login_dialog_content_fmt" msgid="8849649646111167377">"Nazwa użytkownika lub hasło dla konta <xliff:g id="ACCOUNT">%s</xliff:g> są nieprawidłowe. Chcesz je poprawić?"</string>
     <string name="account_settings_login_dialog_reason_fmt" msgid="4266359321648406752">"Błąd logowania się na <xliff:g id="ACCOUNT">%s</xliff:g>. Odpowiedź serwera: <xliff:g id="REASON">%s</xliff:g> Czy chcesz zaktualizować nazwę użytkownika i/lub hasło?"</string>
     <string name="account_settings_background_attachments_label" msgid="2980317599840958688">"Pobieraj załączniki"</string>
-    <string name="account_settings_background_attachments_summary" msgid="5954218549226189376">"Automatycznie pobieraj załączniki najnowszych wiadomości przez Wi-Fi."</string>
+    <string name="account_settings_background_attachments_summary" msgid="5954218549226189376">"Automatycznie pobieraj załączniki najnowszych wiadomości przez Wi-Fi"</string>
     <string name="account_settings_notify_label" msgid="1630001017303007974">"Powiadomienia e-mail"</string>
     <string name="account_settings_summary" msgid="8403582255413830007">"Częstotliwość synchronizacji, powiadomienia itd."</string>
-    <string name="account_settings_notify_summary" msgid="8134339460923068254">"Wysyłaj powiadomienie, gdy przychodzi nowy e-mail."</string>
+    <string name="account_settings_notify_summary" msgid="8134339460923068254">"Wysyłaj powiadomienie, gdy przychodzi nowy e-mail"</string>
     <string name="account_settings_mail_check_frequency_label" msgid="4322235101687302250">"Częstotliwość"</string>
     <string name="account_settings_incoming_label" msgid="7858928031806297542">"Poczta przychodząca"</string>
     <string name="account_settings_incoming_summary" msgid="2923044634831881068">"Użytkownik, hasło i inne ustawienia serwera poczty przychodzącej"</string>
@@ -220,7 +220,7 @@
     <string name="account_settings_description_label" msgid="8894815221204511715">"Nazwa konta"</string>
     <string name="account_settings_name_label" msgid="8186406122590008449">"Imię i nazwisko"</string>
     <string name="account_settings_edit_quick_responses_label" msgid="3106019627675996480">"Szybkie odpowiedzi"</string>
-    <string name="account_settings_edit_quick_responses_summary" msgid="8056686122888722591">"Edytuj tekst, który często wstawiasz do e-maili."</string>
+    <string name="account_settings_edit_quick_responses_summary" msgid="8056686122888722591">"Edytuj tekst, który często wstawiasz do e-maili"</string>
     <string name="account_settings_notifications" msgid="1042620094281375043">"Ustawienia powiadomień"</string>
     <string name="account_settings_data_usage" msgid="6669107430575866736">"Wykorzystanie transmisji danych"</string>
     <string name="account_settings_policies" msgid="6292833636418641840">"Zasady bezpieczeństwa"</string>
@@ -236,7 +236,7 @@
     <string name="account_settings_sync_contacts_enable" msgid="1369272986009573218">"Synchronizuj kontakty"</string>
     <string name="account_settings_sync_contacts_summary" msgid="816919452270997919">"Synchronizuj kontakty dla tego konta"</string>
     <string name="account_settings_sync_calendar_enable" msgid="6855333393468628003">"Synchronizuj kalendarz"</string>
-    <string name="account_settings_sync_calendar_summary" msgid="7606340353079301703">"Synch. kalendarz dla tego konta."</string>
+    <string name="account_settings_sync_calendar_summary" msgid="7606340353079301703">"Synchronizuj kalendarz dla tego konta"</string>
     <string name="account_settings_sync_email_enable" msgid="3754115565685222477">"Synchronizuj e-maile"</string>
     <string name="account_settings_sync_email_summary" msgid="262964076412310990">"Synchronizuj wiadomości e-mail dla tego konta"</string>
     <string name="account_settings_vibrate_when_label" msgid="708477308761702671">"Wibracje"</string>
@@ -246,7 +246,7 @@
     <string name="mailbox_settings_activity_title_with_mailbox" msgid="6485481250424219240">"Opcje synchronizacji (<xliff:g id="MAILBOXX_NAME">%s</xliff:g>)"</string>
     <string name="mailbox_settings_sync_enabled_label" msgid="1180866791599296994">"Zsynchronizuj ten folder"</string>
     <string name="mailbox_settings_sync_enabled_summary" msgid="345878979425044320">"Wiadomości zostaną pobrane po nawiązaniu połączenia"</string>
-    <string name="mailbox_settings_mailbox_sync_window_label" msgid="851180833264474141">"Dni do synchronizacji"</string>
+    <string name="mailbox_settings_mailbox_sync_window_label" msgid="851180833264474141">"Okres do synchronizacji"</string>
     <string name="prefDialogTitle_conversationListIcon" msgid="4601797400885989153">"Zdjęcie nadawcy"</string>
     <string name="provider_note_live" msgid="2995297671709325333">"Tylko niektóre konta typu „Plus” zawierają funkcję dostępu POP umożliwiającą łączenie się za pomocą tego programu. Jeśli nie możesz zalogować się przy użyciu poprawnego adresu e-mail i hasła, być może nie masz płatnego konta typu „Plus”. Uruchom przeglądarkę, aby uzyskać dostęp do tych kont e-mail."</string>
     <string name="provider_note_t_online" msgid="1630642061431427894">"Przed skonfigurowaniem tego konta e-mail odwiedź witrynę T-Online i utwórz hasło dostępu do poczty POP3."</string>
@@ -276,7 +276,7 @@
     <string name="general_preference_text_zoom_large" msgid="6874323663381586918">"Duży"</string>
     <string name="general_preference_text_zoom_huge" msgid="4270503132355963031">"Wielki"</string>
     <string name="more_than_999" msgid="8704425397397918798">"999+"</string>
-    <string name="search_hint" msgid="2200412192574686497">"Wyszukaj w wiadomościach e-mail"</string>
+    <string name="search_hint" msgid="2200412192574686497">"Wyszukaj w e-mailach"</string>
     <string name="policy_dont_allow_camera" msgid="5744573062306937302">"Nie zezwalaj na używanie aparatu"</string>
     <string name="policy_require_password" msgid="7177274900480984702">"Wymagaj hasła do urządzenia"</string>
     <string name="policy_password_history" msgid="5743544498302303181">"Nie zezwalaj na używanie poprzednich haseł"</string>
@@ -286,7 +286,7 @@
     <string name="policy_email_age" msgid="7144148367145424963">"Ogranicz liczbę synchronizowanych e-maili"</string>
     <string name="quick_1" msgid="3426057697353380951">"Dziękuję."</string>
     <string name="quick_2" msgid="4188036352885736617">"Brzmi dobrze."</string>
-    <string name="quick_3" msgid="8061819976353395585">"Przeczytam to później i skontaktuję się."</string>
+    <string name="quick_3" msgid="8061819976353395585">"Przeczytam później i skontaktuję się."</string>
     <string name="quick_4" msgid="3988974084396883051">"Spotkajmy się, aby to omówić."</string>
     <string name="require_manual_sync_message" msgid="7777357288642785955">"Synchronizacja w tle z tym kontem jest podczas roamingu wyłączona."</string>
     <string name="confirm_response" msgid="9151965975158906286">"Wysyłam odpowiedź…"</string>
diff --git a/res/values-pt-rPT/strings.xml b/res/values-pt-rPT/strings.xml
index e1d8576ba..bf5d083a8 100644
--- a/res/values-pt-rPT/strings.xml
+++ b/res/values-pt-rPT/strings.xml
@@ -16,10 +16,10 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="permission_read_attachment_label" msgid="9208086010625033590">"Ler anexos de e-mail"</string>
-    <string name="permission_read_attachment_desc" msgid="3394721085306308972">"Permite à aplicação ler os anexos de e-mail."</string>
-    <string name="permission_access_provider_label" msgid="378256653525377586">"Aceder a dados do fornecedor de e-mail"</string>
-    <string name="permission_access_provider_desc" msgid="6296566558584670348">"Permite que a aplicação aceda à base de dados do e-mail, incluindo às mensagens recebidas, mensagens enviadas, nomes de utilizadores e palavras-passe."</string>
+    <string name="permission_read_attachment_label" msgid="9208086010625033590">"Ler anexos de email"</string>
+    <string name="permission_read_attachment_desc" msgid="3394721085306308972">"Permite à aplicação ler os anexos de email."</string>
+    <string name="permission_access_provider_label" msgid="378256653525377586">"Aceder a dados do fornecedor de email"</string>
+    <string name="permission_access_provider_desc" msgid="6296566558584670348">"Permite que a aplicação aceda à base de dados do email, incluindo às mensagens recebidas, mensagens enviadas, nomes de utilizadores e palavras-passe."</string>
     <string name="app_name" msgid="5815426892327290362">"Email"</string>
     <string name="debug_title" msgid="5175710493691536719">"Depuração"</string>
     <string name="next_action" msgid="3931301986364184415">"Seguinte"</string>
@@ -84,7 +84,7 @@
     <string name="account_setup_basics_email_label" msgid="3454164053624112047">"Endereço de email"</string>
     <string name="account_setup_basics_password_label" msgid="9133549799291519298">"Palavra-passe"</string>
     <string name="account_setup_basics_manual_setup_action" msgid="8053852205391155912">"Configuração manual"</string>
-    <string name="account_setup_username_password_toast" msgid="3968270274727947460">"Introduza um endereço de e-mail e palavra-passe válidos."</string>
+    <string name="account_setup_username_password_toast" msgid="3968270274727947460">"Introduza um endereço de email e palavra-passe válidos."</string>
     <string name="account_duplicate_dlg_title" msgid="8089732986912704425">"Conta duplicada"</string>
     <string name="account_duplicate_dlg_message_fmt" msgid="6447629283679935840">"Este nome de utilizador já está a ser utilizado para a conta “<xliff:g id="DUPLICATE">%s</xliff:g>”."</string>
     <string name="account_password_spaces_error" msgid="8928309156658903257">"Esta palavra-passe começa ou termina com um ou mais caracteres de espaço. Muitos servidores não suportam palavras-passe com espaços."</string>
@@ -93,15 +93,15 @@
     <string name="account_setup_check_settings_check_outgoing_msg" msgid="4566131393776891419">"A validar as configurações de smtp..."</string>
     <string name="account_setup_creating_account_msg" msgid="6235569720466839946">"A criar conta..."</string>
     <string name="account_setup_names_title" msgid="8483517350241119291">"Configuração da conta"</string>
-    <string name="account_setup_names_headline" msgid="914858472109729140">"A sua conta está configurada e o e-mail vai a caminho!"</string>
+    <string name="account_setup_names_headline" msgid="914858472109729140">"A sua conta está configurada e o email vai a caminho!"</string>
     <string name="account_setup_names_account_name_label" msgid="8033895024273259196">"Dar um nome a esta conta (opcional)"</string>
     <string name="account_setup_names_user_name_label" msgid="8967410178488604770">"O seu nome (apresentado nas mensagens enviadas)"</string>
     <string name="account_setup_names_user_name_empty_error" msgid="6791427018325367364">"Este campo não pode estar em branco."</string>
     <string name="account_setup_account_type_title" msgid="7156551693961182124">"Configuração da conta"</string>
     <string name="account_setup_account_type_headline" msgid="3574102329184831086">"Tipo de conta"</string>
-    <string name="account_setup_account_type_instructions" msgid="114515540798408760">"Que tipo de conta é este?"</string>
+    <string name="account_setup_account_type_instructions" msgid="114515540798408760">"Que tipo de conta é esta?"</string>
     <string name="account_setup_incoming_title" msgid="6796626791039136005">"Configuração da conta"</string>
-    <string name="account_setup_incoming_headline" msgid="6183711037633407184">"Definições do servidor de recepção"</string>
+    <string name="account_setup_incoming_headline" msgid="6183711037633407184">"Definições do servidor de receção"</string>
     <string name="account_setup_incoming_username_label" msgid="5700581386104070302">"Nome de utilizador"</string>
     <string name="account_setup_incoming_password_label" msgid="6365327603172559859">"Palavra-passe"</string>
     <string name="account_setup_incoming_server_label" msgid="1480342966630002638">"Servidor"</string>
@@ -112,7 +112,7 @@
     <string name="account_setup_incoming_security_ssl_label" msgid="2798501138420163861">"SSL/TLS"</string>
     <string name="account_setup_incoming_security_tls_trust_certificates_label" msgid="6149084428423662620">"STARTTLS (aceitar todos os certificados)"</string>
     <string name="account_setup_incoming_security_tls_label" msgid="6573498431821879660">"STARTTLS"</string>
-    <string name="account_setup_incoming_delete_policy_label" msgid="9213590134693857912">"Eliminar e-mail do servidor"</string>
+    <string name="account_setup_incoming_delete_policy_label" msgid="9213590134693857912">"Eliminar email do servidor"</string>
     <string name="account_setup_incoming_delete_policy_never_label" msgid="3222897501875871041">"Nunca"</string>
     <string name="account_setup_incoming_delete_policy_delete_label" msgid="222216840911785631">"Quando elimino da pasta A Receber"</string>
     <string name="account_setup_incoming_imap_path_prefix_label" msgid="401167247072926810">"Prefixo de caminho IMAP"</string>
@@ -141,10 +141,10 @@
     <string name="account_setup_options_mail_check_frequency_15min" msgid="5052776740089741793">"De 15 em 15 minutos"</string>
     <string name="account_setup_options_mail_check_frequency_30min" msgid="1097088928685931864">"De 30 em 30 minutos"</string>
     <string name="account_setup_options_mail_check_frequency_1hour" msgid="3767715356039692899">"De hora em hora"</string>
-    <string name="account_setup_options_notify_label" msgid="7046146571560728829">"Receber notificação de e-mails novos"</string>
+    <string name="account_setup_options_notify_label" msgid="7046146571560728829">"Receber notificação de emails novos"</string>
     <string name="account_setup_options_sync_contacts_label" msgid="276492345599531778">"Sincronizar contactos a partir desta conta."</string>
     <string name="account_setup_options_sync_calendar_label" msgid="3222151135467189411">"Sincronizar o calendário a partir desta conta."</string>
-    <string name="account_setup_options_sync_email_label" msgid="8585177128405004068">"Sincronizar e-mail a partir desta conta."</string>
+    <string name="account_setup_options_sync_email_label" msgid="8585177128405004068">"Sincronizar email a partir desta conta."</string>
     <string name="account_setup_options_background_attachments_label" msgid="5247749298276451846">"Transferir automaticamente anexos quando ligado a uma rede Wi-Fi"</string>
     <string name="account_setup_failed_dlg_title" msgid="9083263347962940552">"Não foi possível concluir"</string>
     <string name="account_setup_options_mail_window_label" msgid="7582247646138987328">"Dias para sincronização"</string>
@@ -171,13 +171,13 @@
     <string name="account_setup_failed_auth_required" msgid="6799839150250217566">"Os métodos de autenticação não são suportados pelo servidor."</string>
     <string name="account_setup_failed_security" msgid="925820957665764964">"Não foi possível abrir ligação ao servidor devido a um erro de segurança."</string>
     <string name="account_setup_failed_ioerror" msgid="7802604687451830378">"Não foi possível abrir ligação ao servidor."</string>
-    <string name="account_setup_failed_protocol_unsupported" msgid="4607759927226943569">"Introduziu um endereço de servidor incorreto ou o servidor requer uma versão de protocolo que o E-mail não suporta."</string>
+    <string name="account_setup_failed_protocol_unsupported" msgid="4607759927226943569">"Introduziu um endereço de servidor incorreto ou o servidor requer uma versão de protocolo que o Email não suporta."</string>
     <string name="account_setup_failed_access_denied" msgid="6835358740050287051">"Não tem autorização para sincronizar com este servidor. Contacte o administrador do servidor para obter mais informações."</string>
     <string name="account_setup_security_required_title" msgid="1850321535870447468">"Administração de segurança remota"</string>
     <string name="account_setup_security_policies_required_fmt" msgid="5410714107656671761">"O servidor <xliff:g id="SERVER">%s</xliff:g> requer permissão para controlar remotamente algumas das funcionalidades de segurança do dispositivo Android. Pretende concluir a configuração desta conta?"</string>
     <string name="account_setup_failed_security_policies_unsupported" msgid="3210264746877120355">"Este servidor requer funcionalidades de segurança que o seu aparelho Android não suporta, incluindo: <xliff:g id="ERROR">%s</xliff:g>"</string>
     <string name="account_setup_username_uneditable_error" msgid="1618869759801584109">"Não é possível alterar o nome de utilizador de uma conta. Para adicionar uma conta com outro nome de utilizador, toque em Adicionar Conta."</string>
-    <string name="disable_admin_warning" msgid="6196985268695592382">"AVISO: a desativação da autorização da aplicação E-mail para administrar o aparelho eliminará todas as contas de e-mail que necessitam desta, juntamente com o respetivo e-mail, contactos, eventos de agenda e outros dados."</string>
+    <string name="disable_admin_warning" msgid="6196985268695592382">"AVISO: a desativação da autorização da aplicação Email para administrar o aparelho eliminará todas as contas de email que necessitam desta, juntamente com o respetivo email, contactos, eventos de agenda e outros dados."</string>
     <string name="account_security_dialog_title" msgid="430041952584831904">"Atualização de segurança"</string>
     <string name="account_security_dialog_content_fmt" msgid="8843806143923278214">"<xliff:g id="ACCOUNT">%s</xliff:g> requer a atualização das definições de segurança."</string>
     <string name="security_unsupported_ticker_fmt" msgid="5166579214529283975">"Não é possível sincronizar a conta \"<xliff:g id="ACCOUNT">%s</xliff:g>\" devido a requisitos de segurança."</string>
@@ -203,9 +203,9 @@
     <string name="account_settings_login_dialog_reason_fmt" msgid="4266359321648406752">"O seu início de sessão para <xliff:g id="ACCOUNT">%s</xliff:g> falhou; o servidor perguntou: <xliff:g id="REASON">%s</xliff:g> Pretende atualizar o seu nome de utilizador e/ou palavra-passe?"</string>
     <string name="account_settings_background_attachments_label" msgid="2980317599840958688">"Transferir anexos"</string>
     <string name="account_settings_background_attachments_summary" msgid="5954218549226189376">"Transferir automaticamente anexos de mensagens recentes p/ Wi-Fi"</string>
-    <string name="account_settings_notify_label" msgid="1630001017303007974">"Notificações de e-mail"</string>
+    <string name="account_settings_notify_label" msgid="1630001017303007974">"Notificações de email"</string>
     <string name="account_settings_summary" msgid="8403582255413830007">"Frequência da sincronização, notificações, etc."</string>
-    <string name="account_settings_notify_summary" msgid="8134339460923068254">"Enviar notificação quando chegar um e-mail"</string>
+    <string name="account_settings_notify_summary" msgid="8134339460923068254">"Enviar notificação quando chegar um email"</string>
     <string name="account_settings_mail_check_frequency_label" msgid="4322235101687302250">"Frequência de sincronização"</string>
     <string name="account_settings_incoming_label" msgid="7858928031806297542">"Definições de recepção"</string>
     <string name="account_settings_incoming_summary" msgid="2923044634831881068">"Nome de utiliz., palavra-passe e outras def. do serv. de receção"</string>
@@ -237,8 +237,8 @@
     <string name="account_settings_sync_contacts_summary" msgid="816919452270997919">"Sincronizar contactos para esta conta"</string>
     <string name="account_settings_sync_calendar_enable" msgid="6855333393468628003">"Sincronizar calendário"</string>
     <string name="account_settings_sync_calendar_summary" msgid="7606340353079301703">"Sinc. evento do cal. p. esta conta"</string>
-    <string name="account_settings_sync_email_enable" msgid="3754115565685222477">"Sincronizar e-mail"</string>
-    <string name="account_settings_sync_email_summary" msgid="262964076412310990">"Sincronizar e-mail para esta conta"</string>
+    <string name="account_settings_sync_email_enable" msgid="3754115565685222477">"Sincronizar email"</string>
+    <string name="account_settings_sync_email_summary" msgid="262964076412310990">"Sincronizar email para esta conta"</string>
     <string name="account_settings_vibrate_when_label" msgid="708477308761702671">"Vibrar"</string>
     <string name="account_settings_ringtone" msgid="8229878374785575207">"Escolher toque"</string>
     <string name="account_settings_servers" msgid="4925493817981624242">"Definições do servidor"</string>
@@ -249,7 +249,7 @@
     <string name="mailbox_settings_mailbox_sync_window_label" msgid="851180833264474141">"Dias de correio a sincronizar"</string>
     <string name="prefDialogTitle_conversationListIcon" msgid="4601797400885989153">"Imagem do remetente"</string>
     <string name="provider_note_live" msgid="2995297671709325333">"Apenas algumas contas “Plus” incluem acesso POP, permitindo a ligação deste programa. Se não conseguir iniciar sessão com o endereço de email e palavra-passe corretos, é possível que não tenha uma conta “Plus” paga. Inicie o navegador de Internet para obter acesso a essas contas de email."</string>
-    <string name="provider_note_t_online" msgid="1630642061431427894">"Antes de configurar esta conta de e-mail, visite o Web site T-Online e crie uma palavra-passe de acesso a e-mail POP3."</string>
+    <string name="provider_note_t_online" msgid="1630642061431427894">"Antes de configurar esta conta de email, visite o Web site T-Online e crie uma palavra-passe de acesso a e-mail POP3."</string>
     <string name="exchange_name" msgid="1190783774800310346">"Empresa"</string>
     <string name="exchange_name_alternate" msgid="5772529644749041052">"Microsoft Exchange ActiveSync"</string>
     <string name="system_account_create_failed" msgid="3673792980526246177">"Não foi possível criar a conta. Tente novamente."</string>
@@ -276,7 +276,7 @@
     <string name="general_preference_text_zoom_large" msgid="6874323663381586918">"Grande"</string>
     <string name="general_preference_text_zoom_huge" msgid="4270503132355963031">"Muito grande"</string>
     <string name="more_than_999" msgid="8704425397397918798">"999+"</string>
-    <string name="search_hint" msgid="2200412192574686497">"Pesquisar e-mail"</string>
+    <string name="search_hint" msgid="2200412192574686497">"Pesquisar email"</string>
     <string name="policy_dont_allow_camera" msgid="5744573062306937302">"Não perm. utilização câmara do aparelho"</string>
     <string name="policy_require_password" msgid="7177274900480984702">"Solicitar palavra-passe do aparelho"</string>
     <string name="policy_password_history" msgid="5743544498302303181">"Limitar reutilização pal.-passe recentes"</string>
diff --git a/res/values-ro/strings.xml b/res/values-ro/strings.xml
index e89345cb6..bd1bcbc90 100644
--- a/res/values-ro/strings.xml
+++ b/res/values-ro/strings.xml
@@ -80,7 +80,7 @@
   </plurals>
     <string name="account_setup_basics_title" msgid="3578333196594678422">"Configurare cont"</string>
     <string name="account_setup_basics_headline" msgid="6726590205905464015">"Cont de e-mail"</string>
-    <string name="accounts_welcome" msgid="8337750045270269649">"Puteţi configura contul dvs. în doar câţiva paşi."</string>
+    <string name="accounts_welcome" msgid="8337750045270269649">"Vă puteți configura contul în câțiva pași."</string>
     <string name="account_setup_basics_email_label" msgid="3454164053624112047">"Adresă de e-mail"</string>
     <string name="account_setup_basics_password_label" msgid="9133549799291519298">"Parolă"</string>
     <string name="account_setup_basics_manual_setup_action" msgid="8053852205391155912">"Configurare manuală"</string>
@@ -142,12 +142,12 @@
     <string name="account_setup_options_mail_check_frequency_30min" msgid="1097088928685931864">"La fiecare 30 de minute"</string>
     <string name="account_setup_options_mail_check_frequency_1hour" msgid="3767715356039692899">"La fiecare oră"</string>
     <string name="account_setup_options_notify_label" msgid="7046146571560728829">"Doresc să fiu notificat(ă) la primirea de e-mailuri"</string>
-    <string name="account_setup_options_sync_contacts_label" msgid="276492345599531778">"Doresc sincronizarea agendei acestui cont"</string>
+    <string name="account_setup_options_sync_contacts_label" msgid="276492345599531778">"Sincronizează agenda acestui cont"</string>
     <string name="account_setup_options_sync_calendar_label" msgid="3222151135467189411">"Doresc sincronizarea calendarului acestui cont"</string>
-    <string name="account_setup_options_sync_email_label" msgid="8585177128405004068">"Doresc sincronizarea mesajelor de e-mail din acest cont"</string>
-    <string name="account_setup_options_background_attachments_label" msgid="5247749298276451846">"Doresc să se descarce automat ataşamentele când sunt conectat(ă) la Wi-Fi"</string>
+    <string name="account_setup_options_sync_email_label" msgid="8585177128405004068">"Sincronizează mesajele de e-mail din acest cont"</string>
+    <string name="account_setup_options_background_attachments_label" msgid="5247749298276451846">"Descarcă automat atașamentele când sunt conectat(ă) la Wi-Fi"</string>
     <string name="account_setup_failed_dlg_title" msgid="9083263347962940552">"Nu s-a putut finaliza"</string>
-    <string name="account_setup_options_mail_window_label" msgid="7582247646138987328">"Zile pentru sincronizare"</string>
+    <string name="account_setup_options_mail_window_label" msgid="7582247646138987328">"Sincronizați începând cu"</string>
     <string name="account_setup_options_mail_window_auto" msgid="4188895354366183790">"Automat"</string>
     <string name="account_setup_options_mail_window_1day" msgid="7727436096227637646">"Ultima zi"</string>
     <string name="account_setup_options_mail_window_3days" msgid="1841106793912850270">"Ultimele trei zile"</string>
@@ -202,10 +202,10 @@
     <string name="account_settings_login_dialog_content_fmt" msgid="8849649646111167377">"Numele de utilizator sau parola pentru <xliff:g id="ACCOUNT">%s</xliff:g> sunt incorecte. Doriţi să le actualizaţi acum?"</string>
     <string name="account_settings_login_dialog_reason_fmt" msgid="4266359321648406752">"Conectarea dvs. la <xliff:g id="ACCOUNT">%s</xliff:g> a eşuat; motivul invocat de server a fost: <xliff:g id="REASON">%s</xliff:g> Doriţi să actualizaţi numele de utilizator şi/sau parola?"</string>
     <string name="account_settings_background_attachments_label" msgid="2980317599840958688">"Descărcaţi ataşamentele"</string>
-    <string name="account_settings_background_attachments_summary" msgid="5954218549226189376">"Descărcaţi în mod automat prin Wi-Fi ataşam. mesaj. recente"</string>
+    <string name="account_settings_background_attachments_summary" msgid="5954218549226189376">"Descarcă automat prin Wi-Fi ataşam. mesaj. recente"</string>
     <string name="account_settings_notify_label" msgid="1630001017303007974">"Notificările de e-mail"</string>
     <string name="account_settings_summary" msgid="8403582255413830007">"Frecvenţa sincronizării, notificări etc."</string>
-    <string name="account_settings_notify_summary" msgid="8134339460923068254">"Trimiteţi notificare la primire e-mail"</string>
+    <string name="account_settings_notify_summary" msgid="8134339460923068254">"Trimite notificare la primire e-mail"</string>
     <string name="account_settings_mail_check_frequency_label" msgid="4322235101687302250">"Frecvența de sincronizare"</string>
     <string name="account_settings_incoming_label" msgid="7858928031806297542">"Setări pentru mesajele primite"</string>
     <string name="account_settings_incoming_summary" msgid="2923044634831881068">"Nume utilizator, parolă şi alte setări pt. serverul de primire"</string>
@@ -246,7 +246,7 @@
     <string name="mailbox_settings_activity_title_with_mailbox" msgid="6485481250424219240">"Opţiuni de sincronizare (<xliff:g id="MAILBOXX_NAME">%s</xliff:g>)"</string>
     <string name="mailbox_settings_sync_enabled_label" msgid="1180866791599296994">"Sincronizați acest dosar"</string>
     <string name="mailbox_settings_sync_enabled_summary" msgid="345878979425044320">"Mesajele vor fi descărcate la conectare"</string>
-    <string name="mailbox_settings_mailbox_sync_window_label" msgid="851180833264474141">"Zile de sincronizat pentru e-mailuri"</string>
+    <string name="mailbox_settings_mailbox_sync_window_label" msgid="851180833264474141">"Sincronizează începând cu"</string>
     <string name="prefDialogTitle_conversationListIcon" msgid="4601797400885989153">"Imaginea expeditorului"</string>
     <string name="provider_note_live" msgid="2995297671709325333">"Numai unele conturi de tip „Plus” includ accesul de tip POP, permiţând conectarea acestui program. Dacă nu reuşiţi să vă conectaţi cu adresa de e-mail şi parola corecte, este posibil să nu aveţi un cont de tip „Plus” plătit. Lansaţi browserul web pentru a obţine accesul la aceste conturi de e-mail."</string>
     <string name="provider_note_t_online" msgid="1630642061431427894">"Înainte de configurarea acestui cont de e-mail, accesaţi site-ul web T-Online şi creaţi o parolă pentru accesul la serviciile de e-mail POP3."</string>
@@ -284,10 +284,10 @@
     <string name="policy_screen_timeout" msgid="414869965358468080">"Disp. inactiv necesar pt. blocare ecran"</string>
     <string name="policy_calendar_age" msgid="627405158087482302">"Limitare număr evenimente de calendar sincronizate"</string>
     <string name="policy_email_age" msgid="7144148367145424963">"Limitare număr de e-mailuri sincronizate"</string>
-    <string name="quick_1" msgid="3426057697353380951">"Vă mulţumim!"</string>
+    <string name="quick_1" msgid="3426057697353380951">"Mulțumesc!"</string>
     <string name="quick_2" msgid="4188036352885736617">"Sună bine!"</string>
     <string name="quick_3" msgid="8061819976353395585">"Voi citi mai târziu acest mesaj şi vă voi contacta."</string>
-    <string name="quick_4" msgid="3988974084396883051">"Să stabilim o întâlnire pentru a discuta această acţiune."</string>
+    <string name="quick_4" msgid="3988974084396883051">"Să stabilim o întâlnire pentru a discuta."</string>
     <string name="require_manual_sync_message" msgid="7777357288642785955">"Sincronizarea în fundal pentru acest cont este dezactivată în roaming."</string>
     <string name="confirm_response" msgid="9151965975158906286">"Se trimite răspunsul…"</string>
     <string name="no_conversations" msgid="5559527390337162819">"Niciun mesaj."</string>
diff --git a/res/values-ru/strings.xml b/res/values-ru/strings.xml
index 98d0e8043..7d8a27156 100644
--- a/res/values-ru/strings.xml
+++ b/res/values-ru/strings.xml
@@ -79,7 +79,7 @@
     <item quantity="other" msgid="1041353825053598633">"<xliff:g id="SIZE_IN_GIGABYTES">%d</xliff:g> ГБ"</item>
   </plurals>
     <string name="account_setup_basics_title" msgid="3578333196594678422">"Настройка аккаунта"</string>
-    <string name="account_setup_basics_headline" msgid="6726590205905464015">"Ярлык Email"</string>
+    <string name="account_setup_basics_headline" msgid="6726590205905464015">"Аккаунт эл. почты"</string>
     <string name="accounts_welcome" msgid="8337750045270269649">"Укажите ваш эл. адрес и пароль"</string>
     <string name="account_setup_basics_email_label" msgid="3454164053624112047">"Адрес электронной почты"</string>
     <string name="account_setup_basics_password_label" msgid="9133549799291519298">"Пароль"</string>
@@ -135,16 +135,16 @@
     <string name="account_setup_options_headline" msgid="4181274232835368085">"Параметры аккаунта"</string>
     <string name="account_setup_options_mail_check_frequency_label" msgid="4824859792882810053">"Частота проверки папки \"Входящие\""</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_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_1hour" msgid="3767715356039692899">"Каждый час"</string>
-    <string name="account_setup_options_notify_label" msgid="7046146571560728829">"Показывать уведомление при получении новых писем"</string>
+    <string name="account_setup_options_notify_label" msgid="7046146571560728829">"Уведомлять о новых письмах"</string>
     <string name="account_setup_options_sync_contacts_label" msgid="276492345599531778">"Синхронизировать контакты из этого аккаунта"</string>
     <string name="account_setup_options_sync_calendar_label" msgid="3222151135467189411">"Синхронизировать календарь из этого аккаунта"</string>
-    <string name="account_setup_options_sync_email_label" msgid="8585177128405004068">"Синхронизировать электронную почту из этого аккаунта"</string>
+    <string name="account_setup_options_sync_email_label" msgid="8585177128405004068">"Синхронизировать почту из этого аккаунта"</string>
     <string name="account_setup_options_background_attachments_label" msgid="5247749298276451846">"Загружать прикрепленные файлы при наличии Wi-Fi-подключения"</string>
     <string name="account_setup_failed_dlg_title" msgid="9083263347962940552">"Настройка не закончена"</string>
     <string name="account_setup_options_mail_window_label" msgid="7582247646138987328">"Период синхронизации"</string>
@@ -203,13 +203,13 @@
     <string name="account_settings_login_dialog_reason_fmt" msgid="4266359321648406752">"Не удалось войти в аккаунт <xliff:g id="ACCOUNT">%s</xliff:g>. Причина проблемы: <xliff:g id="REASON">%s</xliff:g>. Обновить имя пользователя и/или пароль?"</string>
     <string name="account_settings_background_attachments_label" msgid="2980317599840958688">"Загружать файлы"</string>
     <string name="account_settings_background_attachments_summary" msgid="5954218549226189376">"Автоматически загружать прикрепленные файлы при наличии Wi-Fi-подключения"</string>
-    <string name="account_settings_notify_label" msgid="1630001017303007974">"Показывать уведомления"</string>
+    <string name="account_settings_notify_label" msgid="1630001017303007974">"Уведомления"</string>
     <string name="account_settings_summary" msgid="8403582255413830007">"Частота синхронизации, уведомления и другие настройки"</string>
-    <string name="account_settings_notify_summary" msgid="8134339460923068254">"Показывать уведомление при получении новых писем"</string>
+    <string name="account_settings_notify_summary" msgid="8134339460923068254">"Уведомлять о новых письмах"</string>
     <string name="account_settings_mail_check_frequency_label" msgid="4322235101687302250">"Частота синхронизации"</string>
     <string name="account_settings_incoming_label" msgid="7858928031806297542">"Сервер входящей почты"</string>
     <string name="account_settings_incoming_summary" msgid="2923044634831881068">"Имя пользователя, пароль и др. настройки сервера входящей почты"</string>
-    <string name="account_settings_outgoing_label" msgid="4464829249980026745">"Настройки исходящих сообщений"</string>
+    <string name="account_settings_outgoing_label" msgid="4464829249980026745">"Сервер исходящей почты"</string>
     <string name="account_settings_outgoing_summary" msgid="3572093624332724311">"Имя пользователя, пароль и др. настройки сервера исходящей почты"</string>
     <string name="account_settings_enforced_label" msgid="7429582254433588882">"Политики применены"</string>
     <string name="account_settings_enforced_summary" msgid="8140860420440447771">"Нет"</string>
diff --git a/res/values-sk/strings.xml b/res/values-sk/strings.xml
index 8dcf30276..acf91f3c0 100644
--- a/res/values-sk/strings.xml
+++ b/res/values-sk/strings.xml
@@ -20,17 +20,17 @@
     <string name="permission_read_attachment_desc" msgid="3394721085306308972">"Povoľuje aplikácii čítať prílohy vašich e-mailov."</string>
     <string name="permission_access_provider_label" msgid="378256653525377586">"Prístup k údajom poskytovateľa e-mailu"</string>
     <string name="permission_access_provider_desc" msgid="6296566558584670348">"Povoľuje aplikácii prístup do databázy e-mailu vrátane prijatých a odoslaných správ, používateľských mien a hesiel."</string>
-    <string name="app_name" msgid="5815426892327290362">"Email"</string>
+    <string name="app_name" msgid="5815426892327290362">"E-mail"</string>
     <string name="debug_title" msgid="5175710493691536719">"Ladiť"</string>
     <string name="next_action" msgid="3931301986364184415">"Ďalej"</string>
     <string name="okay_action" msgid="8365197396795675617">"OK"</string>
     <string name="cancel_action" msgid="6967435583794021865">"Zrušiť"</string>
-    <string name="previous_action" msgid="5181616311579820981">"Predchádzajúce"</string>
+    <string name="previous_action" msgid="5181616311579820981">"Naspäť"</string>
     <string name="done_action" msgid="7497990549515580249">"Hotovo"</string>
     <string name="create_action" msgid="3062715563215392251">"Vytvoriť novú"</string>
     <string name="quick_responses_empty_view" msgid="3960050972306132367">"Žiadne rýchle odpovede."</string>
     <string name="account_settings_action" msgid="4494079183315085171">"Nastavenia účtu"</string>
-    <string name="menu_folder_options" msgid="2871906096248843471">"Možnosti synchronizácie"</string>
+    <string name="menu_folder_options" msgid="2871906096248843471">"Možnosti synchr."</string>
     <string name="status_network_error" msgid="2611654064403817391">"Problém s pripojením."</string>
   <plurals name="move_messages">
     <item quantity="one" msgid="320885379869442589">"Presunúť správu"</item>
@@ -55,7 +55,7 @@
     <string name="message_compose_fwd_header_fmt" msgid="5181300290654579434">\n\n"-------- Pôvodná správa --------\nPredmet: <xliff:g id="SUBJECT">%1$s</xliff:g>\nOdosielateľ: <xliff:g id="SENDER">%2$s</xliff:g>\nKomu: <xliff:g id="TO">%3$s</xliff:g>\nKópia: <xliff:g id="CC_0">%4$s</xliff:g>\n\n"</string>
     <string name="message_compose_insert_quick_response_list_title" msgid="5314107302508728189">"Vložiť rýchlu odpoveď"</string>
     <string name="message_compose_insert_quick_response_menu_title" msgid="5817075097532919955">"Vložiť rýchlu odpoveď"</string>
-    <string name="message_view_attachment_background_load" msgid="7906875687519445185">"Pred odoslaním sa prevezme jedna alebo viacero príloh zo správy posielanej ďalej."</string>
+    <string name="message_view_attachment_background_load" msgid="7906875687519445185">"Jedna alebo viac príloh zo správy posielanej ďalej budú pred odoslaním stiahnuté."</string>
     <string name="attachment_not_found" msgid="7155322700141145123">"Prílohu sa nepodarilo stiahnuť."</string>
     <string name="message_decode_error" msgid="5016042255170947834">"Pri dekódovaní správy sa vyskytla chyba."</string>
     <string name="forward_download_failed_ticker" msgid="6176608320359303255">"Nepodarilo sa poslať ďalej jednu alebo viac príloh."</string>
@@ -80,7 +80,7 @@
   </plurals>
     <string name="account_setup_basics_title" msgid="3578333196594678422">"Nastavenie účtu"</string>
     <string name="account_setup_basics_headline" msgid="6726590205905464015">"E-mailový účet"</string>
-    <string name="accounts_welcome" msgid="8337750045270269649">"Účet si môžete nastaviť pomocou niekoľkých krokov."</string>
+    <string name="accounts_welcome" msgid="8337750045270269649">"Účet si nastavíte v niekoľkých jednoduchých krokoch."</string>
     <string name="account_setup_basics_email_label" msgid="3454164053624112047">"E-mailová adresa"</string>
     <string name="account_setup_basics_password_label" msgid="9133549799291519298">"Heslo"</string>
     <string name="account_setup_basics_manual_setup_action" msgid="8053852205391155912">"Ručné nastavenie"</string>
@@ -89,12 +89,12 @@
     <string name="account_duplicate_dlg_message_fmt" msgid="6447629283679935840">"Toto používateľské meno už používate pre účet „<xliff:g id="DUPLICATE">%s</xliff:g>“."</string>
     <string name="account_password_spaces_error" msgid="8928309156658903257">"Toto heslo začína alebo končí aspoň jednou medzerou. Mnoho serverov nepodporuje heslá s medzerami."</string>
     <string name="account_setup_check_settings_retr_info_msg" msgid="4121970450267725664">"Načítavajú sa informácie o účte…"</string>
-    <string name="account_setup_check_settings_check_incoming_msg" msgid="2869198335297585862">"Overenie nastavení servera..."</string>
-    <string name="account_setup_check_settings_check_outgoing_msg" msgid="4566131393776891419">"Overovanie nastavení protokolu SMTP..."</string>
-    <string name="account_setup_creating_account_msg" msgid="6235569720466839946">"Prebieha vytváranie účtu..."</string>
+    <string name="account_setup_check_settings_check_incoming_msg" msgid="2869198335297585862">"Overujú sa nastavenia servera…"</string>
+    <string name="account_setup_check_settings_check_outgoing_msg" msgid="4566131393776891419">"Overujú sa nastavenia SMTP…"</string>
+    <string name="account_setup_creating_account_msg" msgid="6235569720466839946">"Účet sa vytvára…"</string>
     <string name="account_setup_names_title" msgid="8483517350241119291">"Nastavenie účtu"</string>
-    <string name="account_setup_names_headline" msgid="914858472109729140">"Váš účet je nastavený a e-mail je na ceste!"</string>
-    <string name="account_setup_names_account_name_label" msgid="8033895024273259196">"Pomenovať tento účet (nepovinné)"</string>
+    <string name="account_setup_names_headline" msgid="914858472109729140">"Váš účet je nastavený a&amp;nbsp;pošta je na ceste!"</string>
+    <string name="account_setup_names_account_name_label" msgid="8033895024273259196">"Pomenujte tento účet (nepovinné)"</string>
     <string name="account_setup_names_user_name_label" msgid="8967410178488604770">"Vaše meno (zobrazované na odchádzajúcich správach)"</string>
     <string name="account_setup_names_user_name_empty_error" msgid="6791427018325367364">"Toto pole nesmie byť prázdne."</string>
     <string name="account_setup_account_type_title" msgid="7156551693961182124">"Nastavenie účtu"</string>
@@ -108,9 +108,9 @@
     <string name="account_setup_incoming_port_label" msgid="8214738923690447796">"Port"</string>
     <string name="account_setup_incoming_security_label" msgid="2110260791086007424">"Typ zabezpečenia"</string>
     <string name="account_setup_incoming_security_none_label" msgid="8300169413118264895">"Žiadne"</string>
-    <string name="account_setup_incoming_security_ssl_trust_certificates_label" msgid="6151855090123117538">"SSL/TLS (Akceptovať všetky certifikáty)"</string>
+    <string name="account_setup_incoming_security_ssl_trust_certificates_label" msgid="6151855090123117538">"SSL/TLS (prijímať všetky certifikáty)"</string>
     <string name="account_setup_incoming_security_ssl_label" msgid="2798501138420163861">"SSL/TLS"</string>
-    <string name="account_setup_incoming_security_tls_trust_certificates_label" msgid="6149084428423662620">"STARTTLS (akceptovať všetky certifikáty)"</string>
+    <string name="account_setup_incoming_security_tls_trust_certificates_label" msgid="6149084428423662620">"STARTTLS (prijímať všetky certifikáty)"</string>
     <string name="account_setup_incoming_security_tls_label" msgid="6573498431821879660">"STARTTLS"</string>
     <string name="account_setup_incoming_delete_policy_label" msgid="9213590134693857912">"Odstraňovať e-maily zo servera"</string>
     <string name="account_setup_incoming_delete_policy_never_label" msgid="3222897501875871041">"Nikdy"</string>
@@ -135,7 +135,7 @@
     <string name="account_setup_options_headline" msgid="4181274232835368085">"Možnosti účtu"</string>
     <string name="account_setup_options_mail_check_frequency_label" msgid="4824859792882810053">"Frekvencia kontroly doručenej pošty"</string>
     <string name="account_setup_options_mail_check_frequency_never" msgid="287951859480505416">"Nikdy"</string>
-    <string name="account_setup_options_mail_check_frequency_push" msgid="5934525907736008673">"Automaticky (v prípade potreby)"</string>
+    <string name="account_setup_options_mail_check_frequency_push" msgid="5934525907736008673">"Automaticky (push)"</string>
     <string name="account_setup_options_mail_check_frequency_5min" msgid="6388939895878539307">"Každých 5 minút"</string>
     <string name="account_setup_options_mail_check_frequency_10min" msgid="5344463157247877480">"Každých 10 minút"</string>
     <string name="account_setup_options_mail_check_frequency_15min" msgid="5052776740089741793">"Každých 15 minút"</string>
@@ -144,16 +144,16 @@
     <string name="account_setup_options_notify_label" msgid="7046146571560728829">"Upozorniť ma na príchod e-mailu"</string>
     <string name="account_setup_options_sync_contacts_label" msgid="276492345599531778">"Synchronizovať kontakty z tohto účtu"</string>
     <string name="account_setup_options_sync_calendar_label" msgid="3222151135467189411">"Synchronizovať kalendár z tohto účtu"</string>
-    <string name="account_setup_options_sync_email_label" msgid="8585177128405004068">"Synchronizovať e-mail z tohto účtu"</string>
+    <string name="account_setup_options_sync_email_label" msgid="8585177128405004068">"Synchronizovať poštu z tohto účtu"</string>
     <string name="account_setup_options_background_attachments_label" msgid="5247749298276451846">"Automaticky sťahovať prílohy počas pripojenia k sieti Wi-Fi"</string>
-    <string name="account_setup_failed_dlg_title" msgid="9083263347962940552">"Nepodarilo sa dokončiť"</string>
+    <string name="account_setup_failed_dlg_title" msgid="9083263347962940552">"Nedá sa dokončiť"</string>
     <string name="account_setup_options_mail_window_label" msgid="7582247646138987328">"Počet dní na synchronizáciu"</string>
     <string name="account_setup_options_mail_window_auto" msgid="4188895354366183790">"Automaticky"</string>
     <string name="account_setup_options_mail_window_1day" msgid="7727436096227637646">"Posledný deň"</string>
     <string name="account_setup_options_mail_window_3days" msgid="1841106793912850270">"Posledné tri dni"</string>
-    <string name="account_setup_options_mail_window_1week" msgid="5804121771990249346">"Minulý týždeň"</string>
+    <string name="account_setup_options_mail_window_1week" msgid="5804121771990249346">"Posledný týždeň"</string>
     <string name="account_setup_options_mail_window_2weeks" msgid="3583478100026382495">"Posledné dva týždne"</string>
-    <string name="account_setup_options_mail_window_1month" msgid="4289585173153789717">"Minulý mesiac"</string>
+    <string name="account_setup_options_mail_window_1month" msgid="4289585173153789717">"Posledný mesiac"</string>
     <string name="account_setup_options_mail_window_all" msgid="5372861827683632364">"Všetky"</string>
     <string name="account_setup_options_mail_window_default" msgid="2540360826995543134">"Použiť predv. nast. účtu"</string>
     <string name="account_setup_failed_dlg_auth_message" msgid="426627755590431364">"Používateľské meno alebo heslo je nesprávne."</string>
@@ -174,7 +174,7 @@
     <string name="account_setup_failed_protocol_unsupported" msgid="4607759927226943569">"Zadali ste nesprávnu adresu servera alebo server vyžaduje verziu protokolu, ktorú aplikácia E-mail nepodporuje."</string>
     <string name="account_setup_failed_access_denied" msgid="6835358740050287051">"Nemáte povolenie na synchronizáciu s týmto serverom. Kontaktujte správcu servera a požiadajte ho o viac informácií."</string>
     <string name="account_setup_security_required_title" msgid="1850321535870447468">"Vzdialená správa zabezpečenia"</string>
-    <string name="account_setup_security_policies_required_fmt" msgid="5410714107656671761">"Server <xliff:g id="SERVER">%s</xliff:g> vyžaduje povolenie, aby mohol vzdialene ovládať niektoré funkcie zabezpečenia vášho zariadenia so systémom Android. Chcete dokončiť nastavenie tohto účtu?"</string>
+    <string name="account_setup_security_policies_required_fmt" msgid="5410714107656671761">"Server <xliff:g id="SERVER">%s</xliff:g> vyžaduje povolenie, aby mohol vzdialene ovládať niektoré funkcie zabezpečenia vášho zariadenia Android. Chcete dokončiť nastavenie tohto účtu?"</string>
     <string name="account_setup_failed_security_policies_unsupported" msgid="3210264746877120355">"Tento server vyžaduje bezpečnostné funkcie, ktoré vaše zariadenie so systémom Android nepodporuje (vrátane: <xliff:g id="ERROR">%s</xliff:g>)."</string>
     <string name="account_setup_username_uneditable_error" msgid="1618869759801584109">"Používateľské meno účtu nemôžete zmeniť. Ak chcete pridať účet s iným používateľským menom, dotknite sa možnosti Pridať účet."</string>
     <string name="disable_admin_warning" msgid="6196985268695592382">"UPOZORNENIE: Ak deaktivujete oprávnenie aplikácie E-mail spravovať toto zariadenie, budú odstránené všetky účty aplikácie E-mail, ktoré toto oprávnenie vyžadujú. Spoločne s týmito účtami budú odstránené aj všetky ich e-maily, kontakty, udalosti kalendára a ďalšie údaje."</string>
@@ -184,10 +184,10 @@
     <string name="security_needed_ticker_fmt" msgid="2120499087897133665">"Účet „<xliff:g id="ACCOUNT">%s</xliff:g>“ vyžaduje aktualizáciu nastavení zabezpečenia."</string>
     <string name="security_changed_ticker_fmt" msgid="2609435447352755285">"Účet „<xliff:g id="ACCOUNT">%s</xliff:g>“ zmenil svoje nastavenia zabezpečenia. Od používateľa sa nevyžaduje žiadna akcia."</string>
     <string name="security_notification_content_update_title" msgid="2429762903228690154">"Vyžaduje sa bezp. aktualizácia"</string>
-    <string name="security_notification_content_change_title" msgid="443490921895642130">"Pravidlá zabezp. sa zmenili"</string>
+    <string name="security_notification_content_change_title" msgid="443490921895642130">"Prav. zabezpečenia sa zmenili"</string>
     <string name="security_notification_content_unsupported_title" msgid="7315219208043169233">"Prav. zabezp. sa nedajú splniť"</string>
     <string name="account_security_title" msgid="3511543138560418587">"Zabezpečenie zariadenia"</string>
-    <string name="account_security_policy_explanation_fmt" msgid="6932627044314460766">"Server <xliff:g id="SERVER">%s</xliff:g> vyžaduje povolenie, aby mohol vzdialene ovládať niektoré funkcie zabezpečenia vášho zariadenia so systémom Android."</string>
+    <string name="account_security_policy_explanation_fmt" msgid="6932627044314460766">"Server <xliff:g id="SERVER">%s</xliff:g> vyžaduje povolenie, aby mohol vzdialene ovládať niektoré funkcie zabezpečenia vášho zariadenia Android."</string>
     <string name="account_setup_failed_dlg_edit_details_action" msgid="5355993309841479360">"Upraviť podrobnosti"</string>
     <string name="password_expire_warning_ticker_fmt" msgid="2459977229180023773">"Účet „<xliff:g id="ACCOUNT">%s</xliff:g>“ požaduje, aby ste zmenili kód PIN alebo heslo uzamknutia obrazovky."</string>
     <string name="password_expire_warning_content_title" msgid="7174669014074849304">"Uzamykacie heslo čoskoro vyprší"</string>
@@ -203,14 +203,14 @@
     <string name="account_settings_login_dialog_reason_fmt" msgid="4266359321648406752">"Prihlásenie do účtu <xliff:g id="ACCOUNT">%s</xliff:g> zlyhalo. Odpoveď servera: <xliff:g id="REASON">%s</xliff:g> Chcete aktualizovať svoje používateľské meno alebo heslo?"</string>
     <string name="account_settings_background_attachments_label" msgid="2980317599840958688">"Sťahovať všetky prílohy"</string>
     <string name="account_settings_background_attachments_summary" msgid="5954218549226189376">"Automaticky sťahovať prílohy najnovších správ prostredníctvom siete Wi-Fi"</string>
-    <string name="account_settings_notify_label" msgid="1630001017303007974">"E-mailové upozornenia"</string>
+    <string name="account_settings_notify_label" msgid="1630001017303007974">"Upozornenia na poštu"</string>
     <string name="account_settings_summary" msgid="8403582255413830007">"Frekvencia synchronizácie, oznámení atď."</string>
     <string name="account_settings_notify_summary" msgid="8134339460923068254">"Poslať upozornenie na príchod e-mailu"</string>
     <string name="account_settings_mail_check_frequency_label" msgid="4322235101687302250">"Frekvencia synchronizácie"</string>
     <string name="account_settings_incoming_label" msgid="7858928031806297542">"Nastavenia prichádzajúcej pošty"</string>
     <string name="account_settings_incoming_summary" msgid="2923044634831881068">"Používateľské meno, heslo a ďalšie nastavenia servera (prich.)"</string>
     <string name="account_settings_outgoing_label" msgid="4464829249980026745">"Nastavenia odchádzajúcej pošty"</string>
-    <string name="account_settings_outgoing_summary" msgid="3572093624332724311">"Používateľské meno, heslo a ďalšie nastavenia servera (odchádz.)"</string>
+    <string name="account_settings_outgoing_summary" msgid="3572093624332724311">"Používateľské meno, heslo a ďalšie nastavenia servera (odch.)"</string>
     <string name="account_settings_enforced_label" msgid="7429582254433588882">"Vynútené pravidlá"</string>
     <string name="account_settings_enforced_summary" msgid="8140860420440447771">"Žiadne"</string>
     <string name="account_settings_unsupported_label" msgid="1954091071454235577">"Nepodporované pravidlá"</string>
@@ -220,9 +220,9 @@
     <string name="account_settings_description_label" msgid="8894815221204511715">"Názov účtu"</string>
     <string name="account_settings_name_label" msgid="8186406122590008449">"Vaše meno"</string>
     <string name="account_settings_edit_quick_responses_label" msgid="3106019627675996480">"Rýchle odpovede"</string>
-    <string name="account_settings_edit_quick_responses_summary" msgid="8056686122888722591">"Upraviť text, ktorý často vkladáte pri písaní e-mailu"</string>
+    <string name="account_settings_edit_quick_responses_summary" msgid="8056686122888722591">"Upraviť texty, ktoré často vkladáte pri písaní e-mailov"</string>
     <string name="account_settings_notifications" msgid="1042620094281375043">"Nastavenia upozornení"</string>
-    <string name="account_settings_data_usage" msgid="6669107430575866736">"Spotreba dát"</string>
+    <string name="account_settings_data_usage" msgid="6669107430575866736">"Spotreba dátového pripojenia"</string>
     <string name="account_settings_policies" msgid="6292833636418641840">"Pravidlá zabezpečenia"</string>
     <string name="system_folders_title" msgid="2934406494244347991">"Systémové priečinky"</string>
     <string name="system_folders_trash_title" msgid="8470058000681188327">"Priečinok Kôš"</string>
@@ -233,12 +233,12 @@
     <string name="system_folders_sent_dlg" msgid="7071006714702094762">"Vyberte priečinok odoslaných položiek na vašom serveri"</string>
     <string name="edit_quick_response_dialog" msgid="6479106007607928450">"Rýchla odpoveď"</string>
     <string name="save_action" msgid="1988862706623227093">"Uložiť"</string>
-    <string name="account_settings_sync_contacts_enable" msgid="1369272986009573218">"Synchronizovať kontakty"</string>
-    <string name="account_settings_sync_contacts_summary" msgid="816919452270997919">"Synchr. kontakty pre tento účet."</string>
-    <string name="account_settings_sync_calendar_enable" msgid="6855333393468628003">"Synchronizovať kalendár"</string>
-    <string name="account_settings_sync_calendar_summary" msgid="7606340353079301703">"Synchr. udalosť kalendára pre účet"</string>
-    <string name="account_settings_sync_email_enable" msgid="3754115565685222477">"Synchroniz. e-mail"</string>
-    <string name="account_settings_sync_email_summary" msgid="262964076412310990">"Synchr. e-mail pre tento účet"</string>
+    <string name="account_settings_sync_contacts_enable" msgid="1369272986009573218">"Synchr. kontakty"</string>
+    <string name="account_settings_sync_contacts_summary" msgid="816919452270997919">"Synchr. kontakty pre tento účet"</string>
+    <string name="account_settings_sync_calendar_enable" msgid="6855333393468628003">"Synchr. kalendár"</string>
+    <string name="account_settings_sync_calendar_summary" msgid="7606340353079301703">"Synchr. udalosti kalendára pre účet"</string>
+    <string name="account_settings_sync_email_enable" msgid="3754115565685222477">"Synchr. poštu"</string>
+    <string name="account_settings_sync_email_summary" msgid="262964076412310990">"Synchr. poštu pre tento účet"</string>
     <string name="account_settings_vibrate_when_label" msgid="708477308761702671">"Vibrovať"</string>
     <string name="account_settings_ringtone" msgid="8229878374785575207">"Zvoliť tón zvonenia"</string>
     <string name="account_settings_servers" msgid="4925493817981624242">"Nastavenia servera"</string>
@@ -284,10 +284,10 @@
     <string name="policy_screen_timeout" msgid="414869965358468080">"Uzamk. obrazovky nečinného zariadenia"</string>
     <string name="policy_calendar_age" msgid="627405158087482302">"Obmedziť počet synchroniz. udalostí kalendára"</string>
     <string name="policy_email_age" msgid="7144148367145424963">"Obmedziť počet synchronizovaných e-mailov"</string>
-    <string name="quick_1" msgid="3426057697353380951">"Ďakujeme!"</string>
+    <string name="quick_1" msgid="3426057697353380951">"Ďakujem!"</string>
     <string name="quick_2" msgid="4188036352885736617">"To znie dobre!"</string>
-    <string name="quick_3" msgid="8061819976353395585">"Prečítam si to neskôr a dám vám vedieť."</string>
-    <string name="quick_4" msgid="3988974084396883051">"Dohodnime si schôdzku a prediskutujme to."</string>
+    <string name="quick_3" msgid="8061819976353395585">"Prečítam si to neskôr a ozvem sa."</string>
+    <string name="quick_4" msgid="3988974084396883051">"Môžeme si dohodnúť stretnutie, aby sme to prediskutovali."</string>
     <string name="require_manual_sync_message" msgid="7777357288642785955">"Synchronizácia na pozadí je pre tento účet v roamingu zakázaná."</string>
     <string name="confirm_response" msgid="9151965975158906286">"Odosiela sa odpoveď..."</string>
     <string name="no_conversations" msgid="5559527390337162819">"Žiadne správy."</string>
diff --git a/res/values-sl/strings.xml b/res/values-sl/strings.xml
index 776ae6434..9a2da2e61 100644
--- a/res/values-sl/strings.xml
+++ b/res/values-sl/strings.xml
@@ -27,7 +27,7 @@
     <string name="cancel_action" msgid="6967435583794021865">"Prekliči"</string>
     <string name="previous_action" msgid="5181616311579820981">"Nazaj"</string>
     <string name="done_action" msgid="7497990549515580249">"Dokončano"</string>
-    <string name="create_action" msgid="3062715563215392251">"Ustvari nov"</string>
+    <string name="create_action" msgid="3062715563215392251">"Ustvari novega"</string>
     <string name="quick_responses_empty_view" msgid="3960050972306132367">"Ni hitrih odzivov."</string>
     <string name="account_settings_action" msgid="4494079183315085171">"Nastavitve računa"</string>
     <string name="menu_folder_options" msgid="2871906096248843471">"Možnosti sinhronizacije"</string>
@@ -114,7 +114,7 @@
     <string name="account_setup_incoming_security_tls_label" msgid="6573498431821879660">"STARTTLS"</string>
     <string name="account_setup_incoming_delete_policy_label" msgid="9213590134693857912">"Izbriši e-pošto iz strežnika"</string>
     <string name="account_setup_incoming_delete_policy_never_label" msgid="3222897501875871041">"Nikoli"</string>
-    <string name="account_setup_incoming_delete_policy_delete_label" msgid="222216840911785631">"Ko sporočilo izbrišem iz nabiralnika"</string>
+    <string name="account_setup_incoming_delete_policy_delete_label" msgid="222216840911785631">"Ko sporočilo izbrišem iz mape »Prejeto«"</string>
     <string name="account_setup_incoming_imap_path_prefix_label" msgid="401167247072926810">"Predpona poti IMAP"</string>
     <string name="account_setup_incoming_imap_path_prefix_hint" msgid="9190845919067906033">"Neobvezno"</string>
     <string name="account_setup_outgoing_title" msgid="7208495965665711539">"Nastavitev računa"</string>
@@ -145,7 +145,7 @@
     <string name="account_setup_options_sync_contacts_label" msgid="276492345599531778">"Sinhroniziraj stike iz tega računa"</string>
     <string name="account_setup_options_sync_calendar_label" msgid="3222151135467189411">"Sinhroniziraj koledar iz tega računa"</string>
     <string name="account_setup_options_sync_email_label" msgid="8585177128405004068">"Sinhroniziraj e-pošto iz tega računa"</string>
-    <string name="account_setup_options_background_attachments_label" msgid="5247749298276451846">"Samodejni prenos prilog, ko je na voljo povezava Wi-Fi"</string>
+    <string name="account_setup_options_background_attachments_label" msgid="5247749298276451846">"Samodejno prenesi priloge, ko je na voljo povezava Wi-Fi"</string>
     <string name="account_setup_failed_dlg_title" msgid="9083263347962940552">"Ni mogoče končati"</string>
     <string name="account_setup_options_mail_window_label" msgid="7582247646138987328">"Dnevi za sinhronizacijo"</string>
     <string name="account_setup_options_mail_window_auto" msgid="4188895354366183790">"Samodejno"</string>
diff --git a/res/values-sr/strings.xml b/res/values-sr/strings.xml
index b71f17c8a..4f9b51697 100644
--- a/res/values-sr/strings.xml
+++ b/res/values-sr/strings.xml
@@ -20,7 +20,7 @@
     <string name="permission_read_attachment_desc" msgid="3394721085306308972">"Омогућава апликацији да чита прилоге у порукама е-поште."</string>
     <string name="permission_access_provider_label" msgid="378256653525377586">"Приступ подацима о добављачу е-поште"</string>
     <string name="permission_access_provider_desc" msgid="6296566558584670348">"Омогућава да ова апликација приступа бази података е-поште, укључујући примљене поруке, послате поруке, корисничка имена и лозинке."</string>
-    <string name="app_name" msgid="5815426892327290362">"Пошаљи е-поштом"</string>
+    <string name="app_name" msgid="5815426892327290362">"Пошаљи имејлом"</string>
     <string name="debug_title" msgid="5175710493691536719">"Отклањање грешака"</string>
     <string name="next_action" msgid="3931301986364184415">"Следеће"</string>
     <string name="okay_action" msgid="8365197396795675617">"Потврди"</string>
@@ -81,10 +81,10 @@
     <string name="account_setup_basics_title" msgid="3578333196594678422">"Подешавање налога"</string>
     <string name="account_setup_basics_headline" msgid="6726590205905464015">"Налог е-поште"</string>
     <string name="accounts_welcome" msgid="8337750045270269649">"Можете да подесите налог у свега неколико корака."</string>
-    <string name="account_setup_basics_email_label" msgid="3454164053624112047">"Адреса е-поште"</string>
+    <string name="account_setup_basics_email_label" msgid="3454164053624112047">"Имејл адреса"</string>
     <string name="account_setup_basics_password_label" msgid="9133549799291519298">"Лозинка"</string>
     <string name="account_setup_basics_manual_setup_action" msgid="8053852205391155912">"Ручно подешавање"</string>
-    <string name="account_setup_username_password_toast" msgid="3968270274727947460">"Унесите важећу адресу е-поште и лозинку."</string>
+    <string name="account_setup_username_password_toast" msgid="3968270274727947460">"Унесите важећу имејл адресу и лозинку."</string>
     <string name="account_duplicate_dlg_title" msgid="8089732986912704425">"Дуплирани налог"</string>
     <string name="account_duplicate_dlg_message_fmt" msgid="6447629283679935840">"Већ користите ово корисничко име за налог „<xliff:g id="DUPLICATE">%s</xliff:g>“."</string>
     <string name="account_password_spaces_error" msgid="8928309156658903257">"Ова лозинка почиње или се завршава једним размаком или више њих. Многи сервери не подржавају лозинке са размацима."</string>
@@ -171,13 +171,13 @@
     <string name="account_setup_failed_auth_required" msgid="6799839150250217566">"Сервер не подржава методе потврде аутентичности."</string>
     <string name="account_setup_failed_security" msgid="925820957665764964">"Није могуће отворити везу са сервером због безбедносне грешке."</string>
     <string name="account_setup_failed_ioerror" msgid="7802604687451830378">"Није могуће отворити везу са сервером."</string>
-    <string name="account_setup_failed_protocol_unsupported" msgid="4607759927226943569">"Унели сте нетачну адресу сервера или сервер захтева верзију протокола коју Е-пошта не подржава."</string>
+    <string name="account_setup_failed_protocol_unsupported" msgid="4607759927226943569">"Унели сте нетачну адресу сервера или сервер захтева верзију протокола коју Имејл не подржава."</string>
     <string name="account_setup_failed_access_denied" msgid="6835358740050287051">"Немате дозволу за синхронизацију са овим сервером. Контактирајте администратора сервера за више информација."</string>
     <string name="account_setup_security_required_title" msgid="1850321535870447468">"Удаљено безбедносно администрирање"</string>
     <string name="account_setup_security_policies_required_fmt" msgid="5410714107656671761">"Сервер <xliff:g id="SERVER">%s</xliff:g> захтева да му омогућите удаљену контролу појединих безбедносних функција Android уређаја. Желите ли да завршите подешавање овог налога?"</string>
     <string name="account_setup_failed_security_policies_unsupported" msgid="3210264746877120355">"Овај сервер захтева безбедносне функције које Android уређај не подржава, укључујући: <xliff:g id="ERROR">%s</xliff:g>"</string>
     <string name="account_setup_username_uneditable_error" msgid="1618869759801584109">"Не можете да промените корисничко име налога. Да бисте додали налог са другим корисничким именом, додирните Додај налог."</string>
-    <string name="disable_admin_warning" msgid="6196985268695592382">"УПОЗОРЕЊЕ: Деактивирањем овлашћења апликације Е-пошта за управљање уређајем избрисаћете све налоге е-поште који то·захтевају, заједно са адресом е-поште, контактима, догађајима календара и другим подацима."</string>
+    <string name="disable_admin_warning" msgid="6196985268695592382">"УПОЗОРЕЊЕ: Деактивирањем овлашћења апликације Имејл за управљање уређајем избрисаћете све налоге е-поште који то·захтевају, заједно са адресом е-поште, контактима, догађајима календара и другим подацима."</string>
     <string name="account_security_dialog_title" msgid="430041952584831904">"Безбедносно ажурирање"</string>
     <string name="account_security_dialog_content_fmt" msgid="8843806143923278214">"<xliff:g id="ACCOUNT">%s</xliff:g> захтева да ажурирате безбедносна подешавања."</string>
     <string name="security_unsupported_ticker_fmt" msgid="5166579214529283975">"Налог „<xliff:g id="ACCOUNT">%s</xliff:g>“ не може да се синхронизује због безбедносних захтева."</string>
@@ -203,7 +203,7 @@
     <string name="account_settings_login_dialog_reason_fmt" msgid="4266359321648406752">"Пријављивање на <xliff:g id="ACCOUNT">%s</xliff:g> није успело; сервер је рекао: <xliff:g id="REASON">%s</xliff:g> Желите ли да ажурирате корисничко име и/или лозинку?"</string>
     <string name="account_settings_background_attachments_label" msgid="2980317599840958688">"Преузми прилоге"</string>
     <string name="account_settings_background_attachments_summary" msgid="5954218549226189376">"Аутоматско преузимање прилога за недавне поруке преко Wi-Fi-ја"</string>
-    <string name="account_settings_notify_label" msgid="1630001017303007974">"Обавештења е-поштом"</string>
+    <string name="account_settings_notify_label" msgid="1630001017303007974">"Обавештења имејлом"</string>
     <string name="account_settings_summary" msgid="8403582255413830007">"Синхронизација учесталости, обавештења итд."</string>
     <string name="account_settings_notify_summary" msgid="8134339460923068254">"Пошаљи обавештење када стигне е-пошта"</string>
     <string name="account_settings_mail_check_frequency_label" msgid="4322235101687302250">"Синхронизуј фреквенцију"</string>
@@ -248,12 +248,12 @@
     <string name="mailbox_settings_sync_enabled_summary" msgid="345878979425044320">"Поруке ће бити преузете после повезивања"</string>
     <string name="mailbox_settings_mailbox_sync_window_label" msgid="851180833264474141">"Дани поште за синхронизацију"</string>
     <string name="prefDialogTitle_conversationListIcon" msgid="4601797400885989153">"Слика пошиљаоца"</string>
-    <string name="provider_note_live" msgid="2995297671709325333">"Само неки „Плус“ налози подржавају приступ преко POP протокола, што омогућава повезивање овог програма. Ако не можете да се пријавите користећи тачну адресу е-поште и лозинку, можда немате плаћени „Плус“ налог. Покрените веб прегледач да бисте приступили овим налозима е-поште."</string>
+    <string name="provider_note_live" msgid="2995297671709325333">"Само неки „Плус“ налози подржавају приступ преко POP протокола, што омогућава повезивање овог програма. Ако не можете да се пријавите користећи тачну имејл адресу и лозинку, можда немате плаћени „Плус“ налог. Покрените веб прегледач да бисте приступили овим налозима е-поште."</string>
     <string name="provider_note_t_online" msgid="1630642061431427894">"Пре него што подесите овај налог е-поште, посетите T-Online веб сајт и направите лозинку за приступ е-пошти преко POP3 протокола."</string>
     <string name="exchange_name" msgid="1190783774800310346">"Corporate"</string>
     <string name="exchange_name_alternate" msgid="5772529644749041052">"Microsoft Exchange ActiveSync"</string>
     <string name="system_account_create_failed" msgid="3673792980526246177">"Није могуће отворити налог. Покушајте поново."</string>
-    <string name="device_admin_label" msgid="8680224994637869414">"Пошаљи е-поштом"</string>
+    <string name="device_admin_label" msgid="8680224994637869414">"Пошаљи имејлом"</string>
     <string name="device_admin_description" msgid="426727923791430306">"Омогућава безбедносне смернице за одређене сервере"</string>
     <string name="settings_activity_title" msgid="5185915603716333904">"Подешавања"</string>
     <string name="header_label_general_preferences" msgid="8243724566056800991">"Општа подешавања"</string>
diff --git a/res/values-sv/strings.xml b/res/values-sv/strings.xml
index 456798bd7..5465b389f 100644
--- a/res/values-sv/strings.xml
+++ b/res/values-sv/strings.xml
@@ -149,7 +149,7 @@
     <string name="account_setup_failed_dlg_title" msgid="9083263347962940552">"Det gick inte att avsluta"</string>
     <string name="account_setup_options_mail_window_label" msgid="7582247646138987328">"Dagar för synkronisering"</string>
     <string name="account_setup_options_mail_window_auto" msgid="4188895354366183790">"Automatisk"</string>
-    <string name="account_setup_options_mail_window_1day" msgid="7727436096227637646">"Sista dagen"</string>
+    <string name="account_setup_options_mail_window_1day" msgid="7727436096227637646">"Det senaste dygnet"</string>
     <string name="account_setup_options_mail_window_3days" msgid="1841106793912850270">"Senaste tre dagarna"</string>
     <string name="account_setup_options_mail_window_1week" msgid="5804121771990249346">"Förra veckan"</string>
     <string name="account_setup_options_mail_window_2weeks" msgid="3583478100026382495">"Senaste två veckorna"</string>
diff --git a/res/values-sw/strings.xml b/res/values-sw/strings.xml
index 480586088..e7e5903bf 100644
--- a/res/values-sw/strings.xml
+++ b/res/values-sw/strings.xml
@@ -30,7 +30,7 @@
     <string name="create_action" msgid="3062715563215392251">"Unda mpya"</string>
     <string name="quick_responses_empty_view" msgid="3960050972306132367">"Hakuna majibu ya haraka."</string>
     <string name="account_settings_action" msgid="4494079183315085171">"Mipangilio ya akaunti"</string>
-    <string name="menu_folder_options" msgid="2871906096248843471">"Chaguo za usawazishaji"</string>
+    <string name="menu_folder_options" msgid="2871906096248843471">"Chaguo za kusawazisha"</string>
     <string name="status_network_error" msgid="2611654064403817391">"Tatizo la kuunganisha."</string>
   <plurals name="move_messages">
     <item quantity="one" msgid="320885379869442589">"Hamisha ujumbe"</item>
@@ -90,8 +90,8 @@
     <string name="account_password_spaces_error" msgid="8928309156658903257">"Nenosiri hili linaanza au kumalizika na herufi moja ya nafasi. Seva nyingi hazikubali manenosiri yenye nafasi."</string>
     <string name="account_setup_check_settings_retr_info_msg" msgid="4121970450267725664">"Inaleta maelezo ya akaunti"</string>
     <string name="account_setup_check_settings_check_incoming_msg" msgid="2869198335297585862">"Inathibitisha mipangilio ya seva…"</string>
-    <string name="account_setup_check_settings_check_outgoing_msg" msgid="4566131393776891419">"Inahalalisha mipangilio ya smtp…"</string>
-    <string name="account_setup_creating_account_msg" msgid="6235569720466839946">"Inaunda akaunti…"</string>
+    <string name="account_setup_check_settings_check_outgoing_msg" msgid="4566131393776891419">"Inathibitisha mipangilio ya smtp…"</string>
+    <string name="account_setup_creating_account_msg" msgid="6235569720466839946">"Akaunti inafunguliwa…"</string>
     <string name="account_setup_names_title" msgid="8483517350241119291">"Kufungua akaunti"</string>
     <string name="account_setup_names_headline" msgid="914858472109729140">"Akaunti yako imefunguliwa, na barua pepe iko njiani yaja!"</string>
     <string name="account_setup_names_account_name_label" msgid="8033895024273259196">"Ipe akaunti hii jina (ya hiari)"</string>
@@ -112,7 +112,7 @@
     <string name="account_setup_incoming_security_ssl_label" msgid="2798501138420163861">"SSL/TLS"</string>
     <string name="account_setup_incoming_security_tls_trust_certificates_label" msgid="6149084428423662620">"STARTTLS (Kubali vyeti vyote)"</string>
     <string name="account_setup_incoming_security_tls_label" msgid="6573498431821879660">"STARTTLS"</string>
-    <string name="account_setup_incoming_delete_policy_label" msgid="9213590134693857912">"Futa barua pepe kutoka kwa seva"</string>
+    <string name="account_setup_incoming_delete_policy_label" msgid="9213590134693857912">"Futa barua pepe kutoka seva"</string>
     <string name="account_setup_incoming_delete_policy_never_label" msgid="3222897501875871041">"Katu"</string>
     <string name="account_setup_incoming_delete_policy_delete_label" msgid="222216840911785631">"Ninapofuta kutoka katika kikasha"</string>
     <string name="account_setup_incoming_imap_path_prefix_label" msgid="401167247072926810">"Kiambishi cha njia ya IMAP"</string>
@@ -155,7 +155,7 @@
     <string name="account_setup_options_mail_window_2weeks" msgid="3583478100026382495">"Wiki mbili zilizopita"</string>
     <string name="account_setup_options_mail_window_1month" msgid="4289585173153789717">"Mwezi uliopita"</string>
     <string name="account_setup_options_mail_window_all" msgid="5372861827683632364">"Zote"</string>
-    <string name="account_setup_options_mail_window_default" msgid="2540360826995543134">"Tumia akaunti chaguo-msingi"</string>
+    <string name="account_setup_options_mail_window_default" msgid="2540360826995543134">"Tumia chaguo-msingi la akaunti"</string>
     <string name="account_setup_failed_dlg_auth_message" msgid="426627755590431364">"Jina la mtumiaji au nenosiri sio sahihi."</string>
     <string name="account_setup_failed_dlg_auth_message_fmt" msgid="2081384892947238930">"Kuingia kumeshindikana.\n(<xliff:g id="ERROR">%s</xliff:g>)"</string>
     <string name="account_setup_autodiscover_dlg_authfail_title" msgid="7365992662150541370">"Tatizo la kufungua akaunti"</string>
@@ -172,7 +172,7 @@
     <string name="account_setup_failed_security" msgid="925820957665764964">"Haiwezi kufungua muunganisho kwa seva kwa sababu ya hitilafu ya kiusalama."</string>
     <string name="account_setup_failed_ioerror" msgid="7802604687451830378">"Haiwezi kufungua muunganisho kwa seva."</string>
     <string name="account_setup_failed_protocol_unsupported" msgid="4607759927226943569">"Uliingiza anwani ya seva isiyo sahihi au seva inahitaji toleo la itifaki ambalo haiauniwi na Barua pepe."</string>
-    <string name="account_setup_failed_access_denied" msgid="6835358740050287051">"Hauna idhini ya kusawazisha kwa seva hii. Tafadhali wasiliana na msimamizi wako wa seva kwa maelezo zaidi."</string>
+    <string name="account_setup_failed_access_denied" msgid="6835358740050287051">"Hauna idhini ya kusawazisha na seva hii. Tafadhali wasiliana na msimamizi wako wa seva kwa maelezo zaidi."</string>
     <string name="account_setup_security_required_title" msgid="1850321535870447468">"Udhibiti wa usalama kutoka mbali"</string>
     <string name="account_setup_security_policies_required_fmt" msgid="5410714107656671761">"Seva ya <xliff:g id="SERVER">%s</xliff:g> inahitaji uiruhusu idhibiti kwa umbali baadhi ya vipengele vya usalama vya simu yako. Ungependa kumaliza kufungua akaunti hii?"</string>
     <string name="account_setup_failed_security_policies_unsupported" msgid="3210264746877120355">"Seva hii inahitaji vipengele vya usalama ambavyo kifaa chako cha Android haiauni, ikijumlisha: <xliff:g id="ERROR">%s</xliff:g>"</string>
@@ -208,15 +208,15 @@
     <string name="account_settings_notify_summary" msgid="8134339460923068254">"Tuma arifa barua pepe inapoingia"</string>
     <string name="account_settings_mail_check_frequency_label" msgid="4322235101687302250">"Marudio ya usawazishaji"</string>
     <string name="account_settings_incoming_label" msgid="7858928031806297542">"Mipangilio ya kuingia"</string>
-    <string name="account_settings_incoming_summary" msgid="2923044634831881068">"Jina la mtumiaji, nenosiri, na mipangilio mingine ya seva inayoingia"</string>
+    <string name="account_settings_incoming_summary" msgid="2923044634831881068">"Jina la mtumiaji, nenosiri na mipangilio mingine ya seva inayoingia"</string>
     <string name="account_settings_outgoing_label" msgid="4464829249980026745">"Mipangilio ya kutoka"</string>
-    <string name="account_settings_outgoing_summary" msgid="3572093624332724311">"Jina la mmtumiaji, neneosiri na mipangilio mingine ya seva ya kutoka."</string>
+    <string name="account_settings_outgoing_summary" msgid="3572093624332724311">"Jina la mmtumiaji, neneosiri na mipangilio mingine ya seva ya kutoka"</string>
     <string name="account_settings_enforced_label" msgid="7429582254433588882">"Sera zimetekelezwa"</string>
     <string name="account_settings_enforced_summary" msgid="8140860420440447771">"Hamna"</string>
     <string name="account_settings_unsupported_label" msgid="1954091071454235577">"Sera zisizokubaliwa"</string>
     <string name="account_settings_unsupported_summary" msgid="2107633813351863608">"Hamna"</string>
     <string name="account_settings_retry_label" msgid="1104680719299842829">"Jaribu usawazishi"</string>
-    <string name="account_settings_retry_summary" msgid="2703599639846201913">"Gusa hapa ili kusawazisha akaunti hii"</string>
+    <string name="account_settings_retry_summary" msgid="2703599639846201913">"Gusa hapa ili usawazishe akaunti hii"</string>
     <string name="account_settings_description_label" msgid="8894815221204511715">"Jina la akaunti"</string>
     <string name="account_settings_name_label" msgid="8186406122590008449">"Jina lako"</string>
     <string name="account_settings_edit_quick_responses_label" msgid="3106019627675996480">"Majibu ya haraka"</string>
@@ -245,8 +245,8 @@
     <string name="mailbox_settings_activity_title" msgid="4705845931573373274">"Chaguo za kusawazisha"</string>
     <string name="mailbox_settings_activity_title_with_mailbox" msgid="6485481250424219240">"Sawazisha chaguo ( <xliff:g id="MAILBOXX_NAME">%s</xliff:g> )"</string>
     <string name="mailbox_settings_sync_enabled_label" msgid="1180866791599296994">"Sawazisha folda hii"</string>
-    <string name="mailbox_settings_sync_enabled_summary" msgid="345878979425044320">"Ujumbe wote utapakuliwa itakapounganishwa"</string>
-    <string name="mailbox_settings_mailbox_sync_window_label" msgid="851180833264474141">"Siku za kusawazisha barua"</string>
+    <string name="mailbox_settings_sync_enabled_summary" msgid="345878979425044320">"Barua pepe zote zitapakuliwa muunganisho wa intaneti utakaporejea"</string>
+    <string name="mailbox_settings_mailbox_sync_window_label" msgid="851180833264474141">"Sawazisha barua pepe za kipindi hiki"</string>
     <string name="prefDialogTitle_conversationListIcon" msgid="4601797400885989153">"Picha ya mtumaji"</string>
     <string name="provider_note_live" msgid="2995297671709325333">"Akaunti zingine za \"Plus\" tu ndizo zinazojumuisha ufikivu wa POP na kwa hivyo kuruhusu programu hii kuunganisha. Kama hauwezi kuingia kwa kutumia anwani yako ya barua pepe na nenosiri lako sahihi, huenda usiwe na akaunti iliyolipiwa ya \"Plus\". Tafadhali zindua Kivinjari cha Wavuti ili uweze kufikia akaunti hizi za barua pepe."</string>
     <string name="provider_note_t_online" msgid="1630642061431427894">"Kabla ya kusanidi akaunti ya barua pepe hii, tembelea wavuti ya T-Online na unda nenosiri ya ufikivu wa barua pepe ya POP3."</string>
diff --git a/res/values-th/strings.xml b/res/values-th/strings.xml
index c642d08ce..ea641592b 100644
--- a/res/values-th/strings.xml
+++ b/res/values-th/strings.xml
@@ -112,9 +112,9 @@
     <string name="account_setup_incoming_security_ssl_label" msgid="2798501138420163861">"SSL/TLS"</string>
     <string name="account_setup_incoming_security_tls_trust_certificates_label" msgid="6149084428423662620">"STARTTLS (ยอมรับใบรับรองทั้งหมด)"</string>
     <string name="account_setup_incoming_security_tls_label" msgid="6573498431821879660">"STARTTLS"</string>
-    <string name="account_setup_incoming_delete_policy_label" msgid="9213590134693857912">"ลบอีเมลจากเซิร์ฟเวอร์"</string>
+    <string name="account_setup_incoming_delete_policy_label" msgid="9213590134693857912">"นำออกอีเมลจากเซิร์ฟเวอร์"</string>
     <string name="account_setup_incoming_delete_policy_never_label" msgid="3222897501875871041">"ไม่ต้องเลย"</string>
-    <string name="account_setup_incoming_delete_policy_delete_label" msgid="222216840911785631">"เมื่อฉันลบจากกล่องจดหมาย"</string>
+    <string name="account_setup_incoming_delete_policy_delete_label" msgid="222216840911785631">"เมื่อฉันนำออกจากกล่องจดหมาย"</string>
     <string name="account_setup_incoming_imap_path_prefix_label" msgid="401167247072926810">"ส่วนนำของพาธ IMAP"</string>
     <string name="account_setup_incoming_imap_path_prefix_hint" msgid="9190845919067906033">"เป็นตัวเลือก"</string>
     <string name="account_setup_outgoing_title" msgid="7208495965665711539">"การตั้งค่าบัญชี"</string>
@@ -177,7 +177,7 @@
     <string name="account_setup_security_policies_required_fmt" msgid="5410714107656671761">"เซิร์ฟเวอร์ <xliff:g id="SERVER">%s</xliff:g> ต้องการให้คุณอนุญาตให้ควบคุมคุณลักษณะความปลอดภัยบางอย่างของอุปกรณ์ Android ของคุณได้จากระยะไกล คุณต้องการตั้งค่าบัญชีนี้ให้เสร็จหรือไม่"</string>
     <string name="account_setup_failed_security_policies_unsupported" msgid="3210264746877120355">"เซิร์ฟเวอร์นี้ต้องการคุณลักษณะความปลอดภัยที่อุปกรณ์ Android ของคุณไม่สนับสนุน ซึ่งรวมถึง: <xliff:g id="ERROR">%s</xliff:g>"</string>
     <string name="account_setup_username_uneditable_error" msgid="1618869759801584109">"คุณไม่สามารถเปลี่ยนชื่อผู้ใช้ของบัญชีได้ หากต้องการเพิ่มบัญชีด้วยชื่อผู้ใช้อื่น ให้แตะ \"เพิ่มบัญชี\""</string>
-    <string name="disable_admin_warning" msgid="6196985268695592382">"คำเตือน: การปิดใช้งานสิทธิ์ของแอปพลิเคชันอีเมลในการดูแลอุปกรณ์ของคุณจะเป็นการลบบัญชีอีเมลทั้งหมดที่จำเป็นต้องใช้สิทธิ์นั้น พร้อมทั้งอีเมล สมุดโทรศัพท์ กิจกรรมในปฏิทิน และข้อมูลอื่นๆ"</string>
+    <string name="disable_admin_warning" msgid="6196985268695592382">"คำเตือน: การปิดใช้งานสิทธิ์ของแอปพลิเคชันอีเมลในการดูแลอุปกรณ์ของคุณจะเป็นการนำออกบัญชีอีเมลทั้งหมดที่จำเป็นต้องใช้สิทธิ์นั้น พร้อมทั้งอีเมล สมุดโทรศัพท์ กิจกรรมในปฏิทิน และข้อมูลอื่นๆ"</string>
     <string name="account_security_dialog_title" msgid="430041952584831904">"การอัปเดตความปลอดภัย"</string>
     <string name="account_security_dialog_content_fmt" msgid="8843806143923278214">"<xliff:g id="ACCOUNT">%s</xliff:g> กำหนดให้คุณต้องอัปเดตการตั้งค่าความปลอดภัย"</string>
     <string name="security_unsupported_ticker_fmt" msgid="5166579214529283975">"ไม่สามารถซิงค์บัญชี \"<xliff:g id="ACCOUNT">%s</xliff:g>\" เนื่องจากข้อกำหนดด้านความปลอดภัย"</string>
@@ -194,9 +194,9 @@
     <string name="password_expired_ticker" msgid="4230570412974108968">"PIN หรือรหัสผ่านล็อกหน้าจอของคุณหมดอายุแล้ว"</string>
     <string name="password_expired_content_title" msgid="4349518706602252979">"รหัสผ่านล็อกหน้าจอหมดอายุแล้ว"</string>
     <string name="password_expire_warning_dialog_title" msgid="1687074175399798189">"รหัสผ่านล็อกหน้าจอใกล้หมดอายุ"</string>
-    <string name="password_expire_warning_dialog_content_fmt" msgid="4293446611405084436">"คุณต้องเปลี่ยน PIN หรือรหัสผ่านสำหรับการล็อกหน้าจอโดยเร็ว ไม่เช่นนั้นข้อมูลของ <xliff:g id="ACCOUNT">%s</xliff:g> จะถูกลบ คุณต้องการเปลี่ยนตอนนี้หรือไม่"</string>
+    <string name="password_expire_warning_dialog_content_fmt" msgid="4293446611405084436">"คุณต้องเปลี่ยน PIN หรือรหัสผ่านสำหรับการล็อกหน้าจอโดยเร็ว ไม่เช่นนั้นข้อมูลของ <xliff:g id="ACCOUNT">%s</xliff:g> จะถูกนำออก คุณต้องการเปลี่ยนตอนนี้หรือไม่"</string>
     <string name="password_expired_dialog_title" msgid="2186547998125938084">"รหัสผ่านล็อกหน้าจอหมดอายุแล้ว"</string>
-    <string name="password_expired_dialog_content_fmt" msgid="6538210092073931079">"ข้อมูลสำหรับ <xliff:g id="ACCOUNT">%s</xliff:g> กำลังถูกลบออกจากอุปกรณ์ของคุณ คุณสามารถคืนค่าข้อมูลได้โดยเปลี่ยน PIN หรือรหัสผ่านล็อกหน้าจอของคุณ เปลี่ยนรหัสตอนนี้หรือไม่"</string>
+    <string name="password_expired_dialog_content_fmt" msgid="6538210092073931079">"ข้อมูลสำหรับ <xliff:g id="ACCOUNT">%s</xliff:g> กำลังถูกนำออกออกจากอุปกรณ์ของคุณ คุณสามารถคืนค่าข้อมูลได้โดยเปลี่ยน PIN หรือรหัสผ่านล็อกหน้าจอของคุณ เปลี่ยนรหัสตอนนี้หรือไม่"</string>
     <string name="account_settings_exit_server_settings" msgid="8006323251094711431">"ยกเลิกการเปลี่ยนแปลงที่ยังไม่ได้บันทึกหรือไม่"</string>
     <string name="account_settings_login_dialog_title" msgid="4024422579146302775">"ลงชื่อเข้าใช้ไม่ได้"</string>
     <string name="account_settings_login_dialog_content_fmt" msgid="8849649646111167377">"ชื่อผู้ใช้หรือรหัสผ่านสำหรับ <xliff:g id="ACCOUNT">%s</xliff:g> ไม่ถูกต้อง คุณต้องการอัปเดตตอนนี้หรือไม่"</string>
@@ -257,7 +257,7 @@
     <string name="device_admin_description" msgid="426727923791430306">"เปิดการใช้งานนโยบายความปลอดภัยที่ระบุโดยเซิร์ฟเวอร์"</string>
     <string name="settings_activity_title" msgid="5185915603716333904">"การตั้งค่า"</string>
     <string name="header_label_general_preferences" msgid="8243724566056800991">"การตั้งค่าทั่วไป"</string>
-    <string name="general_preference_confirm_delete_label" msgid="1863245465244241907">"ยืนยันก่อนลบ"</string>
+    <string name="general_preference_confirm_delete_label" msgid="1863245465244241907">"ยืนยันก่อนนำออก"</string>
     <string name="general_preference_confirm_delete_summary" msgid="6710240861010766643">"ข้อความ"</string>
     <string name="general_preference_confirm_send_label" msgid="4548277349553989930">"ยืนยันก่อนส่ง"</string>
     <string name="general_preference_confirm_send_summary" msgid="2695471027185506093">"ข้อความ"</string>
diff --git a/res/values-tr/strings.xml b/res/values-tr/strings.xml
index a849e9f14..04928f2d4 100644
--- a/res/values-tr/strings.xml
+++ b/res/values-tr/strings.xml
@@ -207,9 +207,9 @@
     <string name="account_settings_summary" msgid="8403582255413830007">"Sıklığı, bildirimleri vs. senkronize et"</string>
     <string name="account_settings_notify_summary" msgid="8134339460923068254">"E-posta geldiğinde bildirim gönder"</string>
     <string name="account_settings_mail_check_frequency_label" msgid="4322235101687302250">"Senkronizasyon sıklığı"</string>
-    <string name="account_settings_incoming_label" msgid="7858928031806297542">"Gelen ayarlar"</string>
+    <string name="account_settings_incoming_label" msgid="7858928031806297542">"Gelen ayarları"</string>
     <string name="account_settings_incoming_summary" msgid="2923044634831881068">"Kullanıcı adı, şifre ve diğer gelen sunucu ayarları"</string>
-    <string name="account_settings_outgoing_label" msgid="4464829249980026745">"Giden ayarlar"</string>
+    <string name="account_settings_outgoing_label" msgid="4464829249980026745">"Giden ayarları"</string>
     <string name="account_settings_outgoing_summary" msgid="3572093624332724311">"Kullanıcı adı, şifre ve diğer giden sunucu ayarları"</string>
     <string name="account_settings_enforced_label" msgid="7429582254433588882">"Politikalar uygulandı"</string>
     <string name="account_settings_enforced_summary" msgid="8140860420440447771">"Hiçbiri"</string>
diff --git a/res/values-zh-rCN/strings.xml b/res/values-zh-rCN/strings.xml
index 599bd5a2d..7ebe61f54 100644
--- a/res/values-zh-rCN/strings.xml
+++ b/res/values-zh-rCN/strings.xml
@@ -36,7 +36,7 @@
     <item quantity="one" msgid="320885379869442589">"移动邮件"</item>
     <item quantity="other" msgid="371256717624461324">"移动邮件"</item>
   </plurals>
-    <string name="cannot_move_protocol_not_supported_toast" msgid="6558083148128616292">"POP3 帐户不支持移动邮件的操作。"</string>
+    <string name="cannot_move_protocol_not_supported_toast" msgid="6558083148128616292">"POP3帐户不支持移动邮件的操作。"</string>
     <string name="cannot_move_multiple_accounts_toast" msgid="7922594026384944163">"所选内容包含多个帐户的邮件，因此无法进行移动。"</string>
     <string name="cannot_move_special_mailboxes_toast" msgid="7093107954841896970">"无法移动“草稿”、“发件箱”和“已发邮件”中的邮件。"</string>
     <string name="mailbox_name_display_inbox" msgid="3542327124749861736">"收件箱"</string>
@@ -51,7 +51,7 @@
     <string name="account_folder_list_summary_starred" msgid="3134312269246375723">"已加星标的内容"</string>
     <string name="account_folder_list_summary_drafts" msgid="5514845993247300437">"草稿"</string>
     <string name="account_folder_list_summary_outbox" msgid="3059836696049399377">"发件箱"</string>
-    <string name="mailbox_list_account_selector_combined_view" msgid="1556327299894225044">"合并的视图"</string>
+    <string name="mailbox_list_account_selector_combined_view" msgid="1556327299894225044">"合并视图"</string>
     <string name="message_compose_fwd_header_fmt" msgid="5181300290654579434">\n\n"-------- 原始邮件 --------\n主题：<xliff:g id="SUBJECT">%1$s</xliff:g>\n发件人：<xliff:g id="SENDER">%2$s</xliff:g>\n收件人：<xliff:g id="TO">%3$s</xliff:g>\n抄送：<xliff:g id="CC_0">%4$s</xliff:g>\n\n"</string>
     <string name="message_compose_insert_quick_response_list_title" msgid="5314107302508728189">"插入快速回复"</string>
     <string name="message_compose_insert_quick_response_menu_title" msgid="5817075097532919955">"插入快速回复"</string>
@@ -90,7 +90,7 @@
     <string name="account_password_spaces_error" msgid="8928309156658903257">"该密码的开头或结尾存在一个或多个空格。很多服务器不支持带空格的密码。"</string>
     <string name="account_setup_check_settings_retr_info_msg" msgid="4121970450267725664">"正在检索帐户信息..."</string>
     <string name="account_setup_check_settings_check_incoming_msg" msgid="2869198335297585862">"正在验证服务器设置…"</string>
-    <string name="account_setup_check_settings_check_outgoing_msg" msgid="4566131393776891419">"正在验证 SMTP 设置…"</string>
+    <string name="account_setup_check_settings_check_outgoing_msg" msgid="4566131393776891419">"正在验证SMTP设置…"</string>
     <string name="account_setup_creating_account_msg" msgid="6235569720466839946">"正在创建帐户…"</string>
     <string name="account_setup_names_title" msgid="8483517350241119291">"帐户设置"</string>
     <string name="account_setup_names_headline" msgid="914858472109729140">"您的帐户已设置完毕，可以收发电子邮件了！"</string>
@@ -115,11 +115,11 @@
     <string name="account_setup_incoming_delete_policy_label" msgid="9213590134693857912">"从服务器中删除电子邮件"</string>
     <string name="account_setup_incoming_delete_policy_never_label" msgid="3222897501875871041">"永不"</string>
     <string name="account_setup_incoming_delete_policy_delete_label" msgid="222216840911785631">"当我从收件箱中删除时"</string>
-    <string name="account_setup_incoming_imap_path_prefix_label" msgid="401167247072926810">"IMAP 路径前缀"</string>
+    <string name="account_setup_incoming_imap_path_prefix_label" msgid="401167247072926810">"IMAP路径前缀"</string>
     <string name="account_setup_incoming_imap_path_prefix_hint" msgid="9190845919067906033">"可选"</string>
     <string name="account_setup_outgoing_title" msgid="7208495965665711539">"帐户设置"</string>
     <string name="account_setup_outgoing_headline" msgid="2025001060935366394">"外发服务器设置"</string>
-    <string name="account_setup_outgoing_smtp_server_label" msgid="6035137446691195177">"SMTP 服务器"</string>
+    <string name="account_setup_outgoing_smtp_server_label" msgid="6035137446691195177">"SMTP服务器"</string>
     <string name="account_setup_outgoing_port_label" msgid="7573207437835827876">"端口"</string>
     <string name="account_setup_outgoing_security_label" msgid="911398071120720589">"安全类型"</string>
     <string name="account_setup_outgoing_require_login_label" msgid="7779484127897397562">"要求登录"</string>
@@ -128,24 +128,24 @@
     <string name="account_setup_exchange_certificate_title" msgid="8473793588405277962">"客户端证书"</string>
     <string name="account_setup_exchange_select_certificate" msgid="1536103662037268683">"选择"</string>
     <string name="account_setup_exchange_use_certificate" msgid="8690682770083161349">"使用客户端证书"</string>
-    <string name="account_setup_exchange_remove_certificate" msgid="5633249155510301766">"删除"</string>
+    <string name="account_setup_exchange_remove_certificate" msgid="5633249155510301766">"移除"</string>
     <string name="account_setup_exchange_no_certificate" msgid="1119542961954780872">"无"</string>
-    <string name="account_setup_exchange_device_id_label" msgid="1646827333223157658">"移动设备 ID"</string>
+    <string name="account_setup_exchange_device_id_label" msgid="1646827333223157658">"移动设备ID"</string>
     <string name="account_setup_options_title" msgid="9016600767888846051">"帐户设置"</string>
     <string name="account_setup_options_headline" msgid="4181274232835368085">"帐户选项"</string>
     <string name="account_setup_options_mail_check_frequency_label" msgid="4824859792882810053">"邮件查收频率"</string>
     <string name="account_setup_options_mail_check_frequency_never" msgid="287951859480505416">"永不"</string>
     <string name="account_setup_options_mail_check_frequency_push" msgid="5934525907736008673">"自动（推送）"</string>
-    <string name="account_setup_options_mail_check_frequency_5min" msgid="6388939895878539307">"每隔 5 分钟"</string>
-    <string name="account_setup_options_mail_check_frequency_10min" msgid="5344463157247877480">"每隔 10 分钟"</string>
-    <string name="account_setup_options_mail_check_frequency_15min" msgid="5052776740089741793">"每隔 15 分钟"</string>
-    <string name="account_setup_options_mail_check_frequency_30min" msgid="1097088928685931864">"每隔 30 分钟"</string>
+    <string name="account_setup_options_mail_check_frequency_5min" msgid="6388939895878539307">"每隔5分钟"</string>
+    <string name="account_setup_options_mail_check_frequency_10min" msgid="5344463157247877480">"每隔10分钟"</string>
+    <string name="account_setup_options_mail_check_frequency_15min" msgid="5052776740089741793">"每隔15分钟"</string>
+    <string name="account_setup_options_mail_check_frequency_30min" msgid="1097088928685931864">"每隔30分钟"</string>
     <string name="account_setup_options_mail_check_frequency_1hour" msgid="3767715356039692899">"每小时"</string>
     <string name="account_setup_options_notify_label" msgid="7046146571560728829">"收到电子邮件时通知我"</string>
     <string name="account_setup_options_sync_contacts_label" msgid="276492345599531778">"同步此帐户中的联系人"</string>
     <string name="account_setup_options_sync_calendar_label" msgid="3222151135467189411">"同步此帐户中的日历"</string>
     <string name="account_setup_options_sync_email_label" msgid="8585177128405004068">"同步此帐户中的电子邮件"</string>
-    <string name="account_setup_options_background_attachments_label" msgid="5247749298276451846">"连接到 WLAN 后自动下载附件"</string>
+    <string name="account_setup_options_background_attachments_label" msgid="5247749298276451846">"连接到WLAN后自动下载附件"</string>
     <string name="account_setup_failed_dlg_title" msgid="9083263347962940552">"无法完成"</string>
     <string name="account_setup_options_mail_window_label" msgid="7582247646138987328">"同步最近多少天的邮件"</string>
     <string name="account_setup_options_mail_window_auto" msgid="4188895354366183790">"自动"</string>
@@ -174,8 +174,8 @@
     <string name="account_setup_failed_protocol_unsupported" msgid="4607759927226943569">"您键入的服务器地址不正确，或电子邮件服务不支持该服务器需要的协议版本。"</string>
     <string name="account_setup_failed_access_denied" msgid="6835358740050287051">"您没有与此服务器同步的权限。要了解详情，请与您服务器的管理员联系。"</string>
     <string name="account_setup_security_required_title" msgid="1850321535870447468">"远程安全管理"</string>
-    <string name="account_setup_security_policies_required_fmt" msgid="5410714107656671761">"“<xliff:g id="SERVER">%s</xliff:g>”服务器要求您允许其远程控制您 Android 设备的某些安全功能。您想要完成此帐户设置吗？"</string>
-    <string name="account_setup_failed_security_policies_unsupported" msgid="3210264746877120355">"您的 Android 设备不支持此服务器要求使用的安全功能，其中包括：<xliff:g id="ERROR">%s</xliff:g>"</string>
+    <string name="account_setup_security_policies_required_fmt" msgid="5410714107656671761">"<xliff:g id="SERVER">%s</xliff:g>服务器要求您允许其远程控制您Android设备的某些安全功能。您想要完成此帐户设置吗？"</string>
+    <string name="account_setup_failed_security_policies_unsupported" msgid="3210264746877120355">"您的Android设备不支持此服务器要求使用的安全功能，其中包括：<xliff:g id="ERROR">%s</xliff:g>"</string>
     <string name="account_setup_username_uneditable_error" msgid="1618869759801584109">"您无法更改帐户的用户名。要添加使用其他用户名的帐户，请触摸“添加帐户”。"</string>
     <string name="disable_admin_warning" msgid="6196985268695592382">"警告：撤消“电子邮件”应用管理您设备的权限会删除所有需要此权限的电子邮件帐户，以及这些帐户中的电子邮件、联系人、日历活动和其他数据。"</string>
     <string name="account_security_dialog_title" msgid="430041952584831904">"安全更新"</string>
@@ -184,11 +184,11 @@
     <string name="security_needed_ticker_fmt" msgid="2120499087897133665">"帐户“<xliff:g id="ACCOUNT">%s</xliff:g>”需要更新安全设置。"</string>
     <string name="security_changed_ticker_fmt" msgid="2609435447352755285">"帐户“<xliff:g id="ACCOUNT">%s</xliff:g>”已更改其安全设置，用户无需进行任何操作。"</string>
     <string name="security_notification_content_update_title" msgid="2429762903228690154">"需要进行安全更新"</string>
-    <string name="security_notification_content_change_title" msgid="443490921895642130">"安全政策已更改"</string>
-    <string name="security_notification_content_unsupported_title" msgid="7315219208043169233">"无法满足安全政策的要求"</string>
+    <string name="security_notification_content_change_title" msgid="443490921895642130">"安全策略已更改"</string>
+    <string name="security_notification_content_unsupported_title" msgid="7315219208043169233">"无法满足安全策略的要求"</string>
     <string name="account_security_title" msgid="3511543138560418587">"设备安全性"</string>
-    <string name="account_security_policy_explanation_fmt" msgid="6932627044314460766">"“<xliff:g id="SERVER">%s</xliff:g>”服务器要求您允许其远程控制您 Android 设备的某些安全功能。"</string>
-    <string name="account_setup_failed_dlg_edit_details_action" msgid="5355993309841479360">"编辑详情"</string>
+    <string name="account_security_policy_explanation_fmt" msgid="6932627044314460766">"<xliff:g id="SERVER">%s</xliff:g>服务器要求您允许其远程控制您Android设备的某些安全功能。"</string>
+    <string name="account_setup_failed_dlg_edit_details_action" msgid="5355993309841479360">"修改详细信息"</string>
     <string name="password_expire_warning_ticker_fmt" msgid="2459977229180023773">"“<xliff:g id="ACCOUNT">%s</xliff:g>”要求更改锁定屏幕 PIN 或密码。"</string>
     <string name="password_expire_warning_content_title" msgid="7174669014074849304">"锁定屏幕密码即将过期"</string>
     <string name="password_expired_ticker" msgid="4230570412974108968">"您的锁定屏幕 PIN 或密码已过期。"</string>
@@ -202,7 +202,7 @@
     <string name="account_settings_login_dialog_content_fmt" msgid="8849649646111167377">"<xliff:g id="ACCOUNT">%s</xliff:g> 的用户名或密码不正确。要立即更新吗？"</string>
     <string name="account_settings_login_dialog_reason_fmt" msgid="4266359321648406752">"无法登录 <xliff:g id="ACCOUNT">%s</xliff:g>；服务器提示：<xliff:g id="REASON">%s</xliff:g>。您要更新自己的用户名和/或密码吗？"</string>
     <string name="account_settings_background_attachments_label" msgid="2980317599840958688">"下载附件"</string>
-    <string name="account_settings_background_attachments_summary" msgid="5954218549226189376">"通过 WLAN 自动下载最新邮件的附件"</string>
+    <string name="account_settings_background_attachments_summary" msgid="5954218549226189376">"通过WLAN自动下载最新邮件的附件"</string>
     <string name="account_settings_notify_label" msgid="1630001017303007974">"电子邮件通知"</string>
     <string name="account_settings_summary" msgid="8403582255413830007">"同步频率、通知等。"</string>
     <string name="account_settings_notify_summary" msgid="8134339460923068254">"收到电子邮件时发送通知"</string>
@@ -211,9 +211,9 @@
     <string name="account_settings_incoming_summary" msgid="2923044634831881068">"用户名、密码和其他接收服务器设置"</string>
     <string name="account_settings_outgoing_label" msgid="4464829249980026745">"外发设置"</string>
     <string name="account_settings_outgoing_summary" msgid="3572093624332724311">"用户名、密码和其他外发服务器设置"</string>
-    <string name="account_settings_enforced_label" msgid="7429582254433588882">"政策已执行"</string>
+    <string name="account_settings_enforced_label" msgid="7429582254433588882">"已执行策略"</string>
     <string name="account_settings_enforced_summary" msgid="8140860420440447771">"无"</string>
-    <string name="account_settings_unsupported_label" msgid="1954091071454235577">"不支持的政策"</string>
+    <string name="account_settings_unsupported_label" msgid="1954091071454235577">"不支持的策略"</string>
     <string name="account_settings_unsupported_summary" msgid="2107633813351863608">"无"</string>
     <string name="account_settings_retry_label" msgid="1104680719299842829">"尝试同步"</string>
     <string name="account_settings_retry_summary" msgid="2703599639846201913">"触摸此处以同步此帐户"</string>
@@ -223,7 +223,7 @@
     <string name="account_settings_edit_quick_responses_summary" msgid="8056686122888722591">"编辑您在写电子邮件时经常插入的文本"</string>
     <string name="account_settings_notifications" msgid="1042620094281375043">"通知设置"</string>
     <string name="account_settings_data_usage" msgid="6669107430575866736">"数据使用"</string>
-    <string name="account_settings_policies" msgid="6292833636418641840">"安全政策"</string>
+    <string name="account_settings_policies" msgid="6292833636418641840">"安全策略"</string>
     <string name="system_folders_title" msgid="2934406494244347991">"系统文件夹"</string>
     <string name="system_folders_trash_title" msgid="8470058000681188327">"已删除邮件文件夹"</string>
     <string name="system_folders_trash_summary" msgid="1258919809198485244">"选择您在服务器上的已删除邮件文件夹"</string>
@@ -234,11 +234,11 @@
     <string name="edit_quick_response_dialog" msgid="6479106007607928450">"快速回复"</string>
     <string name="save_action" msgid="1988862706623227093">"保存"</string>
     <string name="account_settings_sync_contacts_enable" msgid="1369272986009573218">"同步联系人"</string>
-    <string name="account_settings_sync_contacts_summary" msgid="816919452270997919">"同步此帐户的联系人"</string>
+    <string name="account_settings_sync_contacts_summary" msgid="816919452270997919">"同步此帐户中的联系人"</string>
     <string name="account_settings_sync_calendar_enable" msgid="6855333393468628003">"同步日历"</string>
-    <string name="account_settings_sync_calendar_summary" msgid="7606340353079301703">"同步此帐户的日历活动"</string>
+    <string name="account_settings_sync_calendar_summary" msgid="7606340353079301703">"同步此帐户中的日历活动"</string>
     <string name="account_settings_sync_email_enable" msgid="3754115565685222477">"同步电子邮件"</string>
-    <string name="account_settings_sync_email_summary" msgid="262964076412310990">"同步此帐户的电子邮件"</string>
+    <string name="account_settings_sync_email_summary" msgid="262964076412310990">"同步此帐户中的电子邮件"</string>
     <string name="account_settings_vibrate_when_label" msgid="708477308761702671">"振动"</string>
     <string name="account_settings_ringtone" msgid="8229878374785575207">"选择铃声"</string>
     <string name="account_settings_servers" msgid="4925493817981624242">"服务器设置"</string>
@@ -249,12 +249,12 @@
     <string name="mailbox_settings_mailbox_sync_window_label" msgid="851180833264474141">"同步最近多少天的邮件"</string>
     <string name="prefDialogTitle_conversationListIcon" msgid="4601797400885989153">"发件人头像"</string>
     <string name="provider_note_live" msgid="2995297671709325333">"只有某些“Plus”帐户支持 POP 访问而允许此程序进行连接。如果您使用正确的电子邮件地址和密码无法登录，则可能还未开通付费的“Plus”帐户。请启动网络浏览器以获取对这些电子邮件帐户的访问权限。"</string>
-    <string name="provider_note_t_online" msgid="1630642061431427894">"在设置该电子邮件帐户之前，请访问 T-Online 网站，为访问 POP3 电子邮件创建密码。"</string>
+    <string name="provider_note_t_online" msgid="1630642061431427894">"在设置该电子邮件帐户之前，请访问T-Online网站创建密码，以便使用POP3电子邮件功能。"</string>
     <string name="exchange_name" msgid="1190783774800310346">"公司"</string>
     <string name="exchange_name_alternate" msgid="5772529644749041052">"Microsoft Exchange ActiveSync"</string>
     <string name="system_account_create_failed" msgid="3673792980526246177">"无法创建帐户，请重试。"</string>
     <string name="device_admin_label" msgid="8680224994637869414">"电子邮件"</string>
-    <string name="device_admin_description" msgid="426727923791430306">"启用指定服务器的安全政策"</string>
+    <string name="device_admin_description" msgid="426727923791430306">"启用服务器专有的安全策略"</string>
     <string name="settings_activity_title" msgid="5185915603716333904">"设置"</string>
     <string name="header_label_general_preferences" msgid="8243724566056800991">"常规设置"</string>
     <string name="general_preference_confirm_delete_label" msgid="1863245465244241907">"删除前先确认"</string>
diff --git a/res/values-zh-rHK/strings.xml b/res/values-zh-rHK/strings.xml
index 2e4cef6f3..32982d930 100644
--- a/res/values-zh-rHK/strings.xml
+++ b/res/values-zh-rHK/strings.xml
@@ -38,19 +38,19 @@
   </plurals>
     <string name="cannot_move_protocol_not_supported_toast" msgid="6558083148128616292">"POP3 帳戶不支援郵件移動功能。"</string>
     <string name="cannot_move_multiple_accounts_toast" msgid="7922594026384944163">"無法移動，因為選取了多個帳戶。"</string>
-    <string name="cannot_move_special_mailboxes_toast" msgid="7093107954841896970">"無法移動 [草稿]、[寄件匣] 及 [寄件備份] 中的郵件。"</string>
-    <string name="mailbox_name_display_inbox" msgid="3542327124749861736">"收件匣"</string>
-    <string name="mailbox_name_display_outbox" msgid="2826214174661417662">"寄件匣"</string>
+    <string name="cannot_move_special_mailboxes_toast" msgid="7093107954841896970">"無法移動 [草稿]、[寄件箱] 及 [寄件備份] 中的郵件。"</string>
+    <string name="mailbox_name_display_inbox" msgid="3542327124749861736">"收件箱"</string>
+    <string name="mailbox_name_display_outbox" msgid="2826214174661417662">"寄件箱"</string>
     <string name="mailbox_name_display_drafts" msgid="4868718300700514319">"草稿"</string>
     <string name="mailbox_name_display_trash" msgid="9139069064580630647">"垃圾桶"</string>
     <string name="mailbox_name_display_sent" msgid="3426058998191869523">"已傳送"</string>
     <string name="mailbox_name_display_junk" msgid="9046762505977999288">"垃圾郵件"</string>
     <string name="mailbox_name_display_starred" msgid="7788694947644186069">"已加星號"</string>
     <string name="mailbox_name_display_unread" msgid="1015674989793998695">"未閱讀"</string>
-    <string name="account_folder_list_summary_inbox" msgid="7518263761297423255">"收件匣"</string>
+    <string name="account_folder_list_summary_inbox" msgid="7518263761297423255">"收件箱"</string>
     <string name="account_folder_list_summary_starred" msgid="3134312269246375723">"已加星號"</string>
     <string name="account_folder_list_summary_drafts" msgid="5514845993247300437">"草稿"</string>
-    <string name="account_folder_list_summary_outbox" msgid="3059836696049399377">"寄件匣"</string>
+    <string name="account_folder_list_summary_outbox" msgid="3059836696049399377">"寄件箱"</string>
     <string name="mailbox_list_account_selector_combined_view" msgid="1556327299894225044">"合併檢視"</string>
     <string name="message_compose_fwd_header_fmt" msgid="5181300290654579434">\n\n"-------- 原始郵件 --------\n主旨：<xliff:g id="SUBJECT">%1$s</xliff:g>\n寄件者：<xliff:g id="SENDER">%2$s</xliff:g>\n收件者：<xliff:g id="TO">%3$s</xliff:g>\n副本抄送：<xliff:g id="CC_0">%4$s</xliff:g>\n\n"</string>
     <string name="message_compose_insert_quick_response_list_title" msgid="5314107302508728189">"插入快速回應"</string>
@@ -114,7 +114,7 @@
     <string name="account_setup_incoming_security_tls_label" msgid="6573498431821879660">"STARTTLS"</string>
     <string name="account_setup_incoming_delete_policy_label" msgid="9213590134693857912">"從伺服器中刪除電子郵件"</string>
     <string name="account_setup_incoming_delete_policy_never_label" msgid="3222897501875871041">"永不"</string>
-    <string name="account_setup_incoming_delete_policy_delete_label" msgid="222216840911785631">"當我從收件匣刪除時"</string>
+    <string name="account_setup_incoming_delete_policy_delete_label" msgid="222216840911785631">"當我從收件箱刪除時"</string>
     <string name="account_setup_incoming_imap_path_prefix_label" msgid="401167247072926810">"IMAP 路徑首碼"</string>
     <string name="account_setup_incoming_imap_path_prefix_hint" msgid="9190845919067906033">"非必填"</string>
     <string name="account_setup_outgoing_title" msgid="7208495965665711539">"帳戶設定"</string>
@@ -133,7 +133,7 @@
     <string name="account_setup_exchange_device_id_label" msgid="1646827333223157658">"流動裝置編號"</string>
     <string name="account_setup_options_title" msgid="9016600767888846051">"帳戶設定"</string>
     <string name="account_setup_options_headline" msgid="4181274232835368085">"帳戶選項"</string>
-    <string name="account_setup_options_mail_check_frequency_label" msgid="4824859792882810053">"查看收件匣頻率"</string>
+    <string name="account_setup_options_mail_check_frequency_label" msgid="4824859792882810053">"查看收件箱頻率"</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>
diff --git a/res/values-zh-rTW/strings.xml b/res/values-zh-rTW/strings.xml
index 4f3639066..fd7f8d187 100644
--- a/res/values-zh-rTW/strings.xml
+++ b/res/values-zh-rTW/strings.xml
@@ -204,7 +204,7 @@
     <string name="account_settings_background_attachments_label" msgid="2980317599840958688">"下載附件"</string>
     <string name="account_settings_background_attachments_summary" msgid="5954218549226189376">"透過 Wi-Fi 自動下載最新郵件的附件"</string>
     <string name="account_settings_notify_label" msgid="1630001017303007974">"電子郵件通知"</string>
-    <string name="account_settings_summary" msgid="8403582255413830007">"同步處理頻率和通知等其他設定"</string>
+    <string name="account_settings_summary" msgid="8403582255413830007">"同步處理頻率和通知等設定"</string>
     <string name="account_settings_notify_summary" msgid="8134339460923068254">"收到電子郵件時傳送通知"</string>
     <string name="account_settings_mail_check_frequency_label" msgid="4322235101687302250">"同步處理頻率"</string>
     <string name="account_settings_incoming_label" msgid="7858928031806297542">"內收設定"</string>
diff --git a/res/values-zu/strings.xml b/res/values-zu/strings.xml
index afb74a710..c22136a45 100644
--- a/res/values-zu/strings.xml
+++ b/res/values-zu/strings.xml
@@ -90,7 +90,7 @@
     <string name="account_password_spaces_error" msgid="8928309156658903257">"Le phasiwedi iqala noma igcina ngezimpawu"</string>
     <string name="account_setup_check_settings_retr_info_msg" msgid="4121970450267725664">"Ilanda ulwazi le-akhawunti..."</string>
     <string name="account_setup_check_settings_check_incoming_msg" msgid="2869198335297585862">"Iqinisekisa izilungiselelo zeseva…"</string>
-    <string name="account_setup_check_settings_check_outgoing_msg" msgid="4566131393776891419">"Iqinisekisa amasethingi e-smtp…"</string>
+    <string name="account_setup_check_settings_check_outgoing_msg" msgid="4566131393776891419">"Iqinisekisa izilungiselelo ze-smtp…"</string>
     <string name="account_setup_creating_account_msg" msgid="6235569720466839946">"Idala i-akhawunti…"</string>
     <string name="account_setup_names_title" msgid="8483517350241119291">"Ukumisa i-akhawunti"</string>
     <string name="account_setup_names_headline" msgid="914858472109729140">"I-akhawunti yakho imisiwe, futhi i-imeyli isendleleni!"</string>
@@ -116,7 +116,7 @@
     <string name="account_setup_incoming_delete_policy_never_label" msgid="3222897501875871041">"Akusoze"</string>
     <string name="account_setup_incoming_delete_policy_delete_label" msgid="222216840911785631">"Lapho ngisusa Ebhokisini lokungenayo"</string>
     <string name="account_setup_incoming_imap_path_prefix_label" msgid="401167247072926810">"Isiqalo sendlela ye-IMAP"</string>
-    <string name="account_setup_incoming_imap_path_prefix_hint" msgid="9190845919067906033">"Okokuzithandela"</string>
+    <string name="account_setup_incoming_imap_path_prefix_hint" msgid="9190845919067906033">"Inketho"</string>
     <string name="account_setup_outgoing_title" msgid="7208495965665711539">"Ukumisa i-akhawunti"</string>
     <string name="account_setup_outgoing_headline" msgid="2025001060935366394">"Izilungiselelo zeseva eziphumayo"</string>
     <string name="account_setup_outgoing_smtp_server_label" msgid="6035137446691195177">"Iseva ye-SMTP"</string>
@@ -175,18 +175,18 @@
     <string name="account_setup_failed_access_denied" msgid="6835358740050287051">"Awunayo imvume yokuvumelanisa ngalesisiphakeli. Thintana nomqondisi wesiphakeli sakho ukuze uthole ukwazisa okuningi."</string>
     <string name="account_setup_security_required_title" msgid="1850321535870447468">"Ukuphatha ukuphepha kokulawula okukude"</string>
     <string name="account_setup_security_policies_required_fmt" msgid="5410714107656671761">"Iseva<xliff:g id="SERVER">%s</xliff:g> idinga ukuba uyivumele ukuba ilawule kude ezinye izici zokuphepha zedivayisi ye-Android yakho.  Ingabe ufuna ukuqedela ukumisa le-akhawunti?"</string>
-    <string name="account_setup_failed_security_policies_unsupported" msgid="3210264746877120355">"Lesi siphakeli sidinga izici zokuphepha ezingasekelwa idivayisi yakho ye-Android, kuhlanganisa: <xliff:g id="ERROR">%s</xliff:g>"</string>
+    <string name="account_setup_failed_security_policies_unsupported" msgid="3210264746877120355">"Le seva idinga izici zokuphepha ezingasekelwa idivayisi yakho ye-Android, kuhlanganisa: <xliff:g id="ERROR">%s</xliff:g>"</string>
     <string name="account_setup_username_uneditable_error" msgid="1618869759801584109">"Awukwazi ukushintsha igama lomsebenzi le-akhawunti. Ukuze wengeze i-akhawunti ngegama lomsebenzi elihlukile, thinta Faka i-akhawunti."</string>
     <string name="disable_admin_warning" msgid="6196985268695592382">"ISEXWAYISO: Yenza kungasebenzi imvume yohlelo lokusebenza lwe-Imeyli ukubhalisa idivaysi yakho kuzosusa wonke ama-akhawunti e-Imeyli ayidingayo, kuhlanganise ne-imeyli yayo, othintana nabo, amakhalenda, izenzakalo, neminye imininingo."</string>
     <string name="account_security_dialog_title" msgid="430041952584831904">"Okwakamuva kwezokuphepha"</string>
-    <string name="account_security_dialog_content_fmt" msgid="8843806143923278214">"<xliff:g id="ACCOUNT">%s</xliff:g> idinga ukuba ubuyekeze izilungiselelo zakho zokuzivikela."</string>
+    <string name="account_security_dialog_content_fmt" msgid="8843806143923278214">"<xliff:g id="ACCOUNT">%s</xliff:g> idinga ubuyekeze izilungiselelo zakho zokuphepha."</string>
     <string name="security_unsupported_ticker_fmt" msgid="5166579214529283975">"I-Akhawuni \"<xliff:g id="ACCOUNT">%s</xliff:g>\" ayikwazi ukuvumelanisa ngenxa yezimfuneko sokuphepha."</string>
     <string name="security_needed_ticker_fmt" msgid="2120499087897133665">"I-Akhawunti \"<xliff:g id="ACCOUNT">%s</xliff:g>\" idinga ukubuyekeza izilungiselelo zokuphepha."</string>
     <string name="security_changed_ticker_fmt" msgid="2609435447352755285">"I-Akhawunti \"<xliff:g id="ACCOUNT">%s</xliff:g>\" ishintshe izilungiselelo zayo zokuphepha; asikho isenzo somsebenzisi esidingekayo."</string>
     <string name="security_notification_content_update_title" msgid="2429762903228690154">"Ukubuyekeza ezokuphepha kuyadingeka"</string>
     <string name="security_notification_content_change_title" msgid="443490921895642130">"Izinqubomgomo zokuphepha zishintshiwe"</string>
     <string name="security_notification_content_unsupported_title" msgid="7315219208043169233">"Izinqubomgomo zokuphepha azikwazi ukuhlangabezwa"</string>
-    <string name="account_security_title" msgid="3511543138560418587">"Ukuphepha kweDivaysi"</string>
+    <string name="account_security_title" msgid="3511543138560418587">"Ukuphepha kwedivaysi"</string>
     <string name="account_security_policy_explanation_fmt" msgid="6932627044314460766">"Iseva <xliff:g id="SERVER">%s</xliff:g> idinga ukuba uyivumele ukuba ilawule kude ezinye izici zokuphepha kwedivayisi ye-Android."</string>
     <string name="account_setup_failed_dlg_edit_details_action" msgid="5355993309841479360">"Hlela imininingwane"</string>
     <string name="password_expire_warning_ticker_fmt" msgid="2459977229180023773">"\"<xliff:g id="ACCOUNT">%s</xliff:g>\" idinga ukuba ushintshe iphinikhodi yokuvala isikrini noma iphasiwedi"</string>
@@ -241,7 +241,7 @@
     <string name="account_settings_sync_email_summary" msgid="262964076412310990">"Vumelanisa i-imeyli yale akhawunti"</string>
     <string name="account_settings_vibrate_when_label" msgid="708477308761702671">"Dlidliza"</string>
     <string name="account_settings_ringtone" msgid="8229878374785575207">"Khetha ithoni yokukhala"</string>
-    <string name="account_settings_servers" msgid="4925493817981624242">"Izilungiselelo Zeseva"</string>
+    <string name="account_settings_servers" msgid="4925493817981624242">"Izilungiselelo zeseva"</string>
     <string name="mailbox_settings_activity_title" msgid="4705845931573373274">"Vumelanisa okukhethwa kukho"</string>
     <string name="mailbox_settings_activity_title_with_mailbox" msgid="6485481250424219240">"Vumelanisa okukhethwa kukho (<xliff:g id="MAILBOXX_NAME">%s</xliff:g>)"</string>
     <string name="mailbox_settings_sync_enabled_label" msgid="1180866791599296994">"Vumelanisa le folda"</string>
@@ -278,7 +278,7 @@
     <string name="more_than_999" msgid="8704425397397918798">"999+"</string>
     <string name="search_hint" msgid="2200412192574686497">"Sesha i-imeyli"</string>
     <string name="policy_dont_allow_camera" msgid="5744573062306937302">"Ungavumeli ukusebenza kwekhamera yedivayisi"</string>
-    <string name="policy_require_password" msgid="7177274900480984702">"Idinga iphasiwedi yedivayisi"</string>
+    <string name="policy_require_password" msgid="7177274900480984702">"Dinga iphasiwedi yedivayisi"</string>
     <string name="policy_password_history" msgid="5743544498302303181">"Khawulela ukusetshenziswa kabusha kwamaphasiwedi wakamuva"</string>
     <string name="policy_password_expiration" msgid="1248123255253649199">"Cela ukuthi amaphasiwedi aphalwe isikhathi"</string>
     <string name="policy_screen_timeout" msgid="414869965358468080">"Dinga idivayisi yokumisa ukukhiya isikrini sayo"</string>