From b0085c774a4ae582f10c411bd677c8d84f25e3e0 Mon Sep 17 00:00:00 2001
From: Baligh Uddin <baligh@google.com>
Date: Mon, 5 May 2014 14:15:53 -0700
Subject: [PATCH] Import translations. DO NOT MERGE

Change-Id: Id701dd23f377d5cb0f05c65e5bd608b7d20b2468
Auto-generated-cl: translation import
---
 res/values-am/strings.xml     | 44 +++++++++++++++++------------------
 res/values-es/strings.xml     |  2 +-
 res/values-fr-rCA/strings.xml |  2 +-
 res/values-hu/strings.xml     |  2 +-
 res/values-ja/strings.xml     |  2 +-
 res/values-nb/strings.xml     |  4 ++--
 res/values-pl/strings.xml     | 16 ++++++-------
 res/values-ro/strings.xml     | 18 +++++++-------
 res/values-ru/strings.xml     | 14 +++++------
 res/values-sl/strings.xml     |  6 ++---
 10 files changed, 55 insertions(+), 55 deletions(-)

diff --git a/res/values-am/strings.xml b/res/values-am/strings.xml
index 09605779c..26e101aec 100644
--- a/res/values-am/strings.xml
+++ b/res/values-am/strings.xml
@@ -49,7 +49,7 @@
     <string name="account_folder_list_summary_starred" msgid="3134312269246375723">"ኮከብ የተደረገባቸው"</string>
     <string name="account_folder_list_summary_drafts" msgid="5514845993247300437">"ረቂቆች"</string>
     <string name="account_folder_list_summary_outbox" msgid="3059836696049399377">"የወጪ መልዕክት ሳጥን"</string>
-    <string name="mailbox_list_account_selector_combined_view" msgid="1556327299894225044">"የተቀላቀለዕይታ"</string>
+    <string name="mailbox_list_account_selector_combined_view" msgid="1556327299894225044">"የተቀላቀለ ዕይታ"</string>
     <string name="message_compose_fwd_header_fmt" msgid="5181300290654579434">\n\n"----------- ዋና መልዕክት---------\nጉዳዩ፡<xliff:g id="SUBJECT">%1$s</xliff:g>\n ከ፡<xliff:g id="SENDER">%2$s</xliff:g>\nለ፡<xliff:g id="TO">%3$s</xliff:g>\n<xliff:g id="CC_0">%4$s</xliff:g>\n  ካርቦን ቅጂ፡\n"</string>
     <string name="message_compose_insert_quick_response_list_title" msgid="5314107302508728189">"ፈጣን ምላሽ አስገባ"</string>
     <string name="message_compose_insert_quick_response_menu_title" msgid="5817075097532919955">"ፈጣን ምላሽ አስገባ"</string>
@@ -105,9 +105,9 @@
     <string name="account_setup_ab_headline" msgid="7110531768613341908">"የመለያ አይነት ያረጋግጡ"</string>
     <string name="account_setup_ab_instructions_format" msgid="2107254631013471380">"<xliff:g id="EMAIL">%1$s</xliff:g> <xliff:g id="USERPROTOCOL">%2$s</xliff:g>ን እንደሚጠቀም አመልክተዋል፣ ነገር ግን መለያው <xliff:g id="PROVIDERPROTOCOL">%3$s</xliff:g>ን ሊጠቀም ይችላል"</string>
     <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>
@@ -146,7 +146,7 @@
     <string name="account_setup_exchange_device_id_label" msgid="5105898844003459657">"የተንቀሳቃሽ መሣሪያ መታወቂያ"</string>
     <string name="account_setup_options_title" msgid="9016600767888846051">"መለያ ቅንብሮች"</string>
     <string name="account_setup_options_headline" msgid="4181274232835368085">"የመለያ አማራጮች"</string>
-    <string name="account_setup_options_mail_check_frequency_label" msgid="8321552620846334354">"የማመሳስል ድግግሞሽ፦"</string>
+    <string name="account_setup_options_mail_check_frequency_label" msgid="8321552620846334354">"የአስምር ድግግሞሽ፦"</string>
     <string name="account_setup_options_mail_check_frequency_never" msgid="287951859480505416">"በፍፁም"</string>
     <string name="account_setup_options_mail_check_frequency_push" msgid="5934525907736008673">"ራስሰር(ግፋ)"</string>
     <string name="account_setup_options_mail_check_frequency_5min" msgid="6388939895878539307">"በየ5 ደቂቃዎቹ"</string>
@@ -155,15 +155,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="7603869690500525594">"ኢሜይሎችን አመሳስል ከ፦"</string>
     <string name="account_setup_options_mail_window_auto" msgid="4188895354366183790">"ራስ ሰር"</string>
     <string name="account_setup_options_mail_window_1day" msgid="7727436096227637646">"ያለፈው ቀን"</string>
-    <string name="account_setup_options_mail_window_3days" msgid="1841106793912850270">"ያለፉት ሶስት ቀናት"</string>
+    <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>
@@ -187,7 +187,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>
@@ -197,10 +197,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>
@@ -217,9 +217,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>
@@ -233,7 +233,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>
@@ -249,8 +249,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>
@@ -259,7 +259,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>
@@ -270,9 +270,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">
@@ -298,9 +298,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-es/strings.xml b/res/values-es/strings.xml
index 17178952f..205c8b0ad 100644
--- a/res/values-es/strings.xml
+++ b/res/values-es/strings.xml
@@ -244,7 +244,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-fr-rCA/strings.xml b/res/values-fr-rCA/strings.xml
index de41fd2b8..3d98873d8 100644
--- a/res/values-fr-rCA/strings.xml
+++ b/res/values-fr-rCA/strings.xml
@@ -111,7 +111,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="406939983633223354">"NOM D\'UTILISATEUR"</string>
diff --git a/res/values-hu/strings.xml b/res/values-hu/strings.xml
index d4bdef545..cbd9aa683 100644
--- a/res/values-hu/strings.xml
+++ b/res/values-hu/strings.xml
@@ -250,7 +250,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 652e14715..705437c32 100644
--- a/res/values-ja/strings.xml
+++ b/res/values-ja/strings.xml
@@ -111,7 +111,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="406939983633223354">"ユーザー名"</string>
diff --git a/res/values-nb/strings.xml b/res/values-nb/strings.xml
index 9f6fad60f..824aba790 100644
--- a/res/values-nb/strings.xml
+++ b/res/values-nb/strings.xml
@@ -105,7 +105,7 @@
     <string name="account_setup_ab_headline" msgid="7110531768613341908">"Bekreft kontotypen"</string>
     <string name="account_setup_ab_instructions_format" msgid="2107254631013471380">"Du har angitt at <xliff:g id="EMAIL">%1$s</xliff:g> bruker <xliff:g id="USERPROTOCOL">%2$s</xliff:g>, men kontoen bruker kanskje <xliff:g id="PROVIDERPROTOCOL">%3$s</xliff:g>"</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>
@@ -260,7 +260,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-pl/strings.xml b/res/values-pl/strings.xml
index 64146cc99..645d33aa3 100644
--- a/res/values-pl/strings.xml
+++ b/res/values-pl/strings.xml
@@ -93,7 +93,7 @@
     <string name="authentication_label" msgid="6917956186120234602">"UWIERZYTELNIANIE"</string>
     <string name="add_authentication_label" msgid="865206092644419804">"Dodaj uwierzytelnianie"</string>
     <string name="clear_authentication_label" msgid="8113966442068335059">"Wyczyść uwierzytelnianie"</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>
@@ -215,10 +215,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>
@@ -233,7 +233,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>
@@ -249,7 +249,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>
@@ -259,7 +259,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>
@@ -289,7 +289,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>
@@ -299,7 +299,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-ro/strings.xml b/res/values-ro/strings.xml
index 7732607dd..021a9be01 100644
--- a/res/values-ro/strings.xml
+++ b/res/values-ro/strings.xml
@@ -83,7 +83,7 @@
     <string name="password_warning_label" msgid="1479956455912041077">"Adresa de e-mail sau parola este incorectă"</string>
     <string name="email_confirmation_label" msgid="1082319634606902954">"Adresa de e-mail:"</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="or_label" msgid="2207403489755254427">"SAU"</string>
     <string name="sign_in_with_google" msgid="9051489501495503976">"Conectați-vă cu Google"</string>
@@ -155,10 +155,10 @@
     <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="7603869690500525594">"Sincronizați e-mailurile începând cu:"</string>
     <string name="account_setup_options_mail_window_auto" msgid="4188895354366183790">"Automat"</string>
@@ -215,10 +215,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>
@@ -259,7 +259,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>
@@ -297,10 +297,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 38bb93e17..719c30630 100644
--- a/res/values-ru/strings.xml
+++ b/res/values-ru/strings.xml
@@ -82,7 +82,7 @@
     <string name="oauth_error_description" msgid="5257268852139229456">"Не удалось выполнить аутентификацию"</string>
     <string name="password_warning_label" msgid="1479956455912041077">"Неверный адрес эл. почты или пароль"</string>
     <string name="email_confirmation_label" msgid="1082319634606902954">"Адрес эл. почты:"</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="or_label" msgid="2207403489755254427">"ИЛИ"</string>
@@ -148,16 +148,16 @@
     <string name="account_setup_options_headline" msgid="4181274232835368085">"Параметры аккаунта"</string>
     <string name="account_setup_options_mail_check_frequency_label" msgid="8321552620846334354">"Частота синхронизации:"</string>
     <string name="account_setup_options_mail_check_frequency_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="7603869690500525594">"Синхронизация почты:"</string>
@@ -216,13 +216,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-sl/strings.xml b/res/values-sl/strings.xml
index 825f5972c..358eceb57 100644
--- a/res/values-sl/strings.xml
+++ b/res/values-sl/strings.xml
@@ -25,7 +25,7 @@
     <string name="next_action" msgid="3931301986364184415">"Naprej"</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>
@@ -127,7 +127,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>
@@ -158,7 +158,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="7603869690500525594">"Sinhronizacija e-poštnih sporočil od:"</string>
     <string name="account_setup_options_mail_window_auto" msgid="4188895354366183790">"Samodejno"</string>